Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59898: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59792: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59780: Merged DEV to PATCHES/V4.2.1 (4.2.1)
            58668 : MNT-10074 : Impossible to use CMIS AtomPub binding when Kerberos is enable
               - Kerberos filter should correctly restart authentication using Negotiate method if Basic was recieved.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 09:30:12 +00:00
parent 9fb192e164
commit 0bc41d66ce

View File

@@ -264,10 +264,10 @@ public abstract class BaseKerberosAuthenticationFilter extends BaseSSOAuthentica
if ( authHdr.startsWith( "Negotiate")) if ( authHdr.startsWith( "Negotiate"))
reqAuth = true; reqAuth = true;
else if ( authHdr.startsWith( "NTLM")) else if ( authHdr.startsWith( "NTLM") || (authHdr.length() > 5 && authHdr.substring(0,5).equalsIgnoreCase("BASIC")))
{ {
if ( getLogger().isDebugEnabled()) if ( getLogger().isDebugEnabled())
getLogger().debug("Received NTLM logon from client"); getLogger().debug("Received NTLM or BASIC logon from client: " + authHdr);
// Restart the authentication // Restart the authentication