From 8007bb802cc45fcf9343221379987f722696de3b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 17 Mar 2011 16:22:25 +0000
Subject: [PATCH] Improve LDAP security DAO

git-svn-id: https://svn.argeo.org/commons/trunk@4318 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/argeo-node-web.properties                |  2 +-
 .../.project                                  | 22 -------
 .../META-INF/MANIFEST.MF                      | 20 ------
 .../META-INF/spring/ldap-osgi.xml             | 30 ---------
 .../META-INF/spring/ldap.xml                  | 61 -------------------
 .../build.properties                          |  1 -
 .../ldap.properties                           |  6 --
 .../org.argeo.security.dao.ldap/.project      |  2 +-
 .../META-INF/MANIFEST.MF                      |  5 +-
 .../META-INF/spring/ldap-osgi.xml             |  6 --
 .../META-INF/spring/ldap.xml                  |  5 +-
 11 files changed, 5 insertions(+), 155 deletions(-)
 delete mode 100644 security/modules/org.argeo.security.dao.admin.ldap/.project
 delete mode 100644 security/modules/org.argeo.security.dao.admin.ldap/META-INF/MANIFEST.MF
 delete mode 100644 security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap-osgi.xml
 delete mode 100644 security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap.xml
 delete mode 100644 security/modules/org.argeo.security.dao.admin.ldap/build.properties
 delete mode 100644 security/modules/org.argeo.security.dao.admin.ldap/ldap.properties

diff --git a/demo/argeo-node-web.properties b/demo/argeo-node-web.properties
index 477bafdf7..726f225c3 100644
--- a/demo/argeo-node-web.properties
+++ b/demo/argeo-node-web.properties
@@ -2,7 +2,7 @@ argeo.osgi.start=\
 org.springframework.osgi.extender,\
 org.argeo.server.ads.server,\
 org.argeo.node.repo.jackrabbit,\
-org.argeo.security.manager.ldap,\
+org.argeo.security.dao.ldap,\
 org.argeo.security.services,\
 org.argeo.security.services.admin,\
 com.springsource.javax.servlet,\
diff --git a/security/modules/org.argeo.security.dao.admin.ldap/.project b/security/modules/org.argeo.security.dao.admin.ldap/.project
deleted file mode 100644
index b79fc941e..000000000
--- a/security/modules/org.argeo.security.dao.admin.ldap/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.security.dao.admin.ldap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/security/modules/org.argeo.security.dao.admin.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.dao.admin.ldap/META-INF/MANIFEST.MF
deleted file mode 100644
index b6100ab26..000000000
--- a/security/modules/org.argeo.security.dao.admin.ldap/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Bundle-SymbolicName: org.argeo.security.dao.admin.ldap
-Bundle-Version: 0.2.3.SNAPSHOT
-Import-Package: com.sun.jndi.ldap;resolution:=optional,
- org.argeo.security,
- org.argeo.security.ldap,
- org.argeo.security.ldap.nature,
- org.argeo.security.nature,
- org.argeo.server.json;resolution:=optional,
- org.springframework.beans.factory.config,
- org.springframework.ldap.core.support,
- org.springframework.security,
- org.springframework.security.ldap,
- org.springframework.security.ldap.populator,
- org.springframework.security.providers,
- org.springframework.security.providers.encoding;specification-version="2.0.6.RELEASE",
- org.springframework.security.providers.ldap,
- org.springframework.security.providers.ldap.authenticator,
- org.springframework.security.userdetails,
- org.springframework.security.userdetails.ldap
-Bundle-Name: Security Manager LDAP
diff --git a/security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap-osgi.xml b/security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap-osgi.xml
deleted file mode 100644
index 7a0fa89fa..000000000
--- a/security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap-osgi.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<!-- REFERENCES -->
-	<list id="userNatureMappers" interface="org.argeo.security.ldap.UserNatureMapper"
-		cardinality="0..N" />
-
-	<!-- SERVICES -->
-	<service ref="authenticationProvider"
-		interface="org.springframework.security.providers.AuthenticationProvider"
-		context-class-loader="service-provider" />
-	<service ref="securityDao" interface="org.argeo.security.CurrentUserDao"
-		context-class-loader="service-provider" />
-	<service ref="securityDao" interface="org.argeo.security.UserAdminDao"
-		context-class-loader="service-provider" />
-	<service ref="userDetailsService"
-		interface="org.springframework.security.userdetails.UserDetailsService"
-		context-class-loader="service-provider" />
-
-	<!-- Provides deserialization -->
-	<service interface="org.argeo.server.json.JsonObjectFactory">
-		<beans:bean class="org.argeo.server.json.JsonObjectFactoryImpl" />
-	</service>
-
-</beans:beans>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap.xml
deleted file mode 100644
index 2f65ebe82..000000000
--- a/security/modules/org.argeo.security.dao.admin.ldap/META-INF/spring/ldap.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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">
-
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="locations">
-			<value>osgibundle:ldap.properties</value>
-		</property>
-	</bean>
-
-	<bean id="passwordEncoder"
-		class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
-
-	<bean id="contextSource"
-		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}" />
-	</bean>
-
-	<bean id="authenticationProvider"
-		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" />
-	</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=People</value>
-			</list>
-		</property>
-		<property name="passwordEncoder">
-			<bean
-				class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
-		</property>
-	</bean>
-</beans>
diff --git a/security/modules/org.argeo.security.dao.admin.ldap/build.properties b/security/modules/org.argeo.security.dao.admin.ldap/build.properties
deleted file mode 100644
index 5f22cdd44..000000000
--- a/security/modules/org.argeo.security.dao.admin.ldap/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = META-INF/
diff --git a/security/modules/org.argeo.security.dao.admin.ldap/ldap.properties b/security/modules/org.argeo.security.dao.admin.ldap/ldap.properties
deleted file mode 100644
index 1b24ee3d1..000000000
--- a/security/modules/org.argeo.security.dao.admin.ldap/ldap.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-argeo.ldap.rootdn=dc=demo,dc=argeo,dc=org
-argeo.ldap.protocol=ldap
-argeo.ldap.host=localhost
-argeo.ldap.port=10389
-argeo.ldap.manager.userdn=uid=admin,ou=system
-argeo.ldap.manager.password=secret
diff --git a/security/modules/org.argeo.security.dao.ldap/.project b/security/modules/org.argeo.security.dao.ldap/.project
index 6de38255f..cd8b39380 100644
--- a/security/modules/org.argeo.security.dao.ldap/.project
+++ b/security/modules/org.argeo.security.dao.ldap/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.security.manager.ldap</name>
+	<name>org.argeo.security.dao.ldap</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF
index 5325587bb..85bbf4b21 100644
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/MANIFEST.MF
@@ -1,18 +1,17 @@
-Bundle-SymbolicName: org.argeo.security.manager.ldap
+Bundle-SymbolicName: org.argeo.security.dao.ldap
 Bundle-Version: 0.2.3.SNAPSHOT
 Import-Package: com.sun.jndi.ldap;resolution:=optional,
  org.argeo.security,
  org.argeo.security.ldap,
  org.argeo.security.ldap.nature,
  org.argeo.security.nature,
- org.argeo.server.json;resolution:=optional,
  org.springframework.beans.factory.config,
  org.springframework.ldap.core.support,
  org.springframework.security,
  org.springframework.security.ldap,
  org.springframework.security.ldap.populator,
  org.springframework.security.providers,
- org.springframework.security.providers.encoding;specification-version="2.0.6.RELEASE",
+ org.springframework.security.providers.encoding,
  org.springframework.security.providers.ldap,
  org.springframework.security.providers.ldap.authenticator,
  org.springframework.security.userdetails,
diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
index 7a0fa89fa..3ae43c330 100644
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap-osgi.xml
@@ -21,10 +21,4 @@
 	<service ref="userDetailsService"
 		interface="org.springframework.security.userdetails.UserDetailsService"
 		context-class-loader="service-provider" />
-
-	<!-- Provides deserialization -->
-	<service interface="org.argeo.server.json.JsonObjectFactory">
-		<beans:bean class="org.argeo.server.json.JsonObjectFactoryImpl" />
-	</service>
-
 </beans:beans>
\ No newline at end of file
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..fdf216444 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
@@ -53,9 +53,6 @@
 				<value>uid={0},ou=People</value>
 			</list>
 		</property>
-		<property name="passwordEncoder">
-			<bean
-				class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
-		</property>
+		<property name="passwordEncoder" ref="passwordEncoder" />
 	</bean>
 </beans>
-- 
2.30.2