From 38ba7a02ad1cbab307987a92417762923a55a6b2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 16 Sep 2009 18:36:07 +0000
Subject: [PATCH] LDAP authentication

git-svn-id: https://svn.argeo.org/commons/trunk@2940 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 security/demo/.classpath                      |  6 +++
 security/demo/.project                        | 23 +++++++++
 .../demo/.settings/org.eclipse.jdt.core.prefs |  5 ++
 .../.settings/org.maven.ide.eclipse.prefs     |  9 ++++
 .../log4j.properties                          |  9 +---
 security/demo/pom.xml                         | 28 +++++++++++
 .../META-INF/MANIFEST.MF                      |  9 +++-
 .../WEB-INF/applicationContext.xml            |  1 +
 .../WEB-INF/ldap.xml                          | 49 +++++++++++++++++++
 .../WEB-INF/security.xml                      |  7 +--
 .../runtime/org.argeo.security.core/pom.xml   |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 +++
 .../META-INF/spring/ads.xml                   |  9 ++++
 13 files changed, 153 insertions(+), 12 deletions(-)
 create mode 100644 security/demo/.classpath
 create mode 100644 security/demo/.project
 create mode 100644 security/demo/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 security/demo/.settings/org.maven.ide.eclipse.prefs
 create mode 100644 security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
 create mode 100644 server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
 create mode 100644 server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml

diff --git a/security/demo/.classpath b/security/demo/.classpath
new file mode 100644
index 000000000..d0bec0f76
--- /dev/null
+++ b/security/demo/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/security/demo/.project b/security/demo/.project
new file mode 100644
index 000000000..170a23688
--- /dev/null
+++ b/security/demo/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.commons.security.demo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/security/demo/.settings/org.eclipse.jdt.core.prefs b/security/demo/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..742857a26
--- /dev/null
+++ b/security/demo/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Sep 16 19:11:49 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/security/demo/.settings/org.maven.ide.eclipse.prefs b/security/demo/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..004ee666a
--- /dev/null
+++ b/security/demo/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Wed Sep 16 19:09:41 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/security/demo/org.argeo.security.demo.log4j/log4j.properties b/security/demo/org.argeo.security.demo.log4j/log4j.properties
index dd02654c2..75aa47799 100644
--- a/security/demo/org.argeo.security.demo.log4j/log4j.properties
+++ b/security/demo/org.argeo.security.demo.log4j/log4j.properties
@@ -6,14 +6,9 @@ log4j.logger.org.argeo=DEBUG
 log4j.logger.org.hibernate=WARN
 
 log4j.logger.org.springframework=WARN
-log4j.logger.org.springframework.web=DEBUG
+#log4j.logger.org.springframework.web=DEBUG
 #log4j.logger.org.springframework.jms=WARN
-#log4j.logger.org.springframework.security=WARN
-
-log4j.logger.org.apache.activemq=WARN
-log4j.logger.org.apache.activemq.transport=WARN
-log4j.logger.org.apache.activemq.ActiveMQMessageConsumer=INFO
-log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO
+log4j.logger.org.springframework.security=DEBUG
 
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
diff --git a/security/demo/pom.xml b/security/demo/pom.xml
index 7f52d9631..404eb18b8 100644
--- a/security/demo/pom.xml
+++ b/security/demo/pom.xml
@@ -16,6 +16,7 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<bundlesPomArtifactId>org.argeo.security.demo</bundlesPomArtifactId>
@@ -24,6 +25,7 @@
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
 					<execDir>target/exec</execDir>
 					<osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
@@ -193,5 +195,31 @@
 			ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
 		-->
+
+		<!-- Apache Directory -->
+		<dependency>
+			<groupId>org.apache.directory</groupId>
+			<artifactId>com.springsource.org.apache.directory.server.core</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.directory</groupId>
+			<artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.jdbm</groupId>
+			<artifactId>com.springsource.jdbm</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<!--
+			TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory
+			takes 2.1.0
+		-->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<version>2.4.0</version>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
index 8116c1e4f..124179eb3 100644
--- a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
@@ -11,4 +11,11 @@ Import-Package: javax.servlet,
  org.springframework.web.context,
  org.springframework.web.context.support,
  org.springframework.web.filter,
- org.springframework.web.servlet
+ org.springframework.web.servlet,
+ org.springframework.security.ldap,
+ org.springframework.security.providers.ldap,
+ org.springframework.security.providers.ldap.authenticator,
+ org.springframework.security.ldap.populator,
+ org.springframework.security.userdetails.ldap,
+ org.springframework.security,
+ org.springframework.ldap.core.support
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml b/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
index 2ad009d2b..7d0e6beb0 100644
--- a/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
@@ -11,6 +11,7 @@
 		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
 	-->
 	<import resource="security.xml" />
+	<import resource="ldap.xml" />
 
 	<import resource="osgi.xml" />
 
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml b/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
new file mode 100644
index 000000000..eab6c3a0f
--- /dev/null
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
@@ -0,0 +1,49 @@
+<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">
+	<security:ldap-server url="ldap://localhost:389/dc=argeo,dc=org"
+		manager-dn="cn=Manager,dc=argeo,dc=org" manager-password="secret" />
+	<security:ldap-authentication-provider
+		user-dn-pattern="uid={0},ou=users" group-search-base="ou=groups">
+		<security:password-compare hash="{sha}" />
+	</security:ldap-authentication-provider>
+  
+  <!-- 
+	<bean id="contextSource"
+		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
+		<constructor-arg value="ldap://localhost:389/dc=argeo,dc=org" />
+		<property name="userDn" value="cn=Manager,dc=argeo,dc=org" />
+		<property name="password" value="secret" />
+	</bean>
+	
+	<bean id="ldapAuthProvider"
+		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
+		<constructor-arg>
+			<bean
+				class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
+				<constructor-arg ref="contextSource" />
+				<property name="userDnPatterns">
+					<list>
+						<value>uid={0},ou=users</value>
+					</list>
+				</property>
+				<property name="passwordEncoder">
+					<bean
+						class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder"></bean>
+				</property>
+			</bean>
+		</constructor-arg>
+		<constructor-arg>
+			<bean
+				class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
+				<constructor-arg ref="contextSource" />
+				<constructor-arg value="ou=groups" />
+				<property name="groupRoleAttribute" value="ou" />
+			</bean>
+		</constructor-arg>
+	</bean>
+	
+	 -->
+</beans>
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/security.xml b/security/modules/org.argeo.security.webapp/WEB-INF/security.xml
index 35397ad70..81595ee9b 100644
--- a/security/modules/org.argeo.security.webapp/WEB-INF/security.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/security.xml
@@ -4,11 +4,12 @@
               http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
 	<http realm="User Interface" >
-		<intercept-url pattern="/**" access="ROLE_USER,ROLE_ADMIN" />
+		<intercept-url pattern="/**" access="ROLE_REGISTEREDUSERS,ROLE_USER,ROLE_ADMIN" />
 		<http-basic />
 		<anonymous />
 	</http>
-
+	
+<!-- 
 	<authentication-provider>
 		<user-service>
 			<user name="mbaudier" password="mbaudier" authorities="ROLE_USER,ROLE_ADMIN" />
@@ -17,5 +18,5 @@
 			<user name="demo" password="demo" authorities="ROLE_USER" />
 		</user-service>
 	</authentication-provider>
-
+ -->
 </beans:beans>
diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 340e08fc9..0b103ee23 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-			<version>1.3.0.0002</version>
+			<version>1.3.0.0003-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Security -->
diff --git a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..91eeea70f
--- /dev/null
+++ b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.ads.server
+Import-Package: org.apache.directory.server.configuration,
+ org.apache.directory.server.core.partition.impl.btree,
+ org.apache.directory.server.jndi,
+ org.apache.directory.shared.asn1.codec,
+ org.springframework.security.config,
+ org.springframework.security.ldap
diff --git a/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml b/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
new file mode 100644
index 000000000..7c47ba429
--- /dev/null
+++ b/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
@@ -0,0 +1,9 @@
+<beans:beans xmlns="http://www.springframework.org/schema/security"
+	xmlns:beans="http://www.springframework.org/schema/beans" 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">
+
+	<!-- <ldap-server ldif="classpath:base.ldif" /> -->
+	<ldap-server root="dc=argeo,dc=org" port="10389"/>
+
+</beans:beans>
-- 
2.30.2