Changeset 4918

Timestamp:

Aug 8, 2018, 2:20:30 PM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #1055: Implement extension for logging in with OTP

The login form extension has been updated with support for both otp-only and otp+password authentication.

Location:

extensions/net.sf.basedb.otp/trunk

Files:

• resources/css/otp.css (modified) (1 diff)
• resources/scripts/login.js (modified) (1 diff)
• src/net/sf/basedb/otp/Otp.java (modified) (1 diff)
• src/net/sf/basedb/otp/OtpLoginFormFactory.java (modified) (3 diffs)

extensions/net.sf.basedb.otp/trunk/resources/css/otp.css

@@ -18 +18 @@
   min-height: 70px;
 }
+
+#extra-row.optional td::after
+{
+  content: "(optional)";
+  opacity: 0.5;
+}
+
+#extra-row.required td::after
+{
+  content: "(required)";
+  opacity: 0.5;
+}

extensions/net.sf.basedb.otp/trunk/resources/scripts/login.js

@@ -7 +7 @@
   otp.initPage = function()
   {
-    var pwd = Doc.element('password');
-    if (pwd.type == 'text')
+    // The OTP field can be either the password field or the
+    // extra field
+    var otpField = Doc.element('extraField');
+    if (!otpField) otpField = Doc.element('password');
+    // If the OTP field is text type, the user is not 
+    // supposed to enter password into it
+    if (otpField.type == 'text')
     {
       // Limit to digits
-      Events.addEventHandler(pwd, 'keypress', Events.integerOnly);
+      Events.addEventHandler(otpField, 'keypress', Events.integerOnly);
       // Disable auto-complete
-      pwd.setAttribute('autocomplete', 'off');
+      otpField.setAttribute('autocomplete', 'off');
     }
   }

extensions/net.sf.basedb.otp/trunk/src/net/sf/basedb/otp/Otp.java

@@ -131 +131 @@
     return clientId != null && requireOtpLogin != null && requireOtpLogin.contains(clientId);
   }
+  
+  /**
+    Get the authentication method to use:
+    {@link #OTP_ONLY_AUTHENTICATION_METHOD} or 
+    {@link #OTP_PASSWORD_AUTHENTICATION_METHOD}.
+  */
+  public static AuthenticationMethod getAuthenticationMethod()
+  {
+    AuthenticationMethod am = OTP_PASSWORD_AUTHENTICATION_METHOD;
+    if ("otp-only".equals(getConfig().get("login-method")))
+    {
+      am = OTP_ONLY_AUTHENTICATION_METHOD;
+    }
+    return am;
+  }
+
 
 }

extensions/net.sf.basedb.otp/trunk/src/net/sf/basedb/otp/OtpLoginFormFactory.java

@@ -5 +5 @@
 import net.sf.basedb.clients.web.extensions.login.LoginFormAction;
 import net.sf.basedb.clients.web.extensions.login.LoginFormBean;
+import net.sf.basedb.core.authentication.AuthenticationMethod;
 import net.sf.basedb.util.extensions.InvokationContext;
 
@@ -18 +19 @@
   
   private final boolean hasConfig;
+  private final AuthenticationMethod authMethod;
   private final LoginFormBean loginFormOptional;
   private final LoginFormBean loginFormRequired;
@@ -25 +27 @@
   {
     hasConfig = Otp.getConfig() != null;
+    authMethod = Otp.getAuthenticationMethod();
+    
+    FieldInfo otpOrPasswordField = new FieldInfo("OTP or password", true);
+    otpOrPasswordField.setStyle("width: 10em;");
+    otpOrPasswordField.setTooltip("Use your device to generate a 6-digit passcode (or use the regular password)");
+
+    FieldInfo otpFieldRequired = new FieldInfo("One-time passcode", false);
+    otpFieldRequired.setClazz("requried");
+    otpFieldRequired.setStyle("width: 10em;");
+    otpFieldRequired.setTooltip("Use your device to generate a 6-digit code (required)");
+
+    FieldInfo otpFieldOptional = new FieldInfo("One-time passcode", false);
+    otpFieldOptional.setClazz("optional");
+    otpFieldOptional.setStyle("width: 10em;");
+    otpFieldOptional.setTooltip("Use your device to generate a 6-digit code (optional)");
+    
+    String helpTextWithConfigLink = "<p style=\"margin-top: 0.5em;\">"
+        + "<b>Note!</b> If you have not configured your account for OTP you can do it "
+        + "<span class=\"link auto-init\" data-auto-init=\"setup-otp\">here</span>.";
     
     loginFormOptional = new LoginFormBean();
     loginFormOptional.setRememberLastLogin(true);
-    loginFormOptional.setHelp(
+    loginFormOptional.setLoginField(FieldInfo.DEFAULT_LOGIN);
+    if (authMethod == Otp.OTP_ONLY_AUTHENTICATION_METHOD)
+    {
+      loginFormOptional.setHelp(
         "If you have set-up your account for one-time passwords (OTP), use your device to generate a "
         + "6-digit passcode. Enter your username in the <b>Login</b> field and the code in the <b>OTP or password</b> field. "
-        + "<p style=\"margin-top: 0.5em;\">"
-        + "<b>Note!</b> If you have not configured your account for OTP you can do it <span class=\"link auto-init\" data-auto-init=\"setup-otp\">here</span>.");
-  
-    FieldInfo otpFieldOptional = new FieldInfo("OTP or password", true);
-    otpFieldOptional.setStyle("width: 10em;");
-    otpFieldOptional.setTooltip("Use your device to generate a 6-digit passcode (or use the regular password)");
-
-    loginFormOptional.setLoginField(FieldInfo.DEFAULT_LOGIN);
-    loginFormOptional.setPasswordField(otpFieldOptional);
+        + helpTextWithConfigLink);
+      loginFormOptional.setPasswordField(otpOrPasswordField);
+    }
+    else
+    {
+      loginFormOptional.setHelp(
+        "If you have set-up your account for one-time passwords (OTP), use your device to generate a "
+        + "6-digit passcode. Enter your username in the <b>Login</b> field, your regular password in "
+        + "the <b>Password</b> field and the code in the <b>One-time passcode</b> field. "
+        + helpTextWithConfigLink);
+      loginFormOptional.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
+      loginFormOptional.setExtraField(otpFieldOptional);
+    }
 
     loginFormRequired = new LoginFormBean();
     loginFormRequired.setRememberLastLogin(true);
-    loginFormRequired.setHelp(
+    loginFormRequired.setLoginField(FieldInfo.DEFAULT_LOGIN);
+    if (authMethod == Otp.OTP_ONLY_AUTHENTICATION_METHOD)
+    {
+      loginFormRequired.setHelp(
         "A one-time passcode (OTP) is required to login. Enter your username in the <b>Login</b> field. "
         + "Use your device to generate a 6-digit code and enter it in the <b>One-time passcode</b> field. "
-        + "<p style=\"margin-top: 0.5em;\">"
-        + "<b>Note!</b> If you have not configured your account for OTP you can do it <span class=\"link auto-init\" data-auto-init=\"setup-otp\">here</span>.");
-  
-    FieldInfo otpFieldRequired = new FieldInfo("One-time passcode", false);
-    otpFieldRequired.setStyle("width: 10em;");
-    otpFieldRequired.setTooltip("Use your device to generate a 6-digit code");
-
-    loginFormRequired.setLoginField(FieldInfo.DEFAULT_LOGIN);
-    loginFormRequired.setPasswordField(otpFieldRequired);
+        + helpTextWithConfigLink);
+      loginFormRequired.setPasswordField(otpFieldRequired);
+    }
+    else
+    {
+      loginFormRequired.setHelp(
+        "A one-time passcode (OTP) is required to login. Enter your username in the <b>Login</b> field and your "
+        + "regular password in the <b>Password</b> field. "
+        + "Use your device to generate a 6-digit code and enter it in the <b>One-time passcode</b> field. "
+        + helpTextWithConfigLink);
+      loginFormRequired.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
+      loginFormRequired.setExtraField(otpFieldRequired);
+    }
   }