From c7a7beae1cb1d10048eb56eca559e9d1fc83f947 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 16:48:23 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63706: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF) 63631: MNT-10806: NPE with passthru SSO when client does not accept cookies Add improved logging for case when NTLM details can not be retrieved from session. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/webdav/auth/BaseNTLMAuthenticationFilter.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java index 2932dc03c6..3eb11fd6f8 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java @@ -565,6 +565,13 @@ public abstract class BaseNTLMAuthenticationFilter extends BaseSSOAuthentication } else { + if (ntlmDetails == null) + { + if (logger.isWarnEnabled()) + logger.warn("Authentication failed: NTLM details can not be retrieved from session. Client must support cookies."); + restartLoginChallenge(context, req, res); + return false; + } // Passthru mode, send the hashed password details to the passthru authentication server NTLMPassthruToken authToken = (NTLMPassthruToken) ntlmDetails.getAuthenticationToken(); authToken.setUserAndPassword(type3Msg.getUserName(), type3Msg.getNTLMHash(), PasswordEncryptor.NTLM1);