Improve security

git-svn-id: https://svn.argeo.org/commons/trunk@3135 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/pom.xml b/pom.xml
index 0bab17fde3ccd0cf03617a5c00a003a3fb2849b4..6ce75d8e29038dc789d14503e14dbbf65271e6c9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <properties>
                <developmentCycle>0.1</developmentCycle>
                <version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
-               <version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.22</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>
        </properties>

diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
new file mode 100644 (file)
index 0000000..04e7168
--- /dev/null
+++ b/security/dep/org.argeo.security.dep.ads/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.commons.security</groupId>
+               <version>0.1.2-SNAPSHOT</version>
+               <artifactId>dep</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.dep.ads</artifactId>
+       <packaging>pom</packaging>
+       <name>Dep Security Apache Directory Server</name>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.ldap</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.modules</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.modules</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.ads</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/security/dep/org.argeo.security.dep.ldap/pom.xml b/security/dep/org.argeo.security.dep.ldap/pom.xml
new file mode 100644 (file)
index 0000000..6afd9eb
--- /dev/null
+++ b/security/dep/org.argeo.security.dep.ldap/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.commons.security</groupId>
+               <version>0.1.2-SNAPSHOT</version>
+               <artifactId>dep</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.dep.ldap</artifactId>
+       <packaging>pom</packaging>
+       <name>Dep Security LDAP</name>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.mvc</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.json</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/security/dep/pom.xml b/security/dep/pom.xml
new file mode 100644 (file)
index 0000000..3eb840a
--- /dev/null
+++ b/security/dep/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.commons</groupId>
+               <version>0.1.2-SNAPSHOT</version>
+               <artifactId>server</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.commons.security</groupId>
+       <artifactId>dep</artifactId>
+       <name>Commons Security Dependencies</name>
+       <packaging>pom</packaging>
+       <modules>
+               <module>org.argeo.security.dep.ldap</module>
+               <module>org.argeo.security.dep.ads</module>
+       </modules>
+</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 4df4ae832a29d6b033a011dab87f2a7e5323b1ed..380fe85673e3c83cbec3ab8e57b001f3ecf614c7 100644 (file)
--- a/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.webapp/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Import-Package: javax.servlet,
  org.springframework.osgi.web.context.support,
  org.springframework.security,
  org.springframework.security.config,
+ org.springframework.security.ui,
  org.springframework.security.ui.webapp,
  org.springframework.web.context,
  org.springframework.web.context.support,

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 6b73babc5afacbbb856ca82936e7c3674004f77e..197bd8fdc1fff90e6f2b78236d8b92f0205f03f9 100644 (file)
--- a/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/osgi.xml
@@ -13,4 +13,8 @@
 \r
        <list id="objectFactories" interface="org.argeo.server.json.JsonObjectFactory"\r
                cardinality="0..N" />\r
+\r
+<!-- \r
+       <service ref="authenticationProcessingFilterEntryPoint"\r
+               interface="org.springframework.security.ui.AuthenticationEntryPoint" /> -->\r
 </beans:beans>
\ No newline at end of file

diff --git a/security/pom.xml b/security/pom.xml
index a5499a702670673fe3dc8d17ac0cc9813e45cf2d..b99aca3f3893fb3fc708b660380b2794ec16081e 100644 (file)
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -13,6 +13,7 @@
        <modules>
                <module>runtime</module>
                <module>modules</module>
+               <module>dep</module>
                <module>demo</module>
        </modules>
 </project>
\ No newline at end of file