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=757231ada3408c39ef3d88527c61b1279ba462b8;hp=525b84db0fa504b25c24fda6e2008b493a190ce5;hpb=0c7d4e488bf4e357ca33329c87a29baae63a5be9;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 525b84db0..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,11 @@
 	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="authByAdapterProvider" />
-<!-- 				<ref bean="preAuthAuthenticationProvider" /> -->
+				<ref bean="preAuthProvider" />
 				<ref bean="anonymousAuthenticationProvider" />
 				<ref bean="rememberMeAuthenticationProvider" />
 				<ref bean="ldapAuthenticationProvider" />
@@ -28,10 +23,16 @@
 		<property name="key" value="${argeo.security.systemKey}" />
 	</bean>
 
-<!-- 	<bean id="preAuthAuthenticationProvider" -->
-<!-- 		class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider"> -->
-<!-- 		<description><![CDATA[Pre-authentication]]></description> -->
-<!-- 	</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">