mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
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
477 lines
14 KiB
Java
477 lines
14 KiB
Java
/**
|
|
*
|
|
*/
|
|
package org.alfresco.repo.remote;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.alfresco.service.cmr.remote.RepoRemote;
|
|
import org.alfresco.service.cmr.remote.RepoRemoteTransport;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.security.AuthenticationService;
|
|
import org.alfresco.util.GUID;
|
|
import org.springframework.extensions.surf.util.Pair;
|
|
|
|
/**
|
|
* The server side implementation of RepoRemoteTransport. It
|
|
* handles ticket validation, and expiration of idle streams.
|
|
* @author britt
|
|
*/
|
|
public class RepoRemoteTransportService implements RepoRemoteTransport,
|
|
Runnable
|
|
{
|
|
/**
|
|
* The map of handles to open input streams.
|
|
*/
|
|
private Map<String, InputStream> fInputStreams;
|
|
|
|
/**
|
|
* The map of handles to last accesses for input streams.
|
|
*/
|
|
private Map<String, Long> fInputLastAccessTimes;
|
|
|
|
/**
|
|
* The map of handles to busy flags.
|
|
*/
|
|
private Map<String, Boolean> fInputBusy;
|
|
|
|
/**
|
|
* The map of handles to open output streams.
|
|
*/
|
|
private Map<String, OutputStream> fOutputStreams;
|
|
|
|
/**
|
|
* The map of handles to last accesses for output streams.
|
|
*/
|
|
private Map<String, Long> fOutputLastAccessTimes;
|
|
|
|
/**
|
|
* The map of handles to busy flags.
|
|
*/
|
|
private Map<String, Boolean> fOutputBusy;
|
|
|
|
/**
|
|
* The stale handle time. This is the maximum time a handle
|
|
* can stay idle in milliseconds.
|
|
*/
|
|
private long fIdleTimeout;
|
|
|
|
/**
|
|
* The thread for this Runnable.
|
|
*/
|
|
private Thread fThread;
|
|
|
|
/**
|
|
* Flag for whether this Runnable is done.
|
|
*/
|
|
private boolean fDone;
|
|
|
|
/**
|
|
* The RepoRemote instance.
|
|
*/
|
|
private RepoRemote fRepoRemote;
|
|
|
|
/**
|
|
* The AuthenticationService instance.
|
|
*/
|
|
private AuthenticationService fAuthService;
|
|
|
|
/**
|
|
* Default constructor.
|
|
*/
|
|
public RepoRemoteTransportService()
|
|
{
|
|
fIdleTimeout = 30000;
|
|
fInputStreams = new HashMap<String, InputStream>();
|
|
fInputLastAccessTimes = new HashMap<String, Long>();
|
|
fInputBusy = new HashMap<String, Boolean>();
|
|
fOutputStreams = new HashMap<String, OutputStream>();
|
|
fOutputLastAccessTimes = new HashMap<String, Long>();
|
|
fOutputBusy = new HashMap<String, Boolean>();
|
|
}
|
|
|
|
/**
|
|
* Set the Idle Timeout value.
|
|
* @param timeout The value to set.
|
|
*/
|
|
public void setIdleTimeout(long timeout)
|
|
{
|
|
fIdleTimeout = timeout;
|
|
}
|
|
|
|
/**
|
|
* Set the RepoRemote instance.
|
|
*/
|
|
public void setRepoRemote(RepoRemote remote)
|
|
{
|
|
fRepoRemote = remote;
|
|
}
|
|
|
|
/**
|
|
* Set the AuthenticationService instance.
|
|
*/
|
|
public void setAuthenticationService(AuthenticationService service)
|
|
{
|
|
fAuthService = service;
|
|
}
|
|
|
|
/**
|
|
* The init method. This fires up a thread to check
|
|
* for closable streams.
|
|
*/
|
|
public void init()
|
|
{
|
|
fThread = new Thread(this);
|
|
fDone = false;
|
|
fThread.start();
|
|
}
|
|
|
|
/**
|
|
* The body of this Runnable.
|
|
*/
|
|
public synchronized void run()
|
|
{
|
|
while (!fDone)
|
|
{
|
|
try
|
|
{
|
|
wait(fIdleTimeout);
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
long now = System.currentTimeMillis();
|
|
List<String> toClose = new ArrayList<String>();
|
|
for (String handle : fInputLastAccessTimes.keySet())
|
|
{
|
|
if (fInputBusy.get(handle))
|
|
{
|
|
continue;
|
|
}
|
|
if (now - fInputLastAccessTimes.get(handle) > fIdleTimeout)
|
|
{
|
|
toClose.add(handle);
|
|
}
|
|
}
|
|
for (String handle : toClose)
|
|
{
|
|
try
|
|
{
|
|
fInputStreams.get(handle).close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fInputStreams.remove(handle);
|
|
fInputLastAccessTimes.remove(handle);
|
|
fInputBusy.remove(handle);
|
|
}
|
|
toClose.clear();
|
|
for (String handle : fOutputLastAccessTimes.keySet())
|
|
{
|
|
if (fOutputBusy.get(handle))
|
|
{
|
|
continue;
|
|
}
|
|
if (now - fOutputLastAccessTimes.get(handle) > fIdleTimeout)
|
|
{
|
|
toClose.add(handle);
|
|
}
|
|
}
|
|
for (String handle : toClose)
|
|
{
|
|
try
|
|
{
|
|
fOutputStreams.get(handle).close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fOutputStreams.remove(handle);
|
|
fOutputLastAccessTimes.remove(handle);
|
|
fOutputBusy.remove(handle);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Shutdown the Runnable cleanly.
|
|
*/
|
|
public void shutDown()
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fDone = true;
|
|
notifyAll();
|
|
}
|
|
try
|
|
{
|
|
fThread.join();
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#closeInputHandle(java.lang.String, java.lang.String)
|
|
*/
|
|
public synchronized void closeInputHandle(String ticket, String handle)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
InputStream in = fInputStreams.get(handle);
|
|
if (in != null)
|
|
{
|
|
try
|
|
{
|
|
in.close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fInputStreams.remove(handle);
|
|
fInputLastAccessTimes.remove(handle);
|
|
fInputBusy.remove(handle);
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#closeOutputHandle(java.lang.String, java.lang.String)
|
|
*/
|
|
public synchronized void closeOutputHandle(String ticket, String handle)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
OutputStream out = fOutputStreams.get(handle);
|
|
if (out != null)
|
|
{
|
|
try
|
|
{
|
|
out.close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fOutputStreams.remove(handle);
|
|
fOutputLastAccessTimes.remove(handle);
|
|
fOutputBusy.remove(handle);
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#createDirectory(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public NodeRef createDirectory(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fRepoRemote.createDirectory(base, path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#createFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public String createFile(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
OutputStream out = fRepoRemote.createFile(base, path);
|
|
return getOutputHandle(out);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#getListing(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
|
|
*/
|
|
public Map<String, Pair<NodeRef, Boolean>> getListing(String ticket, NodeRef dir)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fRepoRemote.getListing(dir);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#getRoot(java.lang.String)
|
|
*/
|
|
public NodeRef getRoot(String ticket)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fRepoRemote.getRoot();
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#lookup(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public Pair<NodeRef, Boolean> lookup(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
return fRepoRemote.lookup(base, path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#readFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public String readFile(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
InputStream in = fRepoRemote.readFile(base, path);
|
|
return getInputHandle(in);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#readFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
|
|
*/
|
|
public String readFile(String ticket, NodeRef fileRef)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
InputStream in = fRepoRemote.readFile(fileRef);
|
|
return getInputHandle(in);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#readInput(java.lang.String, java.lang.String, int)
|
|
*/
|
|
public byte[] readInput(String ticket, String handle, int count)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
InputStream in = null;
|
|
synchronized (this)
|
|
{
|
|
in = fInputStreams.get(handle);
|
|
if (in == null)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid Input Handle.");
|
|
}
|
|
fInputBusy.put(handle, true);
|
|
fInputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
}
|
|
byte [] buff = new byte[count];
|
|
try
|
|
{
|
|
int read = in.read(buff);
|
|
if (read == -1)
|
|
{
|
|
read = 0;
|
|
}
|
|
if (read != count)
|
|
{
|
|
byte [] newBuff = new byte[read];
|
|
for (int i = 0; i < read; i++)
|
|
{
|
|
newBuff[i] = buff[i];
|
|
}
|
|
return newBuff;
|
|
}
|
|
return buff;
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
throw new AlfrescoRuntimeException("I/O Error.");
|
|
}
|
|
finally
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fInputBusy.put(handle, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#removeNode(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public void removeNode(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fRepoRemote.removeNode(base, path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#removeNode(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
|
|
*/
|
|
public void removeNode(String ticket, NodeRef toRemove)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fRepoRemote.removeNode(toRemove);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#rename(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String, java.lang.String)
|
|
*/
|
|
public void rename(String ticket, NodeRef base, String src, String dst)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
fRepoRemote.rename(base, src, dst);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#writeFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public String writeFile(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
OutputStream out = fRepoRemote.writeFile(base, path);
|
|
return getOutputHandle(out);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#writeOutput(java.lang.String, java.lang.String, byte[], int)
|
|
*/
|
|
public void writeOutput(String ticket, String handle, byte[] buff, int count)
|
|
{
|
|
fAuthService.validate(ticket, null);
|
|
OutputStream out = null;
|
|
synchronized (this)
|
|
{
|
|
out = fOutputStreams.get(handle);
|
|
if (out == null)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid Output Handle.");
|
|
}
|
|
fOutputBusy.put(handle, true);
|
|
fOutputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
}
|
|
try
|
|
{
|
|
out.write(buff, 0, count);
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
throw new AlfrescoRuntimeException("I/O Errror.");
|
|
}
|
|
finally
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fOutputBusy.put(handle, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
private synchronized String getOutputHandle(OutputStream out)
|
|
{
|
|
String handle = GUID.generate();
|
|
fOutputStreams.put(handle, out);
|
|
fOutputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
fOutputBusy.put(handle, false);
|
|
return handle;
|
|
}
|
|
|
|
private synchronized String getInputHandle(InputStream in)
|
|
{
|
|
String handle = GUID.generate();
|
|
fInputStreams.put(handle, in);
|
|
fInputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
fInputBusy.put(handle, false);
|
|
return handle;
|
|
}
|
|
}
|