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

Merged V3.1 to HEAD

Browse Source 
13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 21:48:15 +00:00
parent ae58306cf9
commit 198ebe371e
48 changed files with 461 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/tenant/TenantInterpreter.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.ClassPathResource;
/**
@@ -51,7 +52,7 @@ public class TenantInterpreter extends BaseInterpreter
protected TenantService tenantService;
private AuthenticationService authenticationService;
private String baseAdminUsername = "admin"; // default for backwards compatibility only - eg. upgrade of existing MT instance (mt-admin-context.xml.sample)
private String baseAdminUsername = null; // default for backwards compatibility only - eg. upgrade of existing MT instance (mt-admin-context.xml.sample)
public void setTenantAdminService(TenantAdminService tenantAdminService)
{
@@ -73,6 +74,15 @@ public class TenantInterpreter extends BaseInterpreter
this.baseAdminUsername = baseAdminUsername;
}
public String getBaseAdminUsername()
{
if (baseAdminUsername != null)
{
return baseAdminUsername;
}
return AuthenticationUtil.getAdminUserName();
}
/**
* Main entry point.
*/
@@ -336,7 +346,7 @@ public class TenantInterpreter extends BaseInterpreter
String tenantDomain = new String(command[1]).toLowerCase();
final String newPassword = new String(command[2]);
final String tenantAdminUsername = tenantService.getDomainUser(baseAdminUsername, tenantDomain);
final String tenantAdminUsername = tenantService.getDomainUser(getBaseAdminUsername(), tenantDomain);
AuthenticationUtil.runAs(new RunAsWork<Object>()
{