Bug 1199089 - add support for duo-security

2 files changed, 25 insertions, 5 deletions

diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index fea4239b3..a6cb8d3b1 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -142,16 +142,34 @@
     "<li>letters_numbers - Passwords must contain at least one UPPER and one " _
     "lower case letter and a number.</li>" _
     "<li>letters_numbers_specialchars - Passwords must contain at least one " _
-    "UPPER or one lower case letter, a number and a special character.</li></ul>"
-  },
+    "UPPER or one lower case letter, a number and a special character.</li></ul>",
 
   password_check_on_login =>
     "If set, $terms.Bugzilla will check that the password meets the current " _
     "complexity rules and minimum length requirements  when the user logs " _
     "into the $terms.Bugzilla web interface. If it doesn't, the user would " _
-    "not be able to log in, and recieve a message to reset their password."
+    "not be able to log in, and recieve a message to reset their password.",
 
-   auth_delegation =>
+  auth_delegation =>
     "If set, $terms.Bugzilla will allow third party applications " _
-    "to request API keys for users."
+    "to request API keys for users.",
+
+  duo_host =>
+    "The 'API hostname' for Duo 2FA. This value is provided by your " _
+    "Duo Security administrator. Set this to a blank value to disable" _
+    "Duo 2FA.",
+
+  duo_akey =>
+    "The 'integration secret key' for Duo 2FA. This is automatically " _
+    "generated by checksetup.pl.",
+
+  duo_ikey =>
+    "The 'integration key' for Duo 2FA. This value is provided by your " _
+    "Duo Security administrator.",
+
+  duo_skey =>
+    "The 'secret key' for Duo 2FA. This value is provided by your " _
+    "Duo Security administrator.",
+
+  },
 %]
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index 72fe4349c..a455ef84b 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -133,6 +133,8 @@
               [% SWITCH otheruser.mfa %]
                 [% CASE "TOTP" %]
                   <option value="TOTP" selected>Enabled - TOTP</option>
+                [% CASE "Duo" %]
+                  <option value="Duo" selected>Enabled - Duo Security</option>
               [% END %]
             </select>
           [% ELSE %]