From a0a64c143f6f333b1aab4ac24a49fe4020fedc46 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 16 May 2014 16:29:37 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68527:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       68302: Merged
 V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)          68117: MNT-11315:
 Merged V4.1.6 (4.1.6.17) to V4.1-BUG-FIX (4.1.9)             64849: Merged
 DEV to PATCHES/V4.1.6 (4.1.6.11)                63976 : MNT-10797 : Support
 HTTP Basic auth for /alfresco/cmisatom CMIS binding when using kerberos      
             - Added fallback authentication mechanism for webdav
 authentication filter for kerberos. So it should be possible to login via
 BASIC authentication when kerbeross SSO enabled.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../kerberos/kerberos-filter-context.xml       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/config/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml b/config/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
index 5820d92ddc..bdbbb31b13 100644
--- a/config/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
+++ b/config/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
@@ -8,6 +8,21 @@
       </property>
    </bean>
 
+   <bean id="kerberos_SSOFallbackBasicAuthenticationDriver" class="org.alfresco.repo.webdav.auth.SSOFallbackBasicAuthenticationDriver">
+      <property name="authenticationService">
+         <ref bean="AuthenticationService" />
+      </property>
+      <property name="personService">
+         <ref bean="personService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="nodeService"/>
+      </property>
+      <property name="transactionService">
+         <ref bean="transactionService" />
+      </property>
+   </bean>
+
    <bean id="globalAuthenticationFilter" class="org.alfresco.web.app.servlet.KerberosAuthenticationFilter">
       <property name="active">
          <value>${kerberos.authentication.sso.enabled}</value>
@@ -123,6 +138,9 @@
       <property name="remoteUserMapper">
          <ref bean="RemoteUserMapper" />
       </property>
+      <property name="fallback">
+         <ref bean="kerberos_SSOFallbackBasicAuthenticationDriver"/>
+      </property>
    </bean>
    
    <bean id="sharepointAuthenticationHandler" class="org.alfresco.web.sharepoint.auth.kerberos.KerberosAuthenticationHandler">