From 421ff7f194875db9634ea783d9dd5b6111f19df3 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 1 Sep 2015 13:01:20 +0800
Subject: Bug 1197073 - add support for 2fa using totp (eg. google
 authenticator)

---
 extensions/Persona/lib/Login.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'extensions/Persona/lib')

diff --git a/extensions/Persona/lib/Login.pm b/extensions/Persona/lib/Login.pm
index ece92a3c0..c2f8caf2b 100644
--- a/extensions/Persona/lib/Login.pm
+++ b/extensions/Persona/lib/Login.pm
@@ -98,6 +98,12 @@ sub get_login_info {
                      user_error => 'persona_account_too_powerful' };
         }
 
+        if ($user->mfa) {
+            return { failure    => AUTH_ERROR,
+                     user_error => 'mfa_prevents_login',
+                     details    => { provider => 'Persona' } };
+        }
+
         $login_data->{'user'} = $user;
         $login_data->{'user_id'} = $user->id;
 
-- 
cgit v1.2.3-24-g4f1b