X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.manager.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=534bfe5df342ad9088f9b9db13438c85066f70f0;hb=ff1367187d728854f39a55e360f8908d4ab04159;hp=2867ad2c23ea08a1f240d3886b0e92d7f98e1be8;hpb=727a852dcd2a6e80b11ae71ca37f50d202baae5c;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 2867ad2c2..534bfe5df 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" />
@@ -33,52 +22,53 @@
 
 	<bean id="authenticationProvider"
 		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
+		<constructor-arg ref="ldapAuthenticator" />
 		<constructor-arg>
-			<bean
-				class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
-				<constructor-arg ref="contextSource" />
-				<property name="userDnPatterns">
-					<list>
-						<value>uid={0},ou=users</value>
-					</list>
-				</property>
-				<property name="passwordEncoder">
-					<bean
-						class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder"></bean>
-				</property>
-			</bean>
+			<bean factory-bean="securityDao" factory-method="getAuthoritiesPopulator" />
 		</constructor-arg>
-		<constructor-arg ref="authoritiesPopulator" />
-		<property name="userDetailsContextMapper" ref="userDetailsMapper" />
+		<property name="userDetailsContextMapper">
+			<bean factory-bean="securityDao" factory-method="getUserDetailsMapper" />
+		</property>
 	</bean>
 
-	<bean id="authoritiesPopulator" class="org.argeo.security.ldap.ArgeoLdapAuthoritiesPopulator">
+	<bean id="securityDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
 		<constructor-arg ref="contextSource" />
-		<constructor-arg value="ou=groups" />
-		<!-- <property name="defaultRole" value="ROLE_USER" /> -->
-		<property name="groupSearchFilter" value="uniqueMember={0}" />
+		<property name="userNatureMappers" ref="userNatureMappers" />
 	</bean>
 
-	<bean id="userDetailsManager"
-		class="org.springframework.security.userdetails.ldap.LdapUserDetailsManager">
+	<bean id="ldapAuthenticator"
+		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
 		<constructor-arg ref="contextSource" />
-		<property name="userDetailsMapper" ref="userDetailsMapper" />
-		<property name="groupSearchBase" value="ou=groups" />
-		<property name="usernameMapper">
+		<property name="userDnPatterns">
+			<list>
+				<value>uid={0},ou=users</value>
+			</list>
+		</property>
+		<property name="passwordEncoder">
 			<bean
-				class="org.springframework.security.ldap.DefaultLdapUsernameToDnMapper">
-				<constructor-arg value="ou=users" />
-				<constructor-arg value="uid" />
-			</bean>
+				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">
-			<list>
-				<bean class="org.argeo.security.ldap.SimpleUserNatureMapper" />
-				<bean class="org.argeo.security.ldap.CoworkerUserNatureMapper" />
-			</list>
-		</property>
+		<property name="userNatureMappers" ref="userNatureMappers" />
 	</bean>
+	-->
 </beans>