mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -137,7 +137,7 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato
|
|||||||
logger.debug("Authenticating as Guest");
|
logger.debug("Authenticating as Guest");
|
||||||
|
|
||||||
// authenticate as guest
|
// authenticate as guest
|
||||||
AuthenticationUtil.setCurrentUser(AuthenticationUtil.getGuestUserName());
|
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
|
||||||
|
|
||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
logger.debug("Setting Web Client authentication context for guest");
|
logger.debug("Setting Web Client authentication context for guest");
|
||||||
@@ -150,7 +150,7 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato
|
|||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
logger.debug("Authenticating as user " + portalUser);
|
logger.debug("Authenticating as user " + portalUser);
|
||||||
|
|
||||||
AuthenticationUtil.setCurrentUser(portalUser);
|
AuthenticationUtil.setFullyAuthenticatedUser(portalUser);
|
||||||
|
|
||||||
// determine if Web Client context needs to be updated
|
// determine if Web Client context needs to be updated
|
||||||
User user = getWebClientUser(session);
|
User user = getWebClientUser(session);
|
||||||
|
@@ -74,7 +74,7 @@ public class MTWebScriptAuthenticationFilter implements Filter
|
|||||||
{
|
{
|
||||||
if (AuthenticationUtil.isMtEnabled())
|
if (AuthenticationUtil.isMtEnabled())
|
||||||
{
|
{
|
||||||
String currentUser = AuthenticationUtil.getCurrentUserName();
|
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
|
||||||
if (currentUser == null)
|
if (currentUser == null)
|
||||||
{
|
{
|
||||||
// retrieve authenticator factory
|
// retrieve authenticator factory
|
||||||
|
Reference in New Issue
Block a user