From 3313b6d34582b5be63c6b2a670acc68c5e0698ac Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:43:46 +0000 Subject: [PATCH] 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 --- .../repo/webdav/auth/BaseKerberosAuthenticationFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java index bdb4138012..db132aa21d 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java @@ -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