From 23daa3a3818f0a18703a3b0ca95c7908326f95cb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 17 Sep 2009 13:47:24 +0000
Subject: [PATCH] Centralize authentication

git-svn-id: https://svn.argeo.org/commons/trunk@2949 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 pom.xml                                       |  1 +
 security/demo/pom.xml                         |  9 ++-
 .../META-INF/MANIFEST.MF                      | 10 +++
 .../META-INF/spring/ldap.xml                  | 62 +++++++++++++++++++
 .../META-INF/spring/osgi.xml                  | 13 ++++
 .../META-INF/MANIFEST.MF                      | 12 +---
 .../WEB-INF/applicationContext.xml            |  5 --
 .../WEB-INF/ldap.xml                          | 36 -----------
 .../WEB-INF/osgi.xml                          |  2 +
 .../WEB-INF/security.xml                      |  2 +-
 .../runtime/org.argeo.security.ria/pom.xml    |  3 +-
 .../src/WEB-INF/applicationContext.xml        |  1 +
 .../src/WEB-INF/osgi.xml                      | 13 ++++
 .../src/WEB-INF/security.xml                  | 10 +--
 14 files changed, 118 insertions(+), 61 deletions(-)
 create mode 100644 security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
 create mode 100644 security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
 create mode 100644 security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
 delete mode 100644 security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
 create mode 100644 security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml

diff --git a/pom.xml b/pom.xml
index 1ec5d05ce..064ddb278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
 	<properties>
 		<developmentCycle>0.1</developmentCycle>
 		<version.slc>0.12.1-SNAPSHOT</version.slc>
+		<version.argeo-ria>0.12.1-SNAPSHOT</version.argeo-ria>
 		<version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
 		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
 		<version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
diff --git a/security/demo/pom.xml b/security/demo/pom.xml
index c397b63db..bc19cb063 100644
--- a/security/demo/pom.xml
+++ b/security/demo/pom.xml
@@ -38,11 +38,13 @@
 							org.springframework.osgi.extender,
 							org.springframework.osgi.web.extender,
 							org.argeo.dep.osgi.catalina.start,
+							org.argeo.security.manager.ldap,
 							org.argeo.security.webapp,
+							org.argeo.security.ria,
 							org.argeo.server.ads.server
 						</slc.osgi.start>
 						<slc.osgi.bundles>
-							${basedir};in=*;ex=pom.xml;ex=target;ex=.*,
+							${basedir};in=*;ex=pom.xml;ex=target;ex=.*;ex=*.ldif,
 							${basedir}/../modules;in=*;ex=pom.xml;ex=target;ex=.*,
 							${basedir}/../../server/modules;in=*;ex=pom.xml;ex=target;ex=.*,
 						</slc.osgi.bundles>
@@ -58,6 +60,11 @@
 			<artifactId>org.argeo.security.mvc</artifactId>
 			<version>0.1.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ria</artifactId>
+			<version>0.1.1-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.json</artifactId>
diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..bfcd8154b
--- /dev/null
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Bundle-SymbolicName: org.argeo.security.manager.ldap
+Bundle-Version: 0.1.1.SNAPSHOT
+Import-Package: org.springframework.security.ldap,
+ org.springframework.security.providers,
+ 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.manager.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
new file mode 100644
index 000000000..49a2c93d1
--- /dev/null
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
@@ -0,0 +1,62 @@
+<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 id="_authenticationManager" class="org.springframework.security.providers.ProviderManager">
+		<property name="providers">
+			<list>
+				<ref bean="authenticationProvider" />
+			</list>
+		</property>
+	</bean>
+
+	<!--
+		<security:ldap-server
+		url="ldap://localhost:10389/dc=demo,dc=argeo,dc=org"
+		manager-dn="uid=admin,ou=system" manager-password="secret" />
+
+		<security:ldap-authentication-provider
+		user-details-class="inetOrgPerson" 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:10389/dc=demo,dc=argeo,dc=org" />
+		<property name="userDn" value="uid=admin,ou=system" />
+		<property name="password" value="secret" />
+	</bean>
+
+	<bean id="authenticationProvider"
+		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="defaultRole" value="ROLE_USER" /> -->
+				<property name="groupSearchFilter" value="uniqueMember={0}" />
+			</bean>
+		</constructor-arg>
+	</bean>
+
+</beans>
diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..c99e04dcf
--- /dev/null
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
@@ -0,0 +1,13 @@
+<?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">
+
+	<service ref="_authenticationManager"
+		interface="org.springframework.security.AuthenticationManager" />
+	<!-- <service ref="authenticationProvider"
+		interface="org.springframework.security.providers.AuthenticationProvider" /> -->
+</beans:beans>
\ 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 124179eb3..f52b69aa2 100644
--- a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
@@ -6,16 +6,10 @@ Import-Package: javax.servlet,
  javax.servlet.resources,
  org.argeo.security.mvc,
  org.argeo.server.json.mvc,
+ org.springframework.ldap.core.support,
  org.springframework.osgi.web.context.support,
- org.springframework.security.userdetails.memory,
+ org.springframework.security,
  org.springframework.web.context,
  org.springframework.web.context.support,
  org.springframework.web.filter,
- 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
+ org.springframework.web.servlet
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 7d0e6beb0..ee1621d61 100644
--- a/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/applicationContext.xml
@@ -7,12 +7,7 @@
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
-	<!--
-		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
-	-->
 	<import resource="security.xml" />
-	<import resource="ldap.xml" />
-
 	<import resource="osgi.xml" />
 
 	<!--  Properties -->
diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml b/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
deleted file mode 100644
index 7e2cac430..000000000
--- a/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
+++ /dev/null
@@ -1,36 +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">
-
-	<security:ldap-server url="ldap://localhost:10389/dc=demo,dc=argeo,dc=org"
-		manager-dn="uid=admin,ou=system" manager-password="secret" />
-
-	<security:ldap-authentication-provider
-		user-details-class="inetOrgPerson" 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/osgi.xml b/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml
index 1b46c0eb4..bb5722691 100644
--- a/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml
@@ -6,4 +6,6 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+	<reference id="_authenticationManager"
+		interface="org.springframework.security.AuthenticationManager" />
 </beans:beans>
\ No newline at end of file
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 8e5fd4356..7b9bc9d80 100644
--- a/security/modules/org.argeo.security.webapp/WEB-INF/security.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/security.xml
@@ -3,7 +3,7 @@
 	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">
 
-	<http realm="User Interface" >
+	<http realm="User Interface">
 		<intercept-url pattern="/**" access="ROLE_USER,ROLE_ADMIN" />
 		<http-basic />
 		<anonymous />
diff --git a/security/runtime/org.argeo.security.ria/pom.xml b/security/runtime/org.argeo.security.ria/pom.xml
index 95aee7c06..b224bc2d2 100644
--- a/security/runtime/org.argeo.security.ria/pom.xml
+++ b/security/runtime/org.argeo.security.ria/pom.xml
@@ -116,7 +116,8 @@
 							org.springframework.web.context,
 							org.springframework.osgi.web.context.support,
 							org.springframework.web.filter,
-							org.springframework.security.context
+							org.springframework.ldap.core.support,
+							org.springframework.security
 						</Import-Package>
 						<Web-ContextPath>org.argeo.security.ria</Web-ContextPath>
 					</instructions>
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml
index 415bdc304..2b8a2e744 100644
--- a/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml
+++ b/security/runtime/org.argeo.security.ria/src/WEB-INF/applicationContext.xml
@@ -7,6 +7,7 @@
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
+	<import resource="osgi.xml" />
 	<import resource="security.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml
new file mode 100644
index 000000000..d344cc8d6
--- /dev/null
+++ b/security/runtime/org.argeo.security.ria/src/WEB-INF/osgi.xml
@@ -0,0 +1,13 @@
+<?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"
+	xmlns:security="http://www.springframework.org/schema/security"
+	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
+       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
+
+	<reference id="_authenticationManager"
+		interface="org.springframework.security.AuthenticationManager" />
+</beans:beans>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml b/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml
index ed0f29bc3..883c65553 100644
--- a/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml
+++ b/security/runtime/org.argeo.security.ria/src/WEB-INF/security.xml
@@ -3,15 +3,9 @@
 	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">
 
-	<http realm="User Interface">
-		<intercept-url pattern="/**" access="ROLE_ANONYMOUS" />
+	<http realm="User Interface" >
+		<intercept-url pattern="/**" access="ROLE_USER" />
 		<http-basic />
 	</http>
-	<authentication-provider>
-		<user-service>
-			<user name="test" password="test" authorities="ROLE_USER" />
-			<user name="demo" password="demo" authorities="ROLE_USER" />
-		</user-service>
-	</authentication-provider>
 
 </beans:beans>
-- 
2.30.2