aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-02-04 12:14:06 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-02-04 12:14:06 +0100
commit04636e11d108f26df4712c62be108d68ba166e0a (patch)
treec6694a44cc765d3564a5f37502a928475a377fd6
parent9ef2e8fc5a59abcadc71714da371605bc1fdafa5 (diff)
downloadmoa-id-spss-04636e11d108f26df4712c62be108d68ba166e0a.tar.gz
moa-id-spss-04636e11d108f26df4712c62be108d68ba166e0a.tar.bz2
moa-id-spss-04636e11d108f26df4712c62be108d68ba166e0a.zip
* update demoOA layout
* add test keystore
Diffstat
-rw-r--r--id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java16
-rw-r--r--id/oa/src/main/webapp/css/index.css5
-rw-r--r--id/oa/src/main/webapp/index.jsp13
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12bin0 -> 7885 bytes
-rw-r--r--id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12bin0 -> 7885 bytes
-rw-r--r--id/server/data/deploy/conf/moa-id/keys/moa_idp.p12bin0 -> 7885 bytes
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties8
-rw-r--r--pom.xml6
8 files changed, 32 insertions, 16 deletions
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
index 4e13a34df..652960bbc 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
@@ -48,6 +48,7 @@ import org.opensaml.common.xml.SAMLConstants;
import org.opensaml.saml2.core.NameIDType;
import org.opensaml.saml2.metadata.AssertionConsumerService;
import org.opensaml.saml2.metadata.AttributeConsumingService;
+import org.opensaml.saml2.metadata.EncryptionMethod;
import org.opensaml.saml2.metadata.EntitiesDescriptor;
import org.opensaml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml2.metadata.KeyDescriptor;
@@ -55,6 +56,9 @@ import org.opensaml.saml2.metadata.LocalizedString;
import org.opensaml.saml2.metadata.NameIDFormat;
import org.opensaml.saml2.metadata.SPSSODescriptor;
import org.opensaml.saml2.metadata.ServiceName;
+import org.opensaml.saml2.metadata.impl.EncryptionMethodBuilder;
+import org.opensaml.xml.encryption.EncryptionConstants;
+import org.opensaml.xml.encryption.OAEPparams;
import org.opensaml.xml.io.Marshaller;
import org.opensaml.xml.security.credential.Credential;
import org.opensaml.xml.security.credential.UsageType;
@@ -187,7 +191,17 @@ public class BuildMetadata extends HttpServlet {
KeyDescriptor encryKeyDescriptor = SAML2Utils
.createSAMLObject(KeyDescriptor.class);
encryKeyDescriptor.setUse(UsageType.ENCRYPTION);
- encryKeyDescriptor.setKeyInfo(keyInfoGenerator.generate(authEncCredential));
+ encryKeyDescriptor.setKeyInfo(keyInfoGenerator.generate(authEncCredential));
+
+ //set encryption methode
+// EncryptionMethod encMethode = SAML2Utils.createSAMLObject(EncryptionMethod.class);
+// encMethode.setAlgorithm(EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM);
+// encryKeyDescriptor.getEncryptionMethods().add(encMethode);
+//
+// EncryptionMethod keyencMethode = SAML2Utils.createSAMLObject(EncryptionMethod.class);
+// keyencMethode.setAlgorithm(EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP);
+// encryKeyDescriptor.getEncryptionMethods().add(keyencMethode);
+
spSSODescriptor.getKeyDescriptors().add(encryKeyDescriptor);
} else {
diff --git a/id/oa/src/main/webapp/css/index.css b/id/oa/src/main/webapp/css/index.css
index 6ff99af63..b195a21c0 100644
--- a/id/oa/src/main/webapp/css/index.css
+++ b/id/oa/src/main/webapp/css/index.css
@@ -72,18 +72,21 @@ p {
/* Anmeldeframe */
#demonstrator_main {
clear:both;
+ margin-left: 5%;
}
#demonstrator_leftcontent {
/*float:left;*/
/* width:255px; */
- margin-left: 40%;
+ margin-left: 17%;
+ margin-top:25px;
position: relative;
/* margin: 0 auto; */
}
#submitbutton {
width: 150px;
+ height: 35px;
}
h2#demonstrator_tabheader, h2#demonstrator_contentheader {
diff --git a/id/oa/src/main/webapp/index.jsp b/id/oa/src/main/webapp/index.jsp
index f13a6e1bf..49f3e3e3a 100644
--- a/id/oa/src/main/webapp/index.jsp
+++ b/id/oa/src/main/webapp/index.jsp
@@ -11,10 +11,17 @@
</head>
<body>
+
+
<div id="demonstrator_main">
- <div id="demonstrator_leftcontent">
- <input type="button" size="400" value="Login" onclick="PVP2LoginIframe('servlet/pvp2login');" id="submitbutton"/>
- </div>
+ <h1>PVP2.1 Demo-Applikation für MOA-ID 2.x</h1>
+
+ <p>Dieser Test demonstriert die Anmeldung an einer Online-Anwendung mittels Bürgerkarte oder Handy-Signatur.<br>
+ Nach Betätigung des Login Buttons muss im ersten Schritt muss zwischen Bürgerkarte oder Handy-Signatur gewählt werden.</p>
+
+ <div id="demonstrator_leftcontent">
+ <input type="button" size="400" value="Login" onclick="PVP2LoginIframe('servlet/pvp2login');" id="submitbutton"/>
+ </div>
</div>
diff --git a/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12
Binary files differ
diff --git a/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12
Binary files differ
diff --git a/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12
Binary files differ
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 879cb575a..73627ef9b 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -32,14 +32,6 @@ service.foreignidentities.clientKeyStore=keys/....
service.foreignidentities.clientKeyStorePassword=
-##STORK configuration
-#STORK
-stork.samlsigningparameter.signaturecreation.keystore.file=keys/storkDemoKeys.jks
-stork.samlsigningparameter.signaturecreation.keystore.password=local-demo
-stork.samlsigningparameter.signaturecreation.keyname.name=at-demo-cert
-stork.samlsigningparameter.signaturecreation.keyname.password=stork
-
-
##Protocol configuration##
#PVP2
protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp.p12
diff --git a/pom.xml b/pom.xml
index c162aba71..33ca79239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</activation>
<modules>
<module>common</module>
- <!-- <module>spss</module> -->
+ <module>spss</module>
<module>id</module>
</modules>
</profile>
@@ -69,9 +69,9 @@
<finalName>moa</finalName>
<descriptors>
<descriptor>id/assembly-auth.xml</descriptor>
-<!-- <descriptor>id/assembly-proxy.xml</descriptor>
+ <descriptor>id/assembly-proxy.xml</descriptor>
<descriptor>spss/assembly.xml</descriptor>
- <descriptor>spss/assembly-lib.xml</descriptor> -->
+ <descriptor>spss/assembly-lib.xml</descriptor>
</descriptors>
</configuration>
</plugin>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:14:32 +0000