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

1
source/test-java/org/alfresco/Repository01TestSuite.java
View File

@@ -363,6 +363,7 @@ public class Repository01TestSuite extends TestSuite
static void tests56(TestSuite suite) static void tests56(TestSuite suite)
{ {
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.tenant.MultiTServiceImplTest.class));
suite.addTestSuite(org.alfresco.repo.tenant.MultiTDemoTest.class); suite.addTestSuite(org.alfresco.repo.tenant.MultiTDemoTest.class);
} }

734
source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java Normal file
View File

@@ -0,0 +1,734 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.tenant;
import static org.junit.Assert.*;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
/**
* A test for MultiTServiceImpl class.
*
* @author alex.mukha
* @since 4.2.3
*/
public class MultiTServiceImplTest
{
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private MultiTServiceImpl multiTServiceImpl;
private TenantAdminService tenantAdminService;
private PersonService personService;
private TenantService tenantService;
private MutableAuthenticationService authenticationService;
private TransactionService transactionService;
private NodeService nodeService;
private SearchService searchService;
private NamespaceService namespaceService;
private UserTransaction txn;
private boolean mtEnabled;
// Test variables
private static final String DEFAULT_ADMIN_PW = "admin";
private static final String PASS = "password";
private static final String DOMAIN = MultiTServiceImplTest.class.getName().toLowerCase();
private static final String USER1 = "USER1";
private static final String USER2 = "USER2";
private static final String USER3 = "USER3";
private static final String USER2_WITH_DOMAIN = USER2 + TenantService.SEPARATOR + DOMAIN;
private static final String STRING = "stringwithouttenant";
private static final String TENANT_STRING = addDomainToId(STRING, DOMAIN);
private static final String STRING_WITH_EXISTENT_DOMAIN = TenantService.SEPARATOR + DOMAIN + TenantService.SEPARATOR;
private static final String STRING_WITH_NONEXITENT_DOMAIN = TenantService.SEPARATOR + STRING + TenantService.SEPARATOR;
private static final String PROTOCOL = "testprotocol";
private static final String IDENTIFIER = "testidentifier";
private static final String ID = "id";
private static final String ROOT_PATH = "/";
private static final StoreRef DEFAULT_STORE = StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
private static final StoreRef TENANT_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, addDomainToId("SpacesStore", DOMAIN));
private static final NodeRef NODE_REF = new NodeRef(PROTOCOL, IDENTIFIER, ID);
private static final NodeRef TENANT_NODE_REF = new NodeRef(PROTOCOL, addDomainToId(IDENTIFIER, DOMAIN), ID);
private static final StoreRef STORE_REF = new StoreRef(PROTOCOL, IDENTIFIER);
private static final StoreRef TENANT_STORE_REF = new StoreRef(PROTOCOL, addDomainToId(IDENTIFIER, DOMAIN));
private static final String NAMESPACE_URI = "testassoctypenamespace";
private static final String LOCAL_NAME = "testassoctypelocalname";
private static final QName QNAME = QName.createQName(NAMESPACE_URI, LOCAL_NAME);
private static final QName TENANT_QNAME = QName.createQName(addDomainToId(NAMESPACE_URI, DOMAIN), LOCAL_NAME);
private static final AssociationRef assocRef = new AssociationRef(NODE_REF, QNAME, NODE_REF);
private static final AssociationRef tenantAssocRef = new AssociationRef(TENANT_NODE_REF, QNAME, TENANT_NODE_REF);
private static final ChildAssociationRef childAssocRef = new ChildAssociationRef(QNAME, NODE_REF, QNAME, NODE_REF);
private static final ChildAssociationRef tenantChildAssocRef = new ChildAssociationRef(QNAME, TENANT_NODE_REF, QNAME, TENANT_NODE_REF);
@Before
public void setUp() throws Exception
{
multiTServiceImpl = ctx.getBean("tenantService", MultiTServiceImpl.class);
tenantAdminService = ctx.getBean("tenantAdminService", TenantAdminService.class);
personService = ctx.getBean("PersonService", PersonService.class);
tenantService = ctx.getBean("tenantService", TenantService.class);
authenticationService = ctx.getBean("AuthenticationService", MutableAuthenticationService.class);
transactionService = ctx.getBean("TransactionService", TransactionService.class);
nodeService = ctx.getBean("NodeService", NodeService.class);
searchService = ctx.getBean("SearchService", SearchService.class);
namespaceService = ctx.getBean("NamespaceService", NamespaceService.class);
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
mtEnabled = AuthenticationUtil.isMtEnabled();
txn = transactionService.getUserTransaction();
txn.begin();
AuthenticationUtil.setMtEnabled(false);
}
@After
public void tearDown() throws Exception
{
txn.rollback();
AuthenticationUtil.setMtEnabled(mtEnabled);
AuthenticationUtil.clearCurrentSecurityContext();
}
@Test
public void testIsTenantUser()
{
// Create a user with a plain user name without a domain
NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
assertFalse("The user is not from a tenant, but was reported otherwise.", multiTServiceImpl.isTenantUser(USER1));
// Create a user with a name as an email, but not from tenant
userNodeRef = createUser(USER2_WITH_DOMAIN, TenantService.DEFAULT_DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
assertFalse("The user is not from a tenant, but was reported otherwise.", multiTServiceImpl.isTenantUser(USER2_WITH_DOMAIN));
// Create a tenant and a user in it
createTenant(DOMAIN);
userNodeRef = createUser(USER3, DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
assertTrue("The user is from a tenant, but was reported otherwise.", multiTServiceImpl.isTenantUser(USER3 + MultiTServiceImpl.SEPARATOR + DOMAIN));
}
@Test
public void testGetCurrentUserDomain()
{
// Test a tenant user
createTenant(DOMAIN);
NodeRef userNodeRef = createUser(USER1, DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
TenantRunAsWork<String> work = new TenantRunAsWork<String>()
{
@Override
public String doWork() throws Exception
{
return tenantService.getCurrentUserDomain();
}
};
String result = TenantUtil.runAsUserTenant(work, USER1, DOMAIN);
assertEquals("The domains do not match.", DOMAIN, result);
// Test a default user
userNodeRef = createUser(USER2, TenantService.DEFAULT_DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
work = new TenantRunAsWork<String>()
{
@Override
public String doWork() throws Exception
{
return tenantService.getCurrentUserDomain();
}
};
result = TenantUtil.runAsUserTenant(work, USER2, TenantService.DEFAULT_DOMAIN);
assertEquals("The domains do not match.", TenantService.DEFAULT_DOMAIN, result);
}
@Test
public void testGetName()
{
NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
TenantRunAsWork<NodeRef> work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getName(NODE_REF);
}
};
NodeRef result = TenantUtil.runAsUserTenant(work1, USER1, TenantService.DEFAULT_DOMAIN);
assertEquals("The NodeRef should contain domain.", NODE_REF, result);
createTenant(DOMAIN);
userNodeRef = createUser(USER2, DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getName(NODE_REF);
}
};
result = TenantUtil.runAsUserTenant(work1, USER2, DOMAIN);
assertEquals("The NodeRef should contain domain.", TENANT_NODE_REF, result);
work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getName(TENANT_NODE_REF, NODE_REF);
}
};
result = TenantUtil.runAsUserTenant(work1, USER2, DOMAIN);
assertEquals("The NodeRef should contain domain.", TENANT_NODE_REF, result);
TenantRunAsWork<StoreRef> work2 = new TenantRunAsWork<StoreRef>()
{
@Override
public StoreRef doWork() throws Exception
{
return tenantService.getName(STORE_REF);
}
};
StoreRef result2 = TenantUtil.runAsUserTenant(work2, USER2, DOMAIN);
assertEquals("The StoreRef should contain domain.", TENANT_STORE_REF, result2);
TenantRunAsWork<ChildAssociationRef> work3 = new TenantRunAsWork<ChildAssociationRef>()
{
@Override
public ChildAssociationRef doWork() throws Exception
{
return tenantService.getName(childAssocRef);
}
};
ChildAssociationRef result3 = TenantUtil.runAsUserTenant(work3, USER2, DOMAIN);
assertEquals("The ChildAssociationRef should contain domain.", tenantChildAssocRef, result3);
TenantRunAsWork<AssociationRef> work4 = new TenantRunAsWork<AssociationRef>()
{
@Override
public AssociationRef doWork() throws Exception
{
return tenantService.getName(assocRef);
}
};
AssociationRef result4 = TenantUtil.runAsUserTenant(work4, USER2, DOMAIN);
assertEquals("The AssociationRef should contain domain.", tenantAssocRef, result4);
TenantRunAsWork<StoreRef> work5 = new TenantRunAsWork<StoreRef>()
{
@Override
public StoreRef doWork() throws Exception
{
return tenantService.getName(USER2_WITH_DOMAIN, STORE_REF);
}
};
StoreRef result5 = TenantUtil.runAsUserTenant(work5, USER2, DOMAIN);
assertEquals("The StoreRef should contain domain.", TENANT_STORE_REF, result5);
TenantRunAsWork<QName> work6 = new TenantRunAsWork<QName>()
{
@Override
public QName doWork() throws Exception
{
return tenantService.getName(QNAME);
}
};
QName result6 = TenantUtil.runAsUserTenant(work6, USER2, DOMAIN);
assertEquals("The QName should contain domain.", TENANT_QNAME, result6);
TenantRunAsWork<QName> work7 = new TenantRunAsWork<QName>()
{
@Override
public QName doWork() throws Exception
{
return tenantService.getName(TENANT_NODE_REF ,QNAME);
}
};
QName result7 = TenantUtil.runAsUserTenant(work7, USER2, DOMAIN);
assertEquals("The QName should contain domain.", TENANT_QNAME, result7);
TenantRunAsWork<String> work8 = new TenantRunAsWork<String>()
{
@Override
public String doWork() throws Exception
{
return tenantService.getName(STRING);
}
};
String result8 = TenantUtil.runAsUserTenant(work8, USER2, DOMAIN);
assertEquals("The String should contain domain.", TENANT_STRING, result8);
}
@Test
public void testGetBaseName()
{
NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
TenantRunAsWork<NodeRef> work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getBaseName(NODE_REF);
}
};
NodeRef result = TenantUtil.runAsUserTenant(work1, USER1, TenantService.DEFAULT_DOMAIN);
assertEquals("The NodeRef should not contain domain.", NODE_REF, result);
createTenant(DOMAIN);
userNodeRef = createUser(USER2, DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getBaseName(TENANT_NODE_REF);
}
};
result = TenantUtil.runAsUserTenant(work1, USER2, DOMAIN);
assertEquals("The NodeRef should not contain domain.", NODE_REF, result);
work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getBaseName(TENANT_NODE_REF, true);
}
};
result = TenantUtil.runAsUserTenant(work1, USER1, TenantService.DEFAULT_DOMAIN);
assertEquals("The NodeRef should not contain domain.", NODE_REF, result);
work1 = new TenantRunAsWork<NodeRef>()
{
@Override
public NodeRef doWork() throws Exception
{
return tenantService.getBaseName(TENANT_NODE_REF, false);
}
};
result = TenantUtil.runAsUserTenant(work1, USER1, TenantService.DEFAULT_DOMAIN);
assertEquals("The NodeRef should contain domain.", TENANT_NODE_REF, result);
TenantRunAsWork<StoreRef> work2 = new TenantRunAsWork<StoreRef>()
{
@Override
public StoreRef doWork() throws Exception
{
return tenantService.getBaseName(TENANT_STORE_REF);
}
};
StoreRef result2 = TenantUtil.runAsUserTenant(work2, USER2, DOMAIN);
assertEquals("The StoreRef should not contain domain.", STORE_REF, result2);
TenantRunAsWork<ChildAssociationRef> work3 = new TenantRunAsWork<ChildAssociationRef>()
{
@Override
public ChildAssociationRef doWork() throws Exception
{
return tenantService.getBaseName(tenantChildAssocRef);
}
};
ChildAssociationRef result3 = TenantUtil.runAsUserTenant(work3, USER2, DOMAIN);
assertEquals("The ChildAssociationRef not should contain domain.", childAssocRef, result3);
TenantRunAsWork<AssociationRef> work4 = new TenantRunAsWork<AssociationRef>()
{
@Override
public AssociationRef doWork() throws Exception
{
return tenantService.getBaseName(tenantAssocRef);
}
};
AssociationRef result4 = TenantUtil.runAsUserTenant(work4, USER2, DOMAIN);
assertEquals("The AssociationRef should not contain domain.", assocRef, result4);
TenantRunAsWork<QName> work5 = new TenantRunAsWork<QName>()
{
@Override
public QName doWork() throws Exception
{
return tenantService.getBaseName(TENANT_QNAME, false);
}
};
QName result5 = TenantUtil.runAsUserTenant(work5, USER2, DOMAIN);
assertEquals("The QName should not contain domain.", QNAME, result5);
TenantRunAsWork<String> work6 = new TenantRunAsWork<String>()
{
@Override
public String doWork() throws Exception
{
return tenantService.getBaseName(TENANT_STRING);
}
};
String result6 = TenantUtil.runAsUserTenant(work6, USER2, DOMAIN);
assertEquals("The String should not contain domain.", STRING, result6);
}
@Test
public void testCheckDomainUser()
{
String nonExistentDomain = "nonExistentDomain";
createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
createTenant(DOMAIN);
createUser(USER2, DOMAIN, PASS);
createUser(USER3, nonExistentDomain, PASS);
String username3WithDomain = USER3 + TenantService.SEPARATOR + nonExistentDomain;
try
{
checkDomainUserWork(USER1, TenantService.DEFAULT_DOMAIN, USER1);
}
catch (Exception e)
{
fail("The user is not from domain and is not a tenant.");
}
try
{
checkDomainUserWork(USER2_WITH_DOMAIN, DOMAIN, USER2);
}
catch (Exception e)
{
fail("The user is from domain and is a tenant.");
}
try
{
checkDomainUserWork(username3WithDomain, DOMAIN, USER2);
fail("The user is not from this domain.");
}
catch (Exception e)
{
// Expected
}
}
@Test
public void testCheckDomain()
{
createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
createTenant(DOMAIN);
createUser(USER2, DOMAIN, PASS);
createUser(USER3, STRING, PASS);
try
{
checkDomainWork(STRING_WITH_EXISTENT_DOMAIN, TenantService.DEFAULT_DOMAIN, USER1);
fail("The string has a domain, which should not match the default one.");
}
catch (Exception e)
{
// Expected
}
try
{
checkDomainWork(STRING_WITH_EXISTENT_DOMAIN, DOMAIN, USER2);
}
catch (Exception e)
{
fail("The string has a tenant domain and should match the execution context tenant.");
}
try
{
checkDomainWork(STRING_WITH_NONEXITENT_DOMAIN, DOMAIN, USER2);
fail("The string has a domain, which should not match the execution context tenant.");
}
catch (Exception e)
{
// Expected
}
}
@Test
public void testGetRootNode()
{
NodeRef rootNodeRefDefault = nodeService.getRootNode(DEFAULT_STORE);
NodeRef rootNodeRef = new NodeRef(DEFAULT_STORE, IDENTIFIER);
NodeRef nodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, ROOT_PATH, rootNodeRef);
assertEquals("The reported rootNodeRef for the default domain is not correct.", rootNodeRefDefault, nodeRef);
createTenant(DOMAIN);
rootNodeRefDefault = nodeService.getRootNode(TENANT_STORE);
rootNodeRef = new NodeRef(TENANT_STORE, IDENTIFIER);
nodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, ROOT_PATH, rootNodeRef);
assertEquals("The reported rootNodeRef for the tenant domain is not correct.", rootNodeRefDefault, nodeRef);
}
/**
* Format of a valid domain string is "@domain@"
*/
@Test
public void testIsTenantName()
{
boolean result = tenantService.isTenantName(STRING);
assertFalse("The string was reported as domain, but it is not", result);
result = tenantService.isTenantName(STRING_WITH_EXISTENT_DOMAIN);
assertTrue("The string was not reported as domain.", result);
}
@Test
public void testGetPrimaryDomain()
{
String result = tenantService.getPrimaryDomain(USER1);
assertNull("The primary domain should be null for a non tenant user without a tenant in name.", result);
result = tenantService.getPrimaryDomain(USER2_WITH_DOMAIN);
assertNull("The primary domain should be null for a tenant user if multi tenancy is not enabled.", result);
createTenant(DOMAIN);
result = tenantService.getPrimaryDomain(USER2_WITH_DOMAIN);
assertEquals("The primary domain should be of the USER2 is " + DOMAIN + ", but was reported as " + result, DOMAIN, result);
result = tenantService.getPrimaryDomain(USER1);
assertTrue("The primary domain should be the default one (empty string) for a non tenant user without a tenant in name.", result.equals(TenantService.DEFAULT_DOMAIN));
}
@Test
public void testGetDomain() throws Exception
{
createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
String result = getDomainWork(STRING, TenantService.DEFAULT_DOMAIN, USER1, false);
assertEquals("The domain should be reported as default.", TenantService.DEFAULT_DOMAIN, result);
createUser(USER2, DOMAIN, PASS);
result = getDomainWork(STRING, TenantService.DEFAULT_DOMAIN, USER2, false);
assertEquals("The domain should be reported as default as the tenant was not created yet.", TenantService.DEFAULT_DOMAIN, result);
createTenant(DOMAIN);
result = getDomainWork(STRING_WITH_EXISTENT_DOMAIN, DOMAIN, USER2, false);
assertEquals("The USER2 domain should be reported as " + DOMAIN, DOMAIN, result);
try
{
result = getDomainWork(STRING_WITH_EXISTENT_DOMAIN, TenantService.DEFAULT_DOMAIN, USER1, true);
assertEquals("The domain should be reported as " + DOMAIN, DOMAIN, result);
}
catch (Exception e)
{
fail("An exception should not be thrown.");
}
try
{
result = getDomainWork(STRING_WITH_NONEXITENT_DOMAIN, DOMAIN, USER2, true);
fail("An exception should be thrown as the domains do not match.");
}
catch (Exception e)
{
// Expected
}
}
@Test
public void testGetTenant()
{
Tenant tenant = tenantService.getTenant(DOMAIN);
assertNull("The tenant should not exist.", tenant);
createTenant(DOMAIN);
tenant = tenantService.getTenant(DOMAIN);
assertNotNull("The tenant should exist.", tenant);
assertTrue("The tenant should have the correct domain.", DOMAIN.equals(tenant.getTenantDomain()));
assertTrue("The tenant should be enabled.", tenant.isEnabled());
}
@Test
public void testGetUserDomain()
{
String result = tenantService.getUserDomain(USER1);
assertEquals("The user domain should be the default one for a non tenant user without a tenant in name.", TenantService.DEFAULT_DOMAIN, result);
result = tenantService.getUserDomain(USER2_WITH_DOMAIN);
assertEquals("The user domain should be the default one for a user with email like name if multi tenancy is not enabled.", TenantService.DEFAULT_DOMAIN, result);
createTenant(DOMAIN);
result = tenantService.getUserDomain(USER2_WITH_DOMAIN);
assertEquals("The user domain should be of the USER2 is " + DOMAIN + ", but was reported as " + result, DOMAIN, result);
result = tenantService.getUserDomain(USER1);
assertTrue("The user domain should be the default one (empty string) for a non tenant user without a tenant in name.", result.equals(TenantService.DEFAULT_DOMAIN));
}
/**
* Runs {@link TenantService#getDomain(String)} as a specified tenant.
* @param user The input parameter to the {@link TenantService#getDomain(String)}
* @param domain
* @param runAsUsername
* @param checkCurrentDomain
* @return domain
* @throws Exception
*/
private String getDomainWork(final String user, String domain, String runAsUsername, final boolean checkCurrentDomain) throws Exception
{
TenantRunAsWork<String> work = new TenantRunAsWork<String>()
{
@Override
public String doWork() throws Exception
{
return tenantService.getDomain(user, checkCurrentDomain);
}
};
return TenantUtil.runAsUserTenant(work, runAsUsername, domain);
}
/**
* Runs {@link TenantService#checkDomain(String)} as a specified tenant.
* @param string The input parameter to the {@link TenantService#checkDomain(String)}
* @param domain
* @param runAsUsername
* @throws Exception
*/
private void checkDomainWork(final String string, String domain, String runAsUsername) throws Exception
{
TenantRunAsWork<Void> work = new TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
tenantService.checkDomain(string);
return null;
}
};
TenantUtil.runAsUserTenant(work, runAsUsername, domain);
}
/**
* Runs {@link TenantService#checkDomainUser(String)} as a specified tenant.
* @param username The input parameter to the {@link TenantService#checkDomainUser(String)}
* @param domain
* @param runAsUsername
* @throws Exception
*/
private void checkDomainUserWork(final String username, String domain, String runAsUsername) throws Exception
{
TenantRunAsWork<Void> work = new TenantRunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
tenantService.checkDomainUser(username);
return null;
}
};
TenantUtil.runAsUserTenant(work, runAsUsername, domain);
}
/**
* Create a tenant domain, if not already created
*
* @param tenantDomain
*/
private void createTenant(final String tenantDomain)
{
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
public Object doWork() throws Exception
{
if (!tenantAdminService.existsTenant(tenantDomain))
{
tenantAdminService.createTenant(tenantDomain, (DEFAULT_ADMIN_PW + " " + tenantDomain).toCharArray(), null);
}
return null;
}
}, AuthenticationUtil.getSystemUserName());
}
/**
* Crate a user and authentication
*
* @param baseUserName
* @param tenantDomain
* @param password
* @return the new user NideRef
*/
private NodeRef createUser(String baseUserName, String tenantDomain, String password)
{
String userName = tenantService.getDomainUser(baseUserName, tenantDomain);
NodeRef personNodeRef = null;
if (!this.personService.personExists(userName))
{
// Create the authentication
this.authenticationService.createAuthentication(userName, password.toCharArray());
// Create the person
Map<QName, Serializable> personProperties = new HashMap<QName, Serializable>();
personProperties.put(ContentModel.PROP_USERNAME, userName);
personProperties.put(ContentModel.PROP_FIRSTNAME, baseUserName);
personProperties.put(ContentModel.PROP_LASTNAME, baseUserName + "-" + tenantDomain);
personProperties.put(ContentModel.PROP_EMAIL, userName);
personNodeRef = this.personService.createPerson(personProperties);
}
else
{
personNodeRef = personService.getPerson(userName);
}
return personNodeRef;
}
/**
* Utility method to add a domain to an string id
* @param id
* @param domain
* @return a string in format "@domain@id"
*/
private static String addDomainToId(String id, String domain)
{
return TenantService.SEPARATOR + domain + TenantService.SEPARATOR + id;
}
}