From beaf650b9eed06270b987c36bcadb5d133f623e4 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Mon, 17 Aug 2015 11:48:44 +0000 Subject: [PATCH] Merged 5.0.N (5.0.3) to HEAD (5.1) 110095: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) 110058: MNT-14274: CIFS __ShowDetails.exe throws a 500 error when Kerberos SSO is enabled. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/webdav/auth/BaseKerberosAuthenticationFilter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java index 1d8e99c653..b535ef912d 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java @@ -338,6 +338,11 @@ public abstract class BaseKerberosAuthenticationFilter extends BaseSSOAuthentica // Filter validate hook if (getLogger().isDebugEnabled()) getLogger().debug("Authenticated with a ticket parameter."); + + if (user == null) + { + user = (SessionUser) httpSess.getAttribute(getUserAttributeName()); + } onValidate( context, req, resp, new TicketCredentials(user.getTicket())); // Chain to the next filter