From b68a5e30ad98fca7e058b292f8f2abe6fa1e9e42 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Jun 01 2021 15:37:37 +0000
Subject: Use a separate field for OTP in Fedora


Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/ipsilon/login/authldap.py b/ipsilon/login/authldap.py
index 1050423..8ca918d 100644
--- a/ipsilon/login/authldap.py
+++ b/ipsilon/login/authldap.py
@@ -65,6 +65,7 @@ class LDAP(LoginFormBase, Log):
     def POST(self, *args, **kwargs):
         username = kwargs.get("login_name")
         password = kwargs.get("login_password")
+        password += kwargs.get("login_otp", "")
         userattrs = None
         authok = False
         errmsg = None
diff --git a/ipsilon/login/authpam.py b/ipsilon/login/authpam.py
index 67c3ed5..9ebee9d 100644
--- a/ipsilon/login/authpam.py
+++ b/ipsilon/login/authpam.py
@@ -35,6 +35,7 @@ class Pam(LoginFormBase):
     def POST(self, *args, **kwargs):
         username = kwargs.get("login_name")
         password = kwargs.get("login_password")
+        password += kwargs.get("login_otp", "")
         user = None
         error = None
 
diff --git a/ipsilon/login/authtest.py b/ipsilon/login/authtest.py
index 9e28de7..a3375f9 100644
--- a/ipsilon/login/authtest.py
+++ b/ipsilon/login/authtest.py
@@ -14,6 +14,7 @@ class TestAuth(LoginFormBase):
     def POST(self, *args, **kwargs):
         username = kwargs.get("login_name")
         password = kwargs.get("login_password")
+        password += kwargs.get("login_otp", "")
         error = None
 
         if username and password:
diff --git a/templates/login/form.html b/templates/login/form.html
index fe99c5a..eea8a13 100644
--- a/templates/login/form.html
+++ b/templates/login/form.html
@@ -32,6 +32,11 @@
       </div>
     </div>
     <div class="form-group">
+      <div class="col-sm-10 col-md-10 col-sm-offset-2 col-md-offset-2">
+        <input type="text" class="form-control" name="login_otp" id="otp" placeholder="One-Time-Password (if you have one)" tabindex="3" />
+      </div>
+    </div>
+    <div class="form-group">
       <div class="col-sm-offset-2 col-md-offset-2 col-xs-12 col-sm-10 col-md-10 submit">
         {% if cancel_url %}
           <a href="{{ cancel_url }}" title="Cancel" class="btn btn-link" tabindex="4">Cancel</a>
diff --git a/themes/Fedora/templates/login/form.html b/themes/Fedora/templates/login/form.html
index ae616a5..6c695ab 100644
--- a/themes/Fedora/templates/login/form.html
+++ b/themes/Fedora/templates/login/form.html
@@ -19,8 +19,11 @@
                     <div class="form-group">
                         <input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
                     </div>
+                    <div class="form-group">
+                        <input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
+                    </div>
                     <div class="form-group mb-0">
-                        <input class="form-control" id="password" name="login_password" type="password" placeholder="Password or Password + One-Time-Password" />
+                        <input class="form-control" id="otp" name="login_otp" placeholder="One-Time-Password (if you have one)" />
                     </div>
                 </div>
                 <div class="card-footer d-flex justify-content-between">
diff --git a/themes/openSUSE/templates/login/form.html b/themes/openSUSE/templates/login/form.html
index aead180..596410e 100644
--- a/themes/openSUSE/templates/login/form.html
+++ b/themes/openSUSE/templates/login/form.html
@@ -20,8 +20,11 @@
                     <div class="form-group">
                         <input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
                     </div>
-                    <div class="form-group mb-0">
+                    <div class="form-group">
                         <input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
+                    </div>
+                    <div class="form-group mb-0">
+                        <input class="form-control" id="otp" name="login_otp" placeholder="One-Time-Password (if you have one)" />
                         <a target="_blank" href="https://www.microfocus.com/selfreg/jsp/forgotPassword.jsp">Forgot password?</a>
                     </div>
                     </div>