X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.manager.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=ddfa022f7cbc2d35aa8bf1cdd1029eccecc2cb5b;hb=b00a7e9898ea2819100290cab22bf614e23a3abf;hp=49a2c93d1b5d2527a81d131f613ba2496193a88b;hpb=23daa3a3818f0a18703a3b0ca95c7908326f95cb;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 49a2c93d1..ddfa022f7 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
@@ -13,17 +13,6 @@
 		</property>
 	</bean>
 
-	<!--
-		<security:ldap-server
-		url="ldap://localhost:10389/dc=demo,dc=argeo,dc=org"
-		manager-dn="uid=admin,ou=system" manager-password="secret" />
-
-		<security:ldap-authentication-provider
-		user-details-class="inetOrgPerson" user-dn-pattern="uid={0},ou=users"
-		group-search-base="ou=groups"> <security:password-compare hash="{sha}"
-		/> </security:ldap-authentication-provider>
-	-->
-
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg value="ldap://localhost:10389/dc=demo,dc=argeo,dc=org" />
@@ -48,15 +37,32 @@
 				</property>
 			</bean>
 		</constructor-arg>
-		<constructor-arg>
+		<constructor-arg ref="authoritiesPopulator" />
+		<property name="userDetailsContextMapper" ref="userDetailsMapper" />
+	</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.populator.DefaultLdapAuthoritiesPopulator">
-				<constructor-arg ref="contextSource" />
-				<constructor-arg value="ou=groups" />
-				<!-- <property name="defaultRole" value="ROLE_USER" /> -->
-				<property name="groupSearchFilter" value="uniqueMember={0}" />
+				class="org.springframework.security.ldap.DefaultLdapUsernameToDnMapper">
+				<constructor-arg value="ou=users" />
+				<constructor-arg value="uid" />
 			</bean>
-		</constructor-arg>
+		</property>
 	</bean>
 
+	<bean id="userDetailsMapper" class="org.argeo.security.ldap.ArgeoUserDetailsContextMapper">
+		<property name="userNatureMappers" ref="userNatureMappers" />
+	</bean>
 </beans>