Changeset 6685

Timestamp:

Jan 20, 2015, 9:18:41 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1907: Make it possible to login with external authentication for the root user

No special treatment for the root user when logging in.

Location:

trunk

Files:

• doc/src/docbook/developer/extensions.xml (modified) (2 diffs)
• src/core/net/sf/basedb/core/SessionControl.java (modified) (1 diff)

trunk/doc/src/docbook/developer/extensions.xml

@@ -2391 +2391 @@
       
         <para>
-          All login requests (except ROOT) are always sent to registered authentication
+          All login requests are always sent to registered authentication
           managers first. Internal authentication is only used if no authentication 
           manager could validate the user. Even with external authentication it is possible to 
@@ -2410 +2410 @@
           
           <itemizedlist>
-          <listitem>
-            <para>
-              The ROOT user is logging on. Internal authentication is always 
-              used for the root user and no authentication managers are used.
-            </para>
-          </listitem>
-
           <listitem>
             <para>

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

@@ -381 +381 @@
       tx = HibernateUtil.newTransaction(session);
 
-      // Try external authentication at first, except...
-      // ...root user should always use internal verification
-      UserData root = HibernateUtil.loadData(session, UserData.class, SystemItems.getId(User.ROOT));
-      assert root != null : "root == null";
-      
-      AuthenticatedUser authUser = null;
-      if (!loginRequest.getLogin().equals(root.getLogin()))
-      {
-        authUser = verifyUserExternal(session, loginRequest);
-      }
-      
+      AuthenticatedUser authUser = verifyUserExternal(session, loginRequest);
       if (authUser == null)
       {