From 1f083b6f5e5776cd4c38b5dc81b7aa8c6ef73b62 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 Jul 2009 17:00:57 +0000
Subject: [PATCH] Security

git-svn-id: https://svn.argeo.org/slc/trunk@2693 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      | 11 +++--
 demo/site/org.argeo.slc.demo.ant/conf/ant.xml |  2 +-
 .../org.argeo.slc.demo.ant/conf/imports.xml   |  4 --
 .../site/org.argeo.slc.demo.ant/conf/osgi.xml |  4 --
 .../META-INF/MANIFEST.MF                      | 16 +++++--
 .../org.argeo.slc.demo.basic/conf/imports.xml |  3 +-
 .../org.argeo.slc.demo.log4j/log4j.properties |  2 +-
 .../META-INF/MANIFEST.MF                      | 10 +++--
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../WEB-INF/security.xml                      |  4 +-
 .../core/execution/DefaultExecutionSpec.java  |  2 +-
 .../org/argeo/slc/core/test/spring.xml        | 45 +++++++++++++++++++
 .../core/test/spring/applicationContext.xml   | 45 +++----------------
 server/org.argeo.slc.ria/pom.xml              |  7 ++-
 .../src/WEB-INF/applicationContext.xml        | 12 +++++
 .../src/WEB-INF/security.xml                  | 20 +++++++++
 server/org.argeo.slc.ria/src/WEB-INF/web.xml  | 28 ++++++++++++
 17 files changed, 149 insertions(+), 69 deletions(-)
 create mode 100644 runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring.xml
 create mode 100644 server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml
 create mode 100644 server/org.argeo.slc.ria/src/WEB-INF/security.xml

diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
index fdc1904d3..27a4ecff4 100644
--- a/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
@@ -1,8 +1,4 @@
 Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.support.osgi,
- org.argeo.slc.specs,
- org.argeo.slc.core,
- org.argeo.slc.support.ant
 Bundle-Version: 0.11.4.SNAPSHOT
 Bundle-Name: SLC Demo Ant
 Bundle-Description: Demonstrate Ant support
@@ -13,6 +9,13 @@ Import-Package: net.sf.cglib.core,
  net.sf.cglib.reflect,
  org.aopalliance.aop,
  org.apache.commons.logging,
+ org.argeo.slc.ant,
+ org.argeo.slc.core.execution,
+ org.argeo.slc.core.execution.tasks,
+ org.argeo.slc.execution,
+ org.argeo.slc.osgi,
+ org.argeo.slc.osgi.execution,
+ org.argeo.slc.structure,
  org.springframework.aop,
  org.springframework.aop.framework,
  org.springframework.aop.scope,
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/ant.xml b/demo/site/org.argeo.slc.demo.ant/conf/ant.xml
index 826c185ed..7985043dd 100644
--- a/demo/site/org.argeo.slc.demo.ant/conf/ant.xml
+++ b/demo/site/org.argeo.slc.demo.ant/conf/ant.xml
@@ -7,7 +7,7 @@
 	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
-	<bean id="hello" parent="slcTemplate.simpleFlow">
+	<bean id="main" parent="slcTemplate.simpleFlow">
 		<property name="executables">
 			<list>
 				<bean class="org.argeo.slc.ant.AntRun">
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/imports.xml b/demo/site/org.argeo.slc.demo.ant/conf/imports.xml
index 6bff52fb1..c5f6e3ace 100644
--- a/demo/site/org.argeo.slc.demo.ant/conf/imports.xml
+++ b/demo/site/org.argeo.slc.demo.ant/conf/imports.xml
@@ -5,8 +5,4 @@
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<import resource="classpath:org/argeo/slc/core/execution/spring.xml" />
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
 </beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml b/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml
index a6f9740ef..74b537da9 100644
--- a/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml
+++ b/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml
@@ -7,8 +7,4 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<beans:import resource="classpath:org/argeo/slc/osgi/execution/spring.xml" />
-
-	<reference id="attachmentUploader" interface="org.argeo.slc.core.attachment.AttachmentUploader" />
-
-	<list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
 </beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
index ee988146b..f26a85e8d 100644
--- a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
@@ -4,11 +4,19 @@ Bundle-Version: 0.11.4.SNAPSHOT
 Bundle-Name: SLC Demo Basic
 Bundle-Description: Test of basic features
 Spring-Context: conf/*,conf/testCases/*
-Require-Bundle: 
- org.argeo.slc.specs,
- org.argeo.slc.core,
- org.argeo.slc.support.osgi
 Import-Package: 
+ org.argeo.slc.core.test,
+ org.argeo.slc.core.attachment,
+ org.argeo.slc.core.execution,
+ org.argeo.slc.core.execution.tasks,
+ org.argeo.slc.core.test.context,
+ org.argeo.slc.core.test.tree,
+ org.argeo.slc.core.structure.tree,
+ org.argeo.slc.test,
+ org.argeo.slc.execution,
+ org.argeo.slc.osgi,
+ org.argeo.slc.osgi.execution,
+ org.argeo.slc.structure,
  net.sf.cglib.core,
  net.sf.cglib.proxy,
  net.sf.cglib.reflect,
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/imports.xml b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
index 6bff52fb1..dc44a31c3 100644
--- a/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
@@ -6,7 +6,6 @@
 
 	<import resource="classpath:org/argeo/slc/core/execution/spring.xml" />
 
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+	<import resource="classpath:/org/argeo/slc/core/test/spring.xml" />
 
 </beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index 64433ee53..875e36cef 100644
--- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -13,7 +13,7 @@ log4j.logger.org.hibernate=WARN
 
 log4j.logger.org.springframework=WARN
 log4j.logger.org.springframework.jms=WARN
-log4j.logger.org.springframework.security=INFO
+log4j.logger.org.springframework.security=WARN
 
 log4j.logger.org.apache.activemq=WARN
 log4j.logger.org.apache.activemq.transport=WARN
diff --git a/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
index 4e59d7e4a..ba406292b 100644
--- a/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
@@ -4,16 +4,18 @@ Bundle-Version: 0.11.4.SNAPSHOT
 Bundle-Name: SLC Demo Minimal Module
 Bundle-Description: Minimal functioning execution module
 Spring-Context: slc/*
-Require-Bundle: 
- org.argeo.slc.specs,
- org.argeo.slc.core,
- org.argeo.slc.support.osgi
 Import-Package: 
  net.sf.cglib.core,
  net.sf.cglib.proxy,
  net.sf.cglib.reflect,
  org.aopalliance.aop,
  org.apache.commons.logging,
+ org.argeo.slc.core.execution,
+ org.argeo.slc.core.execution.tasks,
+ org.argeo.slc.execution,
+ org.argeo.slc.osgi,
+ org.argeo.slc.osgi.execution,
+ org.argeo.slc.structure,
  org.springframework.aop,
  org.springframework.aop.framework,
  org.springframework.aop.scope,
diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index bd110b5a9..83da4bfa0 100644
--- a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -47,4 +47,5 @@ Import-Package: net.sf.cglib.core,
  org.springframework.web.filter,
  org.springframework.web.servlet,
  org.springframework.web.servlet.handler,
- org.springframework.web.servlet.mvc
+ org.springframework.web.servlet.mvc,
+ org.springframework.security.context
diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
index fbf7439ca..457d698c9 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
@@ -3,8 +3,8 @@
 	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>
-		<intercept-url pattern="/**" access="ROLE_USER" />
+	<http realm="User Interface" >
+		<intercept-url pattern="/**" access="ROLE_USER,ROLE_ANONYMOUS" />
 		<http-basic />
 		<anonymous />
 	</http>
diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java
index d9038197d..1f66686f5 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java
@@ -79,7 +79,7 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
 				RefSpecAttribute rsa = (RefSpecAttribute) attr;
 				if (rsa.getChoices() == null) {
 					List<RefValueChoice> choices = buildRefValueChoices(rsa);
-					if (log.isDebugEnabled())
+					if (log.isTraceEnabled())
 						log.debug("Found " + choices.size() + " choices for "
 								+ rsa + " in spec " + name);
 
diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring.xml
new file mode 100644
index 000000000..20c821401
--- /dev/null
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="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.5.xsd"
+    default-lazy-init="true">
+
+    <bean id="slcDefault.test.resultLogger"
+        class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
+    </bean>
+
+    <bean name="slcDefault.test.testRun"
+        class="org.argeo.slc.core.test.SimpleTestRun"
+        scope="prototype">
+    </bean>
+
+    <bean name="slcDefault.test.uuid" class="java.util.UUID"
+        factory-method="randomUUID" scope="prototype">
+    </bean>
+
+    <bean id="slcDefault.test.basicTreeTestResult"
+        class="org.argeo.slc.core.test.tree.TreeTestResult"
+        abstract="true" destroy-method="close">
+        <property name="uuid">
+            <bean factory-bean="slcDefault.test.uuid"
+                factory-method="toString">
+            </bean>
+        </property>
+        <property name="listeners">
+            <list>
+                <ref bean="slcDefault.test.resultLogger" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="slcDefault.test.basicSimpleTestResult"
+        class="org.argeo.slc.core.test.SimpleTestResult"
+        abstract="true">
+        <property name="uuid">
+            <bean factory-bean="slcDefault.test.uuid"
+                factory-method="toString">
+            </bean>
+        </property>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
index 20c821401..d5e7e2cc2 100644
--- a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
@@ -1,45 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="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.5.xsd"
-    default-lazy-init="true">
+	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.5.xsd"
+	default-lazy-init="true">
 
-    <bean id="slcDefault.test.resultLogger"
-        class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
-    </bean>
-
-    <bean name="slcDefault.test.testRun"
-        class="org.argeo.slc.core.test.SimpleTestRun"
-        scope="prototype">
-    </bean>
-
-    <bean name="slcDefault.test.uuid" class="java.util.UUID"
-        factory-method="randomUUID" scope="prototype">
-    </bean>
-
-    <bean id="slcDefault.test.basicTreeTestResult"
-        class="org.argeo.slc.core.test.tree.TreeTestResult"
-        abstract="true" destroy-method="close">
-        <property name="uuid">
-            <bean factory-bean="slcDefault.test.uuid"
-                factory-method="toString">
-            </bean>
-        </property>
-        <property name="listeners">
-            <list>
-                <ref bean="slcDefault.test.resultLogger" />
-            </list>
-        </property>
-    </bean>
-
-    <bean id="slcDefault.test.basicSimpleTestResult"
-        class="org.argeo.slc.core.test.SimpleTestResult"
-        abstract="true">
-        <property name="uuid">
-            <bean factory-bean="slcDefault.test.uuid"
-                factory-method="toString">
-            </bean>
-        </property>
-    </bean>
+	<description>Deprecated</description>
 
+	<import resource="../spring.xml" />
 </beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index da8dc1f54..9a42a88de 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -110,7 +110,12 @@
 							javax.servlet.jsp.jstl.core,
 							javax.servlet.jsp.jstl.fmt,
 							javax.servlet.jsp.jstl.tlv,
-							javax.servlet.resources
+							javax.servlet.resources,
+							org.springframework.security.ui.webapp,
+							org.springframework.security.userdetails.memory,
+							org.springframework.web.context,
+							org.springframework.osgi.web.context.support,
+							org.springframework.web.filter
 						</Import-Package>
 						<Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
 					</instructions>
diff --git a/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml b/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..415bdc304
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       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="security.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/WEB-INF/security.xml b/server/org.argeo.slc.ria/src/WEB-INF/security.xml
new file mode 100644
index 000000000..dcd6e8ca3
--- /dev/null
+++ b/server/org.argeo.slc.ria/src/WEB-INF/security.xml
@@ -0,0 +1,20 @@
+<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">
+
+	<http realm="User Interface">
+		<intercept-url pattern="/**" access="ROLE_USER" />
+		<http-basic />
+		<anonymous />
+	</http>
+
+	<authentication-provider>
+		<user-service>
+			<user name="mbaudier" password="mbaudier" authorities="ROLE_USER,ROLE_ADMIN" />
+			<user name="cdujeu" password="cdujeu" authorities="ROLE_USER" />
+			<user name="test" password="test" authorities="ROLE_USER" />
+		</user-service>
+	</authentication-provider>
+
+</beans:beans>
diff --git a/server/org.argeo.slc.ria/src/WEB-INF/web.xml b/server/org.argeo.slc.ria/src/WEB-INF/web.xml
index f46cd1782..dc1ae6e70 100644
--- a/server/org.argeo.slc.ria/src/WEB-INF/web.xml
+++ b/server/org.argeo.slc.ria/src/WEB-INF/web.xml
@@ -4,4 +4,32 @@
 	version="2.5">
 
 	<display-name>SLC Web UI</display-name>
+
+	<!-- General -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+
+	<listener>
+		<display-name>Spring Context</display-name>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+	</context-param>
+
+	<!--  Security -->
+	<filter>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+
 </web-app>
-- 
2.39.2