Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57163: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57016: Reverse Merge to the original
         56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
               which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
               See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
            56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
                  Added JUnit test for the issue. Added the test to SecurityTestSuite.
            56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 
            56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               << last commit missed a file >>
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/cache-context.xml

@@ -42,6 +42,7 @@
    <bean name="authorityBridgeTableCache" class="org.alfresco.repo.security.authority.AuthorityBridgeTableAsynchronouslyRefreshedCache" parent="abstractAsynchronouslyRefreshedCache">
       <property name="authorityBridgeDAO" ref="authorityBridgeDAO" />
       <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
+      <property name="tenantAdminService" ref="tenantAdminService" />
    </bean>
    
    <!-- ===================================== -->

source/java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCache.java

@@ -21,6 +21,9 @@ package org.alfresco.repo.security.authority;
 import java.util.List;
 
 import org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.tenant.TenantAdminService;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.util.BridgeTable;
@@ -35,6 +38,7 @@ public class AuthorityBridgeTableAsynchronouslyRefreshedCache extends AbstractAs
 {
     private AuthorityBridgeDAO authorityBridgeDAO;
     private RetryingTransactionHelper retryingTransactionHelper;
+    private TenantAdminService tenantAdminService;
 
     /**
      * @param authorityBridgeDAO
@@ -54,17 +58,29 @@ public class AuthorityBridgeTableAsynchronouslyRefreshedCache extends AbstractAs
         this.retryingTransactionHelper = retryingTransactionHelper;
     }
 
+    public void setTenantAdminService(TenantAdminService tenantAdminService)
+    {
+        this.tenantAdminService = tenantAdminService;
+    }
+
     @Override
     protected BridgeTable<String> buildCache(final String tenantId)
     {
-        return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<BridgeTable<String>>()
+        return AuthenticationUtil.runAs(new RunAsWork<BridgeTable<String>>()
         {
-            @Override
+            public BridgeTable<String> doWork() throws Exception
-            public BridgeTable<String> execute() throws Throwable
             {
-                return doBuildCache(tenantId);
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<BridgeTable<String>>()
+                {
+                    @Override
+                    public BridgeTable<String> execute() throws Throwable
+                    {
+                        return doBuildCache(tenantId);
+                    }
+                }, true, false);
+
             }
-        }, true, false);
+        }, tenantAdminService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantId));
     }
 
     private BridgeTable<String> doBuildCache(String tenantId)

source/test-java/org/alfresco/repo/security/SecurityTestSuite.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -28,6 +28,7 @@ import org.alfresco.repo.security.authentication.AuthenticationTest;
 import org.alfresco.repo.security.authentication.AuthorizationTest;
 import org.alfresco.repo.security.authentication.ChainingAuthenticationServiceTest;
 import org.alfresco.repo.security.authentication.NameBasedUserNameGeneratorTest;
+import org.alfresco.repo.security.authority.AuthorityBridgeTableAsynchronouslyRefreshedCacheTest;
 import org.alfresco.repo.security.authority.AuthorityServiceTest;
 import org.alfresco.repo.security.authority.DuplicateAuthorityTest;
 import org.alfresco.repo.security.authority.ExtendedPermissionServiceTest;
@@ -76,7 +77,8 @@ public class SecurityTestSuite extends TestSuite
         // suite.addTestSuite(ChainingUserRegistrySynchronizerTest.class);
         suite.addTestSuite(OwnableServiceTest.class);    
         suite.addTestSuite(ReadPermissionTest.class);    
-        suite.addTestSuite(AuthorizationTest.class);    
+        suite.addTestSuite(AuthorizationTest.class);
+        suite.addTestSuite(AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.class);
 
         suite.addTest(new JUnit4TestAdapter(HomeFolderProviderSynchronizerTest.class));
 

source/test-java/org/alfresco/repo/security/authority/AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2005-2013 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.security.authority;
+
+import junit.framework.TestCase;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+
+import org.alfresco.util.GUID;
+import org.springframework.context.ApplicationContext;
+
+import java.util.Set;
+
+public class AuthorityBridgeTableAsynchronouslyRefreshedCacheTest extends TestCase
+{
+    private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
+
+    private AuthorityService authorityService;
+    private TenantAdminService tenantAdminService;
+    private TransactionService transactionService;
+    private PersonService personService;
+
+    private static final String TENANT_DOMAIN = GUID.generate() + ".com";
+    private static final String TENANT_ADMIN_USER = AuthenticationUtil.getAdminUserName() + "@" + TENANT_DOMAIN;
+
+    public AuthorityBridgeTableAsynchronouslyRefreshedCacheTest()
+    {
+        super();
+    }
+
+    @Override
+    public void setUp() throws Exception
+    {
+        transactionService = (TransactionService) ctx.getBean(ServiceRegistry.TRANSACTION_SERVICE.getLocalName());
+        authorityService = (AuthorityService) ctx.getBean(ServiceRegistry.AUTHORITY_SERVICE.getLocalName());
+        tenantAdminService = ctx.getBean("tenantAdminService", TenantAdminService.class);
+        personService = (PersonService) ctx.getBean(ServiceRegistry.PERSON_SERVICE.getLocalName());
+    }
+
+    @Override
+    protected void tearDown()
+    {
+
+    }
+
+    /**
+     * See MNT-9375
+     */
+    public void testAuthorityBridgeTableCacheForTenants() throws Exception
+    {
+        final String tenantPersonName = GUID.generate() + "@" + TENANT_DOMAIN;
+        final String childGroupName = "tenantChildGroup" + GUID.generate();
+        final String parentGroupName = "tenantParentGroup" + GUID.generate();
+
+        createTenant(TENANT_DOMAIN);
+
+        // Create a group and place a user in it
+        AuthenticationUtil.setFullyAuthenticatedUser(TENANT_ADMIN_USER);
+        final String tenantChildGroup = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<String>()
+        {
+            @Override
+            public String execute() throws Throwable
+            {
+                personService.getPerson(tenantPersonName, true);
+                assertTrue(personService.personExists(tenantPersonName));
+                String tenantChildGroup = authorityService.createAuthority(AuthorityType.GROUP, childGroupName);
+                assertNotNull(authorityService.getAuthorityNodeRef(tenantChildGroup));
+                authorityService.addAuthority(tenantChildGroup, tenantPersonName);
+                return tenantChildGroup;
+            }
+        }, false, true);
+
+        // Create another group and place in it an existing group with a user
+        // The transaction is required, because the AuthorityBridgeTableAsynchronouslyRefreshedCache is cleared in the end of transaction asynchronously using FutureTask.
+        final String tenantParentGroup = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<String>()
+        {
+            @Override
+            public String execute() throws Throwable
+            {
+                String tenantParentGroup = authorityService.createAuthority(AuthorityType.GROUP, parentGroupName);
+                assertNotNull(authorityService.getAuthorityNodeRef(tenantParentGroup));
+                authorityService.addAuthority(tenantParentGroup, tenantChildGroup);
+
+                return tenantParentGroup;
+            }
+        }, false, true);
+
+        Set<String> authorities = authorityService.getContainingAuthorities(null, tenantPersonName, false);
+        assertEquals(2, authorities.size());
+        assertTrue(authorities.contains(tenantParentGroup));
+        assertTrue(authorities.contains(tenantChildGroup));
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+    }
+
+    private void createTenant(final String tenantDomain)
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                if (!tenantAdminService.existsTenant(tenantDomain))
+                {
+                    tenantAdminService.createTenant(tenantDomain, "password".toCharArray());
+                }
+                return null;
+            }
+        }, false, true);
+    }
+}