inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
63085: Reverse merged
      63077: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
         62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
               Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
               and PassthruCifsAuthenticator.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64264 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-14 15:45:59 +00:00
parent 50b4c69df3
commit 6a048b6b85
4 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java
View File

@@ -399,7 +399,7 @@ public abstract class CifsAuthenticatorBase extends CifsAuthenticator implements
if (personName == null) if (personName == null)
{ {
// Force creation of a person if possible // Force creation of a person if possible
authenticationComponent.setCurrentUser(userName); getPersonService().getPerson(userName);
personName = getPersonService().getUserIdentifier(userName); personName = getPersonService().getUserIdentifier(userName);
} }

5
source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java
View File

@@ -122,11 +122,6 @@ public class PassthruCifsAuthenticator extends CifsAuthenticatorBase implements
m_sessions = new Hashtable<String, PassthruDetails>(); m_sessions = new Hashtable<String, PassthruDetails>();
} }
public Hashtable<String, PassthruDetails> getSessions()
{
return m_sessions;
}
public void setPassthruServers(PassthruServers servers) public void setPassthruServers(PassthruServers servers)
{ {
m_passthruServers = servers; m_passthruServers = servers;

3
source/test-java/org/alfresco/Repository01TestSuite.java
View File

@@ -436,10 +436,7 @@ public class Repository01TestSuite extends TestSuite
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.ApplicationContextInitTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.ApplicationContextInitTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporaryNodesTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporaryNodesTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporarySitesTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.TemporarySitesTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorKerberosTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorPassthruTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanSystemTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanSystemTest.class));
} }
} }

31
source/test-resources/alfresco/filesys/auth/cifs/test-kerberos-context.xml
View File

@@ -1,31 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Overriding test properties to point to custom properties -->
<bean id="cifs-test-properties"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="properties">
<props>
<prop key="kerberos.authentication.realm">ALFRESCO.ORG</prop>
<prop key="kerberos.authentication.user.configEntryName">Alfresco</prop>
<prop key="kerberos.authentication.defaultAdministratorUserNames"></prop>
<prop key="kerberos.authentication.cifs.configEntryName">AlfrescoCIFS</prop>
<prop key="kerberos.authentication.cifs.password">secret</prop>
<prop key="kerberos.authentication.cifs.enableTicketCracking">false</prop>
<prop key="kerberos.authentication.stripUsernameSuffix">true</prop>
<!-- initialization not necessary for test -->
<prop key="kerberos.authentication.authenticateCIFS">false</prop>
</props>
</property>
<property name="searchSystemEnvironment">
<value>false</value>
</property>
</bean>
<import resource="classpath:alfresco/subsystems/Authentication/kerberos/kerberos-authentication-context.xml" />
</beans>