mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +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
228 lines
7.9 KiB
Java
228 lines
7.9 KiB
Java
/*
|
|
* Copyright (C) 2005-2009 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.web.scripts;
|
|
|
|
import java.io.IOException;
|
|
import java.io.PrintWriter;
|
|
import java.io.StringWriter;
|
|
|
|
import org.alfresco.repo.security.authentication.AuthenticationException;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.cmr.security.AuthenticationService;
|
|
import org.alfresco.util.EqualsHelper;
|
|
import org.springframework.extensions.webscripts.TestWebScriptServer;
|
|
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
|
|
|
|
|
/**
|
|
* Stand-alone Web Script Test Server
|
|
*
|
|
* @author davidc
|
|
*/
|
|
public class TestWebScriptRepoServer extends TestWebScriptServer
|
|
{
|
|
/**
|
|
* Main entry point.
|
|
*/
|
|
public static void main(String[] args)
|
|
{
|
|
try
|
|
{
|
|
TestWebScriptServer testServer = getTestServer();
|
|
AuthenticationUtil.setRunAsUserSystem();
|
|
testServer.rep();
|
|
}
|
|
catch(Throwable e)
|
|
{
|
|
StringWriter strWriter = new StringWriter();
|
|
PrintWriter printWriter = new PrintWriter(strWriter);
|
|
e.printStackTrace(printWriter);
|
|
System.out.println(strWriter.toString());
|
|
}
|
|
finally
|
|
{
|
|
System.exit(0);
|
|
}
|
|
}
|
|
|
|
private final static String[] CONFIG_LOCATIONS = new String[]
|
|
{
|
|
"classpath:alfresco/application-context.xml",
|
|
"classpath:alfresco/web-scripts-application-context.xml",
|
|
"classpath:alfresco/web-scripts-application-context-test.xml"
|
|
};
|
|
|
|
/** A static reference to the application context being used */
|
|
private static ClassPathXmlApplicationContext ctx;
|
|
private static String appendedTestConfiguration;
|
|
|
|
private RetryingTransactionHelper retryingTransactionHelper;
|
|
private AuthenticationService authenticationService;
|
|
|
|
|
|
/**
|
|
* Sets helper that provides transaction callbacks
|
|
*/
|
|
public void setTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
|
|
{
|
|
this.retryingTransactionHelper = retryingTransactionHelper;
|
|
}
|
|
|
|
/**
|
|
* @param authenticationService
|
|
*/
|
|
public void setAuthenticationService(AuthenticationService authenticationService)
|
|
{
|
|
this.authenticationService = authenticationService;
|
|
}
|
|
|
|
/**
|
|
* Get default user name
|
|
*/
|
|
protected String getDefaultUserName()
|
|
{
|
|
return AuthenticationUtil.getAdminUserName();
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc #getTestServer(String)}
|
|
*/
|
|
public static TestWebScriptServer getTestServer()
|
|
{
|
|
return getTestServer(null);
|
|
}
|
|
|
|
/**
|
|
* Start up a context and get the server bean.
|
|
* <p>
|
|
* This method will close and restart the application context only if the configuration has
|
|
* changed.
|
|
*
|
|
* @param appendTestConfigLocation additional context file to include in the application context
|
|
* @return Test Server
|
|
*/
|
|
public static synchronized TestWebScriptServer getTestServer(String appendTestConfigLocation)
|
|
{
|
|
if (TestWebScriptRepoServer.ctx != null)
|
|
{
|
|
boolean configChanged = !EqualsHelper.nullSafeEquals(
|
|
appendTestConfigLocation,
|
|
TestWebScriptRepoServer.appendedTestConfiguration);
|
|
if (configChanged)
|
|
{
|
|
// The config changed, so close the context (it'll be restarted later)
|
|
try
|
|
{
|
|
ctx.close();
|
|
ctx = null;
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
throw new RuntimeException("Failed to shut down existing application context", e);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// There is already a context with the required configuration
|
|
}
|
|
}
|
|
|
|
// Check if we need to start/restart the context
|
|
if (TestWebScriptRepoServer.ctx == null)
|
|
{
|
|
// Restart it
|
|
final String[] configLocations;
|
|
if (appendTestConfigLocation == null)
|
|
{
|
|
configLocations = CONFIG_LOCATIONS;
|
|
}
|
|
else
|
|
{
|
|
configLocations = new String[CONFIG_LOCATIONS.length+1];
|
|
System.arraycopy(CONFIG_LOCATIONS, 0, configLocations, 0, CONFIG_LOCATIONS.length);
|
|
configLocations[CONFIG_LOCATIONS.length] = appendTestConfigLocation;
|
|
}
|
|
TestWebScriptRepoServer.ctx = new ClassPathXmlApplicationContext(configLocations);
|
|
TestWebScriptRepoServer.appendedTestConfiguration = appendTestConfigLocation;
|
|
}
|
|
|
|
// Get the bean
|
|
TestWebScriptServer testServer = (TestWebScriptRepoServer)TestWebScriptRepoServer.ctx.getBean("webscripts.test");
|
|
return testServer;
|
|
}
|
|
|
|
/**
|
|
* Interpret a single command using the BufferedReader passed in for any data needed.
|
|
*
|
|
* @param line The unparsed command
|
|
* @return The textual output of the command.
|
|
*/
|
|
@Override
|
|
protected String interpretCommand(final String line)
|
|
throws IOException
|
|
{
|
|
try
|
|
{
|
|
if (username.startsWith("TICKET_"))
|
|
{
|
|
try
|
|
{
|
|
retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Exception
|
|
{
|
|
authenticationService.validate(username, null);
|
|
return null;
|
|
}
|
|
});
|
|
return executeCommand(line);
|
|
}
|
|
finally
|
|
{
|
|
authenticationService.clearCurrentSecurityContext();
|
|
}
|
|
}
|
|
}
|
|
catch(AuthenticationException e)
|
|
{
|
|
executeCommand("user " + getDefaultUserName());
|
|
}
|
|
|
|
// execute command in context of currently selected user
|
|
return AuthenticationUtil.runAs(new RunAsWork<String>()
|
|
{
|
|
@SuppressWarnings("synthetic-access")
|
|
public String doWork() throws Exception
|
|
{
|
|
return executeCommand(line);
|
|
}
|
|
}, username);
|
|
}
|
|
|
|
}
|