Moves Spring Security / Jackrabbit synchronization in JcrSecurityModel

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.dao.ldap / META-INF / spring / security-ldap-services.xml

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
index e0851123dfa0dc465b04a93e27b1ce246797d164..36dedf3891587823d384000e6f777dea902e1b01 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-services.xml
@@ -4,16 +4,13 @@
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <bean id="systemExecutionService" class="org.argeo.security.core.KeyBasedSystemExecutionService">
-               <property name="authenticationManager" ref="authenticationManager" />
-               <property name="systemAuthenticationKey" value="${argeo.security.systemKey}" />
-       </bean>
-
        <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
                <property name="providers">
                        <list>
-                               <ref bean="anonymousAuthenticationProvider" />
                                <ref bean="authByAdapterProvider" />
+                               <ref bean="preAuthProvider" />
+                               <ref bean="anonymousAuthenticationProvider" />
+                               <ref bean="rememberMeAuthenticationProvider" />
                                <ref bean="ldapAuthenticationProvider" />
                        </list>
                </property>
@@ -26,12 +23,29 @@
                <property name="key" value="${argeo.security.systemKey}" />
        </bean>
 
+       <bean id="preAuthProvider"
+               class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider">
+               <description><![CDATA[Pre-authentication]]></description>
+               <property name="preAuthenticatedUserDetailsService">
+                       <bean id="userDetailsServiceWrapper"
+                               class="org.springframework.security.userdetails.UserDetailsByNameServiceWrapper">
+                               <property name="userDetailsService" ref="userDetailsManager" />
+                       </bean>
+               </property>
+       </bean>
+
        <bean id="anonymousAuthenticationProvider"
                class="org.springframework.security.providers.anonymous.AnonymousAuthenticationProvider">
                <description><![CDATA[Anonymous authentication]]></description>
                <property name="key" value="${argeo.security.systemKey}" />
        </bean>
 
+       <bean id="rememberMeAuthenticationProvider"
+               class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
+               <description><![CDATA[Remember me authentication]]></description>
+               <property name="key" value="${argeo.security.systemKey}" />
+       </bean>
+
        <!-- Internal authentication, used by during the general authentication 
                initialization himself, in order to prevent the following dependency cycle: 
                Repository.login() <= AuthenticationManager <= LdapAuthenticationProvider