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

1Merged V4.0-BUG-FIX to HEAD

Browse Source 
35438: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX:
       - fix merge issue (THOR-4 / ALF-13756)
   35446: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX:
      29422: record-only
      29453: build/test fix (AspectTest, PolicyTest, WebScriptTestSuite)
   35448: ALF-13770: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2)
      35447: ALF-13769: Merged V3.4.8 (3.4.8.7) to V3.4-BUG-FIX (3.4.10)
         35435: ALF-11535 Home Folder Synchronizer fails when destination folder already exists
            - HomeFolderProviderSynchronizerTest was broken on build m/c because PersonTest (in the same suite) created
              its own UserNameMatcherImpl and left it attached to the personServiceImpl.
         35413: ALF-11535 Home Folder Synchronizer (HFS) fails when destination folder already exists
            - HomeFolderManager no longer returns an existing folder (unless the provider is an ExistingPathBasedHomeFolderProvider*),
              but will append -N (where N is an integer) so that a new folder is always created.
              This fixes an unreported bug (when case sensitive user names are in use) that users created in Share that only differ
              in case would have shared the same home folder.
            - Modified HFS to log more 'info' rather than 'debug' messages so it is possible for administrators to understand the moves
              and errors better.
            - Modified HFS to understand that Alfresco does not allow duplicate folders/content when case is ignored.
            - Added unit test for case insensitive user names.
            - Modified HFS to allows folder structure to change case on re-sync
   35451: Fix for ALF-13503 Add SOLR client API tests to the SystemBuildTest project
   - missed keystore from checkin
   35454: Improved solution for ALF-13286 - after changes to "SiteService" ProxyFactoryBean definition from Andy.
    - now checks user ability to execute the SiteService.createSite() method based on ACLs defined - avoiding AccessDeniedException.
   35462: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
   - minor manual merge (to avoid future conflict)
   35465: Fix for ALF-13454 - Advanced search date picker missing the additional pop up
   35475: ALF-12780 - CIFS and TextEdit shuffle
   35495: ALF-13753: Prevent users from editing the name of locked documents in Share via the insitu editor


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-04-20 16:51:08 +00:00
parent 94f6320f57
commit fa1f4c3276
30 changed files with 919 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
View File

@@ -28,8 +28,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import javax.transaction.Status;
import javax.transaction.UserTransaction;
@@ -51,7 +51,6 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
@@ -83,6 +82,7 @@ public class HomeFolderProviderSynchronizerTest
private static AuthorityService authorityService;
private static TenantAdminService tenantAdminService;
private static TenantService tenantService;
private static UserNameMatcherImpl userNameMatcher;
private static PortableHomeFolderManager homeFolderManager;
private static RegexHomeFolderProvider largeHomeFolderProvider;
private static String largeHomeFolderProviderName;
@@ -109,6 +109,7 @@ public class HomeFolderProviderSynchronizerTest
authorityService = (AuthorityService) applicationContext.getBean("authorityService");
tenantAdminService = (TenantAdminService) applicationContext.getBean("tenantAdminService");
tenantService = (TenantService) applicationContext.getBean("tenantService");
userNameMatcher = (UserNameMatcherImpl) applicationContext.getBean("userNameMatcher");
homeFolderManager = (PortableHomeFolderManager) applicationContext.getBean("homeFolderManager");
largeHomeFolderProvider = (RegexHomeFolderProvider) applicationContext.getBean("largeHomeFolderProvider");
largeHomeFolderProviderName = largeHomeFolderProvider.getName();
@@ -207,6 +208,7 @@ public class HomeFolderProviderSynchronizerTest
trans.commit();
trans = null;
AuthenticationUtil.clearCurrentSecurityContext();
userNameMatcher.setUserNamesAreCaseSensitive(false); // Put back the default
}
private Set<NodeRef> deleteNonAdminGuestUsers()
@@ -704,6 +706,8 @@ public class HomeFolderProviderSynchronizerTest
@Test
public void testPathAlreadyInUseByContent() throws Exception
{
System.out.println("testPathAlreadyInUseByContent: EXPECT TO SEE AN EXCEPTION IN THE LOG ======================== ");
createUser("", "fred");
createContent("", "fr");
@@ -731,7 +735,7 @@ public class HomeFolderProviderSynchronizerTest
assertHomeFolderLocation("peter", "pe/peter");
assertHomeFolderLocation("pe", "pe/pe");
assertFalse("The Temporary1 folder should have been removed", exists("Temporary1"));
assertFalse("The Temporary-1 folder should have been removed", exists("Temporary-1"));
}
@Test
@@ -739,24 +743,26 @@ public class HomeFolderProviderSynchronizerTest
{
createUser("", "fr");
createUser("", "fred");
createFolder("Temporary1");
createFolder("Temporary2");
createFolder("Temporary3");
createFolder("Temporary-1");
createFolder("Temporary-2");
createFolder("Temporary-3");
// Don't delete the temporary folder
homeFolderProviderSynchronizer.setKeepEmptyParents("true");
moveUserHomeFolders();
assertTrue("The existing Temporary1 folder should still exist", exists("Temporary1"));
assertTrue("The existing Temporary2 folder should still exist", exists("Temporary2"));
assertTrue("The existing Temporary3 folder should still exist", exists("Temporary3"));
assertTrue("The existing Temporary4 folder should still exist", exists("Temporary4"));
assertTrue("The existing Temporary-1 folder should still exist", exists("Temporary-1"));
assertTrue("The existing Temporary-2 folder should still exist", exists("Temporary-2"));
assertTrue("The existing Temporary-3 folder should still exist", exists("Temporary-3"));
assertTrue("The existing Temporary-4 folder should still exist", exists("Temporary-4"));
}
@Test
public void testException() throws Exception
{
System.out.println("testException: EXPECT TO SEE AN EXCEPTION IN THE LOG ======================== ");
// Force the need for a temporary folder
createUser("", "fr");
createUser("", "fred");
@@ -764,7 +770,7 @@ public class HomeFolderProviderSynchronizerTest
// Use up all possible temporary folder names
for (int i=1; i<=100; i++)
{
createFolder("Temporary"+i);
createFolder("Temporary-"+i);
}
moveUserHomeFolders();
@@ -939,4 +945,38 @@ public class HomeFolderProviderSynchronizerTest
assertHomeFolderLocation(tenant2, "fred", "fr/"+tenantService.getDomainUser("fred", tenant2));
}
}
// ALF-11535
@Test
public void testChangeParentFolderCase() throws Exception
{
// By default, user names are case sensitive
createUser("fr", "FRED");
moveUserHomeFolders();
assertHomeFolderLocation("FRED", "FR/FRED");
assertHomeFolderLocation("fred", "FR/FRED"); // Same user
}
// ALF-11535
@Test
public void testCaseSensitiveUsers() throws Exception
{
userNameMatcher.setUserNamesAreCaseSensitive(true);
// Users are processed in a sorted order (natural ordering).
// The preferred parent folder structure of the first user
// is used where there is a clash between users.
// The following users are in their natural order.
createUser("Ab", "Abby");
createUser("TE", "TESS");
createUser("TE", "Tess");
createUser("Ab", "aBBY");
moveUserHomeFolders();
assertHomeFolderLocation("Abby", "Ab/Abby");
assertHomeFolderLocation("TESS", "TE/TESS");
assertHomeFolderLocation("Tess", "TE/Tess-1");
assertHomeFolderLocation("aBBY", "Ab/aBBY-1");
}
}