X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fsecurity-ldap-services.xml;h=36dedf3891587823d384000e6f777dea902e1b01;hb=69f324f4c2e115192c08f9939d8ecb74e181a34b;hp=e0851123dfa0dc465b04a93e27b1ce246797d164;hpb=484dcb1507e4e35cc282e50522ea7eac7e99a7f9;p=lgpl%2Fargeo-commons.git

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 e0851123d..36dedf389 100644
--- 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