aboutsummaryrefslogtreecommitdiff
path: root/id/oa
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2014-03-25 22:02:54 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2014-03-25 22:02:54 +0100
commitfc189a2e69c7468c12621b7d4a3c94343d1a672c (patch)
tree89d9e08195bf3c708115ded47a8e588c6e4acbb0 /id/oa
parent242a22849402a13e585fada9d055a85f1c6d1ee8 (diff)
parent1b47a1e5f5787a3d1681cdee8b8bc1ec7a5cd9c9 (diff)
downloadmoa-id-spss-fc189a2e69c7468c12621b7d4a3c94343d1a672c.tar.gz
moa-id-spss-fc189a2e69c7468c12621b7d4a3c94343d1a672c.tar.bz2
moa-id-spss-fc189a2e69c7468c12621b7d4a3c94343d1a672c.zip
merge
Diffstat (limited to 'id/oa')
-rw-r--r--id/oa/pom.xml27
-rw-r--r--id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java7
-rw-r--r--id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java5
3 files changed, 34 insertions, 5 deletions
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index 621c428bd..cc2bff4b0 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>MOA</groupId>
<artifactId>id</artifactId>
- <version>1.9.98-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -24,10 +24,25 @@
<name>Internet2</name>
<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
</repository>
+ <repository>
+ <id>IAIK Local</id>
+ <name>iaik/libs</name>
+ <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/iaik/</url>
+ </repository>
</repositories>
<build>
<finalName>oa</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -53,8 +68,13 @@
<artifactId>xmltooling</artifactId>
<version>1.4.0</version>
</dependency>
-
- <dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
@@ -84,4 +104,5 @@
</dependency>
</dependencies>
+
</project>
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
index c143d050b..85f16e11f 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
@@ -40,6 +40,7 @@ import java.util.Timer;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.log4j.Logger;
import org.opensaml.DefaultBootstrap;
import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
import org.opensaml.xml.parse.BasicParserPool;
@@ -52,6 +53,8 @@ import at.iaik.commons.util.MiscUtil;
public class Configuration {
+ private static final Logger log = Logger.getLogger(Configuration.class);
+
private Properties props;
private static final String SYSTEM_PROP_CONFIG = "moa.id.demoOA";
@@ -216,6 +219,8 @@ public class Configuration {
//load OpenSAML library
DefaultBootstrap.bootstrap();
+ log.info("Demo Application initializaten finished.");
+
} catch ( FileNotFoundException e) {
throw new ConfigurationException("DemoOA configuration is not found at " + configFileName);
@@ -259,6 +264,8 @@ public class Configuration {
pvp2logininitialzied = true;
+ log.info("Load IDP Metadata finished.");
+
} catch (Exception e) {
throw new ConfigurationException("PVP2 authentification can not be initialized.", e);
}
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
index 5bf9c4970..00d82296c 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
@@ -129,10 +129,11 @@ public class Authenticate extends HttpServlet {
authReq.setSubject(subject);
issuer.setFormat(NameIDType.ENTITY);
authReq.setIssuer(issuer);
+
NameIDPolicy policy = SAML2Utils
.createSAMLObject(NameIDPolicy.class);
- policy.setAllowCreate(true);
- policy.setFormat(NameID.PERSISTENT);
+ policy.setAllowCreate(true);
+ policy.setFormat(NameID.PERSISTENT);
authReq.setNameIDPolicy(policy);
String entityname = config.getPVP2IDPMetadataEntityName();