From 155190be25c7146df90bb2d8c21b0fdb1f991770 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Fri, 19 Dec 2008 12:15:59 +0000 Subject: [PATCH] Merged V3.0 to HEAD 12145: Merged V2.2 to V3.0 (AuthenticationUtil) 12109: AuthenticationUtil and AuthenticationComponent refactor 12152: Removed Lucene usage from lookup of 'sites' root folder 12153: Fix InviteServiceTest by cleaning up leaking authentications 12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../scripts/portlet/WebClientPortletAuthenticatorFactory.java | 4 ++-- .../web/app/servlet/MTWebScriptAuthenticationFilter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java index 9bb7eaf3ea..24e312c518 100644 --- a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java +++ b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java @@ -137,7 +137,7 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato logger.debug("Authenticating as Guest"); // authenticate as guest - AuthenticationUtil.setCurrentUser(AuthenticationUtil.getGuestUserName()); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName()); if (logger.isDebugEnabled()) logger.debug("Setting Web Client authentication context for guest"); @@ -150,7 +150,7 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato if (logger.isDebugEnabled()) logger.debug("Authenticating as user " + portalUser); - AuthenticationUtil.setCurrentUser(portalUser); + AuthenticationUtil.setFullyAuthenticatedUser(portalUser); // determine if Web Client context needs to be updated User user = getWebClientUser(session); diff --git a/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java index 4cc85eaf9e..207da11f0a 100644 --- a/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java +++ b/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java @@ -74,7 +74,7 @@ public class MTWebScriptAuthenticationFilter implements Filter { if (AuthenticationUtil.isMtEnabled()) { - String currentUser = AuthenticationUtil.getCurrentUserName(); + String currentUser = AuthenticationUtil.getFullyAuthenticatedUser(); if (currentUser == null) { // retrieve authenticator factory