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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
73702: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73647: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73236: Merged DEV to DEV
            71914: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
            Corrected the MultiTServiceImpl.isTenantUser(String).
            Added a test to simulate the issue.
         73242: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Removed @deprecated marks.
         Added @Override annotations.
         73244: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Fixed formatting.
         73245: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Fixed messed javadoc.
         73372: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Implemented tests.
         Fixed the getPrimaryDomain method.
         73484: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Removed wrongly committed files from r73236.
         73492: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Fixed multi line method calls.
         Added additional test.
         73552: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Hardened the test's initialization and clean up methods.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:08:29 +00:00
parent 30007f936d
commit 176c2069be
3 changed files with 981 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

525
source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2013 Alfresco Software Limited.
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -46,128 +46,137 @@ import org.springframework.extensions.surf.util.I18NUtil;
public class MultiTServiceImpl implements TenantService
{
private TenantAdminDAO tenantAdminDAO;
public void setTenantAdminDAO(TenantAdminDAO tenantAdminDAO)
{
this.tenantAdminDAO = tenantAdminDAO;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public NodeRef getName(NodeRef nodeRef)
{
if (nodeRef == null) { return null; }
if (nodeRef == null)
{
return null;
}
return new NodeRef(nodeRef.getStoreRef().getProtocol(), getName(nodeRef.getStoreRef().getIdentifier()), nodeRef.getId());
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public NodeRef getName(NodeRef inNodeRef, NodeRef nodeRef)
{
if (inNodeRef == null || nodeRef == null) { return null; }
if (inNodeRef == null || nodeRef == null)
{
return null;
}
int idx = inNodeRef.getStoreRef().getIdentifier().lastIndexOf(SEPARATOR);
if (idx != -1)
{
{
String tenantDomain = inNodeRef.getStoreRef().getIdentifier().substring(1, idx);
return new NodeRef(nodeRef.getStoreRef().getProtocol(), getName(nodeRef.getStoreRef().getIdentifier(), tenantDomain), nodeRef.getId());
return new NodeRef(nodeRef.getStoreRef().getProtocol(), getName(nodeRef.getStoreRef().getIdentifier(), tenantDomain), nodeRef.getId());
}
return nodeRef;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.StoreRef)
*/
@Override
public StoreRef getName(StoreRef storeRef)
{
if (storeRef == null) { return null; }
if (storeRef == null)
{
return null;
}
return new StoreRef(storeRef.getProtocol(), getName(storeRef.getIdentifier()));
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.ChildAssociationRef)
*/
@Override
public ChildAssociationRef getName(ChildAssociationRef childAssocRef)
{
if (childAssocRef == null) { return null; }
if (childAssocRef == null)
{
return null;
}
return new ChildAssociationRef(
childAssocRef.getTypeQName(),
getName(childAssocRef.getParentRef()),
childAssocRef.getQName(),
getName(childAssocRef.getChildRef()),
childAssocRef.isPrimary(),
childAssocRef.isPrimary(),
childAssocRef.getNthSibling());
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.AssociationRef)
*/
@Override
public AssociationRef getName(AssociationRef assocRef)
{
if (assocRef == null) { return null; }
if (assocRef == null)
{
return null;
}
return new AssociationRef(assocRef.getId(),
getName(assocRef.getSourceRef()),
assocRef.getTypeQName(),
getName(assocRef.getTargetRef()));
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(java.lang.String, org.alfresco.service.cmr.repository.StoreRef)
*/
@Override
public StoreRef getName(String username, StoreRef storeRef)
{
if (storeRef == null) { return null; }
if (storeRef == null)
{
return null;
}
if ((username != null) && (AuthenticationUtil.isMtEnabled()))
{
int idx = username.lastIndexOf(SEPARATOR);
if ((idx > 0) && (idx < (username.length()-1)))
if ((idx > 0) && (idx < (username.length() - 1)))
{
String tenantDomain = username.substring(idx+1);
String tenantDomain = username.substring(idx + 1);
return new StoreRef(storeRef.getProtocol(), getName(storeRef.getIdentifier(), tenantDomain));
}
}
return storeRef;
}
protected StoreRef getName(StoreRef storeRef, String tenantDomain, boolean checkTenantEnabled)
{
if (storeRef == null) { return null; }
if (tenantDomain != null)
{
storeRef = new StoreRef(storeRef.getProtocol(), getName(storeRef.getIdentifier(), tenantDomain, checkTenantEnabled));
}
return storeRef;
}
protected StoreRef getName(StoreRef storeRef, String tenantDomain, boolean checkTenantEnabled)
{
if (storeRef == null)
{
return null;
}
if (tenantDomain != null)
{
storeRef = new StoreRef(storeRef.getProtocol(), getName(storeRef.getIdentifier(), tenantDomain, checkTenantEnabled));
}
return storeRef;
}
protected String getName(String name, String tenantDomain)
{
return getName(name, tenantDomain, true);
}
protected String getName(String name, String tenantDomain, boolean checkTenantEnabled)
{
return getName(name, tenantDomain, true);
}
protected String getName(String name, String tenantDomain, boolean checkTenantEnabled)
{
ParameterCheck.mandatory("tenantDomain", tenantDomain);
if (name == null)
{
return null;
}
if (checkTenantEnabled)
{
checkTenantEnabled(tenantDomain);
}
if (checkTenantEnabled)
{
checkTenantEnabled(tenantDomain);
}
int idx1 = name.indexOf(SEPARATOR);
if (idx1 != 0)
{
@@ -178,38 +187,34 @@ public class MultiTServiceImpl implements TenantService
{
int idx2 = name.indexOf(SEPARATOR, 1);
String nameDomain = name.substring(1, idx2);
if (! tenantDomain.equalsIgnoreCase(nameDomain))
if (!tenantDomain.equalsIgnoreCase(nameDomain))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
}
return name;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.namespace.QName)
*/
@Override
public QName getName(QName name)
{
String tenantDomain = getCurrentUserDomain();
if (! tenantDomain.equals(DEFAULT_DOMAIN))
if (!tenantDomain.equals(DEFAULT_DOMAIN))
{
checkTenantEnabled(tenantDomain);
name = getName(name, tenantDomain);
}
return name;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName)
*/
@Override
public QName getName(NodeRef inNodeRef, QName name)
{
ParameterCheck.mandatory("InNodeRef", inNodeRef);
int idx = inNodeRef.getStoreRef().getIdentifier().lastIndexOf(SEPARATOR);
if (idx != -1)
{
@@ -217,17 +222,17 @@ public class MultiTServiceImpl implements TenantService
checkTenantEnabled(tenantDomain);
return getName(name, tenantDomain);
}
return name;
}
private QName getName(QName name, String tenantDomain)
{
if (name == null)
{
return null;
}
String namespace = name.getNamespaceURI();
int idx1 = namespace.indexOf(SEPARATOR);
if (idx1 == -1)
@@ -240,28 +245,26 @@ public class MultiTServiceImpl implements TenantService
{
int idx2 = namespace.indexOf(SEPARATOR, 1);
String nameDomain = namespace.substring(1, idx2);
if (! tenantDomain.equalsIgnoreCase(nameDomain))
if (!tenantDomain.equalsIgnoreCase(nameDomain))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
}
return name;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getName(java.lang.String)
*/
@Override
public String getName(String name)
{
if (name == null)
{
return null;
}
String tenantDomain = getCurrentUserDomain();
if (! tenantDomain.equals(DEFAULT_DOMAIN))
if (!tenantDomain.equals(DEFAULT_DOMAIN))
{
int idx1 = name.indexOf(SEPARATOR);
if (idx1 != 0)
@@ -273,165 +276,154 @@ public class MultiTServiceImpl implements TenantService
{
int idx2 = name.indexOf(SEPARATOR, 1);
String nameDomain = name.substring(1, idx2);
if (! tenantDomain.equalsIgnoreCase(nameDomain))
if (!tenantDomain.equalsIgnoreCase(nameDomain))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
}
}
return name;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.namespace.QName, boolean)
*/
@Override
public QName getBaseName(QName name, boolean forceForNonTenant)
{
{
String baseNamespaceURI = getBaseName(name.getNamespaceURI(), forceForNonTenant);
return QName.createQName(baseNamespaceURI, name.getLocalName());
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public NodeRef getBaseName(NodeRef nodeRef)
{
return getBaseName(nodeRef, false);
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.cmr.repository.NodeRef, boolean)
*/
@Override
public NodeRef getBaseName(NodeRef nodeRef, boolean forceForNonTenant)
{
if (nodeRef == null) { return null; }
if (nodeRef == null)
{
return null;
}
return new NodeRef(nodeRef.getStoreRef().getProtocol(), getBaseName(nodeRef.getStoreRef().getIdentifier(), forceForNonTenant), nodeRef.getId());
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.cmr.repository.StoreRef)
*/
@Override
public StoreRef getBaseName(StoreRef storeRef)
{
if (storeRef == null) { return null; }
{
if (storeRef == null)
{
return null;
}
return new StoreRef(storeRef.getProtocol(), getBaseName(storeRef.getIdentifier()));
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.cmr.repository.ChildAssociationRef)
*/
}
@Override
public ChildAssociationRef getBaseName(ChildAssociationRef childAssocRef)
{
return getBaseName(childAssocRef, false);
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.cmr.repository.ChildAssociationRef, boolean)
*/
@Override
public ChildAssociationRef getBaseName(ChildAssociationRef childAssocRef, boolean forceForNonTenant)
{
if (childAssocRef == null) { return null; }
if (childAssocRef == null)
{
return null;
}
return new ChildAssociationRef(
childAssocRef.getTypeQName(),
getBaseName(childAssocRef.getParentRef(), forceForNonTenant),
childAssocRef.getQName(),
getBaseName(childAssocRef.getChildRef(), forceForNonTenant),
childAssocRef.isPrimary(),
childAssocRef.isPrimary(),
childAssocRef.getNthSibling());
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(org.alfresco.service.cmr.repository.AssociationRef)
*/
@Override
public AssociationRef getBaseName(AssociationRef assocRef)
{
if (assocRef == null) { return null; }
if (assocRef == null)
{
return null;
}
return new AssociationRef(assocRef.getId(),
getBaseName(assocRef.getSourceRef()),
assocRef.getTypeQName(),
getBaseName(assocRef.getTargetRef()));
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(java.lang.String)
*/
@Override
public String getBaseName(String name)
{
{
// get base name, but don't force for non-tenant user (e.g. super admin)
return getBaseName(name, false);
return getBaseName(name, false);
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseName(java.lang.String, boolean)
*/
@Override
public String getBaseName(String name, boolean forceForNonTenant)
{
if (name == null)
{
return null;
}
String tenantDomain = getCurrentUserDomain();
int idx1 = name.indexOf(SEPARATOR);
if (idx1 == 0)
{
int idx2 = name.indexOf(SEPARATOR, 1);
String nameDomain = name.substring(1, idx2);
if ((! tenantDomain.equals(DEFAULT_DOMAIN)) && (! tenantDomain.equals(nameDomain)))
if ((!tenantDomain.equals(DEFAULT_DOMAIN)) && (!tenantDomain.equals(nameDomain)))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
if ((! tenantDomain.equals(DEFAULT_DOMAIN)) || (forceForNonTenant))
if ((!tenantDomain.equals(DEFAULT_DOMAIN)) || (forceForNonTenant))
{
// remove tenant domain
name = name.substring(idx2+1);
name = name.substring(idx2 + 1);
}
}
return name;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getBaseNameUser(java.lang.String)
*/
public String getBaseNameUser(String name)
{
// can be null (e.g. for System user / during app ctx init)
if (name != null)
if (name != null)
{
int idx = name.lastIndexOf(SEPARATOR);
if (idx != -1)
{
return name.substring(0, idx);
return name.substring(0, idx);
}
}
}
return name;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#checkDomainUser(java.lang.String)
*/
@Override
public void checkDomainUser(String username)
{
ParameterCheck.mandatory("Username", username);
String tenantDomain = getCurrentUserDomain();
if (! tenantDomain.equals(DEFAULT_DOMAIN))
if (!tenantDomain.equals(DEFAULT_DOMAIN))
{
int idx2 = username.lastIndexOf(SEPARATOR);
if ((idx2 > 0) && (idx2 < (username.length()-1)))
if ((idx2 > 0) && (idx2 < (username.length() - 1)))
{
String tenantUserDomain = username.substring(idx2+1);
if ((tenantUserDomain == null) || (! tenantDomain.equalsIgnoreCase(tenantUserDomain)))
String tenantUserDomain = username.substring(idx2 + 1);
if ((tenantUserDomain == null) || (!tenantDomain.equalsIgnoreCase(tenantUserDomain)))
{
throw new TenantDomainMismatchException(tenantDomain, tenantUserDomain);
}
@@ -442,53 +434,48 @@ public class MultiTServiceImpl implements TenantService
}
}
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#checkDomain(java.lang.String)
*/
@Override
public void checkDomain(String name)
{
if (name == null)
{
return;
}
String nameDomain = null;
int idx1 = name.indexOf(SEPARATOR);
if (idx1 == 0)
{
int idx2 = name.indexOf(SEPARATOR, 1);
nameDomain = name.substring(1, idx2);
}
String tenantDomain = getCurrentUserDomain();
if (((nameDomain == null) && (! tenantDomain.equals(DEFAULT_DOMAIN))) ||
((nameDomain != null) && (! nameDomain.equals(tenantDomain))))
if (((nameDomain == null) && (!tenantDomain.equals(DEFAULT_DOMAIN))) || ((nameDomain != null) && (!nameDomain.equals(tenantDomain))))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getRootNode(org.alfresco.service.cmr.repository.NodeService, org.alfresco.service.cmr.search.SearchService, org.alfresco.service.namespace.NamespaceService, java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public NodeRef getRootNode(NodeService nodeService, SearchService searchService, NamespaceService namespaceService, String rootPath, NodeRef rootNodeRef)
{
ParameterCheck.mandatory("NodeService", nodeService);
ParameterCheck.mandatory("SearchService", searchService);
ParameterCheck.mandatory("SearchService", searchService);
ParameterCheck.mandatory("NamespaceService", namespaceService);
ParameterCheck.mandatory("RootPath", rootPath);
ParameterCheck.mandatory("RootNodeRef", rootNodeRef);
//String username = AuthenticationUtil.getFullyAuthenticatedUser();
ParameterCheck.mandatory("RootPath", rootPath);
ParameterCheck.mandatory("RootNodeRef", rootNodeRef);
// String username = AuthenticationUtil.getFullyAuthenticatedUser();
StoreRef storeRef = rootNodeRef.getStoreRef();
AuthenticationUtil.RunAsWork<NodeRef> action = new GetRootNode(nodeService, searchService, namespaceService, rootPath, rootNodeRef, storeRef);
return getBaseName(AuthenticationUtil.runAs(action, AuthenticationUtil.getSystemUserName()));
}
private class GetRootNode implements AuthenticationUtil.RunAsWork<NodeRef>
{
NodeService nodeService;
@@ -509,12 +496,12 @@ public class MultiTServiceImpl implements TenantService
}
public NodeRef doWork() throws Exception
{
{
// Get company home / root for the tenant domain
// Do this as the System user in case the tenant user does not have permission
// Connect to the repo and ensure that the store exists
if (! nodeService.exists(storeRef))
if (!nodeService.exists(storeRef))
{
throw new AlfrescoRuntimeException("Store not created prior to application startup: " + storeRef);
}
@@ -539,47 +526,41 @@ public class MultiTServiceImpl implements TenantService
{
// we found a node
rootNodeRef = nodeRefs.get(0);
}
}
return rootNodeRef;
}
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#isTenantUser()
*/
// TODO review usages (re: cloud external user => more than one domain)
@Override
public boolean isTenantUser()
{
//return isTenantUser(AuthenticationUtil.getRunAsUser());
return (! getCurrentUserDomain().equals(TenantService.DEFAULT_DOMAIN));
// return isTenantUser(AuthenticationUtil.getRunAsUser());
return (!getCurrentUserDomain().equals(TenantService.DEFAULT_DOMAIN));
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#isTenantUser(java.lang.String)
*/
// TODO review usages (re: cloud external user => more than one domain)
@Override
public boolean isTenantUser(String username)
{
// can be null (e.g. for System user / during app ctx init)
if (username != null)
if (username != null && AuthenticationUtil.isMtEnabled())
{
int idx = username.lastIndexOf(SEPARATOR);
if ((idx > 0) && (idx < (username.length()-1)))
if ((idx > 0) && (idx < (username.length() - 1)))
{
return true;
return true;
}
}
return false;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#isTenantName(java.lang.String)
*/
@Override
public boolean isTenantName(String name)
{
ParameterCheck.mandatory("name", name);
int idx1 = name.indexOf(SEPARATOR);
if (idx1 == 0)
{
@@ -589,32 +570,30 @@ public class MultiTServiceImpl implements TenantService
return true;
}
}
return false;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getUserDomain(java.lang.String)
*/
// TODO review usages (re: cloud external user => more than one domain)
@Override
public String getUserDomain(String username)
{
// can be null (e.g. for System user / during app ctx init)
if ((username != null) && AuthenticationUtil.isMtEnabled())
{
int idx = username.lastIndexOf(SEPARATOR);
if ((idx > 0) && (idx < (username.length()-1)))
if ((idx > 0) && (idx < (username.length() - 1)))
{
String tenantDomain = getTenantDomain(username.substring(idx+1));
checkTenantEnabled(tenantDomain);
return tenantDomain;
String tenantDomain = getTenantDomain(username.substring(idx + 1));
checkTenantEnabled(tenantDomain);
return tenantDomain;
}
}
return DEFAULT_DOMAIN; // default domain - non-tenant user
}
/**
* Get the primary domain for the given user, if a tenant for that domain exists.
*
@@ -626,88 +605,84 @@ public class MultiTServiceImpl implements TenantService
* If the username does not end with a domain, as described above, then the default domain is
* returned.
*/
@Override public String getPrimaryDomain(String username)
@Override
public String getPrimaryDomain(String username)
{
String result = null;
String result = null;
// can be null (e.g. for System user / during app ctx init)
if (username != null)
if (username != null && AuthenticationUtil.isMtEnabled())
{
int idx = username.lastIndexOf(SEPARATOR);
if ((idx > 0) && (idx < (username.length()-1)))
if ((idx > 0) && (idx < (username.length() - 1)))
{
String tenantDomain = getTenantDomain(username.substring(idx+1));
if (getTenant(tenantDomain) != null)
{
result = tenantDomain;
}
String tenantDomain = getTenantDomain(username.substring(idx + 1));
if (getTenant(tenantDomain) != null)
{
result = tenantDomain;
}
}
else
{
result = DEFAULT_DOMAIN;
result = DEFAULT_DOMAIN;
}
}
return result; // default domain - non-tenant user
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantUserService#getCurrentUserDomain()
*/
public String getCurrentUserDomain()
{
String tenantDomain = TenantUtil.getCurrentDomain();
// if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
// {
// checkTenantEnabled(tenantDomain);
// }
// if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
// {
// checkTenantEnabled(tenantDomain);
// }
return tenantDomain;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantUserService#getDomain(java.lang.String)
*/
@Override
public String getDomain(String name)
{
return getDomain(name, false);
}
@Override
public String getDomain(String name, boolean checkCurrentDomain)
{
ParameterCheck.mandatory("name", name);
String nameDomain = DEFAULT_DOMAIN;
int idx1 = name.indexOf(SEPARATOR);
if (idx1 == 0)
{
int idx2 = name.indexOf(SEPARATOR, 1);
nameDomain = getTenantDomain(name.substring(1, idx2));
if (checkCurrentDomain)
{
String tenantDomain = getCurrentUserDomain();
if ((! tenantDomain.equals(DEFAULT_DOMAIN)) && (! tenantDomain.equals(nameDomain)))
if ((!tenantDomain.equals(DEFAULT_DOMAIN)) && (!tenantDomain.equals(nameDomain)))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
}
}
return nameDomain;
}
/**
* @deprecated
* @return
*/
/**
* @return
*/
public static String getMultiTenantDomainName(String name)
{
// Check that all the passed values are not null
ParameterCheck.mandatory("name", name);
int idx1 = name.indexOf(SEPARATOR);
if (idx1 == 0)
{
@@ -719,14 +694,11 @@ public class MultiTServiceImpl implements TenantService
}
return DEFAULT_DOMAIN;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantUserService#getDomainUser(java.lang.String, java.lang.String)
*/
public String getDomainUser(String baseUsername, String tenantDomain)
{
ParameterCheck.mandatory("baseUsername", baseUsername);
if ((tenantDomain == null) || (tenantDomain.equals(DEFAULT_DOMAIN)))
{
return baseUsername;
@@ -737,17 +709,17 @@ public class MultiTServiceImpl implements TenantService
{
throw new AlfrescoRuntimeException("Invalid base username: " + baseUsername);
}
if (tenantDomain.contains(SEPARATOR))
{
throw new AlfrescoRuntimeException("Invalid tenant domain: " + tenantDomain);
}
tenantDomain = getTenantDomain(tenantDomain);
return baseUsername + SEPARATOR + tenantDomain;
}
}
protected void checkTenantEnabled(String tenantDomain)
{
Tenant tenant = getTenant(tenantDomain);
@@ -757,10 +729,8 @@ public class MultiTServiceImpl implements TenantService
throw new TenantDisabledException(tenantDomain);
}
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantService#getTenant(java.lang.String)
*/
@Override
public Tenant getTenant(String tenantDomain)
{
TenantEntity tenantEntity = tenantAdminDAO.getTenant(tenantDomain);
@@ -771,15 +741,12 @@ public class MultiTServiceImpl implements TenantService
}
return tenant;
}
/* (non-Javadoc)
* @see org.alfresco.repo.tenant.TenantUserService#isEnabled()
*/
public boolean isEnabled()
{
return AuthenticationUtil.isMtEnabled();
}
private String getTenantDomain(String tenantDomain)
{
return tenantDomain.toLowerCase(I18NUtil.getLocale());