From 22e9128f35d3e9e1c9627a6b594f942e84104bd2 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 14 Mar 2014 15:42:10 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    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@64260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../auth/cifs/CifsAuthenticatorBase.java      |  2 +-
 .../auth/cifs/PassthruCifsAuthenticator.java  |  5 +++
 .../org/alfresco/Repository01TestSuite.java   |  3 ++
 .../auth/cifs/test-kerberos-context.xml       | 31 +++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 source/test-resources/alfresco/filesys/auth/cifs/test-kerberos-context.xml

diff --git a/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java b/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java
index af79d71798..8efb1880ab 100644
--- a/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java
+++ b/source/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorBase.java
@@ -399,7 +399,7 @@ public abstract class CifsAuthenticatorBase extends CifsAuthenticator implements
                         if (personName == null)
                         {
                             // Force creation of a person if possible
-                            getPersonService().getPerson(userName);
+                            authenticationComponent.setCurrentUser(userName);
                             personName = getPersonService().getUserIdentifier(userName);
                         }
                         
diff --git a/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java b/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java
index 21dfe4eca8..8dc738447f 100644
--- a/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java
+++ b/source/java/org/alfresco/filesys/auth/cifs/PassthruCifsAuthenticator.java
@@ -122,6 +122,11 @@ public class PassthruCifsAuthenticator extends CifsAuthenticatorBase implements
         m_sessions = new Hashtable<String, PassthruDetails>();
     }        
 
+    public Hashtable<String, PassthruDetails> getSessions()
+    {
+        return m_sessions;
+    }
+
     public void setPassthruServers(PassthruServers servers)
     {
         m_passthruServers = servers;
diff --git a/source/test-java/org/alfresco/Repository01TestSuite.java b/source/test-java/org/alfresco/Repository01TestSuite.java
index 5168f59f6d..2ddc7701fe 100644
--- a/source/test-java/org/alfresco/Repository01TestSuite.java
+++ b/source/test-java/org/alfresco/Repository01TestSuite.java
@@ -436,7 +436,10 @@ 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.TemporaryNodesTest.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.CronTriggerBeanSystemTest.class));
     }
+    
 }
diff --git a/source/test-resources/alfresco/filesys/auth/cifs/test-kerberos-context.xml b/source/test-resources/alfresco/filesys/auth/cifs/test-kerberos-context.xml
new file mode 100644
index 0000000000..2db5c952f4
--- /dev/null
+++ b/source/test-resources/alfresco/filesys/auth/cifs/test-kerberos-context.xml
@@ -0,0 +1,31 @@
+<?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>
\ No newline at end of file