mirror of
				https://github.com/Alfresco/alfresco-community-repo.git
				synced 2025-10-29 15:21:53 +00:00 
			
		
		
		
	28993: HomeFolderProviderSynchronizer: Provider used for LDAP to continue to use username as home folder name directly under .../app:company_home/app:user_homes
   Property spaces.user_homes.regex.pattern now set to "" rather than "^(..)" which would have given a single level hash structure.
   28970: Merge DEV/ALAN/HOME_FOLDER to DEV/V3.4-BUG-FIX
      28947: - Introduction of version 2 HomeFolderProvider2 and re-factor of version 1
        so that the code used to create the folders is now in the HomeFolderManager.
      - Re-factor homeFolderProviderSynchronizer to handle HomeFolderProvider2.
      - Addition of AbstractHomeFolderProvider.V2Adaptor to allow external providers
        that extend AbstractHomeFolderPathProvider to be handled by
        homeFolderProviderSynchronizer.
      28860: Minor change to class comment and removed unused imports
      28858: ALF-4727 Hashed home folder provider added and used by default for LDAP sync users  - based on Romain Guinot work.
      ALF-7797 HomeFolderProviderSynchronizer added to move existing users (normally those added by LDAP sync) into location preferred by home folder provider.
      - HomeFolderProviderSynchronizer bug fixes
        - tenant accounts supported for first time
        - addition of a phase to create parent folders before moving home folder to avoid a race condition
        - check for conditions that would result in FileExistExceptions as we don't want a the transaction to be discarded as this results in retries.  
      - HomeFolderProviderSynchronizerTest integration test including tenant services
      - HomeFolderManager now sets the HOME_FOLDER_PROVIDER if it uses a default when HOME_FOLDER_PROVIDER is not set.
      - AbstractHomeFolderProvider clears cache when path reset as it will be invalid.
      - UIDBasedHomeFolderProvider.createNewParent creates its own mutable List as the one passed in may not be mutable.
      28580: Save code changes - added comments to do with LDAP syn overriding the HFP value and related to this added a global property to keep empty parent folders. 
      28347: HomeFolderProviderSynchronizer
      - issue to do with new run of sync having created a user via UI that has a home folder as one of the parent folders.
      - issue to do with catching exception when creating temporary folder - transaction is gone
      - give up if error in any phase
      28298: Addition of HomeFolderPathProvider (based on Romain's work) and addition of HomeFolderProviderSynchronizer.
   28956: Merged DEV to V3.4-BUG-FIX
      ALF-9428: Multitenancy users not preserved after upgrade from 3.2.2.7 to 3.4.2
                - Provide correct RunAs context in FixUserQNamesPatch batching.
   28941: ALF-9361 : CLONE -sync Flat IMAP client with Alfresco is slow and inaccurate
   28916: ALF-9421 The AlfrescoJavaScript action now includes company home in the JavaScript scope.
   28879: Fixed ALF-9296: Alfresco Dashboard: Impossible to approve/reject task from My Tasks dashlet on My Alfresco
   28875: Fixed ALF-6329: SPANISH - Share, translation on Transfer Target configuration
   28864: Message:
   ALF-9430: RuntimeExec waitForCompletion logic is obscure
    - Only a single flag 'isCompleted'
    - Set flag in try-finally
    - Added notify()
   However, the wait() code doesn't, in practice, get called because the waitForCompletion is synchronized with the run()
   and is called a while after the reading thread is triggered.  So the logic is less obscure and safer for the finally.
   28800: File for rev 28799: ALF-9240
   28799: Merged DEV to V3.4-BUG-FIX
      28797: ALF-9240: Issue with adding an aspect with large multivalued list
             Added unit test to stress, but could not reproduce
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
		
	
		
			
				
	
	
		
			184 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Java
		
	
	
	
	
	
			
		
		
	
	
			184 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			Java
		
	
	
	
	
	
| /*
 | |
|  * Copyright (C) 2005-2011 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.person;
 | |
| 
 | |
| import java.util.ArrayList;
 | |
| import java.util.Collections;
 | |
| import java.util.List;
 | |
| import java.util.regex.Matcher;
 | |
| import java.util.regex.Pattern;
 | |
| import java.util.regex.PatternSyntaxException;
 | |
| 
 | |
| import org.alfresco.service.cmr.repository.NodeRef;
 | |
| import org.alfresco.service.namespace.NamespaceService;
 | |
| import org.alfresco.service.namespace.QName;
 | |
| import org.alfresco.util.FileNameValidator;
 | |
| import org.apache.commons.logging.Log;
 | |
| import org.apache.commons.logging.LogFactory;
 | |
| 
 | |
| /**
 | |
|  * Implementation that returns a tree structure for a home folder based on a property (typically userName)
 | |
|  * from the supplied person. The parent folder names are derived from regular expression groups matched
 | |
|  * against the property value. The final folder name is the full property value.<p>
 | |
|  * 
 | |
|  * For example, given the value "adavis" and the regular expression <tt>"^(..)"</tt> the
 | |
|  * resulting home folder path would be {@code "/ad/adavis"}. However with the regular expression
 | |
|  * <tt>"^(.)(.?)"</tt> the home folder path would be {@code "/a/d/adavis"}. If any group matches a zero
 | |
|  * length string, it is just ignored.<p>
 | |
|  * 
 | |
|  * Note: In order to choose an efficient distribution scheme, be aware that, when m users are
 | |
|  * distributed into n leaf folders, when m >> n log n the statistical maximum load is
 | |
|  * m/n + O( sqrt((m log n)/n)), w.h.p
 | |
|  * 
 | |
|  * @author Romain Guinot, Alan Davis
 | |
|  */
 | |
| public class RegexHomeFolderProvider extends UsernameHomeFolderProvider
 | |
| {
 | |
|     private static Log logger = LogFactory.getLog(RegexHomeFolderProvider.class);
 | |
|     
 | |
|     private QName propertyName;
 | |
|     private Pattern pattern;
 | |
|     private List<Integer> groupOrder;
 | |
|     
 | |
|     /**
 | |
|      * @param propertyName String the cm:person property used as the key, such as userName
 | |
|      *        or organizationId.
 | |
|      */
 | |
|     public void setPropertyName(String propertyName)
 | |
|     {
 | |
|         this.propertyName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, propertyName);
 | |
|     }
 | |
| 
 | |
|     /**
 | |
|      * @param patternString the regex pattern against the cm:person property value. Regex
 | |
|      *        groups define the parent folder structure.
 | |
|      */
 | |
|     public void setPattern(String patternString)
 | |
|     {
 | |
|         pattern = getPattern(patternString);
 | |
|     }
 | |
| 
 | |
|     /**
 | |
|      * @param groupOrderString String the order (as a comma separated list) in which the
 | |
|      *        regex pattern groups should be assembled into folders (such as {@code 2,1}).
 | |
|      *        The default ordering is as they appear.
 | |
|      */
 | |
|     public void setGroupOrder(String groupOrderString)
 | |
|     {
 | |
|         groupOrder = getGroupOrder(groupOrderString);
 | |
|     }
 | |
| 
 | |
|     private Pattern getPattern(String patternString)
 | |
|     {
 | |
|         if (patternString == null || patternString.trim().length() == 0)
 | |
|             return null;
 | |
|         
 | |
|         Pattern pattern;
 | |
|         try
 | |
|         {
 | |
|             pattern = Pattern.compile(patternString);
 | |
|             logger.debug("Successfully compiled patternString : " + patternString);
 | |
|         } catch (PatternSyntaxException pse)
 | |
|         {
 | |
|             throw new PersonException("Pattern string :" + patternString + " does not compile", pse);
 | |
|         }
 | |
|         return pattern;
 | |
|     }
 | |
| 
 | |
|     private List<Integer> getGroupOrder(String groupOrderString)
 | |
|     {
 | |
|         if (groupOrderString == null || groupOrderString.trim().length() == 0)
 | |
|             return Collections.emptyList();
 | |
|         
 | |
|         String[] groupOrderStrings = groupOrderString.split(",");
 | |
|         List<Integer>groupOrder = new ArrayList<Integer>(groupOrderStrings.length);
 | |
|         for (String group : groupOrderStrings)
 | |
|         {       
 | |
|             Integer i;
 | |
|             try
 | |
|             {
 | |
|                 i = Integer.valueOf(group);
 | |
|             }
 | |
|             catch (NumberFormatException nfe)
 | |
|             {
 | |
|                 throw new PersonException("groupOrdering value " + groupOrderString + " is invalid.", nfe);
 | |
|             }
 | |
|             if (groupOrder.contains(i) || i < 0)
 | |
|             {
 | |
|                 throw new PersonException("groupOrdering value " + groupOrderString + " is invalid.");
 | |
|             }
 | |
|             groupOrder.add(i);
 | |
|         }
 | |
|         return groupOrder;
 | |
|     }
 | |
|     
 | |
|     @Override
 | |
|     public List<String> getHomeFolderPath(NodeRef person)
 | |
|     {
 | |
|         List<String> path = new ArrayList<String>();
 | |
|         String key = FileNameValidator.getValidFileName(
 | |
|                 getHomeFolderManager().getPersonProperty(person, propertyName));
 | |
|         if (pattern != null)
 | |
|         {
 | |
|             Matcher matcher = pattern.matcher(key);
 | |
| 
 | |
|             if (matcher.find())
 | |
|             {
 | |
|                 int groupCount = matcher.groupCount();
 | |
|                 if (!groupOrder.isEmpty())
 | |
|                 {
 | |
|                     for (int group : groupOrder)
 | |
|                     {
 | |
|                         if (group > groupCount)
 | |
|                         {
 | |
|                             throw new PersonException("groupOrdering value "
 | |
|                                     + group + " is out of range.");
 | |
|                         }
 | |
|                         addFolderToPath(path, matcher, group);
 | |
|                     }
 | |
|                 }
 | |
|                 else // "natural" group ordering, i.e as they appear in the regex
 | |
|                 {
 | |
|                     for (int group = 1; group <= groupCount; group++)
 | |
|                     {
 | |
|                         addFolderToPath(path, matcher, group);
 | |
|                     }
 | |
|                 }
 | |
|             }
 | |
|         }
 | |
|         path.add(key);
 | |
|         
 | |
|         if (logger.isDebugEnabled())
 | |
|         {
 | |
|             logger.debug("returning "+path+" for key: "+key);
 | |
|         }
 | |
|         
 | |
|         return path;
 | |
|     }
 | |
| 
 | |
|     private void addFolderToPath(List<String> path, Matcher matcher, int group)
 | |
|     {
 | |
|         String folder = matcher.group(group);
 | |
|         if (folder.length() > 0)
 | |
|         {
 | |
|             path.add(folder);
 | |
|         }
 | |
|     }
 | |
| }
 |