X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fmodules%2Forg.argeo.security.auth.ldap%2FMETA-INF%2Fspring%2Fsecurity-ldap.xml;h=f367aba1d399ec262f30e5aa48e1a34085d8acba;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=3777f8853d5e6ab1437d92f668b477697ca3cd0c;hpb=469d8a3bd7a681cdb7e23ccb01cc299e0b8b681f;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml b/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml
index 3777f8853..f367aba1d 100644
--- a/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml
+++ b/security/modules/org.argeo.security.auth.ldap/META-INF/spring/security-ldap.xml
@@ -22,59 +22,59 @@
 	</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><![CDATA[${argeo.ldap.usernameAttribute}={0},${argeo.ldap.userBase}]]></value> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" /> -->
+<!-- 		<property name="passwordEncoder" ref="passwordEncoder" /> -->
+<!-- 	</bean> -->
+
+	<!-- Bind authenticator doesn't work with Apache DS 1.0 -->
 	<bean id="ldapAuthenticator"
-		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
+		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>
-		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
-		<property name="passwordEncoder" ref="passwordEncoder" />
 	</bean>
 
-	<!-- Bind authenticator doesn't work with Apache DS 1.0 -->
-	<!-- <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> -->
-
 	<!-- USER DETAILS -->
-	<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="jcrLdapSynchronizer" />
-		<property name="userAdminDao" ref="userAdminDao" />
-		<property name="passwordEncoder" ref="passwordEncoder" />
-		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
-		<property name="superUsername" value="${argeo.security.superUsername}" />
-	</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="jcrLdapSynchronizer" /> -->
+<!-- 		<property name="userAdminDao" ref="userAdminDao" /> -->
+<!-- 		<property name="passwordEncoder" ref="passwordEncoder" /> -->
+<!-- 		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" /> -->
+<!-- 		<property name="superUsername" value="${argeo.security.superUsername}" /> -->
+<!-- 	</bean> -->
 
-	<bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoUserAdminDaoLdap">
-		<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="userAdminDao" class="org.argeo.security.ldap.ArgeoUserAdminDaoLdap"> -->
+<!-- 		<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">
@@ -96,8 +96,8 @@
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg
 			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}" />
+<!-- 		<property name="userDn" value="${argeo.ldap.manager.userdn}" /> -->
+<!-- 		<property name="password" value="${argeo.ldap.manager.password}" /> -->
 	</bean>
 
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">