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

72929: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      72835: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         72833: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            72748: Reverse merged V4.1.9 (4.1.9)
               << Fix for MNT-11315/MNT-10797 fixes this issue in a more flexible way, but requires the original fix to be removed. >>
               59793: Merged V4.2-BUG-FIX (4.2.2) to V4.1-BUG-FIX (4.1.8)
                  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@74747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:43:46 +00:00
parent 39a10ee82d
commit 3313b6d345

View File

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