Changeset 7536

Timestamp:

Nov 28, 2018, 8:49:22 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2131: Add support for installing multiple authentication managers

Added an "external" version of the default username+password login form. This is is disabled by default but need to be used when another external authentication manager has been installed and some users still need to be able to login with username+password.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/login/PasswordLoginFormFactory.java (added)
• src/clients/web/web-extensions.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/Install.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/Update.java (modified) (2 diffs)
• www/main.jsp (modified) (2 diffs)
• www/switch.jsp (modified) (2 diffs)

trunk/src/clients/web/web-extensions.xml

@@ -212 +212 @@
      * OnSave: Add callback functionality when saving from an edit dialog
   -->
+  
+  <extension
+    id="password-login-form"
+    extends="net.sf.basedb.clients.web.login-form"
+    >
+    <about>
+      <name>Password login form</name>
+      <description>
+        The regular username+password login form. This is disabled by 
+        default, but need to be enabled when installing an external 
+        authentication manager that is optional.
+      </description>
+    </about>
+    <index>99</index>
+    <action-factory>
+      <factory-class>net.sf.basedb.clients.web.extensions.login.PasswordLoginFormFactory</factory-class>
+    </action-factory>
+  </extension>
   
   <extension

trunk/src/core/net/sf/basedb/core/Install.java

@@ -119 +119 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(141).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(142).intValue();
   
   public static synchronized int createTables(SchemaGenerator.Mode mode, ProgressReporter progress,
@@ -961 +961 @@
       }
       
+      Settings xtSettings = Application.getExtensionsManager().getSettings();
       if (!update || schemaVersion.getSchemaVersion() < 108)
       {
@@ -966 +967 @@
         // base.config setting has enabled it when installing or updating from
         // pre BASE 3.2
-        Settings xtSettings = Application.getExtensionsManager().getSettings();
         xtSettings.enableExtension("net.sf.basedb.core.db-log-manager", 
           "net.sf.basedb.core.log.db.DbLogManagerFactory".equals(Config.getString("changelog.factory")));
-        xtSettings.save();
-      }
+      }
+      if (!update || schemaVersion.getSchemaVersion() < 142)
+      {
+        // The Password login form should be disabled by default
+        xtSettings.enableExtension("net.sf.basedb.clients.web.password-login-form", false);
+      }
+      xtSettings.save();
       
       if (progress != null) 

trunk/src/core/net/sf/basedb/core/Update.java

@@ -399 +399 @@
     </td>
   </tr>
+  <tr>
+    <td>142</td>
+    <td>
+      Added the default password login form. It needs to be disabled by default which is
+      triggered by the schema version update. No actual database change.
+    </td>
+  </tr>
   
   </table>
@@ -646 +653 @@
         if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 141...");
         schemaVersion = setSchemaVersionInTransaction(session, 141);
+        progress_current += progress_step;
+      }
+      
+      if (schemaVersion < 142)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 142...");
+        schemaVersion = setSchemaVersionInTransaction(session, 142);
         progress_current += progress_step;
       }

trunk/www/main.jsp

@@ -50 +50 @@
   import="net.sf.basedb.clients.web.servlet.RssNewsFeed"
   import="net.sf.basedb.clients.web.extensions.login.LoginFormAction"
-  import="net.sf.basedb.clients.web.extensions.login.LoginFormBean"
   import="net.sf.basedb.clients.web.extensions.login.FieldInfo"
+  import="net.sf.basedb.clients.web.extensions.login.PasswordLoginFormFactory"
   import="net.sf.basedb.util.Values"
   import="java.util.Date"
@@ -111 +111 @@
   if (loginAction == null)
   {
-    LoginFormBean bean  = new LoginFormBean();
-    bean.setRememberLastLogin(true);
-    bean.setLoginField(FieldInfo.DEFAULT_LOGIN);
-    bean.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
-    loginAction = bean;
-    selectedLoginForm = "password";
+    loginAction = PasswordLoginFormFactory.INSTANCE;
+    selectedLoginForm = loginAction.getId();
   }
 

trunk/www/switch.jsp

@@ -39 +39 @@
   import="net.sf.basedb.clients.web.extensions.JspContext"
   import="net.sf.basedb.clients.web.extensions.login.LoginFormAction"
-  import="net.sf.basedb.clients.web.extensions.login.LoginFormBean"
+  import="net.sf.basedb.clients.web.extensions.login.PasswordLoginFormFactory"
   import="net.sf.basedb.clients.web.extensions.login.FieldInfo"
   import="net.sf.basedb.util.Values"
@@ -91 +91 @@
   if (loginAction == null)
   {
-    LoginFormBean bean  = new LoginFormBean();
-    bean.setRememberLastLogin(true);
-    bean.setLoginField(FieldInfo.DEFAULT_LOGIN);
-    bean.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
-    loginAction = bean;
-    selectedLoginForm = "password";
+    loginAction = PasswordLoginFormFactory.INSTANCE;
+    selectedLoginForm = loginAction.getId();
   }
   FieldInfo loginField = loginAction.getLoginField();