mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-15 15:02:20 +00:00
19472: ALF-725: Revert to using jTDS JDBC driver for SQL Server in 3.2 SP1, since the Microsoft driver doesn't work with the v3.2.r iBATIS stuff
- All example/installer alfresco-global.properties updated
- Wiki updated http://wiki.alfresco.com/wiki/Database_Configuration#MS-SQL_Databases
- Logged doc bug ALF-2144 and release note bug ALF-2145
19501:Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2 (with corrections)
19243: ALF-757: Cannot start up on JBoss 5.1 due to audit configuration error
- Removed getPath() method because it is incompatible with JBoss and other app servers where resources can't be resolved to a file
- Now use Spring ResourceLoader instead of creating FileInputStream
- getLastModified() still returned where the resource resolves to a file; otherwise the server startup time
19503: (RECORD ONLY) ALF-2100: Merged HEAD to V3.2
19155: ALF-1995: Removed remaining direct dependencies on portlet API from Alfresco Explorer classes
- Moved into AlfrescoFacesPortlet
- portlet.jar was removed from alfresco.war for Liferay compatibility
19506: Merged PATCHES/V3.1.2 to V3.2
19218: (RECORD ONLY) Created hotfix branch off TAGS/ENTERPRISE/V3.1.2
19229: (RECORD ONLY) Merged V3.1 to V3.1.2
18577: Fix for ETHREEOH-4117, based on CHK-11154
19341: Merged DEV/BELARUS/V3.1-2010_02_05 to PATCHES/V3.1.2 (with corrections)
19156: ALF-1906: splitPersonCleanUpBootstrapBean is not able to remove duplicated users
Also
- improved detection of 'split' persons
- added unit tests for person splitting and deleting
- fixed duplicate person caching and sorting problems
- prevented onUpdateProperties from firing needlessly in PersonServiceImpl and AuthorityDAOImpl when persons and authorities are created initially
19342: (RECORD ONLY) Incremented version number
19508: Merged PATCHES/V3.2.0 to V3.2
18762: (RECORD ONLY) Created hotfix branch off V3.2.0-ENTERPRISE-FINAL
18789: (RECORD ONLY) Merged BRANCHES/V3.2:r17905,18254,18319 to PATCHES/V3.2.0
r17905 | markr | 2010-01-06 16:55:12 +0000 (Wed, 06 Jan 2010) | 3 lines
ETHREEOH-3809 - WCM - First test server deploy fails.
added yet another transaction to read the previous snapshot transaction.
added a new system test based upon the WCM services. The beginnings of testing against layered authored sandboxes.
r18254 | janv | 2010-01-22 18:15:43 +0000 (Fri, 22 Jan 2010) | 1 line
WCM/AVM - ETHREEOH-2057 (Submitting WCM Content through WF JSF Error - due to AVM Sync issue)
r18319 | royw | 2010-01-27 12:18:27 +0000 (Wed, 27 Jan 2010) | 4 lines
Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2
18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content
18822: (RECORD ONLY) Merged DEV_TEMPORARY to PATCHES/V3.2.0
18478: SAP XForms errors - ACT 15969
18699: ETHREEOH-4171: HTTP 500 when filling in a WCM webform - ACT 15969
18842: (RECORD ONLY) Merged V3.2 to PATCHES/V3.2.0
18701: Merged DEV_TEMPORARY to V3.2
18693 : ETHREEOH-4182: ASR deployer fails to set the contentUrl of documents on the target system
- Merged in fix related to closing output streams.
- Increased coverage of unit test.
18854: (RECORD ONLY) Merged V3.2 to V3.2.0
18019: ETHREEOH-3770: LDAP sync now supports attribute range retrieval to get around limits imposed by Active Directory on multi-valued attributes
- Meant that groups with more than 1000 members were getting truncated in Active Directory
- Now switched on in ldap-ad and off in ldap subsystem
- Also switched off result set paging in ldap subsystem by default for wider compatibility with non-AD systems
18272: Merged DEV/BELARUS/V3.2-2010_01_11 to V3.2
18257: ETHREEOH-4002: User/Group sync does not handle LDAP communication failures
- Merged with corrections
18276: ETHREEOH-4002: Correction to previous checkin - modification dates are only persisted after successful processing of users and groups, so need to delete them on comms failure
18340: ETHREEOH-4069: LDAP sync cannot resolve DNs containing a slash character
- Due to JNDI interpreting the slash character as a separator
18403: ETHREEOH-4008: LDAP sync should preserve case of group members
- Was incorrectly extracting attributes from lower-cased DN
18846: ETHREEOH-4233: LDAP sync now synchronizes group display names
- New ldap.synchronization.groupDisplayNameAttributeName property provides name of LDAP attribute
18877: (RECORD ONLY) Merged /alfresco/BRANCHES/V3.2:r18616
r18616 | markr | 2010-02-12 14:08:52 +0000 (Fri, 12 Feb 2010) | 1 line
ETHREEOH-4181 - Access denied exception when deploying via avm deployment receiver
19319: ALF-2043: User ID case sensitivity issues with Sharepoint Connector and External Authentication Subsystem
- DefaultRemoteUserMapper and AlfrescoUserGroupServiceHandler should use personService.getUserIdentifier() to 'normalize' a username according to case sensitivity settings
- NtlmAuthenticationHandler should also leave the normalization to personService
19320: (RECORD ONLY) Incremented version label
19380: ALF-2043: Revisit user ID case sensitivity in DefaultRemoteUserMapper
- Has to use public PersonService in case it is accessed outside of a transaction
- Fixed regular expression matching
- Added unit tests to try out all the remote user mapper options
19509: Merged PATCHES/V3.2.r to V3.2
18803: (RECORD ONLY) Created hotfix branch off V3.2.r-ENTERPRISE-FINAL
18833: (RECORD ONLY) Turn on Repo Doclib by default
19054: (RECORD ONLY) Merging V3.2 to PATCHES/V3.2.r
18787: MT: fix ETHREEOH-4125 - authority migration / batch processor (when upgrading groups from 3.1 to 3.2)
19358: (RECORD ONLY) Merged DEV/BELARUS/V3.2-2010_01_11 to PATCHES/V3.2.r
18699: ETHREEOH-4171: HTTP 500 when filling in a WCM webform
19447: (RECORD ONLY) Incremented version label
19518: ALF-757: Corrected audit config resource URL so that it resolves inside Tomcat as well as JUnit!
19525: ALF-708: Use BatchProcessor to process duplicate persons in small batches in SplitPersonCleanupBootstrapBean
- Even tested in a unit test!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
220 lines
7.5 KiB
Java
220 lines
7.5 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 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.Set;
|
|
import java.util.TreeSet;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.batch.BatchProcessor;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
|
import org.alfresco.service.cmr.security.PersonService;
|
|
import org.alfresco.service.transaction.TransactionService;
|
|
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
|
import org.alfresco.util.GUID;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.safehaus.uuid.UUID;
|
|
import org.springframework.context.ApplicationEvent;
|
|
|
|
/**
|
|
* Remove all duplicate users that have previously been split and had guids added to the uid. This been should be wired up into a custom bootstrap process
|
|
*
|
|
* @author Andy Hind
|
|
*/
|
|
public class SplitPersonCleanupBootstrapBean extends AbstractLifecycleBean
|
|
{
|
|
protected final static Log log = LogFactory.getLog(SplitPersonCleanupBootstrapBean.class);
|
|
|
|
private NodeService nodeService;
|
|
|
|
private PersonService personService;
|
|
|
|
private TransactionService transactionService;
|
|
|
|
public void setNodeService(NodeService nodeService)
|
|
{
|
|
this.nodeService = nodeService;
|
|
}
|
|
|
|
public void setPersonService(PersonService personService)
|
|
{
|
|
this.personService = personService;
|
|
}
|
|
|
|
public void setTransactionService(TransactionService transactionService)
|
|
{
|
|
this.transactionService = transactionService;
|
|
}
|
|
|
|
@Override
|
|
protected void onBootstrap(ApplicationEvent event)
|
|
{
|
|
// reindex
|
|
log.info("Removing person entries with GUIDS at the end of the uid ...");
|
|
int count = removePeopleWithGUIDBasedIds();
|
|
log.info("... removed " + count);
|
|
}
|
|
|
|
/**
|
|
* Can have uid+GUID or uid + "(" + GUID + ")"
|
|
*
|
|
* @return
|
|
*/
|
|
protected int removePeopleWithGUIDBasedIds()
|
|
{
|
|
Set<String> uidsToRemove = transactionService.getRetryingTransactionHelper().doInTransaction(
|
|
new RetryingTransactionCallback<Set<String>>()
|
|
{
|
|
public Set<String> execute() throws Exception
|
|
{
|
|
Set<String> uidsToRemove = new TreeSet<String>();
|
|
// A GUID should be 36 chars
|
|
|
|
Set<NodeRef> people = personService.getAllPeople();
|
|
for (NodeRef person : people)
|
|
{
|
|
String uid = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(
|
|
person, ContentModel.PROP_USERNAME));
|
|
if (isUIDWithGUID(uid))
|
|
{
|
|
uidsToRemove.add(uid);
|
|
if (log.isDebugEnabled())
|
|
{
|
|
log.debug("... will remove person with uid " + uid);
|
|
}
|
|
}
|
|
}
|
|
return uidsToRemove;
|
|
}
|
|
|
|
});
|
|
|
|
if (uidsToRemove.isEmpty())
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
// Process the duplicate persons in small batches
|
|
BatchProcessor<String> batchProcessor = new BatchProcessor<String>("Split Person Removal", transactionService
|
|
.getRetryingTransactionHelper(), uidsToRemove, 2, 10, getApplicationContext(), log, 100);
|
|
batchProcessor.process(new BatchProcessor.BatchProcessWorker<String>()
|
|
{
|
|
|
|
public String getIdentifier(String entry)
|
|
{
|
|
return entry;
|
|
}
|
|
|
|
public void beforeProcess() throws Throwable
|
|
{
|
|
// Authenticate as system
|
|
String systemUsername = AuthenticationUtil.getSystemUserName();
|
|
AuthenticationUtil.setFullyAuthenticatedUser(systemUsername);
|
|
}
|
|
|
|
public void afterProcess() throws Throwable
|
|
{
|
|
}
|
|
|
|
public void process(String entry) throws Throwable
|
|
{
|
|
// Delete via the person service to get the correct tidy up
|
|
personService.deletePerson(entry);
|
|
if (log.isDebugEnabled())
|
|
{
|
|
log.debug("... removed person with uid " + entry);
|
|
}
|
|
}
|
|
}, true);
|
|
return uidsToRemove.size();
|
|
|
|
}
|
|
|
|
private boolean isUIDWithGUID(String uid)
|
|
{
|
|
if (uid.length() > 36)
|
|
{
|
|
// uid + GUID
|
|
// Check the last 36 chars are a valid guid
|
|
String guidString = uid.substring(uid.length() - 36);
|
|
try
|
|
{
|
|
@SuppressWarnings("unused")
|
|
UUID id = new UUID(guidString);
|
|
// We have a valid guid.
|
|
return true;
|
|
}
|
|
catch (NumberFormatException e)
|
|
{
|
|
// Not a valid GUID
|
|
}
|
|
}
|
|
|
|
if (uid.length() > 38)
|
|
{
|
|
// UID + "(" + GUID + ")"
|
|
String guidString = uid.substring(uid.length() - 38);
|
|
if (guidString.startsWith("(") && guidString.endsWith(")"))
|
|
{
|
|
guidString = guidString.substring(1, 37);
|
|
try
|
|
{
|
|
@SuppressWarnings("unused")
|
|
UUID id = new UUID(guidString);
|
|
// We have a valid guid.
|
|
return true;
|
|
}
|
|
catch (NumberFormatException e)
|
|
{
|
|
// Not a valid GUID
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
protected void onShutdown(ApplicationEvent event)
|
|
{
|
|
// Nothing to do
|
|
}
|
|
|
|
public static void main(String[] args)
|
|
{
|
|
SplitPersonCleanupBootstrapBean tester = new SplitPersonCleanupBootstrapBean();
|
|
String[] test = new String[] { "andy", "andy" + GUID.generate(), "andy(" + GUID.generate() + ")",
|
|
GUID.generate() + "banana", "andy" + GUID.generate() + "banana",
|
|
"adbadbaddbadbadbadbabdbadbadbabdabdbbadbadbabdbadbadbadb"
|
|
|
|
};
|
|
|
|
for (String uid : test)
|
|
{
|
|
System.out.println(uid + " ... is a uid with guid = " + tester.isUIDWithGUID(uid));
|
|
}
|
|
}
|
|
}
|