X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=1f2117d1ae02328426bc5b31c0599b91cee5d25f;hb=bf936223ebdebe9e79cf8c58a06ef7ff44deb15c;hp=2f65ebe826b84d20aa2ab2f241885ea295bef4ea;hpb=95d53b1b0018e86014d8659bdba9903e6f63526a;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
index 2f65ebe82..1f2117d1a 100644
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
               http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
-
+	<!-- COMMON -->
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
@@ -13,8 +13,9 @@
 		</property>
 	</bean>
 
-	<bean id="passwordEncoder"
-		class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
+	<bean id="passwordEncoder" class="org.argeo.security.ldap.ArgeoLdapShaPasswordEncoder">
+		<property name="useSalt" value="${argeo.ldap.password.useSalt}" />
+	</bean>
 
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
@@ -24,38 +25,79 @@
 		<property name="password" value="${argeo.ldap.manager.password}" />
 	</bean>
 
-	<bean id="authenticationProvider"
+	<!-- AUTHENTICATION -->
+	<bean id="ldapAuthenticationProvider"
 		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
 		<constructor-arg ref="ldapAuthenticator" />
-		<constructor-arg>
-			<bean factory-bean="securityDao" factory-method="getAuthoritiesPopulator" />
-		</constructor-arg>
-		<property name="userDetailsContextMapper">
-			<bean factory-bean="securityDao" factory-method="getUserDetailsMapper" />
-		</property>
-	</bean>
-
-	<bean id="securityDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
-		<constructor-arg ref="contextSource" />
-		<property name="userNatureMappers" ref="userNatureMappers" />
-		<property name="passwordEncoder" ref="passwordEncoder" />
+		<constructor-arg ref="authoritiesPopulator" />
+		<property name="userDetailsContextMapper" ref="jcrUserDetailsContextMapper" />
 	</bean>
 
-	<bean id="userDetailsService" factory-bean="securityDao"
-		factory-method="getUserDetailsService">
-	</bean>
+<!-- 	<bean id="ldapAuthenticator" -->
+<!-- 		class="org.springframework.security.providers.ldap.authenticator.BindAuthenticator"> -->
+<!-- 		<constructor-arg ref="contextSource" /> -->
+<!-- 		<property name="userDnPatterns"> -->
+<!-- 			<list> -->
+<!-- 				<value><![CDATA[${argeo.ldap.usernameAttribute}={0},${argeo.ldap.userBase}]]></value> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 	</bean> -->
 
+	<!-- PasswordComparisonAuthenticator doesn't work with SSHA -->
 	<bean id="ldapAuthenticator"
 		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
 		<constructor-arg ref="contextSource" />
 		<property name="userDnPatterns">
 			<list>
-				<value>uid={0},ou=People</value>
+				<value><![CDATA[${argeo.ldap.usernameAttribute}={0},${argeo.ldap.userBase}]]></value>
 			</list>
 		</property>
-		<property name="passwordEncoder">
-			<bean
-				class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
+		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
+		<property name="passwordEncoder" ref="passwordEncoder" />
+	</bean>
+
+	<!-- USER DETAILS -->
+	<bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
+		<constructor-arg ref="contextSource" />
+		<property name="userBase" value="${argeo.ldap.userBase}" />
+		<property name="usernameAttribute" value="${argeo.ldap.usernameAttribute}" />
+		<property name="groupClasses">
+			<list>
+				<value>top</value>
+				<value>${argeo.ldap.groupClass}</value>
+			</list>
 		</property>
+		<property name="groupBase" value="${argeo.ldap.groupBase}" />
+		<property name="groupRoleAttribute" value="${argeo.ldap.groupRoleAttribute}" />
+		<property name="groupMemberAttribute" value="${argeo.ldap.groupMemberAttribute}" />
+		<property name="defaultRole" value="${argeo.security.defaultRole}" />
+		<property name="rolePrefix" value="${argeo.security.rolePrefix}" />
+		<property name="usernameMapper" ref="usernameMapper" />
+	</bean>
+
+	<bean id="usernameMapper"
+		class="org.springframework.security.ldap.DefaultLdapUsernameToDnMapper">
+		<constructor-arg value="${argeo.ldap.userBase}" />
+		<constructor-arg value="${argeo.ldap.usernameAttribute}" />
+	</bean>
+
+	<bean id="authoritiesPopulator"
+		class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
+		<constructor-arg ref="contextSource" />
+		<constructor-arg value="${argeo.ldap.groupBase}" />
+		<property name="groupSearchFilter" value="${argeo.ldap.groupMemberAttribute}={0}" />
+		<property name="defaultRole" value="${argeo.security.defaultRole}" />
+		<property name="rolePrefix" value="${argeo.security.rolePrefix}" />
+	</bean>
+
+	<bean id="userDetailsManager" class="org.argeo.security.ldap.ArgeoLdapUserDetailsManager">
+		<constructor-arg ref="contextSource" />
+		<property name="groupSearchBase" value="${argeo.ldap.groupBase}" />
+		<property name="groupMemberAttributeName" value="${argeo.ldap.groupMemberAttribute}" />
+		<property name="usernameMapper" ref="usernameMapper" />
+		<property name="userDetailsMapper" ref="jcrUserDetailsContextMapper" />
+		<property name="userAdminDao" ref="userAdminDao" />
+		<property name="passwordEncoder" ref="passwordEncoder" />
+		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
 	</bean>
 </beans>