Fix various issues with security

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.dao.ldap / META-INF / spring / ldap.xml

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 72de115ca04cda85b2b41381d5277b807721748c..77a6ac7d5b48d9281420f38a67c5b9d8c562abd2 100644 (file)
--- 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
@@ -80,27 +80,13 @@
                <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="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>