Update logged in user.

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

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 c3cea65d4a4882682932946bf18e35ccc6fb083e..bd117530d814198547a7cabce1219ca861e708a8 100644 (file)
--- 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
@@ -8,7 +8,6 @@
        <bean
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
                <property name="locations">
                        <value>osgibundle:ldap.properties
                        </value>
@@ -18,6 +17,13 @@
        <bean id="_authenticationManager" class="org.springframework.security.providers.ProviderManager">
                <property name="providers">
                        <list>
+                               <bean class="org.springframework.security.adapters.AuthByAdapterProvider">
+                                       <property name="key" value="${argeo.security.systemKey}" />
+                               </bean>
+                               <bean
+                                       class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
+                                       <property name="key" value="${argeo.security.systemKey}" />
+                               </bean>
                                <ref bean="authenticationProvider" />
                        </list>
                </property>
@@ -26,7 +32,7 @@
        <bean id="contextSource"
                class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
                <constructor-arg
-                       value="ldap://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
+                       value="${argeo.ldap.protocol}://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
                <property name="userDn" value="${argeo.ldap.manager.userdn}" />
                <property name="password" value="${argeo.ldap.manager.password}" />
        </bean>
@@ -47,12 +53,16 @@
                <property name="userNatureMappers" ref="userNatureMappers" />
        </bean>
 
+       <bean id="userDetailsService" factory-bean="securityDao"
+               factory-method="getUserDetailsService">
+       </bean>
+
        <bean id="ldapAuthenticator"
                class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
                <constructor-arg ref="contextSource" />
                <property name="userDnPatterns">
                        <list>
-                               <value>uid={0},ou=users</value>
+                               <value>uid={0},ou=People</value>
                        </list>
                </property>
                <property name="passwordEncoder">
@@ -60,25 +70,4 @@
                                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" ref="userNatureMappers" /> </bean>
-       -->
 </beans>