mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
1c1a35e500
17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
- Forces transaction retry if worker thread reaches child authority before a parent authority
- Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
- Now completes in 5 minutes as opposed to 45
17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
- Working copy aspect already removed the working copy aspect on copy
- Now derives a new name from the node checked out from and a UUID, preserving the extension
17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
- declared dependency between internalEHCacheManager and jgroupsPropertySetter
17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
- authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
- multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
- BatchProcessor now promoted to its own package
17394: Fix for license issue in local enterprise builds.
- Replace Community with Enterprise in version.properties during enterprise war building
17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
17316: Merged V3.1 to V3.2
17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
- AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
17299: Merged V3.2 to V3.1 (Record only)
17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
- thanks Kev!
17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
- AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
17269: Fix failing unit test
- reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
17268: Fix InvitationService
- Runs as system to do privileged AuthenticationService actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
302 lines
11 KiB
Java
302 lines
11 KiB
Java
/*
|
|
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* As a special exception to the terms and conditions of version 2.0 of
|
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
* FLOSS exception. You should have recieved a copy of the text describing
|
|
* the FLOSS exception, and it is also available here:
|
|
* http://www.alfresco.com/legal/licensing
|
|
*/
|
|
|
|
package org.alfresco.repo.attributes;
|
|
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
|
|
import org.alfresco.service.cmr.attributes.AttrQuery;
|
|
import org.alfresco.service.cmr.attributes.AttributeService;
|
|
import org.alfresco.service.cmr.remote.AttributeServiceTransport;
|
|
import org.alfresco.service.cmr.security.AuthenticationService;
|
|
import org.springframework.extensions.surf.util.Pair;
|
|
|
|
/**
|
|
* Server side implementation of transport for AttributeService.
|
|
* @author britt
|
|
*/
|
|
public class AttributeServiceTransportService implements
|
|
AttributeServiceTransport
|
|
{
|
|
private AttributeService fService;
|
|
|
|
private AuthenticationService fAuthService;
|
|
|
|
public AttributeServiceTransportService()
|
|
{
|
|
}
|
|
|
|
public void setAttributeService(AttributeService service)
|
|
{
|
|
fService = service;
|
|
}
|
|
|
|
public void setAuthenticationService(AuthenticationService service)
|
|
{
|
|
fAuthService = service;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#addAttribute(java.lang.String, java.lang.String, org.alfresco.repo.attributes.Attribute)
|
|
*/
|
|
public void addAttribute(String ticket, String path, Attribute value)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.addAttribute(path, value);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#addAttribute(java.lang.String, java.util.List, org.alfresco.repo.attributes.Attribute)
|
|
*/
|
|
public void addAttribute(String ticket, List<String> keys, Attribute value)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.addAttribute(keys, value);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#getAttribute(java.lang.String, java.lang.String)
|
|
*/
|
|
public Attribute getAttribute(String ticket, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.getAttribute(path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#getAttribute(java.lang.String, java.util.List)
|
|
*/
|
|
public Attribute getAttribute(String ticket, List<String> keys)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.getAttribute(keys);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#getKeys(java.lang.String, java.lang.String)
|
|
*/
|
|
public List<String> getKeys(String ticket, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.getKeys(path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#getKeys(java.lang.String, java.util.List)
|
|
*/
|
|
public List<String> getKeys(String ticket, List<String> keys)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.getKeys(keys);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#query(java.lang.String, java.lang.String, org.alfresco.service.cmr.attributes.AttrQuery)
|
|
*/
|
|
public List<Pair<String, Attribute>> query(String ticket, String path,
|
|
AttrQuery query)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.query(path, query);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#query(java.lang.String, java.util.List, org.alfresco.service.cmr.attributes.AttrQuery)
|
|
*/
|
|
public List<Pair<String, Attribute>> query(String ticket,
|
|
List<String> keys, AttrQuery query)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.query(keys, query);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#removeAttribute(java.lang.String, java.lang.String, java.lang.String)
|
|
*/
|
|
public void removeAttribute(String ticket, String path, String name)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.removeAttribute(path, name);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#removeAttribute(java.lang.String, java.util.List, java.lang.String)
|
|
*/
|
|
public void removeAttribute(String ticket, List<String> keys, String name)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.removeAttribute(keys, name);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#removeAttribute(java.lang.String, java.lang.String, int)
|
|
*/
|
|
public void removeAttribute(String ticket, String path, int index)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.removeAttribute(path, index);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#removeAttribute(java.lang.String, java.util.List, int)
|
|
*/
|
|
public void removeAttribute(String ticket, List<String> keys, int index)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.removeAttribute(keys, index);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#setAttribute(java.lang.String, java.lang.String, java.lang.String, org.alfresco.repo.attributes.Attribute)
|
|
*/
|
|
public void setAttribute(String ticket, String path, String name,
|
|
Attribute value)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.setAttribute(path, name, value);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#setAttribute(java.lang.String, java.util.List, java.lang.String, org.alfresco.repo.attributes.Attribute)
|
|
*/
|
|
public void setAttribute(String ticket, List<String> keys, String name,
|
|
Attribute value)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.setAttribute(keys, name, value);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#setAttribute(java.lang.String, java.lang.String, int, org.alfresco.repo.attributes.Attribute)
|
|
*/
|
|
public void setAttribute(String ticket, String path, int index,
|
|
Attribute value)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.setAttribute(path, index, value);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.attributes.AttributeServiceTransport#setAttribute(java.lang.String, java.util.List, int, org.alfresco.repo.attributes.Attribute)
|
|
*/
|
|
public void setAttribute(String ticket, List<String> keys, int index,
|
|
Attribute value)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.setAttribute(keys, index, value);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#exists(java.lang.String, java.util.List)
|
|
*/
|
|
public boolean exists(String ticket, List<String> keys)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.exists(keys);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#exists(java.lang.String, java.lang.String)
|
|
*/
|
|
public boolean exists(String ticket, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.exists(path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#getCount(java.lang.String, java.util.List)
|
|
*/
|
|
public int getCount(String ticket, List<String> keys)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.getCount(keys);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#getCount(java.lang.String, java.lang.String)
|
|
*/
|
|
public int getCount(String ticket, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fService.getCount(path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#addAttributes(java.lang.String, java.util.List, java.util.List)
|
|
*/
|
|
public void addAttributes(String ticket, List<String> keys, List<Attribute> values)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.addAttributes(keys, values);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#addAttributes(java.lang.String, java.lang.String, java.util.List)
|
|
*/
|
|
public void addAttributes(String ticket, String path, List<Attribute> values)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.addAttributes(path, values);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#setAttributes(java.lang.String, java.util.List, java.util.Map)
|
|
*/
|
|
public void setAttributes(String ticket, List<String> keys, Map<String, Attribute> entries)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.setAttributes(keys, entries);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#setAttributes(java.lang.String, java.lang.String, java.util.Map)
|
|
*/
|
|
public void setAttributes(String ticket, String path, Map<String, Attribute> entries)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.setAttributes(path, entries);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#removeEntries(java.lang.String, java.util.List, org.alfresco.service.cmr.attributes.AttrQuery)
|
|
*/
|
|
public void removeEntries(String ticket, List<String> keys, AttrQuery query)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.removeEntries(keys, query);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.AttributeServiceTransport#removeEntries(java.lang.String, java.lang.String, org.alfresco.service.cmr.attributes.AttrQuery)
|
|
*/
|
|
public void removeEntries(String ticket, String path, AttrQuery query)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fService.removeEntries(path, query);
|
|
}
|
|
}
|