inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-16 17:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

MT - fix required, post merge of r8066

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka 2008-03-12 10:13:53 +00:00
parent af56b1ebac
commit 2fece79cd2
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
View File

@ -33,6 +33,7 @@ import net.sf.acegisecurity.providers.dao.User;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.repository.NodeRef;
@ -145,7 +146,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
public Authentication setCurrentUser(final String userName) throws AuthenticationException
{
if (AuthenticationUtil.getSystemUserName().equals(userName))
if (isSystemUserName(userName))
{
return setCurrentUserImpl(userName);
}
@ -178,11 +179,11 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
try
{
UserDetails ud = null;
if (userName.equals(AuthenticationUtil.SYSTEM_USER_NAME))
if (isSystemUserName(userName))
{
GrantedAuthority[] gas = new GrantedAuthority[1];
gas[0] = new GrantedAuthorityImpl("ROLE_SYSTEM");
ud = new User(AuthenticationUtil.SYSTEM_USER_NAME, "", true, true, true, true, gas);
ud = new User(userName, "", true, true, true, true, gas);
}
else if (isGuestUserName(userName))
{
@ -283,7 +284,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
*/
public boolean isSystemUserName(String userName)
{
return ((userName != null) && tenantService.getBaseNameUser(userName).equals(getSystemUserName()));
return (getSystemUserName().equals(tenantService.getBaseNameUser(userName)));
}
/**
@ -343,7 +344,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
private boolean isGuestUserName(String userName)
{
return ((userName != null) && tenantService.getBaseNameUser(userName).equalsIgnoreCase(PermissionService.GUEST_AUTHORITY));
return (PermissionService.GUEST_AUTHORITY.equalsIgnoreCase(tenantService.getBaseNameUser(userName)));
}
protected abstract boolean implementationAllowsGuestLogin();
@ -409,6 +410,10 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
public Authentication execute() throws Throwable
{
try
{
String name = AuthenticationUtil.runAs(new RunAsWork<String>()
{
public String doWork() throws Exception
{
if (personService.personExists(userName))
{
@ -416,27 +421,29 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
if (userNode != null)
{
// Get the person name and use that as the current user to line up with permission checks
String personName = (String) nodeService.getProperty(userNode, ContentModel.PROP_USERNAME);
return setCurrentUserImpl(personName);
return (String) nodeService.getProperty(userNode, ContentModel.PROP_USERNAME);
}
else
{
// Set using the user name
return setCurrentUserImpl(userName);
// Get user name
return userName;
}
}
else
{
// Set using the user name
return setCurrentUserImpl(userName);
// Get user name
return userName;
}
}
}, tenantService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantService.getUserDomain(userName)));
return setCurrentUserImpl(name);
}
catch (AuthenticationException ae)
{
this.ae = ae;
return null;
}
}
}
}