Changeset 6685


Ignore:
Timestamp:
Jan 20, 2015, 9:18:41 AM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/src/docbook/developer/extensions.xml

    r6628 r6685  
    23912391     
    23922392        <para>
    2393           All login requests (except ROOT) are always sent to registered authentication
     2393          All login requests are always sent to registered authentication
    23942394          managers first. Internal authentication is only used if no authentication
    23952395          manager could validate the user. Even with external authentication it is possible to
     
    24102410         
    24112411          <itemizedlist>
    2412           <listitem>
    2413             <para>
    2414               The ROOT user is logging on. Internal authentication is always
    2415               used for the root user and no authentication managers are used.
    2416             </para>
    2417           </listitem>
    2418 
    24192412          <listitem>
    24202413            <para>
  • trunk/src/core/net/sf/basedb/core/SessionControl.java

    r6465 r6685  
    381381      tx = HibernateUtil.newTransaction(session);
    382382
    383       // Try external authentication at first, except...
    384       // ...root user should always use internal verification
    385       UserData root = HibernateUtil.loadData(session, UserData.class, SystemItems.getId(User.ROOT));
    386       assert root != null : "root == null";
    387      
    388       AuthenticatedUser authUser = null;
    389       if (!loginRequest.getLogin().equals(root.getLogin()))
    390       {
    391         authUser = verifyUserExternal(session, loginRequest);
    392       }
    393      
     383      AuthenticatedUser authUser = verifyUserExternal(session, loginRequest);
    394384      if (authUser == null)
    395385      {
Note: See TracChangeset for help on using the changeset viewer.