diff --git a/CTFd/auth.py b/CTFd/auth.py index 968acf4d..b309be67 100644 --- a/CTFd/auth.py +++ b/CTFd/auth.py @@ -91,7 +91,7 @@ Did you initiate a password reset? db.session.close() logger = logging.getLogger('regs') - logger.warn("[{0}] {1} registered with {2}".format(time.strftime("%m/%d/%Y %X"), request.form['name'], request.form['email'])) + logger.warn("[{0}] {1} registered with {2}".format(time.strftime("%m/%d/%Y %X"), request.form['name'].encode('utf-8'), request.form['email'].encode('utf-8'))) return redirect('/login') else: return render_template('register.html') @@ -111,7 +111,7 @@ Did you initiate a password reset? db.session.close() logger = logging.getLogger('logins') - logger.warn("[{0}] {1} logged in".format(time.strftime("%m/%d/%Y %X"), session['username'])) + logger.warn("[{0}] {1} logged in".format(time.strftime("%m/%d/%Y %X"), session['username'].encode('utf-8'))) # if request.args.get('next') and is_safe_url(request.args.get('next')): # return redirect(request.args.get('next')) diff --git a/CTFd/challenges.py b/CTFd/challenges.py index 73838996..c26a0570 100644 --- a/CTFd/challenges.py +++ b/CTFd/challenges.py @@ -83,7 +83,7 @@ def init_challenges(app): return redirect('/') if authed(): logger = logging.getLogger('keys') - data = (time.strftime("%m/%d/%Y %X"), session['username'], request.form['key'], get_kpm(session['id'])) + data = (time.strftime("%m/%d/%Y %X"), session['username'].encode('utf-8'), request.form['key'].encode('utf-8'), get_kpm(session['id'])) print "[{0}] {1} submitted {2} with kpm {3}".format(*data) if get_kpm(session['id']) > 10: wrong = WrongKeys(session['id'], chalid, request.form['key'])