Fix for security hole with setting session['user_id'] before second factor of authentication has been authorised.

app/main/views/code_not_received.py

@@ -10,7 +10,7 @@ from app.main.views import send_sms_code, send_email_code
 @main.route('/email-not-received', methods=['GET', 'POST'])
 def check_and_resend_email_code():
     # TODO there needs to be a way to regenerate a session id
-    user = users_dao.get_user_by_id(session['user_id'])
+    user = users_dao.get_user_by_email(session['user_email'])
     form = EmailNotReceivedForm(email_address=user.email_address)
     if form.validate_on_submit():
         users_dao.update_email_address(id=user.id, email_address=form.email_address.data)
@@ -22,7 +22,7 @@ def check_and_resend_email_code():
 @main.route('/text-not-received', methods=['GET', 'POST'])
 def check_and_resend_text_code():
     # TODO there needs to be a way to regenerate a session id
-    user = users_dao.get_user_by_id(session['user_id'])
+    user = users_dao.get_user_by_email(session['user_email'])
     form = TextNotReceivedForm(mobile_number=user.mobile_number)
     if form.validate_on_submit():
         users_dao.update_mobile_number(id=user.id, mobile_number=form.mobile_number.data)
@@ -39,6 +39,6 @@ def verification_code_not_received():
 @main.route('/send-new-code', methods=['GET'])
 def check_and_resend_verification_code():
     # TODO there needs to be a way to generate a new session id
-    user = users_dao.get_user_by_id(session['user_id'])
+    user = users_dao.get_user_by_email(session['user_email'])
     send_sms_code(user.id, user.mobile_number)
     return redirect(url_for('main.two_factor'))

app/main/views/register.py

@@ -42,7 +42,7 @@ def process_register():
         send_sms_code(user_id=user.id, mobile_number=form.mobile_number.data)
         send_email_code(user_id=user.id, email=form.email_address.data)
         session['expiry_date'] = str(datetime.now() + timedelta(hours=1))
-        session['user_id'] = user.id
+        session['user_email'] = user.email_address
         return redirect('/verify')
 
     return render_template('views/register.html', form=form)

app/main/views/sign_in.py

@@ -18,7 +18,7 @@ def sign_in():
             if user:
                 if not user.is_locked() and user.is_active() and check_hash(form.password.data, user.password):
                     send_sms_code(user.id, user.mobile_number)
-                    session['user_id'] = user.id
+                    session['user_email'] = user.email_address
                     return redirect(url_for('.two_factor'))
                 else:
                     users_dao.increment_failed_login_count(user.id)

app/main/views/two_factor.py

@@ -11,10 +11,12 @@ from app.main.forms import TwoFactorForm
 
 @main.route('/two-factor', methods=['GET', 'POST'])
 def two_factor():
-    form = TwoFactorForm()
+    # TODO handle user_email not in session
+    user = users_dao.get_user_by_email(session['user_email'])
+    codes = verify_codes_dao.get_codes(user.id)
+    form = TwoFactorForm(codes)
 
     if form.validate_on_submit():
-        user = users_dao.get_user_by_id(session['user_id'])
         verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
         login_user(user)
         return redirect(url_for('.dashboard'))

app/main/views/verify.py

@@ -12,8 +12,9 @@ from app.main.forms import VerifyForm
 def verify():
     # TODO there needs to be a way to regenerate a session id
     # or handle gracefully.
-    user = users_dao.get_user_by_id(session['user_id'])
-    form = VerifyForm()
+    user = users_dao.get_user_by_email(session['user_email'])
+    codes = verify_codes_dao.get_codes(user.id)
+    form = VerifyForm(codes)
     if form.validate_on_submit():
         verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='email')
         verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')