X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=1f2117d1ae02328426bc5b31c0599b91cee5d25f;hb=54f55679464258a1943e7398ff9c454b86e266e9;hp=7a2ae9d7f4d7908515bcd37f121c12786b3761f4;hpb=b614eb03ce70d86fd6d02fc443ce11e7125e467d;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 7a2ae9d7f..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
@@ -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">
@@ -25,14 +26,25 @@
 	</bean>
 
 	<!-- AUTHENTICATION -->
-	<bean id="authenticationProvider"
+	<bean id="ldapAuthenticationProvider"
 		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
-		<constructor-arg ref="passwordComparisonAuthenticator" />
+		<constructor-arg ref="ldapAuthenticator" />
 		<constructor-arg ref="authoritiesPopulator" />
 		<property name="userDetailsContextMapper" ref="jcrUserDetailsContextMapper" />
 	</bean>
 
-	<bean id="passwordComparisonAuthenticator"
+<!-- 	<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">
@@ -40,13 +52,13 @@
 				<value><![CDATA[${argeo.ldap.usernameAttribute}={0},${argeo.ldap.userBase}]]></value>
 			</list>
 		</property>
+		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
 		<property name="passwordEncoder" ref="passwordEncoder" />
 	</bean>
 
 	<!-- USER DETAILS -->
-	<bean id="securityDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
+	<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">
@@ -60,10 +72,7 @@
 		<property name="groupMemberAttribute" value="${argeo.ldap.groupMemberAttribute}" />
 		<property name="defaultRole" value="${argeo.security.defaultRole}" />
 		<property name="rolePrefix" value="${argeo.security.rolePrefix}" />
-
-		<property name="passwordEncoder" ref="passwordEncoder" />
 		<property name="usernameMapper" ref="usernameMapper" />
-		<property name="userDetailsManager" ref="userDetailsManager" />
 	</bean>
 
 	<bean id="usernameMapper"
@@ -81,27 +90,14 @@
 		<property name="rolePrefix" value="${argeo.security.rolePrefix}" />
 	</bean>
 
-	<bean id="userDetailsManager"
-		class="org.springframework.security.userdetails.ldap.LdapUserDetailsManager">
+	<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>
-
-	<!-- <bean id="userDetailsService" -->
-	<!-- class="org.springframework.security.userdetails.ldap.LdapUserDetailsManager"> -->
-	<!-- <constructor-arg> -->
-	<!-- <bean -->
-	<!-- class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch"> -->
-	<!-- <constructor-arg value="${argeo.ldap.userBase}" /> -->
-	<!-- <constructor-arg value="(${argeo.ldap.usernameAttribute}={0})" /> -->
-	<!-- <constructor-arg ref="contextSource" /> -->
-	<!-- </bean> -->
-	<!-- </constructor-arg> -->
-	<!-- <constructor-arg ref="authoritiesPopulator" /> -->
-	<!-- <property name="userDetailsMapper" ref="jcrUserDetailsContextMapper" 
-		/> -->
-	<!-- </bean> -->
 </beans>