X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.manager.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=bd117530d814198547a7cabce1219ca861e708a8;hb=5bfc0d2e2e34f86b454a1ec209617a9fc0f306b1;hp=c3cea65d4a4882682932946bf18e35ccc6fb083e;hpb=c6c3aa132f6559ac1e2fa015cf2efba92802eba0;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
index c3cea65d4..bd117530d 100644
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
@@ -8,7 +8,6 @@
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
 		<property name="locations">
 			<value>osgibundle:ldap.properties
 			</value>
@@ -18,6 +17,13 @@
 	<bean id="_authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 			<list>
+				<bean class="org.springframework.security.adapters.AuthByAdapterProvider">
+					<property name="key" value="${argeo.security.systemKey}" />
+				</bean>
+				<bean
+					class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
+					<property name="key" value="${argeo.security.systemKey}" />
+				</bean>
 				<ref bean="authenticationProvider" />
 			</list>
 		</property>
@@ -26,7 +32,7 @@
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg
-			value="ldap://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
+			value="${argeo.ldap.protocol}://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
 		<property name="userDn" value="${argeo.ldap.manager.userdn}" />
 		<property name="password" value="${argeo.ldap.manager.password}" />
 	</bean>
@@ -47,12 +53,16 @@
 		<property name="userNatureMappers" ref="userNatureMappers" />
 	</bean>
 
+	<bean id="userDetailsService" factory-bean="securityDao"
+		factory-method="getUserDetailsService">
+	</bean>
+
 	<bean id="ldapAuthenticator"
 		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
 		<constructor-arg ref="contextSource" />
 		<property name="userDnPatterns">
 			<list>
-				<value>uid={0},ou=users</value>
+				<value>uid={0},ou=People</value>
 			</list>
 		</property>
 		<property name="passwordEncoder">
@@ -60,25 +70,4 @@
 				class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
 		</property>
 	</bean>
-
-
-	<!--
-		<bean id="authoritiesPopulator"
-		class="org.argeo.security.ldap.ArgeoLdapAuthoritiesPopulator">
-		<constructor-arg ref="contextSource" /> <constructor-arg
-		value="ou=groups" /> <property name="defaultRole" value="ROLE_USER" />
-		<property name="groupSearchFilter" value="uniqueMember={0}" /> </bean>
-
-		<bean id="userDetailsManager"
-		class="org.springframework.security.userdetails.ldap.LdapUserDetailsManager">
-		<constructor-arg ref="contextSource" /> <property
-		name="userDetailsMapper" ref="userDetailsMapper" /> <property
-		name="groupSearchBase" value="ou=groups" /> <property
-		name="usernameMapper"> <bean
-		class="org.springframework.security.ldap.DefaultLdapUsernameToDnMapper">
-		<constructor-arg value="ou=users" /> <constructor-arg value="uid" />
-		</bean> </property> </bean> <bean id="userDetailsMapper"
-		class="org.argeo.security.ldap.ArgeoUserDetailsContextMapper">
-		<property name="userNatureMappers" ref="userNatureMappers" /> </bean>
-	-->
 </beans>