diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml index 76eb6276c6..8a45100508 100644 --- a/config/alfresco/authentication-services-context.xml +++ b/config/alfresco/authentication-services-context.xml @@ -531,4 +531,11 @@ 8 + + + + ${alfresco_user_store.adminusername} + ${alfresco_user_store.adminpassword} + + \ No newline at end of file diff --git a/source/java/org/alfresco/cmis/property/CMISPropertyServiceTest.java b/source/java/org/alfresco/cmis/property/CMISPropertyServiceTest.java index de9ad4f6bb..11d4a762c8 100644 --- a/source/java/org/alfresco/cmis/property/CMISPropertyServiceTest.java +++ b/source/java/org/alfresco/cmis/property/CMISPropertyServiceTest.java @@ -47,16 +47,16 @@ public class CMISPropertyServiceTest extends BaseCMISTest { NodeRef folder = fileFolderService.create(rootNodeRef, "BaseFolder", ContentModel.TYPE_FOLDER).getNodeRef(); Map properties = cmisPropertyService.getProperties(folder); - assertEquals(properties.get(CMISMapping.PROP_OBJECT_ID), folder.toString()); + assertEquals(folder.toString(), properties.get(CMISMapping.PROP_OBJECT_ID)); assertNull(properties.get(CMISMapping.PROP_URI)); - assertEquals(properties.get(CMISMapping.PROP_OBJECT_TYPE_ID), CMISMapping.FOLDER_TYPE_ID.getTypeId()); - assertEquals(properties.get(CMISMapping.PROP_CREATED_BY), authenticationComponent.getCurrentUserName()); + assertEquals(CMISMapping.FOLDER_TYPE_ID.getTypeId(), properties.get(CMISMapping.PROP_OBJECT_TYPE_ID)); + assertEquals(authenticationComponent.getCurrentUserName(), properties.get(CMISMapping.PROP_CREATED_BY)); assertNotNull(properties.get(CMISMapping.PROP_CREATION_DATE)); - assertEquals(properties.get(CMISMapping.PROP_LAST_MODIFIED_BY), authenticationComponent.getCurrentUserName()); + assertEquals(authenticationComponent.getCurrentUserName(), properties.get(CMISMapping.PROP_LAST_MODIFIED_BY)); assertNotNull(properties.get(CMISMapping.PROP_LAST_MODIFICATION_DATE)); assertNull(properties.get(CMISMapping.PROP_CHANGE_TOKEN)); - assertEquals(properties.get(CMISMapping.PROP_NAME), "BaseFolder"); + assertEquals("BaseFolder", properties.get(CMISMapping.PROP_NAME)); assertNull(properties.get(CMISMapping.PROP_IS_IMMUTABLE)); assertNull(properties.get(CMISMapping.PROP_IS_LATEST_VERSION)); @@ -74,7 +74,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest assertNull(properties.get(CMISMapping.PROP_CONTENT_STREAM_FILENAME)); assertNull(properties.get(CMISMapping.PROP_CONTENT_STREAM_URI)); - assertEquals(properties.get(CMISMapping.PROP_PARENT_ID), rootNodeRef.toString()); + assertEquals(rootNodeRef.toString(), properties.get(CMISMapping.PROP_PARENT_ID)); assertNull(properties.get(CMISMapping.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS)); } @@ -109,7 +109,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest assertEquals(properties.get(CMISMapping.PROP_CONTENT_STREAM_LENGTH), 0L); assertEquals(properties.get(CMISMapping.PROP_CONTENT_STREAM_MIME_TYPE), "application/octet-stream"); assertEquals(properties.get(CMISMapping.PROP_CONTENT_STREAM_FILENAME), "BaseContent"); - assertEquals(properties.get(CMISMapping.PROP_CONTENT_STREAM_URI), null); + assertEquals(null, properties.get(CMISMapping.PROP_CONTENT_STREAM_URI)); assertNull(properties.get(CMISMapping.PROP_PARENT_ID)); assertNull(properties.get(CMISMapping.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS)); diff --git a/source/java/org/alfresco/jcr/item/ItemTest.java b/source/java/org/alfresco/jcr/item/ItemTest.java index a5083c82f5..d4c7d4f375 100644 --- a/source/java/org/alfresco/jcr/item/ItemTest.java +++ b/source/java/org/alfresco/jcr/item/ItemTest.java @@ -70,7 +70,7 @@ public class ItemTest extends BaseJCRTest public void test_ALFCOM_1655() throws RepositoryException { - SimpleCredentials user = new SimpleCredentials("admin", "admin".toCharArray()); + SimpleCredentials user = new SimpleCredentials(getAdminUserName(), "admin".toCharArray()); session = repository.login(user, getWorkspace()); @@ -143,7 +143,7 @@ public class ItemTest extends BaseJCRTest public void test_ALFCOM_1507() throws RepositoryException { - SimpleCredentials user = new SimpleCredentials("admin", "admin".toCharArray()); + SimpleCredentials user = new SimpleCredentials(getAdminUserName(), "admin".toCharArray()); session = repository.login(user, "SpacesStore"); @@ -233,7 +233,7 @@ public class ItemTest extends BaseJCRTest public void test_JAWS_191() throws RepositoryException { - SimpleCredentials user = new SimpleCredentials("admin", "admin".toCharArray()); + SimpleCredentials user = new SimpleCredentials(getAdminUserName(), "admin".toCharArray()); session = repository.login(user, "SpacesStore"); diff --git a/source/java/org/alfresco/jcr/test/BaseJCRTest.java b/source/java/org/alfresco/jcr/test/BaseJCRTest.java index 3058612139..de5c75f111 100644 --- a/source/java/org/alfresco/jcr/test/BaseJCRTest.java +++ b/source/java/org/alfresco/jcr/test/BaseJCRTest.java @@ -30,6 +30,7 @@ import junit.framework.TestCase; import org.alfresco.jcr.repository.RepositoryFactory; import org.alfresco.jcr.repository.RepositoryImpl; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.repository.StoreRef; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -44,6 +45,7 @@ public class BaseJCRTest extends TestCase private RepositoryImpl repositoryImpl; protected Repository repository; protected StoreRef storeRef; + protected String adminUserName; protected static ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:org/alfresco/jcr/test/test-context.xml"); @@ -51,6 +53,11 @@ public class BaseJCRTest extends TestCase { return storeRef.getIdentifier(); } + + protected String getAdminUserName() + { + return adminUserName; + } @Override protected void setUp() throws Exception @@ -60,6 +67,7 @@ public class BaseJCRTest extends TestCase repositoryImpl = (RepositoryImpl)applicationContext.getBean(RepositoryFactory.REPOSITORY_BEAN); repositoryImpl.setDefaultWorkspace(storeRef.getIdentifier()); repository = repositoryImpl; + adminUserName = AuthenticationUtil.getAdminUserName(); } } diff --git a/source/java/org/alfresco/repo/activities/ActivityServiceImplTest.java b/source/java/org/alfresco/repo/activities/ActivityServiceImplTest.java index f6945dda4c..3b75d11e7f 100644 --- a/source/java/org/alfresco/repo/activities/ActivityServiceImplTest.java +++ b/source/java/org/alfresco/repo/activities/ActivityServiceImplTest.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.List; import org.alfresco.repo.jscript.ClasspathScriptLocation; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.activities.ActivityService; import org.alfresco.service.cmr.activities.FeedControl; import org.alfresco.service.cmr.repository.ScriptLocation; @@ -46,7 +47,6 @@ public class ActivityServiceImplTest extends BaseSpringTest private ScriptService scriptService; private AuthenticationService authenticationService; - private static final String ADMIN_UN = "admin"; private static final String ADMIN_PW = "admin"; private static final String USER_UN = "bob"; @@ -62,7 +62,7 @@ public class ActivityServiceImplTest extends BaseSpringTest this.authenticationService = (AuthenticationService)applicationContext.getBean("authenticationService"); - authenticationService.authenticate(ADMIN_UN, ADMIN_PW.toCharArray()); + authenticationService.authenticate(AuthenticationUtil.getAdminUserName(), ADMIN_PW.toCharArray()); } protected void onTearDownInTransaction() throws Exception diff --git a/source/java/org/alfresco/repo/admin/BaseInterpreter.java b/source/java/org/alfresco/repo/admin/BaseInterpreter.java index 6eda55a803..09e80689ae 100755 --- a/source/java/org/alfresco/repo/admin/BaseInterpreter.java +++ b/source/java/org/alfresco/repo/admin/BaseInterpreter.java @@ -57,7 +57,6 @@ public abstract class BaseInterpreter extends AbstractLifecycleBean * Current context */ private String username = null; - protected final static String DEFAULT_ADMIN = "admin"; /** * Last command issued @@ -75,7 +74,7 @@ public abstract class BaseInterpreter extends AbstractLifecycleBean { BaseInterpreter console = getConsoleBean(context, beanName); - console.username = DEFAULT_ADMIN; + console.username = AuthenticationUtil.getAdminUserName(); console.rep(); System.exit(0); } diff --git a/source/java/org/alfresco/repo/audit/AuditServiceTest.java b/source/java/org/alfresco/repo/audit/AuditServiceTest.java index 7d86d1b9bf..39dcea826d 100644 --- a/source/java/org/alfresco/repo/audit/AuditServiceTest.java +++ b/source/java/org/alfresco/repo/audit/AuditServiceTest.java @@ -153,11 +153,11 @@ public class AuditServiceTest extends BaseSpringTest } authenticationService.createAuthentication("lemur", "lemur".toCharArray()); - if (authenticationDAO.userExists("admin")) + if (authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.deleteAuthentication("admin"); + authenticationService.deleteAuthentication(AuthenticationUtil.getAdminUserName()); } - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); authenticationComponent.clearCurrentSecurityContext(); } diff --git a/source/java/org/alfresco/repo/avm/AVMDeploymentAttemptCleaner.java b/source/java/org/alfresco/repo/avm/AVMDeploymentAttemptCleaner.java index 1224d0e0c8..e00dd3b459 100644 --- a/source/java/org/alfresco/repo/avm/AVMDeploymentAttemptCleaner.java +++ b/source/java/org/alfresco/repo/avm/AVMDeploymentAttemptCleaner.java @@ -49,7 +49,6 @@ import org.apache.commons.logging.LogFactory; public class AVMDeploymentAttemptCleaner { // defaults in case these properties are not configured in Spring - protected String adminUserName = "admin"; protected long maxAge = 180L; protected NodeService nodeService; @@ -63,11 +62,6 @@ public class AVMDeploymentAttemptCleaner { } - public void setAdminUserName(String adminUserName) - { - this.adminUserName = adminUserName; - } - public void setMaxAge(long maxAge) { this.maxAge = new Long(maxAge); @@ -117,7 +111,7 @@ public class AVMDeploymentAttemptCleaner }; // perform the work as the system user - AuthenticationUtil.runAs(authorisedWork, this.adminUserName); + AuthenticationUtil.runAs(authorisedWork, AuthenticationUtil.getAdminUserName()); } /** diff --git a/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java b/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java index 7b989fd175..6b61d5e540 100644 --- a/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java +++ b/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java @@ -80,7 +80,6 @@ import org.apache.commons.logging.LogFactory; public class AVMExpiredContentProcessor { // defaults in case these properties are not configured in Spring - protected String adminUserName = "admin"; protected String workflowName = "jbpm$wcmwf:changerequest"; protected List workflowStores; @@ -109,7 +108,7 @@ public class AVMExpiredContentProcessor public void setAdminUserName(String adminUserName) { - this.adminUserName = adminUserName; + // NOTE: ignore, just for backwards compatible Spring config } public void setWorkflowName(String workflowName) @@ -201,7 +200,7 @@ public class AVMExpiredContentProcessor }; // perform the work as the system user - AuthenticationUtil.runAs(authorisedWork, this.adminUserName); + AuthenticationUtil.runAs(authorisedWork, AuthenticationUtil.getAdminRoleName()); // now we know everything worked ok, let the virtualisation server // know about all the new workflow sandboxes created (just the main stores) diff --git a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java index 6dafae1191..4be7c0f210 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java @@ -36,6 +36,7 @@ import junit.framework.TestCase; import org.alfresco.model.ContentModel; import org.alfresco.repo.avm.util.RemoteBulkLoader; import org.alfresco.repo.domain.PropertyValue; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMStoreDescriptor; import org.alfresco.service.cmr.avmsync.AVMDifference; @@ -88,7 +89,7 @@ public class AVMServiceLocalTest extends TestCase excluder = (NameMatcher) fContext.getBean("globalPathExcluder"); AuthenticationService authService = (AuthenticationService)fContext.getBean("AuthenticationService"); - authService.authenticate("admin", "admin".toCharArray()); + authService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); } if (fService.getStore("main") == null) diff --git a/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java b/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java index 3fa4c4681f..6b12bae256 100644 --- a/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServicePermissionsTest.java @@ -182,11 +182,11 @@ public class AVMServicePermissionsTest extends TestCase } authenticationService.createAuthentication("lemur", "lemur".toCharArray()); - if (authenticationDAO.userExists("admin")) + if (authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.deleteAuthentication("admin"); + authenticationService.deleteAuthentication(AuthenticationUtil.getAdminUserName()); } - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); if (authenticationDAO.userExists("manager")) { @@ -401,7 +401,7 @@ public class AVMServicePermissionsTest extends TestCase public void testStoreAcls() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -415,8 +415,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); permissionService.setPermission(nodeRef.getStoreRef(), "andy", PermissionService.ALL_PERMISSIONS, true); @@ -424,8 +424,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, false)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, false)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); permissionService.deletePermission(nodeRef.getStoreRef(), "andy", PermissionService.ALL_PERMISSIONS); @@ -433,8 +433,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, false)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, false)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, false)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); permissionService.deletePermissions(nodeRef.getStoreRef()); @@ -442,8 +442,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); permissionService.setPermission(nodeRef.getStoreRef(), "andy", PermissionService.ALL_PERMISSIONS, true); assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, true)); @@ -454,8 +454,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); assertEquals(permissionService.getAllSetPermissions(nodeRef.getStoreRef()).size(), 3); permissionService.clearPermission(nodeRef.getStoreRef(), "andy"); @@ -464,8 +464,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, false)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); assertEquals(permissionService.getAllSetPermissions(nodeRef.getStoreRef()).size(), 1); permissionService.clearPermission(nodeRef.getStoreRef(), "lemur"); @@ -474,8 +474,8 @@ public class AVMServicePermissionsTest extends TestCase assertTrue(checkHasPermission("andy", nodeRef, PermissionService.ALL_PERMISSIONS, false)); assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.ALL_PERMISSIONS, false)); assertTrue(checkHasPermission("lemur", nodeRef, PermissionService.ALL_PERMISSIONS, false)); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); - assertTrue(checkHasPermission("admin", nodeRef, PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkHasPermission(AuthenticationUtil.getAdminUserName(), nodeRef, PermissionService.ALL_PERMISSIONS, true)); } finally @@ -496,7 +496,7 @@ public class AVMServicePermissionsTest extends TestCase public void testSimpleUpdate() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -572,7 +572,7 @@ public class AVMServicePermissionsTest extends TestCase public void testUpdateWithPermissions() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -653,7 +653,7 @@ public class AVMServicePermissionsTest extends TestCase public void testComplexStore_AlterInheritance() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -674,9 +674,9 @@ public class AVMServicePermissionsTest extends TestCase NodeRef nodeRef = AVMNodeConverter.ToNodeRef(-1, desc.getPath()); permissionService.setPermission(nodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.ALL_PERMISSIONS, true); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.READ, true)); - assertTrue(checkPermission("admin", storeName + "-layer-base:/layer-to-base", PermissionService.READ, true)); - assertTrue(checkPermission("admin", storeName + "-layer-base:/layer-to-base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.READ, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + "-layer-base:/layer-to-base", PermissionService.READ, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + "-layer-base:/layer-to-base", PermissionService.ALL_PERMISSIONS, true)); // True as unset defaults to allow assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.READ, true)); assertTrue(checkPermission("lemur", storeName + "-layer-base:/layer-to-base", PermissionService.READ, true)); @@ -687,9 +687,9 @@ public class AVMServicePermissionsTest extends TestCase permissionService.setPermission(nodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.ALL_PERMISSIONS, true); permissionService.deletePermission(nodeRef, PermissionService.ALL_AUTHORITIES, PermissionService.ALL_PERMISSIONS); - assertTrue(checkPermission("admin", storeName + ":/base", PermissionService.READ, true)); - assertTrue(checkPermission("admin", storeName + "-layer-base:/layer-to-base", PermissionService.READ, true)); - assertTrue(checkPermission("admin", storeName + "-layer-base:/layer-to-base", PermissionService.ALL_PERMISSIONS, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + ":/base", PermissionService.READ, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + "-layer-base:/layer-to-base", PermissionService.READ, true)); + assertTrue(checkPermission(AuthenticationUtil.getAdminUserName(), storeName + "-layer-base:/layer-to-base", PermissionService.ALL_PERMISSIONS, true)); // True as unset defaults to allow assertTrue(checkPermission("lemur", storeName + ":/base", PermissionService.READ, false)); assertTrue(checkPermission("lemur", storeName + "-layer-base:/layer-to-base", PermissionService.READ, true)); @@ -767,7 +767,7 @@ public class AVMServicePermissionsTest extends TestCase public void testComplexStore_AddPermissionsToMiddle() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -935,7 +935,7 @@ public class AVMServicePermissionsTest extends TestCase public void testComplexStore_AddPermissionsToBottom() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -1102,7 +1102,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleFilePermissionDiff() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1205,7 +1205,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff0() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1299,7 +1299,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff1() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1400,7 +1400,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff2() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1500,7 +1500,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff3() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1648,7 +1648,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff4() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1824,7 +1824,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff5() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -1980,7 +1980,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleDirectoryPermissionDiff6() throws Throwable { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String baseStore = "main"; String layeredStore = "layer"; @@ -2226,7 +2226,7 @@ public class AVMServicePermissionsTest extends TestCase public void testRedirectLayeredDirectory() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -2531,7 +2531,7 @@ public class AVMServicePermissionsTest extends TestCase public void testCopy() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -2648,7 +2648,7 @@ public class AVMServicePermissionsTest extends TestCase public void testBranches() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -2766,7 +2766,7 @@ public class AVMServicePermissionsTest extends TestCase @SuppressWarnings("unused") public void testWCMStyleTemplateAsBranch() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); String branchName = storeName + "-Branch"; try @@ -2861,7 +2861,7 @@ public class AVMServicePermissionsTest extends TestCase */ public void testSimpleExternalLayer() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -3098,7 +3098,7 @@ public class AVMServicePermissionsTest extends TestCase public void testSimpleInternalLayer() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -3341,7 +3341,7 @@ public class AVMServicePermissionsTest extends TestCase public void testMutationsWithSimpleLayers() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -3465,7 +3465,7 @@ public class AVMServicePermissionsTest extends TestCase public void testRenamePlainDirectory() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -3586,7 +3586,7 @@ public class AVMServicePermissionsTest extends TestCase public void testRenamePlainFile() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -3706,7 +3706,7 @@ public class AVMServicePermissionsTest extends TestCase public void testRenamePlainDirectoryIntoLayer() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { @@ -3784,7 +3784,7 @@ public class AVMServicePermissionsTest extends TestCase public void testRenamePlainFileIntoLayer() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); String storeName = "PermissionsTest-" + getName() + "-" + (new Date().getTime()); try { diff --git a/source/java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java b/source/java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java index 52d0ec04a1..7ed6e709c0 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.java @@ -24,6 +24,7 @@ package org.alfresco.repo.avm; import org.alfresco.repo.remote.ClientTicketHolder; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.remote.AVMRemote; import org.alfresco.service.cmr.security.AuthenticationService; @@ -47,7 +48,7 @@ public class AVMServiceRemoteSystemTest extends AVMServiceLocalTest excluder = (NameMatcher) fContext.getBean("globalPathExcluder"); AuthenticationService authService = (AuthenticationService)fContext.getBean("authenticationService"); - authService.authenticate("admin", "admin".toCharArray()); + authService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); String ticket = authService.getCurrentTicket(); ((ClientTicketHolder)fContext.getBean("clientTicketHolder")).setTicket(ticket); } diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java index 1ee248f884..1942d65adb 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java @@ -51,6 +51,7 @@ import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.sandbox.SandboxConstants; @@ -371,7 +372,7 @@ public class AVMServiceTest extends AVMServiceTestBase fService = oldService; fLockingService.removeStoreLocks("main"); fLockingService.removeWebProject("main"); - authService.authenticate("admin", "admin".toCharArray()); + authService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); fService.purgeStore("main--admin"); } } diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java index 1119a9c3d1..a310e24612 100644 --- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java +++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java @@ -156,7 +156,7 @@ public class AVMServiceTestBase extends TestCase ); } - fAuthService.authenticate("admin", "admin".toCharArray()); + fAuthService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); if (fService.getStore("main") != null) { diff --git a/source/java/org/alfresco/repo/avm/AbstractSpringContextTest.java b/source/java/org/alfresco/repo/avm/AbstractSpringContextTest.java index 640f5654f7..21b6e4e745 100644 --- a/source/java/org/alfresco/repo/avm/AbstractSpringContextTest.java +++ b/source/java/org/alfresco/repo/avm/AbstractSpringContextTest.java @@ -24,6 +24,7 @@ */ package org.alfresco.repo.avm; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.security.AuthenticationService; @@ -50,7 +51,7 @@ public abstract class AbstractSpringContextTest extends AbstractDependencyInject permissionService = servReg.getPermissionService(); assertNotNull(permissionService); - authenticationService.authenticate("admin", "admin".toCharArray()); + authenticationService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); } @Override diff --git a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java index ac8a332254..c233025fb9 100644 --- a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java +++ b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java @@ -34,6 +34,7 @@ import java.util.Map; import org.alfresco.model.ContentModel; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.attributes.AttributeService; import org.alfresco.service.cmr.avm.locking.AVMLock; import org.alfresco.service.cmr.avm.locking.AVMLockingService; @@ -323,7 +324,7 @@ public class AVMLockingServiceTest extends TestCase assertFalse(fService.hasAccess("alfresco", "LA:/ScrapHeap/Adam/plans.txt", "Willow")); assertTrue(fService.hasAccess("alfresco", "LA:/ScrapHeap/Adam/plans.txt", "Tara")); assertFalse(fService.hasAccess("alfresco", "LA:/ScrapHeap/Adam/plans.txt", "Xander")); - assertTrue(fService.hasAccess("alfresco", "LA:/ScrapHeap/Adam/plans.txt", "admin")); + assertTrue(fService.hasAccess("alfresco", "LA:/ScrapHeap/Adam/plans.txt", AuthenticationUtil.getAdminUserName())); } catch (Exception e) { diff --git a/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java b/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java index b8bd68469f..e1131d8ea2 100644 --- a/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java +++ b/source/java/org/alfresco/repo/i18n/MessageServiceImplTest.java @@ -59,7 +59,6 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer * Test user details */ private static final String PWD = "admin"; - private static final String USER_NAME = "admin"; /** * Test store ref @@ -92,14 +91,14 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer // Get a reference to the root node NodeRef rootNodeRef = this.nodeService.getRootNode(this.testStoreRef); - // Create an authenticate the user - if(!authenticationService.authenticationExists(USER_NAME)) + // Create and authenticate the user + if(!authenticationService.authenticationExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.createAuthentication(USER_NAME, PWD.toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), PWD.toCharArray()); } // Authenticate - as admin - authenticationService.authenticate(USER_NAME, PWD.toCharArray()); + authenticationService.authenticate(AuthenticationUtil.getAdminUserName(), PWD.toCharArray()); // Store test messages in repo String pattern = "classpath*:" + BASE_RESOURCE_CLASSPATH + BASE_BUNDLE_NAME + "*"; diff --git a/source/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java b/source/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java index c0749e8359..7ba5bd1b57 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java +++ b/source/java/org/alfresco/repo/jscript/ScriptBehaviourTest.java @@ -32,6 +32,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.policy.PolicyComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; @@ -74,7 +75,7 @@ public class ScriptBehaviourTest extends BaseSpringTest this.serviceRegistry = (ServiceRegistry)this.applicationContext.getBean("ServiceRegistry"); AuthenticationComponent authenticationComponent = (AuthenticationComponent)this.applicationContext.getBean("authenticationComponent"); - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); // Create the store and get the root node reference this.storeRef = this.nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis()); diff --git a/source/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java b/source/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java index 538d0f9428..2e550ae000 100644 --- a/source/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java +++ b/source/java/org/alfresco/repo/model/ml/tools/AbstractMultilingualTestCases.java @@ -29,6 +29,7 @@ import junit.framework.TestCase; import org.alfresco.model.ContentModel; import org.alfresco.repo.node.archive.NodeArchiveService; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; @@ -83,7 +84,7 @@ public abstract class AbstractMultilingualTestCases extends TestCase editionService = (EditionService) ctx.getBean("EditionService"); // Run as admin - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); // Create a folder to work in RetryingTransactionCallback createFolderCallback = new RetryingTransactionCallback() diff --git a/source/java/org/alfresco/repo/node/FFCLoadsOfFiles.java b/source/java/org/alfresco/repo/node/FFCLoadsOfFiles.java index 197a8f82c0..8a78aba1fc 100644 --- a/source/java/org/alfresco/repo/node/FFCLoadsOfFiles.java +++ b/source/java/org/alfresco/repo/node/FFCLoadsOfFiles.java @@ -32,6 +32,7 @@ import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -73,7 +74,7 @@ public class FFCLoadsOfFiles // authenticate AuthenticationService authenticationService = serviceRegistry.getAuthenticationService(); - authenticationService.authenticate("admin", "admin".toCharArray()); + authenticationService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); // use TransactionWork to wrap service calls in a user transaction diff --git a/source/java/org/alfresco/repo/preference/PreferenceServiceImpl.java b/source/java/org/alfresco/repo/preference/PreferenceServiceImpl.java index f59c8cdde4..6cddff0c49 100644 --- a/source/java/org/alfresco/repo/preference/PreferenceServiceImpl.java +++ b/source/java/org/alfresco/repo/preference/PreferenceServiceImpl.java @@ -357,7 +357,7 @@ public class PreferenceServiceImpl implements PreferenceService return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); } else { diff --git a/source/java/org/alfresco/repo/rule/BaseRuleTest.java b/source/java/org/alfresco/repo/rule/BaseRuleTest.java index 02cab9aafc..045fd5a354 100644 --- a/source/java/org/alfresco/repo/rule/BaseRuleTest.java +++ b/source/java/org/alfresco/repo/rule/BaseRuleTest.java @@ -35,6 +35,7 @@ import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator; import org.alfresco.repo.action.executer.AddFeaturesActionExecuter; import org.alfresco.repo.configuration.ConfigurableService; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ActionCondition; import org.alfresco.service.cmr.action.ActionService; @@ -127,7 +128,7 @@ public class BaseRuleTest extends BaseSpringTest this.authenticationComponent = (AuthenticationComponent)this.applicationContext.getBean("authenticationComponent"); //authenticationComponent.setSystemUserAsCurrentUser(); - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); // Get the rule type this.ruleType = this.ruleService.getRuleType(RULE_TYPE_NAME); diff --git a/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java b/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java index 0d1170c732..ef3c80e266 100644 --- a/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java +++ b/source/java/org/alfresco/repo/rule/RuleServiceCoverageTest.java @@ -63,6 +63,7 @@ import org.alfresco.repo.dictionary.M2Aspect; import org.alfresco.repo.dictionary.M2Model; import org.alfresco.repo.dictionary.M2Property; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.action.Action; @@ -171,7 +172,7 @@ public class RuleServiceCoverageTest extends TestCase { public Object execute() throws Exception { - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); return null; } }; diff --git a/source/java/org/alfresco/repo/rule/RuleServiceImplTest.java b/source/java/org/alfresco/repo/rule/RuleServiceImplTest.java index 6a2736535f..b8485051b5 100644 --- a/source/java/org/alfresco/repo/rule/RuleServiceImplTest.java +++ b/source/java/org/alfresco/repo/rule/RuleServiceImplTest.java @@ -35,6 +35,7 @@ import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator; import org.alfresco.repo.action.executer.ImageTransformActionExecuter; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.transform.AbstractContentTransformerTest; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ActionCondition; import org.alfresco.service.cmr.repository.ContentWriter; @@ -363,7 +364,7 @@ public class RuleServiceImplTest extends BaseRuleTest this.permissionService.setPermission(this.nodeRef, "coordUser", PermissionService.COORDINATOR, true); this.permissionService.setInheritParentPermissions(this.nodeRef, true); - this.authenticationService.authenticate("admin", "admin".toCharArray()); + this.authenticationService.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); Rule rule2 = createTestRule(); this.ruleService.saveRule(this.nodeRef, rule2); this.authenticationService.clearCurrentSecurityContext(); diff --git a/source/java/org/alfresco/repo/search/SearchServiceTest.java b/source/java/org/alfresco/repo/search/SearchServiceTest.java index 6e30d0c463..118bed588c 100644 --- a/source/java/org/alfresco/repo/search/SearchServiceTest.java +++ b/source/java/org/alfresco/repo/search/SearchServiceTest.java @@ -30,6 +30,7 @@ import junit.framework.TestCase; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; @@ -114,9 +115,9 @@ public class SearchServiceTest extends TestCase authenticationService.createAuthentication("andy", "andy".toCharArray()); } - if (!authenticationDAO.userExists("admin")) + if (!authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); } if (!authenticationDAO.userExists("administrator")) @@ -165,7 +166,7 @@ public class SearchServiceTest extends TestCase public void testAdmim() { - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); SearchParameters sp = new SearchParameters(); sp.setLanguage(SearchService.LANGUAGE_LUCENE); sp.setQuery("PATH:\"//*\""); diff --git a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java index 0082156b1b..f44ea52c54 100644 --- a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java +++ b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java @@ -289,7 +289,7 @@ public class AuthenticationTest extends TestCase long start; long end; - authenticationComponent.authenticate("admin", "admin".toCharArray()); + authenticationComponent.authenticate(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); for (int i = 0; i < 10000; i++) { String id = "TestUser-" + i; diff --git a/source/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java b/source/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java index cd0c67cb42..c0f179dbb2 100644 --- a/source/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java +++ b/source/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java @@ -41,11 +41,12 @@ import org.alfresco.util.EqualsHelper; import org.alfresco.util.log.NDC; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.InitializingBean; /** * Utility helper methods to change the authenticated context for threads. */ -public abstract class AuthenticationUtil +public class AuthenticationUtil implements InitializingBean { static Log s_logger = LogFactory.getLog(AuthenticationUtil.class); @@ -59,10 +60,32 @@ public abstract class AuthenticationUtil Result doWork() throws Exception; } + private static boolean initialized = false; + public static final String SYSTEM_USER_NAME = "System"; - + private static String defaultAdminUserName = PermissionService.ADMINISTRATOR_AUTHORITY; + private static String defaultGuestUserName = PermissionService.GUEST_AUTHORITY; private static boolean mtEnabled = false; + /* (non-Javadoc) + * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() + */ + public void afterPropertiesSet() throws Exception + { + // at this point default admin and guest names have been assigned + initialized = true; + } + + public void setDefaultAdminUserName(String defaultAdminUserName) + { + AuthenticationUtil.defaultAdminUserName = defaultAdminUserName; + } + + public void setDefaultGuestUserName(String defaultGuestUserName) + { + AuthenticationUtil.defaultGuestUserName = defaultGuestUserName; + } + public static void setMtEnabled(boolean mtEnabled) { if (!AuthenticationUtil.mtEnabled) @@ -375,19 +398,45 @@ public abstract class AuthenticationUtil /** * Get the name of the system user * - * @return String + * @return system user name */ public static String getSystemUserName() { return SYSTEM_USER_NAME; } + + /** + * Get the name of the default admin user (the admin user created during bootstrap) + * + * @return admin user name + */ + public static String getAdminUserName() + { + if (!initialized) + { + throw new IllegalStateException("AuthenticationUtil not yet initialised; default admin username not available"); + } + return defaultAdminUserName; + } + /* + * Get the name of admin role + */ + public static String getAdminRoleName() + { + return PermissionService.ADMINISTRATOR_AUTHORITY; + } + /** * Get the name of the Guest User */ public static String getGuestUserName() { - return PermissionService.GUEST_AUTHORITY.toLowerCase(); + if (!initialized) + { + throw new IllegalStateException("AuthenticationUtil not yet initialised; default guest username not available"); + } + return defaultGuestUserName; } /** @@ -545,4 +594,5 @@ public abstract class AuthenticationUtil NDC.push("User:" + userName); } } + } diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java index c08123a5c2..a0705735b7 100644 --- a/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java +++ b/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java @@ -35,6 +35,7 @@ import junit.framework.TestCase; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.repo.security.permissions.impl.AclDaoComponent; import org.alfresco.service.ServiceRegistry; @@ -100,11 +101,11 @@ public class AuthorityServiceTest extends TestCase tx.begin(); for (String user : pubAuthorityService.getAllAuthorities(AuthorityType.USER)) { - if (user.equals("guest")) + if (user.equals(AuthenticationUtil.getGuestUserName())) { continue; } - else if (user.equals("admin")) + else if (user.equals(AuthenticationUtil.getAdminUserName())) { continue; } @@ -138,9 +139,9 @@ public class AuthorityServiceTest extends TestCase authenticationService.createAuthentication("andy", "andy".toCharArray()); } - if (!authenticationDAO.userExists("admin")) + if (!authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); } if (!authenticationDAO.userExists("administrator")) @@ -211,7 +212,7 @@ public class AuthorityServiceTest extends TestCase public void testAdminUser() { - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); assertTrue(authorityService.hasAdminAuthority()); assertTrue(pubAuthorityService.hasAdminAuthority()); assertEquals(3, authorityService.getAuthorities().size()); diff --git a/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java b/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java index bfb1c039a1..a5577f3935 100644 --- a/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java +++ b/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java @@ -86,9 +86,9 @@ public class SimpleAuthorityServiceTest extends TestCase authenticationService.createAuthentication("andy", "andy".toCharArray()); } - if (!authenticationDAO.userExists("admin")) + if (!authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); } if (!authenticationDAO.userExists("administrator")) @@ -117,7 +117,7 @@ public class SimpleAuthorityServiceTest extends TestCase { assertFalse(authorityService.authorityExists("woof")); - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); assertTrue(authorityService.hasAdminAuthority()); assertTrue(pubAuthorityService.hasAdminAuthority()); assertEquals(3, authorityService.getAuthorities().size()); diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java index cad71f47b2..bfcdbb4a7b 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java @@ -31,6 +31,7 @@ import java.util.Map; import org.alfresco.model.ContentModel; import org.alfresco.repo.node.db.NodeDaoService; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.repo.security.permissions.PermissionReference; import org.alfresco.repo.security.permissions.PermissionServiceSPI; @@ -140,11 +141,11 @@ public class AbstractPermissionTest extends BaseSpringTest } authenticationService.createAuthentication("lemur", "lemur".toCharArray()); - if(authenticationDAO.userExists("admin")) + if(authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.deleteAuthentication("admin"); + authenticationService.deleteAuthentication(AuthenticationUtil.getAdminUserName()); } - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); authenticationComponent.clearCurrentSecurityContext(); } diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java b/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java index 6b6abee88e..270d36c5e2 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java @@ -168,11 +168,11 @@ public class AclDaoComponentTest extends TestCase } authenticationService.createAuthentication("lemur", "lemur".toCharArray()); - if(authenticationDAO.userExists("admin")) + if(authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.deleteAuthentication("admin"); + authenticationService.deleteAuthentication(AuthenticationUtil.getAdminUserName()); } - authenticationService.createAuthentication("admin", "admin".toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray()); authenticationComponent.clearCurrentSecurityContext(); } diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java index ad2ccff861..20dd7144d2 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java @@ -97,7 +97,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testDelete() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -144,7 +144,7 @@ public class PermissionServiceTest extends AbstractPermissionTest */ public void testPositionInformation() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef one = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef two = nodeService.createNode(one, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef three = nodeService.createNode(two, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -226,7 +226,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void test_AR_2055() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef folder = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); runAs("andy"); @@ -242,7 +242,7 @@ public class PermissionServiceTest extends AbstractPermissionTest } - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); permissionService.setPermission(folder, "andy", PermissionService.ALL_PERMISSIONS, true); FileFolderServiceImpl.makeFolders(serviceRegistry.getFileFolderService(), folder, pathElements, ContentModel.TYPE_FOLDER); @@ -251,7 +251,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testRunAsRealAndEffectiveUsersWithPriorAuthentication() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); final NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -266,12 +266,12 @@ public class PermissionServiceTest extends AbstractPermissionTest public Object doWork() throws Exception { assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { @@ -291,7 +291,7 @@ public class PermissionServiceTest extends AbstractPermissionTest assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { @@ -308,11 +308,11 @@ public class PermissionServiceTest extends AbstractPermissionTest }, "andy"); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("lemur", AuthenticationUtil.getRunAsUser()); @@ -322,11 +322,11 @@ public class PermissionServiceTest extends AbstractPermissionTest }, "lemur"); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("andy", AuthenticationUtil.getRunAsUser()); @@ -335,7 +335,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testNestedRunAsRealAndEffectiveUsersWithPriorAuthentication() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); final NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -353,7 +353,7 @@ public class PermissionServiceTest extends AbstractPermissionTest assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { @@ -373,7 +373,7 @@ public class PermissionServiceTest extends AbstractPermissionTest assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { @@ -390,11 +390,11 @@ public class PermissionServiceTest extends AbstractPermissionTest }, "andy"); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("lemur", AuthenticationUtil.getRunAsUser()); @@ -404,11 +404,11 @@ public class PermissionServiceTest extends AbstractPermissionTest }, "lemur"); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); assertEquals("andy", AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("andy", AuthenticationUtil.getRunAsUser()); @@ -417,7 +417,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testRunAsRealAndEffectiveUsersWithNoPriorAuthentication() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); final NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -433,11 +433,11 @@ public class PermissionServiceTest extends AbstractPermissionTest { assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); assertNull(AuthenticationUtil.getFullyAuthenticatedUser()); assertNull(AuthenticationUtil.getRunAsUser()); @@ -445,7 +445,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testNestedRunAsRealAndEffectiveUsersWithNoPriorAuthentication() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); final NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -461,8 +461,8 @@ public class PermissionServiceTest extends AbstractPermissionTest { assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { @@ -471,7 +471,7 @@ public class PermissionServiceTest extends AbstractPermissionTest { assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.DENIED); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("lemur", AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() @@ -481,8 +481,8 @@ public class PermissionServiceTest extends AbstractPermissionTest { assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.ALLOWED); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { @@ -491,33 +491,33 @@ public class PermissionServiceTest extends AbstractPermissionTest { assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.DENIED); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("andy", AuthenticationUtil.getRunAsUser()); return null; } }, "andy"); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); assertEquals("lemur", AuthenticationUtil.getRunAsUser()); return null; } }, "lemur"); - assertEquals("admin", AuthenticationUtil.getFullyAuthenticatedUser()); - assertEquals("admin", AuthenticationUtil.getRunAsUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getFullyAuthenticatedUser()); + assertEquals(AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getRunAsUser()); return null; } - }, "admin"); + }, AuthenticationUtil.getAdminUserName()); assertNull(AuthenticationUtil.getFullyAuthenticatedUser()); assertNull(AuthenticationUtil.getRunAsUser()); @@ -526,14 +526,14 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testDefaultModelPermissions() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); runAs("andy"); assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.CONTRIBUTOR)) == AccessStatus.DENIED); - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.CONTRIBUTOR), "andy", AccessStatus.ALLOWED)); @@ -563,7 +563,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testAdminUserPermissions() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); try { assertFalse(serviceRegistry.getPermissionService().hasPermission(rootNodeRef, PermissionService.CONSUMER) == AccessStatus.ALLOWED); @@ -593,7 +593,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testEqualBarCaseAuthorities() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -659,7 +659,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testPermissionCacheOnMove() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -671,7 +671,7 @@ public class PermissionServiceTest extends AbstractPermissionTest assertTrue(permissionService.hasPermission(n1, getPermission(PermissionService.READ)) == AccessStatus.ALLOWED); assertTrue(permissionService.hasPermission(n2, getPermission(PermissionService.READ)) == AccessStatus.ALLOWED); - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); nodeService.moveNode(n2, rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}oneMoved")); runAs("andy"); @@ -1035,7 +1035,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testGlobalPermissionsForAdmin() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_CONTENT).getChildRef(); @@ -1053,11 +1053,11 @@ public class PermissionServiceTest extends AbstractPermissionTest assertTrue(permissionService.hasPermission(n2, getPermission(PermissionService.READ_CHILDREN)) == AccessStatus.ALLOWED); assertTrue(permissionService.hasPermission(n2, getPermission(PermissionService.READ_CONTENT)) == AccessStatus.ALLOWED); - permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_PROPERTIES), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_CONTENT), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.ALL_PERMISSIONS), "admin", AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_PROPERTIES), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_CONTENT), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.ALL_PERMISSIONS), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); assertTrue(permissionService.hasPermission(rootNodeRef, getPermission(PermissionService.READ)) == AccessStatus.ALLOWED); assertTrue(permissionService.hasPermission(rootNodeRef, getPermission(PermissionService.READ_PROPERTIES)) == AccessStatus.ALLOWED); assertTrue(permissionService.hasPermission(rootNodeRef, getPermission(PermissionService.READ_CHILDREN)) == AccessStatus.ALLOWED); @@ -1133,7 +1133,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testSimplePermissionSimpleInheritance() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -1199,7 +1199,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testPermissionGroupSimpleInheritance() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -1425,7 +1425,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testPerformance() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); // TransactionService transactionService = serviceRegistry.getTransactionService(); // UserTransaction tx = transactionService.getUserTransaction(); @@ -1460,7 +1460,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testPerf() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); // TransactionService transactionService = serviceRegistry.getTransactionService(); // UserTransaction tx = transactionService.getUserTransaction(); @@ -1895,7 +1895,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testInheritPermissions() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -1954,7 +1954,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testAncestorRequirementAndInheritance() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -2110,7 +2110,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testContentPermissions() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_CONTENT).getChildRef(); @@ -2318,7 +2318,7 @@ public class PermissionServiceTest extends AbstractPermissionTest public void testGetAllSetPermissionsFromAllNodes() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); NodeRef n2 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -2332,66 +2332,66 @@ public class PermissionServiceTest extends AbstractPermissionTest NodeRef n10 = nodeService.createNode(n1, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}ten"), ContentModel.TYPE_FOLDER).getChildRef(); // assertEquals(0, permissionService.getAllSetPermissionsForCurrentUser().size()); - // assertEquals(0, permissionService.getAllSetPermissionsForAuthority("admin").size()); + // assertEquals(0, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).size()); // assertEquals(0, permissionService.getAllSetPermissionsForAuthority("andy").size()); - permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ_CONTENT), "admin", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ_CONTENT), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.READ_CHILDREN), "andy", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n3, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n4, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n5, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.ALLOWED)); - permissionService.setPermission(new SimplePermissionEntry(n6, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(n7, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(n8, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(n9, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.DENIED)); - permissionService.setPermission(new SimplePermissionEntry(n10, getPermission(PermissionService.READ_CHILDREN), "admin", AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(n3, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n4, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n5, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n6, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(n7, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(n8, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(n9, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); + permissionService.setPermission(new SimplePermissionEntry(n10, getPermission(PermissionService.READ_CHILDREN), AuthenticationUtil.getAdminUserName(), AccessStatus.DENIED)); permissionService.setPermission(new SimplePermissionEntry(n10, getPermission(PermissionService.READ_CHILDREN), "andy", AccessStatus.ALLOWED)); // assertEquals(10, permissionService.getAllSetPermissionsForCurrentUser().size()); - // assertEquals(10, permissionService.getAllSetPermissionsForAuthority("admin").size()); + // assertEquals(10, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).size()); // assertEquals(2, permissionService.getAllSetPermissionsForAuthority("andy").size()); // assertNull(permissionService.getAllSetPermissionsForCurrentUser().get(rootNodeRef)); - // assertNull(permissionService.getAllSetPermissionsForAuthority("admin").get(rootNodeRef)); + // assertNull(permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(rootNodeRef)); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(rootNodeRef)); // assertEquals(2, permissionService.getAllSetPermissionsForCurrentUser().get(n1).size()); - // assertEquals(2, permissionService.getAllSetPermissionsForAuthority("admin").get(n1).size()); + // assertEquals(2, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n1).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n1)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n2).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n2).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n2).size()); // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("andy").get(n2).size()); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n3).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n3).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n3).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n3)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n4).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n4).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n4).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n4)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n5).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n5).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n5).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n5)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n6).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n6).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n6).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n6)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n7).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n7).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n7).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n7)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n8).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n8).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n8).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n8)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n9).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n9).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n9).size()); // assertNull(permissionService.getAllSetPermissionsForAuthority("andy").get(n9)); // assertEquals(1, permissionService.getAllSetPermissionsForCurrentUser().get(n10).size()); - // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("admin").get(n10).size()); + // assertEquals(1, permissionService.getAllSetPermissionsForAuthority(AuthenticationUtil.getAdminUserName()).get(n10).size()); // assertEquals(1, permissionService.getAllSetPermissionsForAuthority("andy").get(n10).size()); } public void xtestFindNodesByPermission() { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); // StoreRef storeRef = rootNodeRef.getStoreRef(); @@ -2414,9 +2414,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // true, false, false), storeRef).size()); // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser("Consumer", // false, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", "Consumer", true, + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), "Consumer", true, // false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", "Consumer", false, + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), "Consumer", false, // false, false), storeRef).size()); // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("andy", "Consumer", true, // false, false), storeRef).size()); @@ -2427,7 +2427,7 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(groupAuth, "Consumer", false, // false, false), storeRef).size()); - permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.CONSUMER), "admin", AccessStatus.ALLOWED)); + permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.CONSUMER), AuthenticationUtil.getAdminUserName(), AccessStatus.ALLOWED)); permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.CONSUMER), "andy", AccessStatus.ALLOWED)); permissionService.setPermission(new SimplePermissionEntry(n6, getPermission(PermissionService.CONSUMER), "andy", AccessStatus.DENIED)); permissionService.setPermission(new SimplePermissionEntry(n7, getPermission(PermissionService.CONSUMER), "andy", AccessStatus.DENIED)); @@ -2448,9 +2448,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONSUMER, // false, false, false), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, true, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, false, false, false), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONSUMER, true, false, false), storeRef).size()); @@ -2467,9 +2467,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONTRIBUTOR, // false, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, true, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, false, false, false), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONTRIBUTOR, true, false, false), storeRef).size()); @@ -2486,9 +2486,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ, false, // false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, true, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, false, false, false), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ, true, false, false), storeRef).size()); @@ -2505,9 +2505,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CONTENT, // false, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, true, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, false, false, false), storeRef).size()); // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CONTENT, true, false, false), storeRef).size()); @@ -2524,9 +2524,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CHILDREN, // false, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, true, false, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, false, false, false), storeRef).size()); // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CHILDREN, true, false, false), storeRef).size()); @@ -2551,9 +2551,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONSUMER, // false, true, false), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, true, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, false, true, false), storeRef).size()); // assertEquals(2, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONSUMER, true, true, false), storeRef).size()); @@ -2570,9 +2570,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONTRIBUTOR, // false, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, true, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, false, true, false), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONTRIBUTOR, true, true, false), storeRef).size()); @@ -2589,9 +2589,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ, false, // true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, true, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, false, true, false), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ, true, true, false), storeRef).size()); @@ -2608,9 +2608,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CONTENT, // false, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, true, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, false, true, false), storeRef).size()); // assertEquals(2, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CONTENT, true, true, false), storeRef).size()); @@ -2627,9 +2627,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CHILDREN, // false, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, true, true, false), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, false, true, false), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CHILDREN, true, true, false), storeRef).size()); @@ -2648,9 +2648,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONSUMER, // false, false, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, true, false, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, false, false, true), storeRef).size()); // assertEquals(2, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONSUMER, true, false, true), storeRef).size()); @@ -2667,9 +2667,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONTRIBUTOR, // false, false, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, true, false, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, false, false, true), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONTRIBUTOR, true, false, true), storeRef).size()); @@ -2686,9 +2686,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ, false, // false, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, true, false, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, false, false, true), storeRef).size()); // assertEquals(3, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ, true, false, true), storeRef).size()); @@ -2705,9 +2705,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CONTENT, // false, false, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, true, false, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, false, false, true), storeRef).size()); // assertEquals(3, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CONTENT, true, false, true), storeRef).size()); @@ -2724,9 +2724,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CHILDREN, // false, false, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, true, false, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, false, false, true), storeRef).size()); // assertEquals(3, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CHILDREN, true, false, true), storeRef).size()); @@ -2745,9 +2745,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONSUMER, // false, true, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, true, true, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONSUMER, false, true, true), storeRef).size()); // assertEquals(3, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONSUMER, true, true, true), storeRef).size()); @@ -2764,9 +2764,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.CONTRIBUTOR, // false, true, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, true, true, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.CONTRIBUTOR, false, true, true), storeRef).size()); // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.CONTRIBUTOR, true, true, true), storeRef).size()); @@ -2783,9 +2783,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ, false, // true, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, true, true, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ, false, true, true), storeRef).size()); // assertEquals(4, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ, true, true, true), storeRef).size()); @@ -2802,9 +2802,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CONTENT, // false, true, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, true, true, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CONTENT, false, true, true), storeRef).size()); // assertEquals(5, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CONTENT, true, true, true), storeRef).size()); @@ -2821,9 +2821,9 @@ public class PermissionServiceTest extends AbstractPermissionTest // assertEquals(0, // filterForStore(permissionService.findNodesByAssignedPermissionForCurrentUser(PermissionService.READ_CHILDREN, // false, true, true), storeRef).size()); - // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(1, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, true, true, true), storeRef).size()); - // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission("admin", + // assertEquals(0, filterForStore(permissionService.findNodesByAssignedPermission(AuthenticationUtil.getAdminUserName(), // PermissionService.READ_CHILDREN, false, true, true), storeRef).size()); // assertEquals(5, filterForStore(permissionService.findNodesByAssignedPermission("andy", // PermissionService.READ_CHILDREN, true, true, true), storeRef).size()); diff --git a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java index 03bcb4b495..2a94652dd6 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationTest.java @@ -37,6 +37,7 @@ import net.sf.acegisecurity.ConfigAttributeDefinition; import org.alfresco.model.ContentModel; import org.alfresco.repo.search.results.ChildAssocRefResultSet; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.impl.AbstractPermissionTest; import org.alfresco.repo.security.permissions.impl.SimplePermissionEntry; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -446,7 +447,7 @@ public class ACLEntryAfterInvocationTest extends AbstractPermissionTest public void testResultSetFilterAll() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -508,7 +509,7 @@ public class ACLEntryAfterInvocationTest extends AbstractPermissionTest public void testResultSetFilterForNullParentOnly() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -570,7 +571,7 @@ public class ACLEntryAfterInvocationTest extends AbstractPermissionTest public void testResultSetFilterNone1() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); @@ -694,7 +695,7 @@ public class ACLEntryAfterInvocationTest extends AbstractPermissionTest public void testResultSetFilterNone2() throws Exception { - runAs("admin"); + runAs(AuthenticationUtil.getAdminUserName()); NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef(); diff --git a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java index 8568f4b7ad..005f090909 100644 --- a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java +++ b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java @@ -59,6 +59,7 @@ import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.AuthorityService; +import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.NoSuchPersonException; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespacePrefixResolver; @@ -584,7 +585,12 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per public NodeRef createPerson(Map properties) { String userName = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_USERNAME)); - + AuthorityType authorityType = AuthorityType.getAuthorityType(userName); + if (authorityType != AuthorityType.USER) + { + throw new AlfrescoRuntimeException("Attempt to create person for an authority which is not a user"); + } + tenantService.checkDomainUser(userName); properties.put(ContentModel.PROP_USERNAME, userName); diff --git a/source/java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/java/org/alfresco/repo/site/SiteServiceImplTest.java index ff2432a40e..b84e5fa8e6 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImplTest.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImplTest.java @@ -34,6 +34,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.model.ForumModel; import org.alfresco.repo.jscript.ClasspathScriptLocation; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.ContentWriter; @@ -167,14 +168,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest SiteInfo siteInfo = this.siteService.createSite(TEST_SITE_PRESET, "mySiteTest", TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC); checkSiteInfo(siteInfo, TEST_SITE_PRESET, "mySiteTest", TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC); - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); this.siteService.setMembership(siteInfo.getShortName(), USER_TWO, SiteModel.SITE_MANAGER); authenticationComponent.setCurrentUser(USER_TWO); this.siteService.setMembership(siteInfo.getShortName(), USER_THREE, SiteModel.SITE_CONTRIBUTOR); this.siteService.removeMembership(siteInfo.getShortName(), USER_THREE); - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); this.siteService.removeMembership(siteInfo.getShortName(), USER_TWO); authenticationComponent.setSystemUserAsCurrentUser(); diff --git a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java index 5aa6c99368..a01e933d91 100755 --- a/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java @@ -96,10 +96,9 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo private RepositoryExporterService repositoryExporterService; private ModuleService moduleService; private SiteAVMBootstrap siteAVMBootstrap; - private List workflowDeployers = new ArrayList(); - private String baseAdminUsername = "admin"; // default for backwards compatibility only - eg. upgrade of existing MT instance (mt-admin-context.xml.sample) + private String baseAdminUsername = null; /* * Tenant domain/ids are unique strings that are case-insensitive. Tenant ids must be valid filenames. @@ -232,6 +231,10 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo protected void checkProperties() { + if (moduleService == null || siteAVMBootstrap == null || baseAdminUsername == null) + { + logger.warn(WARN_MSG); + } PropertyCheck.mandatory(this, "NodeService", nodeService); PropertyCheck.mandatory(this, "DictionaryComponent", dictionaryComponent); PropertyCheck.mandatory(this, "RepoAdminService", repoAdminService); @@ -242,22 +245,9 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo PropertyCheck.mandatory(this, "TenantFileContentStore", tenantFileContentStore); PropertyCheck.mandatory(this, "WorkflowService", workflowService); PropertyCheck.mandatory(this, "RepositoryExporterService", repositoryExporterService); - - // for backwards compatibility only - - if (moduleService == null) - { - // default for now - logger.warn(WARN_MSG); - moduleService = (ModuleService)ctx.getBean("moduleService"); - } - - if (siteAVMBootstrap == null) - { - // default for now - logger.warn(WARN_MSG); - siteAVMBootstrap = (SiteAVMBootstrap)ctx.getBean("siteAVMBootstrap"); - } + PropertyCheck.mandatory(this, "siteAVMBootstrap", siteAVMBootstrap); + PropertyCheck.mandatory(this, "moduleService", moduleService); + PropertyCheck.mandatory(this, "baseAdminUsername", baseAdminUsername); } public void setApplicationContext(ApplicationContext applicationContext) throws BeansException @@ -1232,6 +1222,16 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo // local helpers + public String getBaseAdminUser() + { + // default for backwards compatibility only - eg. upgrade of existing MT instance (mt-admin-context.xml.sample) + if (baseAdminUsername != null) + { + return baseAdminUsername; + } + return AuthenticationUtil.getAdminUserName(); + } + private String getSystemUser(String tenantDomain) { return tenantService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantDomain); @@ -1239,7 +1239,8 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo private String getTenantAdminUser(String tenantDomain) { - return tenantService.getDomainUser(this.baseAdminUsername, tenantDomain); + + return tenantService.getDomainUser(getBaseAdminUser(), tenantDomain); } private String getTenantGuestUser(String tenantDomain) diff --git a/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java b/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java index 81f4ef95de..856178ea05 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java +++ b/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java @@ -104,7 +104,6 @@ public class MultiTDemoTest extends TestCase public static final String ROOT_DIR = "./tenantstores"; - public static final String DEFAULT_ADMIN_UN = "admin"; public static final String DEFAULT_ADMIN_PW = "admin"; public static final String DEFAULT_GUEST_UN = "guest"; @@ -152,7 +151,7 @@ public class MultiTDemoTest extends TestCase public void testCreateTenants() throws Throwable { - AuthenticationUtil.setFullyAuthenticatedUser(DEFAULT_ADMIN_UN); // authenticate as super-admin + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin logger.info("Create tenants"); @@ -217,7 +216,7 @@ public class MultiTDemoTest extends TestCase { for (final String tenantDomain : tenants) { - String tenantAdminName = tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain); + String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain); AuthenticationUtil.runAs(new RunAsWork() { @@ -238,7 +237,7 @@ public class MultiTDemoTest extends TestCase for (final String tenantDomain : tenants) { - String tenantAdminName = tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain); + String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain); AuthenticationUtil.runAs(new RunAsWork() { @@ -343,7 +342,7 @@ public class MultiTDemoTest extends TestCase for (final String tenantDomain : tenants) { - loginLogoutUser(tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain), DEFAULT_ADMIN_PW+" "+tenantDomain); + loginLogoutUser(tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain), DEFAULT_ADMIN_PW+" "+tenantDomain); } } catch (Throwable t) @@ -361,7 +360,7 @@ public class MultiTDemoTest extends TestCase for (final String tenantDomain : tenants) { - String tenantAdminName = tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain); + String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain); AuthenticationUtil.runAs(new RunAsWork() { @@ -392,7 +391,7 @@ public class MultiTDemoTest extends TestCase for (final String tenantDomain : tenants) { - String tenantAdminName = tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain); + String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain); AuthenticationUtil.runAs(new RunAsWork() { @@ -522,11 +521,11 @@ public class MultiTDemoTest extends TestCase assertTrue("Super admin: ", (nodeService.getStores().size() >= DEFAULT_STORE_COUNT)); return null; } - }, DEFAULT_ADMIN_UN); + }, AuthenticationUtil.getAdminUserName()); for (final String tenantDomain : tenants) { - String tenantAdminName = tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain); + String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain); AuthenticationUtil.runAs(new RunAsWork() { @@ -546,7 +545,7 @@ public class MultiTDemoTest extends TestCase for (final String tenantDomain : tenants) { - String tenantAdminName = tenantService.getDomainUser(DEFAULT_ADMIN_UN, tenantDomain); + String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain); AuthenticationUtil.runAs(new RunAsWork() { diff --git a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java index 42b834893e..1f75534522 100755 --- a/source/java/org/alfresco/repo/tenant/TenantInterpreter.java +++ b/source/java/org/alfresco/repo/tenant/TenantInterpreter.java @@ -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() { diff --git a/source/java/org/alfresco/repo/version/BaseVersionStoreTest.java b/source/java/org/alfresco/repo/version/BaseVersionStoreTest.java index ccb2c80b4e..ce59ebe6d8 100644 --- a/source/java/org/alfresco/repo/version/BaseVersionStoreTest.java +++ b/source/java/org/alfresco/repo/version/BaseVersionStoreTest.java @@ -36,6 +36,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.repo.dictionary.DictionaryDAO; import org.alfresco.repo.dictionary.M2Model; import org.alfresco.repo.node.archive.NodeArchiveService; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.version.common.counter.VersionCounterService; @@ -121,7 +122,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest * Test user details */ private static final String PWD = "admin"; - private static final String USER_NAME = "admin"; +// private static final String USER_NAME = "admin"; /** * Sets the meta model dao @@ -196,12 +197,12 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest // Create an authenticate the user - if(!authenticationDAO.userExists(USER_NAME)) + if(!authenticationDAO.userExists(AuthenticationUtil.getAdminUserName())) { - authenticationService.createAuthentication(USER_NAME, PWD.toCharArray()); + authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), PWD.toCharArray()); } - TestWithUserUtils.authenticateUser(USER_NAME, PWD, this.rootNodeRef, this.authenticationService); + TestWithUserUtils.authenticateUser(AuthenticationUtil.getAdminUserName(), PWD, this.rootNodeRef, this.authenticationService); } /** @@ -395,7 +396,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest } // Check the creator - assertEquals(USER_NAME, newVersion.getCreator()); + assertEquals(AuthenticationUtil.getAdminUserName(), newVersion.getCreator()); // Check the metadata properties of the version Map props = newVersion.getVersionProperties(); diff --git a/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java b/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java index 34b06154d2..d68831f3df 100644 --- a/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java +++ b/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java @@ -29,6 +29,7 @@ import java.util.Date; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ActionImpl; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; @@ -87,7 +88,7 @@ public class StartWorkflowActionExecuterTest extends BaseSpringTest ActionImpl action = new ActionImpl(null, GUID.generate(), StartWorkflowActionExecuter.NAME, null); action.setParameterValue(StartWorkflowActionExecuter.PARAM_WORKFLOW_NAME, "jbpm$wf:review"); action.setParameterValue(WorkflowModel.PROP_WORKFLOW_DUE_DATE.toPrefixString(namespaceService), new Date()); - NodeRef reviewer = personService.getPerson("admin"); + NodeRef reviewer = personService.getPerson(AuthenticationUtil.getAdminUserName()); action.setParameterValue(WorkflowModel.ASSOC_ASSIGNEE.toPrefixString(namespaceService), reviewer); executer.execute(action, this.nodeRef); } diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java index f99d35c044..3a7f265401 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java @@ -36,6 +36,7 @@ import org.alfresco.i18n.I18NUtil; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.workflow.BPMEngineRegistry; import org.alfresco.repo.workflow.TaskComponent; import org.alfresco.repo.workflow.WorkflowComponent; @@ -79,7 +80,7 @@ public class JBPMEngineTest extends BaseSpringTest { // run as system authenticationComponent = (AuthenticationComponent)applicationContext.getBean("authenticationComponent"); - authenticationComponent.setCurrentUser("admin"); + authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); BPMEngineRegistry registry = (BPMEngineRegistry)applicationContext.getBean("bpm_engineRegistry"); workflowComponent = registry.getWorkflowComponent("jbpm"); @@ -190,7 +191,7 @@ public class JBPMEngineTest extends BaseSpringTest params.put(QName.createQName("", "Message"), "Hello World"); // context variable outside of task definition params.put(QName.createQName("", "Array"), new String[] { "one", "two" }); // context variable outside of task definition params.put(QName.createQName("", "NodeRef"), new NodeRef("workspace://1/1001")); // context variable outside of task definition - params.put(ContentModel.PROP_OWNER, "admin"); // task assignment + params.put(ContentModel.PROP_OWNER, AuthenticationUtil.getAdminUserName()); // task assignment WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, params); assertNotNull(path); @@ -211,7 +212,7 @@ public class JBPMEngineTest extends BaseSpringTest NodeRef initiator = path.instance.initiator; String initiatorUsername = (String)nodeService.getProperty(initiator, ContentModel.PROP_USERNAME); - assertEquals("admin", initiatorUsername); + assertEquals(AuthenticationUtil.getAdminUserName(), initiatorUsername); } @@ -227,7 +228,7 @@ public class JBPMEngineTest extends BaseSpringTest params.put(QName.createQName("", "Message"), "Hello World"); // context variable outside of task definition params.put(QName.createQName("", "Array"), new String[] { "one", "two" }); // context variable outside of task definition params.put(QName.createQName("", "NodeRef"), new NodeRef("workspace://1/1001")); // context variable outside of task definition - params.put(ContentModel.PROP_OWNER, "admin"); // task assignment + params.put(ContentModel.PROP_OWNER, AuthenticationUtil.getAdminUserName()); // task assignment WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, params); assertNotNull(path); @@ -334,7 +335,7 @@ public class JBPMEngineTest extends BaseSpringTest List instances1 = workflowComponent.getActiveWorkflows(workflowDef.id); assertNotNull(instances1); assertEquals(1, instances1.size()); - List tasks = taskComponent.getAssignedTasks("admin", WorkflowTaskState.IN_PROGRESS); + List tasks = taskComponent.getAssignedTasks(AuthenticationUtil.getAdminUserName(), WorkflowTaskState.IN_PROGRESS); assertNotNull(tasks); assertTrue(tasks.size() > 0); WorkflowInstance cancelledInstance = workflowComponent.cancelWorkflow(instances1.get(0).id); @@ -343,7 +344,7 @@ public class JBPMEngineTest extends BaseSpringTest List instances2 = workflowComponent.getActiveWorkflows(workflowDef.id); assertNotNull(instances2); assertEquals(0, instances2.size()); - List tasks1 = taskComponent.getAssignedTasks("admin", WorkflowTaskState.IN_PROGRESS); + List tasks1 = taskComponent.getAssignedTasks(AuthenticationUtil.getAdminUserName(), WorkflowTaskState.IN_PROGRESS); assertNotNull(tasks1); tasks1 = filterTasksByWorkflowInstance(tasks1, cancelledInstance.id); assertEquals(0, tasks1.size()); @@ -366,7 +367,7 @@ public class JBPMEngineTest extends BaseSpringTest { WorkflowDefinition workflowDef = getTestDefinition(); Map parameters = new HashMap(); - parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), "admin"); + parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), AuthenticationUtil.getAdminUserName()); parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "testNode"), testNodeRef); parameters.put(QName.createQName(NamespaceService.BPM_MODEL_1_0_URI, "package"), packageComponent.createPackage(null)); WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, parameters); @@ -376,11 +377,11 @@ public class JBPMEngineTest extends BaseSpringTest assertEquals(1, tasks.size()); WorkflowTask updatedTask = taskComponent.endTask(tasks.get(0).id, path.node.transitions[0].id); assertNotNull(updatedTask); - List completedTasks = taskComponent.getAssignedTasks("admin", WorkflowTaskState.COMPLETED); + List completedTasks = taskComponent.getAssignedTasks(AuthenticationUtil.getAdminUserName(), WorkflowTaskState.COMPLETED); assertNotNull(completedTasks); completedTasks = filterTasksByWorkflowInstance(completedTasks, path.instance.id); assertEquals(1, completedTasks.size()); - List assignedTasks = taskComponent.getAssignedTasks("admin", WorkflowTaskState.IN_PROGRESS); + List assignedTasks = taskComponent.getAssignedTasks(AuthenticationUtil.getAdminUserName(), WorkflowTaskState.IN_PROGRESS); assertNotNull(assignedTasks); assignedTasks = filterTasksByWorkflowInstance(assignedTasks, path.instance.id); assertEquals(1, assignedTasks.size()); @@ -392,7 +393,7 @@ public class JBPMEngineTest extends BaseSpringTest { WorkflowDefinition workflowDef = getTestDefinition(); List bpm_assignees = new ArrayList(); - bpm_assignees.add("admin"); + bpm_assignees.add(AuthenticationUtil.getAdminUserName()); bpm_assignees.add("bob"); bpm_assignees.add("fred"); Map parameters = new HashMap(); @@ -412,7 +413,7 @@ public class JBPMEngineTest extends BaseSpringTest { WorkflowDefinition workflowDef = getTestDefinition(); Map parameters = new HashMap(); - parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), "admin"); + parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), AuthenticationUtil.getAdminUserName()); parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "testNode"), testNodeRef); parameters.put(QName.createQName(NamespaceService.BPM_MODEL_1_0_URI, "package"), packageComponent.createPackage(null)); WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, parameters); @@ -424,7 +425,7 @@ public class JBPMEngineTest extends BaseSpringTest WorkflowTask updatedTask = taskComponent.endTask(tasks1.get(0).id, null); assertNotNull(updatedTask); assertEquals(WorkflowTaskState.COMPLETED, updatedTask.state); - List completedTasks = taskComponent.getAssignedTasks("admin", WorkflowTaskState.COMPLETED); + List completedTasks = taskComponent.getAssignedTasks(AuthenticationUtil.getAdminUserName(), WorkflowTaskState.COMPLETED); assertNotNull(completedTasks); completedTasks = filterTasksByWorkflowInstance(completedTasks, path.instance.id); assertEquals(1, completedTasks.size()); @@ -436,7 +437,7 @@ public class JBPMEngineTest extends BaseSpringTest { WorkflowDefinition workflowDef = getTestDefinition(); Map parameters = new HashMap(); - parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), "admin"); + parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), AuthenticationUtil.getAdminUserName()); parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "testNode"), testNodeRef); WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, parameters); assertNotNull(path); @@ -454,7 +455,7 @@ public class JBPMEngineTest extends BaseSpringTest { WorkflowDefinition workflowDef = getTestDefinition(); Map parameters = new HashMap(); - parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), "admin"); + parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), AuthenticationUtil.getAdminUserName()); parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "testNode"), testNodeRef); parameters.put(QName.createQName(NamespaceService.BPM_MODEL_1_0_URI, "package"), packageComponent.createPackage(null)); WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, parameters); diff --git a/source/java/org/alfresco/repo/workflow/jbpm/NodeListConverterTest.java b/source/java/org/alfresco/repo/workflow/jbpm/NodeListConverterTest.java index 82d39b7f17..bcfa369e58 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/NodeListConverterTest.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/NodeListConverterTest.java @@ -33,6 +33,7 @@ import java.util.Map; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.workflow.BPMEngineRegistry; import org.alfresco.repo.workflow.TaskComponent; import org.alfresco.repo.workflow.WorkflowComponent; @@ -98,7 +99,7 @@ public class NodeListConverterTest extends BaseSpringTest params.put(WorkflowModel.ASSOC_PACKAGE, testNodeRef); Date reviewDueDate = new Date(); params.put(QName.createQName("http://www.alfresco.org/model/workflow/1.0", "reviewDueDate"), reviewDueDate); - NodeRef reviewer = personService.getPerson("admin"); + NodeRef reviewer = personService.getPerson(AuthenticationUtil.getAdminUserName()); params.put(QName.createQName("http://www.alfresco.org/model/workflow/1.0", "reviewer"), reviewer); WorkflowPath path = workflowComponent.startWorkflow(testWorkflowDef.id, params); diff --git a/source/java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java b/source/java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java index 6a642af47b..c500a7ba95 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java @@ -33,6 +33,7 @@ import java.util.Map; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.workflow.BPMEngineRegistry; import org.alfresco.repo.workflow.TaskComponent; import org.alfresco.repo.workflow.WorkflowComponent; @@ -106,7 +107,7 @@ public class ReviewAndApproveTest extends BaseSpringTest params.put(WorkflowModel.ASSOC_PACKAGE, testNodeRef); Date reviewDueDate = new Date(); params.put(WorkflowModel.PROP_WORKFLOW_DUE_DATE, reviewDueDate); - NodeRef reviewer = personService.getPerson("admin"); + NodeRef reviewer = personService.getPerson(AuthenticationUtil.getAdminUserName()); params.put(WorkflowModel.ASSOC_ASSIGNEE, reviewer); params.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, "Test review"); @@ -125,7 +126,7 @@ public class ReviewAndApproveTest extends BaseSpringTest assertEquals("Test review", endedTask.properties.get(WorkflowModel.PROP_DESCRIPTION)); assertEquals("Test review", endedTask.path.instance.description); - List assignedTasks = taskComponent.getAssignedTasks("admin", WorkflowTaskState.IN_PROGRESS); + List assignedTasks = taskComponent.getAssignedTasks(AuthenticationUtil.getAdminUserName(), WorkflowTaskState.IN_PROGRESS); assertNotNull(assignedTasks); assignedTasks = filterTasksByWorkflowInstance(assignedTasks, path.instance.id); @@ -146,7 +147,7 @@ public class ReviewAndApproveTest extends BaseSpringTest params.put(WorkflowModel.PROP_COMPLETED_ITEMS, (Serializable)nodeRefs); Date reviewDueDate = new Date(); params.put(WorkflowModel.PROP_WORKFLOW_DUE_DATE, reviewDueDate); - NodeRef reviewer = personService.getPerson("admin"); + NodeRef reviewer = personService.getPerson(AuthenticationUtil.getAdminUserName()); params.put(WorkflowModel.ASSOC_ASSIGNEE, reviewer); WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, params); diff --git a/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java b/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java index 8be3ae0568..57da6e8ca2 100644 --- a/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java +++ b/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java @@ -76,7 +76,7 @@ public class AbstractWCMServiceImplTest extends TestCase protected static final boolean TEST_WEBPROJ_DONT_USE_AS_TEMPLATE = false; // base web users - protected static final String USER_ADMIN = "admin"; + //protected static final String USER_ADMIN = "admin"; protected static final String TEST_USER = "testWebUser-"+TEST_RUN; @@ -106,7 +106,7 @@ public class AbstractWCMServiceImplTest extends TestCase transactionService = (TransactionService)ctx.getBean("TransactionService"); // By default run as Admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); createUser(USER_ONE); createUser(USER_TWO); @@ -120,7 +120,7 @@ public class AbstractWCMServiceImplTest extends TestCase if (CLEAN) { // Switch back to Admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); List webProjects = wpService.listWebProjects(); for (final WebProjectInfo wpInfo : webProjects) diff --git a/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java b/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java index 04ae7d1f3b..8e82576281 100644 --- a/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java +++ b/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java @@ -118,10 +118,10 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest // get assets AssetInfo myFolder1Asset = assetService.getAsset(sbStoreId, path+"/myFolder1"); - checkAssetInfo(myFolder1Asset, "myFolder1", path+"/myFolder1", USER_ADMIN, false, true, false, false, null); + checkAssetInfo(myFolder1Asset, "myFolder1", path+"/myFolder1", AuthenticationUtil.getAdminUserName(), false, true, false, false, null); AssetInfo myFile1Asset = assetService.getAsset(sbStoreId, path+"/myFolder1/myFile1"); - checkAssetInfo(myFile1Asset, "myFile1", path+"/myFolder1/myFile1", USER_ADMIN, true, false, false, true, USER_ADMIN); + checkAssetInfo(myFile1Asset, "myFile1", path+"/myFolder1/myFile1", AuthenticationUtil.getAdminUserName(), true, false, false, true, AuthenticationUtil.getAdminUserName()); // delete folder assetService.deleteAsset(myFolder1Asset); // also deletes myFile1 @@ -427,7 +427,7 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest private void runCRUDforRoles(String user, String role, String wpStoreId, String defaultWebApp, boolean canCreate, boolean canUpdateExisting, boolean canDeleteExisting) throws IOException, InterruptedException { // switch to user - content manager - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // invite web user and auto-create their (author) sandbox wpService.inviteWebUser(wpStoreId, user, role, true); @@ -533,10 +533,10 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest // get existing assets AssetInfo existingFolder1Asset = assetService.getAssetWebApp(sbStoreId, defaultWebApp, "/"+PREFIX+user); - checkAssetInfo(existingFolder1Asset, PREFIX+user, path+"/"+PREFIX+user, USER_ADMIN, false, true, false, false, null); + checkAssetInfo(existingFolder1Asset, PREFIX+user, path+"/"+PREFIX+user, AuthenticationUtil.getAdminUserName(), false, true, false, false, null); AssetInfo existingFile1Asset = assetService.getAssetWebApp(sbStoreId, defaultWebApp, "/"+PREFIX+user+"/fileA"); - checkAssetInfo(existingFile1Asset, "fileA", path+"/"+PREFIX+user+"/fileA", USER_ADMIN, true, false, false, false, null); + checkAssetInfo(existingFile1Asset, "fileA", path+"/"+PREFIX+user+"/fileA", AuthenticationUtil.getAdminUserName(), true, false, false, false, null); // get existing content diff --git a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java index 8f30874d2d..446575ad97 100644 --- a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java +++ b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java @@ -103,7 +103,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest if (CLEAN) { // Switch back to Admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); List webProjects = wpService.listWebProjects(); for (final WebProjectInfo wpInfo : webProjects) @@ -185,10 +185,10 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // Create a web project WebProjectInfo wpInfo1 = wpService.createWebProject(TEST_SANDBOX+"-create-author", TEST_WEBPROJ_NAME+"-author", TEST_WEBPROJ_TITLE, TEST_WEBPROJ_DESCRIPTION, TEST_WEBPROJ_DEFAULT_WEBAPP, TEST_WEBPROJ_DONT_USE_AS_TEMPLATE, null); - String expectedUserSandboxId = TEST_SANDBOX+"-create-author" + "--" + USER_ADMIN; + String expectedUserSandboxId = TEST_SANDBOX+"-create-author" + "--" + AuthenticationUtil.getAdminUserName(); SandboxInfo sbInfo1 = sbService.getAuthorSandbox(wpInfo1.getStoreId()); - checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ADMIN, USER_ADMIN, expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo1, expectedUserSandboxId, AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getAdminUserName(), expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); sbInfo1 = sbService.getAuthorSandbox(wpInfo1.getStoreId(), USER_ONE); assertNull(sbInfo1); @@ -200,7 +200,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest assertNull(sbInfo1); // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Invite web user wpService.inviteWebUser(wpInfo1.getStoreId(), USER_ONE, WCMUtil.ROLE_CONTENT_MANAGER); @@ -211,24 +211,24 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest expectedUserSandboxId = TEST_SANDBOX+"-create-author" + "--" + USER_ONE; sbInfo1 = sbService.getAuthorSandbox(wpInfo1.getStoreId(), USER_ONE); - checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, USER_ADMIN, expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, AuthenticationUtil.getAdminUserName(), expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); // Switch to USER_ONE AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE); // Get author sandbox sbInfo1 = sbService.getAuthorSandbox(wpInfo1.getStoreId()); - checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, USER_ADMIN, expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, AuthenticationUtil.getAdminUserName(), expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); String userSandboxId = sbInfo1.getSandboxId(); // Get (author) sandbox sbInfo1 = sbService.getSandbox(userSandboxId); - checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, USER_ADMIN, expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, AuthenticationUtil.getAdminUserName(), expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); // Should return same as before sbInfo1 = sbService.createAuthorSandbox(wpInfo1.getStoreId()); - checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, USER_ADMIN, expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo1, expectedUserSandboxId, USER_ONE, AuthenticationUtil.getAdminUserName(), expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); // Switch to USER_TWO AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO); @@ -245,7 +245,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Invite web user wpService.inviteWebUser(wpInfo1.getStoreId(), USER_TWO, WCMUtil.ROLE_CONTENT_REVIEWER); @@ -284,7 +284,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest List sbInfos = sbService.listSandboxes(wpInfo.getStoreId()); assertEquals(2, sbInfos.size()); // staging sandbox, author sandbox (for admin) - String expectedUserSandboxId = TEST_SANDBOX+"-list" + "--" + USER_ADMIN; + String expectedUserSandboxId = TEST_SANDBOX+"-list" + "--" + AuthenticationUtil.getAdminUserName(); // Do detailed check of the sandbox info objects for (SandboxInfo sbInfo : sbInfos) @@ -293,11 +293,11 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest if (sbType.equals(SandboxConstants.PROP_SANDBOX_STAGING_MAIN) == true) { - checkSandboxInfo(sbInfo, TEST_SANDBOX+"-list", TEST_SANDBOX+"-list", USER_ADMIN, TEST_SANDBOX+"-list", SandboxConstants.PROP_SANDBOX_STAGING_MAIN); + checkSandboxInfo(sbInfo, TEST_SANDBOX+"-list", TEST_SANDBOX+"-list", AuthenticationUtil.getAdminUserName(), TEST_SANDBOX+"-list", SandboxConstants.PROP_SANDBOX_STAGING_MAIN); } else if (sbType.equals(SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN) == true) { - checkSandboxInfo(sbInfo, expectedUserSandboxId, USER_ADMIN, USER_ADMIN, expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo, expectedUserSandboxId, AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getAdminUserName(), expectedUserSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); } else { @@ -358,18 +358,18 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // Get staging sandbox sbInfo = sbService.getStagingSandbox(wpInfo.getStoreId()); - checkSandboxInfo(sbInfo, TEST_SANDBOX+"-get", TEST_SANDBOX+"-get", USER_ADMIN, TEST_SANDBOX+"-get", SandboxConstants.PROP_SANDBOX_STAGING_MAIN); + checkSandboxInfo(sbInfo, TEST_SANDBOX+"-get", TEST_SANDBOX+"-get", AuthenticationUtil.getAdminUserName(), TEST_SANDBOX+"-get", SandboxConstants.PROP_SANDBOX_STAGING_MAIN); // Get (staging) sandbox String stagingSandboxId = wpInfo.getStagingStoreName(); sbInfo = sbService.getSandbox(stagingSandboxId); - checkSandboxInfo(sbInfo, TEST_SANDBOX+"-get", TEST_SANDBOX+"-get", USER_ADMIN, TEST_SANDBOX+"-get", SandboxConstants.PROP_SANDBOX_STAGING_MAIN); + checkSandboxInfo(sbInfo, TEST_SANDBOX+"-get", TEST_SANDBOX+"-get", AuthenticationUtil.getAdminUserName(), TEST_SANDBOX+"-get", SandboxConstants.PROP_SANDBOX_STAGING_MAIN); // Get (author) sandbox sbInfo = sbService.getAuthorSandbox(wpStoreId); sbInfo = sbService.getSandbox(sbInfo.getSandboxId()); - String userSandboxId = TEST_SANDBOX+"-get" + "--" + USER_ADMIN; - checkSandboxInfo(sbInfo, userSandboxId, USER_ADMIN, USER_ADMIN, userSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + String userSandboxId = TEST_SANDBOX+"-get" + "--" + AuthenticationUtil.getAdminUserName(); + checkSandboxInfo(sbInfo, userSandboxId, AuthenticationUtil.getAdminUserName(), AuthenticationUtil.getAdminUserName(), userSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); // test roles @@ -382,7 +382,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // admin can get any sandbox userSandboxId = TEST_SANDBOX+"-get" + "--" + USER_THREE; sbInfo = sbService.getSandbox(userSandboxId); - checkSandboxInfo(sbInfo, userSandboxId, USER_THREE, USER_ADMIN, userSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo, userSandboxId, USER_THREE, AuthenticationUtil.getAdminUserName(), userSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); // Switch to USER_ONE AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE); @@ -390,7 +390,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // content manager can get any (author) sandbox userSandboxId = TEST_SANDBOX+"-get" + "--" + USER_THREE; sbInfo = sbService.getSandbox(userSandboxId); - checkSandboxInfo(sbInfo, userSandboxId, USER_THREE, USER_ADMIN, userSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); + checkSandboxInfo(sbInfo, userSandboxId, USER_THREE, AuthenticationUtil.getAdminUserName(), userSandboxId, SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN); // Switch to USER_TWO AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO); @@ -674,8 +674,8 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // test roles - // Switch to USER_ADMIN - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + // Switch to AuthenticationUtil.getAdminUserName() + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); assertEquals(6, sbService.listSandboxes(wpStoreId).size()); @@ -792,7 +792,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); sbInfo1 = sbService.getAuthorSandbox(wpStoreId, USER_ONE); sbInfo2 = sbService.getAuthorSandbox(wpStoreId, USER_TWO); @@ -888,7 +888,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); sbInfo1 = sbService.getAuthorSandbox(wpStoreId, USER_ONE); sbInfo2 = sbService.getAuthorSandbox(wpStoreId, USER_TWO); @@ -995,7 +995,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // test roles // Switch to USER_ONE - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // admin (content manager) can submit any sandbox String userSandboxId = wpStoreId + "--" + USER_THREE; @@ -1505,7 +1505,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest // test roles // Switch to USER_ONE - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // admin (content manager) can revert any sandbox String userSandboxId = wpStoreId + "--" + USER_THREE; @@ -1865,7 +1865,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER+"-"+j); assertEquals(SCALE_USERS+2, sbService.listSandboxes(wpInfo.getStoreId()).size()); // including staging sandbox and admin sandbox (web project creator) } - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); } System.out.println("testPseudoScaleTest: list sandboxes for "+SCALE_USERS+" content managers for each of "+SCALE_WEBPROJECTS+" web projects in "+(System.currentTimeMillis()-split)+" msecs"); @@ -1881,7 +1881,7 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER+"-"+j); assertEquals(SCALE_USERS+1, wpService.listWebUsers(wpInfo.getStoreId()).size()); // including admin user (web project creator) } - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); } System.out.println("testPseudoScaleTest: list web users for "+SCALE_USERS+" content managers for each of "+SCALE_WEBPROJECTS+" web projects in "+(System.currentTimeMillis()-split)+" msecs"); diff --git a/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java b/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java index 59a7fd03ee..1c860d663b 100644 --- a/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java +++ b/source/java/org/alfresco/wcm/webproject/WebProjectServiceImplTest.java @@ -112,7 +112,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest if (CLEAN) { // Switch back to Admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); deleteGroup(GROUP_ONE); @@ -262,7 +262,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to Admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); NodeRef wpRootNodeRef = wpService.getWebProjectsRoot(); // note: implies "coordinator", "collaborator" or "contributor" (not "editor" or "consumer") - see permissionsDefinition.xml @@ -285,7 +285,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest assertEquals(WCMUtil.ROLE_CONTENT_PUBLISHER, wpService.listWebUsers(wpInfo.getStoreId()).get(USER_TWO)); // Switch back to Admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); permissionService.setPermission(wpRootNodeRef, USER_TWO, PermissionService.EDITOR, true); permissionService.setPermission(wpRootNodeRef, USER_THREE, PermissionService.CONSUMER, true); @@ -421,7 +421,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); webProjects = wpService.listWebProjects(); cnt = webProjects.size(); @@ -520,7 +520,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Delete the web project wpService.deleteWebProject(wpStoreId); @@ -584,7 +584,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Create another webapp - test using wpStoreId wpService.createWebApp(wpInfo.getStoreId(), TEST_WEBAPP2, TEST_WEBPROJ_DESCRIPTION); @@ -683,7 +683,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); try { @@ -745,14 +745,14 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest int userOneWebProjectCount = webProjects.size(); // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Create a web project WebProjectInfo wpInfo = wpService.createWebProject(TEST_WEBPROJ_DNS+"-inviteWebUsers", TEST_WEBPROJ_NAME+"-inviteWebUsers", TEST_WEBPROJ_TITLE, TEST_WEBPROJ_DESCRIPTION); NodeRef wpNodeRef = wpInfo.getNodeRef(); assertEquals(1, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); Map userGroupRoles = new HashMap(); userGroupRoles.put(USER_ONE, WCMUtil.ROLE_CONTENT_MANAGER); @@ -768,7 +768,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest wpService.inviteWebUsersGroups(wpNodeRef, userGroupRoles, false); assertEquals(4, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ONE)); assertEquals(WCMUtil.ROLE_CONTENT_PUBLISHER, wpService.listWebUsers(wpNodeRef).get(USER_TWO)); assertEquals(WCMUtil.ROLE_CONTENT_REVIEWER, wpService.listWebUsers(wpNodeRef).get(USER_THREE)); @@ -790,14 +790,14 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest // Finish: Test fix ETWOTWO-567 // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Create a web project wpInfo = wpService.createWebProject(TEST_WEBPROJ_DNS+"-inviteWebUsers2", TEST_WEBPROJ_NAME+"-inviteWebUsers2", TEST_WEBPROJ_TITLE, TEST_WEBPROJ_DESCRIPTION); wpNodeRef = wpInfo.getNodeRef(); assertEquals(1, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); userGroupRoles = new HashMap(); @@ -807,7 +807,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest wpService.inviteWebUsersGroups(wpInfo.getStoreId(), userGroupRoles); assertEquals(3, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); assertEquals(WCMUtil.ROLE_CONTENT_PUBLISHER, wpService.listWebUsers(wpNodeRef).get(USER_ONE)); assertEquals(WCMUtil.ROLE_CONTENT_PUBLISHER, wpService.listWebUsers(wpNodeRef).get(USER_TWO)); } @@ -825,17 +825,17 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest int userOneWebProjectCount = webProjects.size(); // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Create a web project WebProjectInfo wpInfo = wpService.createWebProject(TEST_WEBPROJ_DNS+"-inviteWebUser1", TEST_WEBPROJ_NAME+"-inviteWebUser1", TEST_WEBPROJ_TITLE, TEST_WEBPROJ_DESCRIPTION); NodeRef wpNodeRef = wpInfo.getNodeRef(); - assertTrue(wpService.isWebUser(wpNodeRef, USER_ADMIN)); + assertTrue(wpService.isWebUser(wpNodeRef, AuthenticationUtil.getAdminUserName())); assertFalse(wpService.isWebUser(wpNodeRef, USER_ONE)); assertEquals(1, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); // Invite one web user - test using wpStoreId wpService.inviteWebUser(wpInfo.getStoreId(), USER_ONE, WCMUtil.ROLE_CONTENT_PUBLISHER); @@ -855,7 +855,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest NodeRef wpNodeRef2 = wpInfo.getNodeRef(); assertEquals(1, wpService.listWebUsers(wpNodeRef2).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef2).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef2).get(AuthenticationUtil.getAdminUserName())); assertFalse(wpService.isWebUser(wpInfo.getStoreId(), USER_ONE)); assertFalse(wpService.isWebUser(wpNodeRef2, USER_TWO)); @@ -919,7 +919,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest assertTrue(wpService.isWebUser(wpNodeRef2, USER_THREE)); // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); assertEquals(4, wpService.listWebUsers(wpNodeRef2).size()); assertEquals(WCMUtil.ROLE_CONTENT_REVIEWER, wpService.listWebUsers(wpNodeRef2).get(USER_THREE)); @@ -938,16 +938,16 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest int userFourWebProjectCount = webProjects.size(); // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Create a web project WebProjectInfo wpInfo = wpService.createWebProject(TEST_WEBPROJ_DNS+"-uninviteWebUser", TEST_WEBPROJ_NAME+"-uninviteWebUser", TEST_WEBPROJ_TITLE, TEST_WEBPROJ_DESCRIPTION); NodeRef wpNodeRef = wpInfo.getNodeRef(); assertEquals(1, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); + assertEquals(WCMUtil.ROLE_CONTENT_MANAGER, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); - assertTrue(wpService.isWebUser(wpNodeRef, USER_ADMIN)); + assertTrue(wpService.isWebUser(wpNodeRef, AuthenticationUtil.getAdminUserName())); assertFalse(wpService.isWebUser(wpNodeRef, USER_FOUR)); assertFalse(wpService.isWebUser(wpNodeRef, USER_ONE)); @@ -998,7 +998,7 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Uninvite web user - test using wpStoreId wpService.uninviteWebUser(wpInfo.getStoreId(), USER_FOUR); @@ -1014,17 +1014,17 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest assertEquals(userFourWebProjectCount, webProjects.size()); // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Content manager can uninvite themself // Uninvite web user - test using wpNodeRef - wpService.uninviteWebUser(wpNodeRef, USER_ADMIN, false); + wpService.uninviteWebUser(wpNodeRef, AuthenticationUtil.getAdminUserName(), false); // Note: All admin authorities are implicitly a web user and content manager (across all web projects) even if not explicitly invited assertEquals(1, wpService.listWebUsers(wpNodeRef).size()); - assertEquals(null, wpService.listWebUsers(wpNodeRef).get(USER_ADMIN)); - assertTrue(wpService.isWebUser(wpNodeRef, USER_ADMIN)); - assertTrue(wpService.isContentManager(wpNodeRef, USER_ADMIN)); + assertEquals(null, wpService.listWebUsers(wpNodeRef).get(AuthenticationUtil.getAdminUserName())); + assertTrue(wpService.isWebUser(wpNodeRef, AuthenticationUtil.getAdminUserName())); + assertTrue(wpService.isContentManager(wpNodeRef, AuthenticationUtil.getAdminUserName())); // Switch to USER_ONE AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE); @@ -1048,12 +1048,12 @@ public class WebProjectServiceImplTest extends AbstractWCMServiceImplTest } // Switch back to admin - AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // Note: All admin authorities are implicitly a web user and content manager (across all web projects) even if not explicitly invited assertEquals(0, wpService.listWebUsers(wpNodeRef).size()); - assertTrue(wpService.isWebUser(wpNodeRef, USER_ADMIN)); - assertTrue(wpService.isContentManager(wpInfo.getStoreId(), USER_ADMIN)); + assertTrue(wpService.isWebUser(wpNodeRef, AuthenticationUtil.getAdminUserName())); + assertTrue(wpService.isContentManager(wpInfo.getStoreId(), AuthenticationUtil.getAdminUserName())); // delete web project wpService.deleteWebProject(wpNodeRef); diff --git a/source/java/org/alfresco/wcm/webproject/script/ScriptWebProjectsTest.java b/source/java/org/alfresco/wcm/webproject/script/ScriptWebProjectsTest.java index ef75485dad..82fb828209 100644 --- a/source/java/org/alfresco/wcm/webproject/script/ScriptWebProjectsTest.java +++ b/source/java/org/alfresco/wcm/webproject/script/ScriptWebProjectsTest.java @@ -18,7 +18,7 @@ public class ScriptWebProjectsTest extends AbstractWCMServiceImplTest this.scriptService = (ScriptService)ctx.getBean("ScriptService"); - AuthenticationUtil.setFullyAuthenticatedUser("admin"); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); } public void testJSAPI() throws Exception