mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-16 17:55:15 +00:00
Merged V2.2 to HEAD
8144: Fix for AR-1850, AR-2046 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
parent
d05655f3c7
commit
c5edd151e9
@ -16,6 +16,9 @@
|
||||
<property name="mutableAuthenticationService">
|
||||
<ref bean="authenticationServiceImplAlfresco"/>
|
||||
</property>
|
||||
<property name="sysAdminCache">
|
||||
<ref bean="sysAdminCache"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.ChainingAuthenticationComponentImpl">
|
||||
@ -41,6 +44,9 @@
|
||||
<property name="authenticationComponent">
|
||||
<ref bean="authenticationComponentImplAlfresco"/>
|
||||
</property>
|
||||
<property name="sysAdminCache">
|
||||
<ref bean="sysAdminCache"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="authenticationDaoAlfresco" class="org.alfresco.repo.security.authentication.RepositoryAuthenticationDao">
|
||||
@ -54,7 +60,10 @@
|
||||
<ref bean="namespaceService"/>
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="searchService"/>
|
||||
<ref bean="admSearchService"/>
|
||||
</property>
|
||||
<property name="retryingTransactionHelper">
|
||||
<ref bean="retryingTransactionHelper"/>
|
||||
</property>
|
||||
<property name="userNamesAreCaseSensitive">
|
||||
<value>${user.name.caseSensitive}</value>
|
||||
@ -74,6 +83,15 @@
|
||||
<property name="allowGuestLogin">
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService" />
|
||||
</property>
|
||||
<property name="personService">
|
||||
<ref bean="personService" />
|
||||
</property>
|
||||
<property name="transactionService">
|
||||
<ref bean="transactionService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- JAAS -->
|
||||
@ -88,6 +106,9 @@
|
||||
<property name="authenticationComponent">
|
||||
<ref bean="authenticationComponentImplJAAS"/>
|
||||
</property>
|
||||
<property name="sysAdminCache">
|
||||
<ref bean="sysAdminCache"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="authenticationComponentImplJAAS" class="org.alfresco.repo.security.authentication.jaas.JAASAuthenticationComponent">
|
||||
@ -97,6 +118,15 @@
|
||||
<property name="jaasConfigEntryName">
|
||||
<value>Alfresco</value>
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService" />
|
||||
</property>
|
||||
<property name="personService">
|
||||
<ref bean="personService" />
|
||||
</property>
|
||||
<property name="transactionService">
|
||||
<ref bean="transactionService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="authenticationDaoJAAS" class="org.alfresco.repo.security.authentication.ntlm.NullMutableAuthenticationDao"/>
|
||||
|
||||
@ -32,348 +32,386 @@ import java.util.TreeSet;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.linkvalidation.LinkValidationService;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationServiceImpl;
|
||||
import org.alfresco.repo.security.authentication.AbstractAuthenticationService;
|
||||
import org.alfresco.repo.transaction.TransactionServiceImpl;
|
||||
import org.alfresco.service.license.LicenseService;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.ApplicationContextAware;
|
||||
|
||||
|
||||
public class RepoServerMgmt implements RepoServerMgmtMBean, ApplicationContextAware
|
||||
public class RepoServerMgmt implements RepoServerMgmtMBean, ApplicationContextAware, InitializingBean
|
||||
{
|
||||
private static final Log log = LogFactory.getLog(RepoServerMgmt.class);
|
||||
|
||||
private ApplicationContext ctx; // to get license component, if installed
|
||||
|
||||
private TransactionServiceImpl transactionService;
|
||||
private AuthenticationServiceImpl authenticationService;
|
||||
private LinkValidationService linkValidationService;
|
||||
|
||||
// property key should be the same as the one in core-services-context.xml (to allow repo to start in multi-user mode even if the property is not set)
|
||||
private final static String PROPERTY_KEY_SINGLE_USER_ONLY = "${server.singleuseronly.name}";
|
||||
|
||||
public void setTransactionService(TransactionServiceImpl transactionService)
|
||||
{
|
||||
this.transactionService = transactionService;
|
||||
}
|
||||
|
||||
public void setAuthenticationService(AuthenticationServiceImpl authenticationService)
|
||||
{
|
||||
this.authenticationService = authenticationService;
|
||||
}
|
||||
|
||||
// TODO - temporary workaround, can be removed when link validation is part of repo
|
||||
public void registerLinkValidationService(LinkValidationService linkValidationService)
|
||||
{
|
||||
this.linkValidationService = linkValidationService;
|
||||
}
|
||||
|
||||
public void setApplicationContext(ApplicationContext ctx)
|
||||
{
|
||||
this.ctx = ctx;
|
||||
}
|
||||
private static final Log log = LogFactory.getLog(RepoServerMgmt.class);
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setReadOnly(boolean)
|
||||
*/
|
||||
public void setReadOnly(boolean readOnly)
|
||||
{
|
||||
if (readOnly && isReadOnly())
|
||||
{
|
||||
log.warn("Alfresco is already read-only");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!readOnly && !isReadOnly())
|
||||
{
|
||||
log.warn("Alfresco is already read-write");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!readOnly)
|
||||
{
|
||||
LicenseService licenseService = null;
|
||||
try
|
||||
{
|
||||
licenseService = (LicenseService)ctx.getBean("org.alfresco.license.LicenseComponent");
|
||||
|
||||
// verify license, but only if license component is installed
|
||||
licenseService.verifyLicense();
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e)
|
||||
{
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
transactionService.setAllowWrite(!readOnly);
|
||||
|
||||
if (readOnly)
|
||||
{
|
||||
log.warn("Alfresco set to be read-only");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Alfresco set to be read-write");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#isReadOnly(java.lang.Boolean)
|
||||
*/
|
||||
public boolean isReadOnly()
|
||||
{
|
||||
return transactionService.isReadOnly();
|
||||
}
|
||||
|
||||
// Note: implementing counts as managed attributes (without params) means that
|
||||
// certain JMX consoles can monitor
|
||||
private ApplicationContext ctx; // to get license component, if installed
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getTicketCountNonExpired()
|
||||
*/
|
||||
public int getTicketCountNonExpired()
|
||||
{
|
||||
return authenticationService.countTickets(true);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getTicketCountAll()
|
||||
*/
|
||||
public int getTicketCountAll()
|
||||
{
|
||||
return authenticationService.countTickets(false);
|
||||
}
|
||||
private TransactionServiceImpl transactionService;
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getUserCountNonExpired()
|
||||
*/
|
||||
public int getUserCountNonExpired()
|
||||
{
|
||||
return authenticationService.getUsersWithTickets(true).size();
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getUserCountAll()
|
||||
*/
|
||||
public int getUserCountAll()
|
||||
{
|
||||
return authenticationService.getUsersWithTickets(false).size();
|
||||
}
|
||||
|
||||
// Note: implement operations without boolean/Boolean parameter, due to problem with some JMX consoles (e.g. MC4J 1.9 Beta)
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#listUserNamesNonExpired()
|
||||
*/
|
||||
public String[] listUserNamesNonExpired()
|
||||
{
|
||||
Set<String> userSet = authenticationService.getUsersWithTickets(true);
|
||||
SortedSet<String> sorted = new TreeSet<String>(userSet);
|
||||
return sorted.toArray(new String[0]);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#listUserNamesAll()
|
||||
*/
|
||||
public String[] listUserNamesAll()
|
||||
{
|
||||
Set<String> userSet = authenticationService.getUsersWithTickets(false);
|
||||
SortedSet<String> sorted = new TreeSet<String>(userSet);
|
||||
return sorted.toArray(new String[0]);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#invalidateTicketsExpired()
|
||||
*/
|
||||
public int invalidateTicketsExpired()
|
||||
{
|
||||
int count = authenticationService.invalidateTickets(true);
|
||||
log.info("Expired tickets invalidated: " + count);
|
||||
return count;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#invalidateTicketsAll()
|
||||
*/
|
||||
public int invalidateTicketsAll()
|
||||
{
|
||||
int count = authenticationService.invalidateTickets(false);
|
||||
log.info("All tickets invalidated: " + count);
|
||||
return count;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#invalidateUser(java.lang.String)
|
||||
*/
|
||||
public void invalidateUser(String username)
|
||||
{
|
||||
authenticationService.invalidateUserSession(username);
|
||||
log.info("User invalidated: " + username);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setSingleUserOnly(java.lang.String)
|
||||
*/
|
||||
public void setSingleUserOnly(String allowedUsername)
|
||||
{
|
||||
int maxUsers = getMaxUsers();
|
||||
|
||||
List<String> allowedUsers = null;
|
||||
if ((allowedUsername != null) && (! allowedUsername.equals("")))
|
||||
{
|
||||
if (! allowedUsername.equals(PROPERTY_KEY_SINGLE_USER_ONLY))
|
||||
{
|
||||
allowedUsers = new ArrayList<String>(0);
|
||||
allowedUsers.add(allowedUsername);
|
||||
|
||||
invalidateTicketsAll();
|
||||
|
||||
if (maxUsers != 0)
|
||||
{
|
||||
log.warn("Alfresco set to allow single-user (" + allowedUsername + ") logins only");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.warn("Alfresco set to allow single-user (" + allowedUsername + ") logins - although further logins are currently prevented (limit = 0)");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (maxUsers == -1)
|
||||
{
|
||||
log.info("Alfresco set to allow logins (no limit set)");
|
||||
}
|
||||
else if (maxUsers == 0)
|
||||
{
|
||||
log.warn("Alfresco set to allow logins - although further logins are currently prevented (limit = 0)");
|
||||
}
|
||||
else if (maxUsers != 0)
|
||||
{
|
||||
log.info("Alfresco set to allow logins (limit = " + maxUsers + ")");
|
||||
}
|
||||
}
|
||||
|
||||
authenticationService.setAllowedUsers(allowedUsers);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#getSingleUserOnly()
|
||||
*/
|
||||
public String getSingleUserOnly()
|
||||
{
|
||||
List<String> allowedUsers = authenticationService.getAllowedUsers();
|
||||
if (allowedUsers != null)
|
||||
{
|
||||
if (allowedUsers.size() > 1)
|
||||
{
|
||||
throw new AlfrescoRuntimeException("Unexpected: more than one user allowed");
|
||||
}
|
||||
if (allowedUsers.size() == 1)
|
||||
{
|
||||
return allowedUsers.get(0);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setMaxUsers(int)
|
||||
*/
|
||||
public void setMaxUsers(int maxUsers)
|
||||
{
|
||||
authenticationService.setMaxUsers(maxUsers);
|
||||
|
||||
String singleUserOnlyName = getSingleUserOnly();
|
||||
if (maxUsers == -1)
|
||||
{
|
||||
if ((singleUserOnlyName != null) && (! singleUserOnlyName.equals("")))
|
||||
{
|
||||
log.info("Alfresco set to allow logins (no limit set) - although currently restricted to single-user (" + singleUserOnlyName + ")");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Alfresco set to allow logins (no limit set)");
|
||||
}
|
||||
}
|
||||
else if (maxUsers == 0)
|
||||
{
|
||||
log.warn("Alfresco set to prevent further logins (limit = 0)");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((singleUserOnlyName != null) && (! singleUserOnlyName.equals("")))
|
||||
{
|
||||
log.info("Alfresco set to allow logins (limit = " + maxUsers + ") - although currently restricted to single-user (" + singleUserOnlyName + ")");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Alfresco set to allow logins (limit = " + maxUsers + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#getMaxUsers()
|
||||
*/
|
||||
public int getMaxUsers()
|
||||
{
|
||||
return authenticationService.getMaxUsers();
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setLinkValidationDisabled(boolean)
|
||||
*/
|
||||
public void setLinkValidationDisabled(boolean disable)
|
||||
{
|
||||
if (linkValidationService == null)
|
||||
{
|
||||
log.error("LinkValidationService not registered");
|
||||
throw new AlfrescoRuntimeException("LinkValidationService not registered");
|
||||
}
|
||||
private AbstractAuthenticationService authenticationService;
|
||||
|
||||
linkValidationService.setLinkValidationDisabled(disable);
|
||||
if (disable)
|
||||
{
|
||||
log.warn("Link validation disabled");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Link validation enabled");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#isLinkValidationDisabled()
|
||||
*/
|
||||
public boolean isLinkValidationDisabled()
|
||||
{
|
||||
if (linkValidationService == null)
|
||||
{
|
||||
log.error("LinkValidationService not registered");
|
||||
throw new AlfrescoRuntimeException("LinkValidationService not registered");
|
||||
}
|
||||
|
||||
return linkValidationService.isLinkValidationDisabled();
|
||||
}
|
||||
private LinkValidationService linkValidationService;
|
||||
|
||||
private boolean initialised = false;
|
||||
|
||||
// property key should be the same as the one in core-services-context.xml (to allow repo to start in multi-user
|
||||
// mode even if the property is not set)
|
||||
private final static String PROPERTY_KEY_SINGLE_USER_ONLY = "${server.singleuseronly.name}";
|
||||
|
||||
public void setTransactionService(TransactionServiceImpl transactionService)
|
||||
{
|
||||
this.transactionService = transactionService;
|
||||
}
|
||||
|
||||
public void setAuthenticationService(AbstractAuthenticationService authenticationService)
|
||||
{
|
||||
this.authenticationService = authenticationService;
|
||||
}
|
||||
|
||||
// TODO - temporary workaround, can be removed when link validation is part of repo
|
||||
public void registerLinkValidationService(LinkValidationService linkValidationService)
|
||||
{
|
||||
this.linkValidationService = linkValidationService;
|
||||
}
|
||||
|
||||
public void setApplicationContext(ApplicationContext ctx)
|
||||
{
|
||||
this.ctx = ctx;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setReadOnly(boolean)
|
||||
*/
|
||||
public void setReadOnly(boolean readOnly)
|
||||
{
|
||||
if (readOnly && isReadOnly())
|
||||
{
|
||||
log.warn("Alfresco is already read-only");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!readOnly && !isReadOnly())
|
||||
{
|
||||
log.warn("Alfresco is already read-write");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!readOnly)
|
||||
{
|
||||
LicenseService licenseService = null;
|
||||
try
|
||||
{
|
||||
licenseService = (LicenseService) ctx.getBean("org.alfresco.license.LicenseComponent");
|
||||
|
||||
// verify license, but only if license component is installed
|
||||
licenseService.verifyLicense();
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException e)
|
||||
{
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
transactionService.setAllowWrite(!readOnly);
|
||||
|
||||
if (readOnly)
|
||||
{
|
||||
log.warn("Alfresco set to be read-only");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Alfresco set to be read-write");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#isReadOnly(java.lang.Boolean)
|
||||
*/
|
||||
public boolean isReadOnly()
|
||||
{
|
||||
return transactionService.isReadOnly();
|
||||
}
|
||||
|
||||
// Note: implementing counts as managed attributes (without params) means that
|
||||
// certain JMX consoles can monitor
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getTicketCountNonExpired()
|
||||
*/
|
||||
public int getTicketCountNonExpired()
|
||||
{
|
||||
return authenticationService.countTickets(true);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getTicketCountAll()
|
||||
*/
|
||||
public int getTicketCountAll()
|
||||
{
|
||||
return authenticationService.countTickets(false);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getUserCountNonExpired()
|
||||
*/
|
||||
public int getUserCountNonExpired()
|
||||
{
|
||||
return authenticationService.getUsersWithTickets(true).size();
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#getUserCountAll()
|
||||
*/
|
||||
public int getUserCountAll()
|
||||
{
|
||||
return authenticationService.getUsersWithTickets(false).size();
|
||||
}
|
||||
|
||||
// Note: implement operations without boolean/Boolean parameter, due to problem with some JMX consoles (e.g. MC4J
|
||||
// 1.9 Beta)
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#listUserNamesNonExpired()
|
||||
*/
|
||||
public String[] listUserNamesNonExpired()
|
||||
{
|
||||
Set<String> userSet = authenticationService.getUsersWithTickets(true);
|
||||
SortedSet<String> sorted = new TreeSet<String>(userSet);
|
||||
return sorted.toArray(new String[0]);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#listUserNamesAll()
|
||||
*/
|
||||
public String[] listUserNamesAll()
|
||||
{
|
||||
Set<String> userSet = authenticationService.getUsersWithTickets(false);
|
||||
SortedSet<String> sorted = new TreeSet<String>(userSet);
|
||||
return sorted.toArray(new String[0]);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#invalidateTicketsExpired()
|
||||
*/
|
||||
public int invalidateTicketsExpired()
|
||||
{
|
||||
int count = authenticationService.invalidateTickets(true);
|
||||
log.info("Expired tickets invalidated: " + count);
|
||||
return count;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.mbeans.RepoServerMgmtMBean#invalidateTicketsAll()
|
||||
*/
|
||||
public int invalidateTicketsAll()
|
||||
{
|
||||
int count = authenticationService.invalidateTickets(false);
|
||||
log.info("All tickets invalidated: " + count);
|
||||
return count;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#invalidateUser(java.lang.String)
|
||||
*/
|
||||
public void invalidateUser(String username)
|
||||
{
|
||||
authenticationService.invalidateUserSession(username);
|
||||
log.info("User invalidated: " + username);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setSingleUserOnly(java.lang.String)
|
||||
*/
|
||||
public void setSingleUserOnly(String allowedUsername)
|
||||
{
|
||||
|
||||
List<String> allowedUsers = null;
|
||||
if ((allowedUsername != null) && (!allowedUsername.equals("")))
|
||||
{
|
||||
if (!allowedUsername.equals(PROPERTY_KEY_SINGLE_USER_ONLY))
|
||||
{
|
||||
allowedUsers = new ArrayList<String>(0);
|
||||
allowedUsers.add(allowedUsername);
|
||||
|
||||
if (initialised)
|
||||
{
|
||||
int maxUsers = getMaxUsers();
|
||||
invalidateTicketsAll();
|
||||
|
||||
if (maxUsers != 0)
|
||||
{
|
||||
log.warn("Alfresco set to allow single-user (" + allowedUsername + ") logins only");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.warn("Alfresco set to allow single-user (" + allowedUsername + ") logins - although further logins are currently prevented (limit = 0)");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (initialised)
|
||||
{
|
||||
int maxUsers = getMaxUsers();
|
||||
if (maxUsers == -1)
|
||||
{
|
||||
log.info("Alfresco set to allow logins (no limit set)");
|
||||
}
|
||||
else if (maxUsers == 0)
|
||||
{
|
||||
log.warn("Alfresco set to allow logins - although further logins are currently prevented (limit = 0)");
|
||||
}
|
||||
else if (maxUsers != 0)
|
||||
{
|
||||
log.info("Alfresco set to allow logins (limit = " + maxUsers + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
authenticationService.setAllowedUsers(allowedUsers);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#getSingleUserOnly()
|
||||
*/
|
||||
public String getSingleUserOnly()
|
||||
{
|
||||
List<String> allowedUsers = authenticationService.getAllowedUsers();
|
||||
if (allowedUsers != null)
|
||||
{
|
||||
if (allowedUsers.size() > 1)
|
||||
{
|
||||
throw new AlfrescoRuntimeException("Unexpected: more than one user allowed");
|
||||
}
|
||||
if (allowedUsers.size() == 1)
|
||||
{
|
||||
return allowedUsers.get(0);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setMaxUsers(int)
|
||||
*/
|
||||
public void setMaxUsers(int maxUsers)
|
||||
{
|
||||
authenticationService.setMaxUsers(maxUsers);
|
||||
|
||||
if (initialised)
|
||||
{
|
||||
String singleUserOnlyName = getSingleUserOnly();
|
||||
if (maxUsers == -1)
|
||||
{
|
||||
if ((singleUserOnlyName != null) && (!singleUserOnlyName.equals("")))
|
||||
{
|
||||
log.info("Alfresco set to allow logins (no limit set) - although currently restricted to single-user (" + singleUserOnlyName + ")");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Alfresco set to allow logins (no limit set)");
|
||||
}
|
||||
}
|
||||
else if (maxUsers == 0)
|
||||
{
|
||||
log.warn("Alfresco set to prevent further logins (limit = 0)");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((singleUserOnlyName != null) && (!singleUserOnlyName.equals("")))
|
||||
{
|
||||
log.info("Alfresco set to allow logins (limit = " + maxUsers + ") - although currently restricted to single-user (" + singleUserOnlyName + ")");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Alfresco set to allow logins (limit = " + maxUsers + ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#getMaxUsers()
|
||||
*/
|
||||
public int getMaxUsers()
|
||||
{
|
||||
return authenticationService.getMaxUsers();
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#setLinkValidationDisabled(boolean)
|
||||
*/
|
||||
public void setLinkValidationDisabled(boolean disable)
|
||||
{
|
||||
if (linkValidationService == null)
|
||||
{
|
||||
log.error("LinkValidationService not registered");
|
||||
throw new AlfrescoRuntimeException("LinkValidationService not registered");
|
||||
}
|
||||
|
||||
linkValidationService.setLinkValidationDisabled(disable);
|
||||
if (disable)
|
||||
{
|
||||
log.warn("Link validation disabled");
|
||||
}
|
||||
else
|
||||
{
|
||||
log.info("Link validation enabled");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.admin.RepoServerMgmtMBean#isLinkValidationDisabled()
|
||||
*/
|
||||
public boolean isLinkValidationDisabled()
|
||||
{
|
||||
if (linkValidationService == null)
|
||||
{
|
||||
log.error("LinkValidationService not registered");
|
||||
throw new AlfrescoRuntimeException("LinkValidationService not registered");
|
||||
}
|
||||
|
||||
return linkValidationService.isLinkValidationDisabled();
|
||||
}
|
||||
|
||||
public void afterPropertiesSet() throws Exception
|
||||
{
|
||||
initialised = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -814,9 +814,9 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
|
||||
if (transformer == null)
|
||||
{
|
||||
// log it
|
||||
if (s_logger.isDebugEnabled())
|
||||
if (s_logger.isInfoEnabled())
|
||||
{
|
||||
s_logger.debug("Not indexed: No transformation: \n" + " source: " + reader + "\n" + " target: " + MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||||
s_logger.info("Not indexed: No transformation: \n" + " source: " + reader + "\n" + " target: " + MimetypeMap.MIMETYPE_TEXT_PLAIN + " at "+nodeService.getPath(nodeRef));
|
||||
}
|
||||
// don't index from the reader
|
||||
readerReady = false;
|
||||
@ -853,9 +853,9 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
|
||||
catch (ContentIOException e)
|
||||
{
|
||||
// log it
|
||||
if (s_logger.isDebugEnabled())
|
||||
if (s_logger.isInfoEnabled())
|
||||
{
|
||||
s_logger.debug("Not indexed: Transformation failed", e);
|
||||
s_logger.info("Not indexed: Transformation failed at "+nodeService.getPath(nodeRef), e);
|
||||
}
|
||||
// don't index from the reader
|
||||
readerReady = false;
|
||||
@ -899,10 +899,10 @@ public class ADMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<NodeRef> imp
|
||||
// URL not present (null reader) or no content at the URL (file missing)
|
||||
{
|
||||
// log it
|
||||
if (s_logger.isDebugEnabled())
|
||||
if (s_logger.isInfoEnabled())
|
||||
{
|
||||
s_logger.debug("Not indexed: Content Missing \n"
|
||||
+ " node: " + nodeRef + "\n" + " reader: " + reader + "\n" + " content exists: "
|
||||
s_logger.info("Not indexed: Content Missing \n"
|
||||
+ " node: " + nodeRef + " at "+nodeService.getPath(nodeRef)+ "\n" + " reader: " + reader + "\n" + " content exists: "
|
||||
+ (reader == null ? " --- " : Boolean.toString(reader.exists())));
|
||||
}
|
||||
// not indexed: content missing
|
||||
|
||||
@ -0,0 +1,155 @@
|
||||
/*
|
||||
* 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.security.authentication;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.repo.cache.SimpleCache;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
|
||||
/**
|
||||
* Common code for authentication services
|
||||
*
|
||||
* @author andyh
|
||||
*/
|
||||
public abstract class AbstractAuthenticationService implements AuthenticationService, InitializingBean
|
||||
{
|
||||
|
||||
private SimpleCache<String, Object> sysAdminCache;
|
||||
|
||||
private static final String KEY_SYSADMIN_ALLOWED_USERS = "sysAdminCache.authAllowedUsers";
|
||||
|
||||
private static final String KEY_SYSADMIN_MAX_USERS = "sysAdminCache.authMaxUsers";
|
||||
|
||||
private boolean initialised = false;
|
||||
|
||||
private Integer initialMaxUsers = null;
|
||||
|
||||
private List<String> initialAllowedUsers = null;
|
||||
|
||||
public void setSysAdminCache(SimpleCache<String, Object> sysAdminCache)
|
||||
{
|
||||
this.sysAdminCache = sysAdminCache;
|
||||
}
|
||||
|
||||
public void preAuthenticationCheck(String userName) throws AuthenticationException
|
||||
{
|
||||
if (sysAdminCache != null)
|
||||
{
|
||||
List<String> allowedUsers = (List<String>) sysAdminCache.get(KEY_SYSADMIN_ALLOWED_USERS);
|
||||
|
||||
if ((allowedUsers != null) && (!allowedUsers.contains(userName)))
|
||||
{
|
||||
throw new AuthenticationDisallowedException("Username not allowed: " + userName);
|
||||
}
|
||||
|
||||
Integer maxUsers = (Integer) sysAdminCache.get(KEY_SYSADMIN_MAX_USERS);
|
||||
|
||||
if ((maxUsers != null) && (maxUsers != -1) && (getUsersWithTickets(true).size() >= maxUsers))
|
||||
{
|
||||
throw new AuthenticationMaxUsersException("Max users exceeded: " + maxUsers);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void setAllowedUsers(List<String> allowedUsers)
|
||||
{
|
||||
if (initialised)
|
||||
{
|
||||
if (sysAdminCache != null)
|
||||
{
|
||||
sysAdminCache.put(KEY_SYSADMIN_ALLOWED_USERS, allowedUsers);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
initialAllowedUsers = allowedUsers;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<String> getAllowedUsers()
|
||||
{
|
||||
if (sysAdminCache != null)
|
||||
{
|
||||
return (List<String>) sysAdminCache.get(KEY_SYSADMIN_ALLOWED_USERS);
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void setMaxUsers(int maxUsers)
|
||||
{
|
||||
if (initialised)
|
||||
{
|
||||
if (sysAdminCache != null)
|
||||
{
|
||||
sysAdminCache.put(KEY_SYSADMIN_MAX_USERS, new Integer(maxUsers));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
initialMaxUsers = new Integer(maxUsers);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public int getMaxUsers()
|
||||
{
|
||||
if (sysAdminCache != null)
|
||||
{
|
||||
Integer maxUsers = (Integer) sysAdminCache.get(KEY_SYSADMIN_MAX_USERS);
|
||||
return (maxUsers == null ? -1 : maxUsers.intValue());
|
||||
}
|
||||
else
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
public abstract Set<String> getUsersWithTickets(boolean nonExpiredOnly);
|
||||
|
||||
public abstract int invalidateTickets(boolean nonExpiredOnly);
|
||||
|
||||
public abstract int countTickets(boolean nonExpiredOnly);
|
||||
|
||||
public abstract Set<TicketComponent> getTicketComponents();
|
||||
|
||||
final public void afterPropertiesSet() throws Exception
|
||||
{
|
||||
initialised = true;
|
||||
if (sysAdminCache != null)
|
||||
{
|
||||
sysAdminCache.put(KEY_SYSADMIN_MAX_USERS, initialMaxUsers);
|
||||
sysAdminCache.put(KEY_SYSADMIN_ALLOWED_USERS, initialAllowedUsers);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -25,14 +25,11 @@
|
||||
package org.alfresco.repo.security.authentication;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.repo.cache.SimpleCache;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
|
||||
public class AuthenticationServiceImpl implements AuthenticationService
|
||||
public class AuthenticationServiceImpl extends AbstractAuthenticationService
|
||||
{
|
||||
MutableAuthenticationDao authenticationDao;
|
||||
|
||||
@ -48,22 +45,11 @@ public class AuthenticationServiceImpl implements AuthenticationService
|
||||
|
||||
private boolean allowsUserPasswordChange = true;
|
||||
|
||||
// SysAdmin cache - used to cluster certain JMX operations
|
||||
private SimpleCache<String, Object> sysAdminCache;
|
||||
private final static String KEY_SYSADMIN_ALLOWED_USERS = "sysAdminCache.authAllowedUsers"; // List<String>
|
||||
private final static String KEY_SYSADMIN_MAX_USERS = "sysAdminCache.authMaxUsers"; // Integer
|
||||
|
||||
|
||||
public AuthenticationServiceImpl()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
public void setSysAdminCache(SimpleCache<String, Object> sysAdminCache)
|
||||
{
|
||||
this.sysAdminCache = sysAdminCache;
|
||||
}
|
||||
|
||||
public void setAuthenticationDao(MutableAuthenticationDao authenticationDao)
|
||||
{
|
||||
this.authenticationDao = authenticationDao;
|
||||
@ -124,22 +110,7 @@ public class AuthenticationServiceImpl implements AuthenticationService
|
||||
{
|
||||
try
|
||||
{
|
||||
// clear context - to avoid MT concurrency issue (causing domain mismatch) - see also 'validate' below
|
||||
clearCurrentSecurityContext();
|
||||
List<String> allowedUsers = (List<String>)sysAdminCache.get(KEY_SYSADMIN_ALLOWED_USERS);
|
||||
|
||||
if ((allowedUsers != null) && (! allowedUsers.contains(userName)))
|
||||
{
|
||||
throw new AuthenticationDisallowedException("Username not allowed: " + userName);
|
||||
}
|
||||
|
||||
Integer maxUsers = (Integer)sysAdminCache.get(KEY_SYSADMIN_MAX_USERS);
|
||||
|
||||
if ((maxUsers != null) && (maxUsers != -1) && (ticketComponent.getUsersWithTickets(true).size() >= maxUsers))
|
||||
{
|
||||
throw new AuthenticationMaxUsersException("Max users exceeded: " + maxUsers);
|
||||
}
|
||||
|
||||
preAuthenticationCheck(userName);
|
||||
authenticationComponent.authenticate(userName, password);
|
||||
}
|
||||
catch(AuthenticationException ae)
|
||||
@ -171,29 +142,6 @@ public class AuthenticationServiceImpl implements AuthenticationService
|
||||
{
|
||||
return ticketComponent.getUsersWithTickets(nonExpiredOnly);
|
||||
}
|
||||
|
||||
public void setAllowedUsers(List<String> allowedUsers)
|
||||
{
|
||||
sysAdminCache.put(KEY_SYSADMIN_ALLOWED_USERS, allowedUsers);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<String> getAllowedUsers()
|
||||
{
|
||||
return (List<String>)sysAdminCache.get(KEY_SYSADMIN_ALLOWED_USERS);
|
||||
}
|
||||
|
||||
public void setMaxUsers(int maxUsers)
|
||||
{
|
||||
sysAdminCache.put(KEY_SYSADMIN_MAX_USERS, new Integer(maxUsers));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public int getMaxUsers()
|
||||
{
|
||||
Integer maxUsers = (Integer)sysAdminCache.get(KEY_SYSADMIN_MAX_USERS);
|
||||
return (maxUsers == null ? -1 : maxUsers.intValue());
|
||||
}
|
||||
|
||||
public void invalidateTicket(String ticket) throws AuthenticationException
|
||||
{
|
||||
@ -250,15 +198,10 @@ public class AuthenticationServiceImpl implements AuthenticationService
|
||||
@SuppressWarnings("unchecked")
|
||||
public void authenticateAsGuest() throws AuthenticationException
|
||||
{
|
||||
List<String> allowedUsers = (List<String>)sysAdminCache.get(KEY_SYSADMIN_ALLOWED_USERS);
|
||||
|
||||
if ((allowedUsers != null) && (! allowedUsers.contains(PermissionService.GUEST_AUTHORITY)))
|
||||
{
|
||||
throw new AuthenticationException("Guest authentication is not allowed");
|
||||
}
|
||||
|
||||
preAuthenticationCheck(PermissionService.GUEST_AUTHORITY);
|
||||
authenticationComponent.setGuestUserAsCurrentUser();
|
||||
ticketComponent.clearCurrentTicket();
|
||||
ticketComponent.getCurrentTicket(PermissionService.GUEST_AUTHORITY); // to ensure new ticket is created (even if client does not explicitly call getCurrentTicket)
|
||||
}
|
||||
|
||||
public boolean guestUserAuthenticationAllowed()
|
||||
@ -347,7 +290,9 @@ public class AuthenticationServiceImpl implements AuthenticationService
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Set<TicketComponent> getTicketComponents()
|
||||
{
|
||||
return Collections.singleton(ticketComponent);
|
||||
}
|
||||
}
|
||||
|
||||
@ -30,6 +30,7 @@ import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
|
||||
/**
|
||||
* This class implements a simple chaining authentication service.
|
||||
@ -51,7 +52,7 @@ import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
*
|
||||
* @author Andy Hind
|
||||
*/
|
||||
public class ChainingAuthenticationServiceImpl implements AuthenticationService
|
||||
public class ChainingAuthenticationServiceImpl extends AbstractAuthenticationService
|
||||
{
|
||||
|
||||
private List<AuthenticationService> authenticationServices;
|
||||
@ -157,6 +158,7 @@ public class ChainingAuthenticationServiceImpl implements AuthenticationService
|
||||
|
||||
public void authenticate(String userName, char[] password) throws AuthenticationException
|
||||
{
|
||||
preAuthenticationCheck(userName);
|
||||
for (AuthenticationService authService : getUsableAuthenticationServices())
|
||||
{
|
||||
try
|
||||
@ -175,6 +177,7 @@ public class ChainingAuthenticationServiceImpl implements AuthenticationService
|
||||
|
||||
public void authenticateAsGuest() throws AuthenticationException
|
||||
{
|
||||
preAuthenticationCheck(PermissionService.GUEST_AUTHORITY);
|
||||
for (AuthenticationService authService : getUsableAuthenticationServices())
|
||||
{
|
||||
try
|
||||
@ -411,4 +414,57 @@ public class ChainingAuthenticationServiceImpl implements AuthenticationService
|
||||
return domains;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getUsersWithTickets(boolean nonExpiredOnly)
|
||||
{
|
||||
HashSet<String> users = new HashSet<String>();
|
||||
for (AuthenticationService authService : getUsableAuthenticationServices())
|
||||
{
|
||||
if(authService instanceof AbstractAuthenticationService)
|
||||
{
|
||||
users.addAll( ((AbstractAuthenticationService)authService).getUsersWithTickets(nonExpiredOnly));
|
||||
}
|
||||
}
|
||||
return users;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int countTickets(boolean nonExpiredOnly)
|
||||
{
|
||||
int count = 0;
|
||||
for(TicketComponent tc : getTicketComponents())
|
||||
{
|
||||
count += tc.countTickets(nonExpiredOnly);
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int invalidateTickets(boolean nonExpiredOnly)
|
||||
{
|
||||
int count = 0;
|
||||
for (AuthenticationService authService : getUsableAuthenticationServices())
|
||||
{
|
||||
if(authService instanceof AbstractAuthenticationService)
|
||||
{
|
||||
count += ((AbstractAuthenticationService)authService).invalidateTickets(nonExpiredOnly);
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<TicketComponent> getTicketComponents()
|
||||
{
|
||||
Set<TicketComponent> tcs = new HashSet<TicketComponent>();
|
||||
for (AuthenticationService authService : getUsableAuthenticationServices())
|
||||
{
|
||||
if(authService instanceof AbstractAuthenticationService)
|
||||
{
|
||||
tcs.addAll(((AbstractAuthenticationService)authService).getTicketComponents());
|
||||
}
|
||||
}
|
||||
return tcs;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -34,6 +34,7 @@ import java.util.zip.CRC32;
|
||||
|
||||
import org.alfresco.repo.cache.SimpleCache;
|
||||
import org.alfresco.service.cmr.repository.datatype.Duration;
|
||||
import org.alfresco.util.GUID;
|
||||
import org.apache.commons.codec.binary.Hex;
|
||||
import org.safehaus.uuid.UUIDGenerator;
|
||||
|
||||
@ -56,6 +57,8 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
||||
private Duration validDuration;
|
||||
|
||||
private boolean oneOff;
|
||||
|
||||
private String guid;
|
||||
|
||||
private SimpleCache<String, Ticket> ticketsCache; // Can't use Ticket as it's private
|
||||
|
||||
@ -66,6 +69,7 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
||||
public InMemoryTicketComponentImpl()
|
||||
{
|
||||
super();
|
||||
guid = GUID.generate();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -234,6 +238,37 @@ public class InMemoryTicketComponentImpl implements TicketComponent
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
final int PRIME = 31;
|
||||
int result = 1;
|
||||
result = PRIME * result + ((guid == null) ? 0 : guid.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj)
|
||||
{
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
final InMemoryTicketComponentImpl other = (InMemoryTicketComponentImpl) obj;
|
||||
if (guid == null)
|
||||
{
|
||||
if (other.guid != null)
|
||||
return false;
|
||||
}
|
||||
else if (!guid.equals(other.guid))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Ticket
|
||||
* @author andyh
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user