From 996774dbf06b037d9f843e57a2cfac9bcc111a51 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 24 May 2019 08:14:55 +0200 Subject: update Demo-OA to illustrate SAML2 SubjectNameId --- .../egovernment/moa/id/demoOA/Configuration.java | 16 +++++++- .../moa/id/demoOA/servlet/pvp2/Authenticate.java | 44 +++++++++++++--------- .../id/demoOA/servlet/pvp2/DemoApplication.java | 23 ++++++++--- .../moa/id/demoOA/utils/ApplicationBean.java | 9 +++++ id/oa/src/main/webapp/demoapp.jsp | 6 ++- id/oa/src/main/webapp/index.jsp | 2 + 6 files changed, 76 insertions(+), 24 deletions(-) (limited to 'id/oa') 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 09069ac7f..8ada01cb6 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 @@ -182,6 +182,21 @@ public class Configuration { return Boolean.parseBoolean(props.getProperty("general.login.pvp2.binding.resp.redirect", "false")); } + + public boolean setAuthnContextClassRef() { + return Boolean.parseBoolean(props.getProperty("general.login.pvp2.req.set.authncontextclassref", "true")); + } + + public String getScopeRequesterId() { + return props.getProperty("general.login.pvp2.sp.requesterId"); + } + + public boolean setNameIdPolicy() { + return Boolean.parseBoolean(props.getProperty("general.login.pvp2.req.set.nameIDPolicy", "true")); + } + + + public void initializePVP2Login() throws ConfigurationException { if (!pvp2logininitialzied) initalPVP2Login(); @@ -276,6 +291,5 @@ public class Configuration { 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 4c909ff80..0671b8c14 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 @@ -35,6 +35,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; import org.joda.time.DateTime; @@ -52,6 +53,8 @@ import org.opensaml.saml2.core.NameID; import org.opensaml.saml2.core.NameIDPolicy; import org.opensaml.saml2.core.NameIDType; import org.opensaml.saml2.core.RequestedAuthnContext; +import org.opensaml.saml2.core.RequesterID; +import org.opensaml.saml2.core.Scoping; import org.opensaml.saml2.metadata.EntityDescriptor; import org.opensaml.saml2.metadata.SingleSignOnService; import org.opensaml.saml2.metadata.impl.SingleSignOnServiceBuilder; @@ -136,11 +139,12 @@ public class Authenticate extends HttpServlet { issuer.setFormat(NameIDType.ENTITY); authReq.setIssuer(issuer); - NameIDPolicy policy = SAML2Utils - .createSAMLObject(NameIDPolicy.class); - policy.setAllowCreate(true); - policy.setFormat(NameID.PERSISTENT); - authReq.setNameIDPolicy(policy); + if (config.setNameIdPolicy()) { + NameIDPolicy policy = SAML2Utils.createSAMLObject(NameIDPolicy.class); + policy.setAllowCreate(true); + policy.setFormat(NameID.PERSISTENT); + authReq.setNameIDPolicy(policy); + } String entityname = config.getPVP2IDPMetadataEntityName(); if (MiscUtil.isEmpty(entityname)) { @@ -183,20 +187,26 @@ public class Authenticate extends HttpServlet { //authReq.setDestination("http://test.test.test"); + if (config.setAuthnContextClassRef()) { + RequestedAuthnContext reqAuthContext = + SAML2Utils.createSAMLObject(RequestedAuthnContext.class); + AuthnContextClassRef authnClassRef = + SAML2Utils.createSAMLObject(AuthnContextClassRef.class); + authnClassRef.setAuthnContextClassRef("http://www.stork.gov.eu/1.0/citizenQAALevel/4"); + reqAuthContext.setComparison(AuthnContextComparisonTypeEnumeration.MINIMUM); + reqAuthContext.getAuthnContextClassRefs().add(authnClassRef); + authReq.setRequestedAuthnContext(reqAuthContext); + } - RequestedAuthnContext reqAuthContext = - SAML2Utils.createSAMLObject(RequestedAuthnContext.class); - - AuthnContextClassRef authnClassRef = - SAML2Utils.createSAMLObject(AuthnContextClassRef.class); - - authnClassRef.setAuthnContextClassRef("http://www.stork.gov.eu/1.0/citizenQAALevel/4"); - - reqAuthContext.setComparison(AuthnContextComparisonTypeEnumeration.MINIMUM); - - reqAuthContext.getAuthnContextClassRefs().add(authnClassRef); + if (StringUtils.isNotEmpty(config.getScopeRequesterId())) { + Scoping scope = SAML2Utils.createSAMLObject(Scoping.class); + RequesterID requesterId = SAML2Utils.createSAMLObject(RequesterID.class); + requesterId.setRequesterID(config.getScopeRequesterId()); + scope.getRequesterIDs().add(requesterId ); + authReq.setScoping(scope ); + + } - authReq.setRequestedAuthnContext(reqAuthContext); //sign authentication request KeyStore keyStore = config.getPVP2KeyStore(); diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java index aeb4d8eac..e36a880ba 100644 --- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java +++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/DemoApplication.java @@ -198,11 +198,7 @@ public class DemoApplication extends HttpServlet { } - //set assertion - org.w3c.dom.Document doc = SAML2Utils.asDOMDocument(samlResponse); - String assertion = DOMUtils.serializeNode(doc); - bean.setAssertion(assertion); - + if (samlResponse.getStatus().getStatusCode().getValue().equals(StatusCode.SUCCESS_URI)) { List saml2assertions = new ArrayList(); @@ -245,12 +241,28 @@ public class DemoApplication extends HttpServlet { } + samlResponse.getAssertions().clear(); + samlResponse.getAssertions().addAll(saml2assertions); + + //set assertion + org.w3c.dom.Document doc = SAML2Utils.asDOMDocument(samlResponse); + String assertion = DOMUtils.serializeNode(doc); + bean.setAssertion(assertion); + + String principleId = null; String givenName = null; String familyName = null; String birthday = null; for (org.opensaml.saml2.core.Assertion saml2assertion : saml2assertions) { + try { + principleId = saml2assertion.getSubject().getNameID().getValue(); + + } catch (Exception e) { + log.warn("Can not read SubjectNameId", e); + } + //loop through the nodes to get what we want List attributeStatements = saml2assertion.getAttributeStatements(); for (int i = 0; i < attributeStatements.size(); i++) @@ -277,6 +289,7 @@ public class DemoApplication extends HttpServlet { } + bean.setPrincipleId(principleId); bean.setDateOfBirth(birthday); bean.setFamilyName(familyName); bean.setGivenName(givenName); diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/utils/ApplicationBean.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/utils/ApplicationBean.java index 05c253b6e..59090cbcc 100644 --- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/utils/ApplicationBean.java +++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/utils/ApplicationBean.java @@ -32,6 +32,7 @@ public class ApplicationBean implements Serializable { private String givenName; private String dateOfBirth; private String assertion; + private String principleId; private boolean isLogin = false; @@ -122,6 +123,14 @@ public class ApplicationBean implements Serializable { public void setSuccessMessage(String successMessage) { this.successMessage = successMessage; } + + public String getPrincipleId() { + return principleId; + } + public void setPrincipleId(String principleId) { + this.principleId = principleId; + } + diff --git a/id/oa/src/main/webapp/demoapp.jsp b/id/oa/src/main/webapp/demoapp.jsp index c6b005deb..7d511a5ce 100644 --- a/id/oa/src/main/webapp/demoapp.jsp +++ b/id/oa/src/main/webapp/demoapp.jsp @@ -31,7 +31,11 @@
- + + + + + diff --git a/id/oa/src/main/webapp/index.jsp b/id/oa/src/main/webapp/index.jsp index 49f3e3e3a..628d3e7a3 100644 --- a/id/oa/src/main/webapp/index.jsp +++ b/id/oa/src/main/webapp/index.jsp @@ -21,6 +21,8 @@ -- cgit v1.2.3 From b0a0f1baf5a17df00c61d151c03ba3e6f6a99685 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 5 Aug 2019 14:40:23 +0200 Subject: change version structure of project --- id/ConfigWebTool/pom.xml | 2 +- id/moa-id-webgui/pom.xml | 2 +- id/moa-spss-container/pom.xml | 3 +-- id/oa/pom.xml | 15 ++++++++++++++- id/pom.xml | 3 +-- id/server/auth-edu/pom.xml | 2 +- id/server/auth-final/pom.xml | 2 +- id/server/idserverlib/pom.xml | 3 +-- id/server/moa-id-commons/pom.xml | 3 +-- id/server/moa-id-frontend-resources/pom.xml | 3 +-- id/server/moa-id-jaxb_classes/pom.xml | 2 +- id/server/moa-id-spring-initializer/pom.xml | 3 +-- .../moa-id-modul-citizencard_authentication/pom.xml | 2 +- .../modules/moa-id-module-AT_eIDAS_connector/pom.xml | 2 +- id/server/modules/moa-id-module-E-ID_connector/pom.xml | 2 +- .../modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml | 2 +- id/server/modules/moa-id-module-eIDAS-v2/pom.xml | 2 +- id/server/modules/moa-id-module-eIDAS/pom.xml | 2 +- .../modules/moa-id-module-elga_mandate_service/pom.xml | 2 +- id/server/modules/moa-id-module-openID/pom.xml | 2 +- id/server/modules/moa-id-module-pvp2/pom.xml | 2 +- .../modules/moa-id-module-sl20_authentication/pom.xml | 2 +- id/server/modules/moa-id-module-ssoTransfer/pom.xml | 2 +- .../moa-id-modules-federated_authentication/pom.xml | 2 +- id/server/modules/moa-id-modules-saml1/pom.xml | 2 +- id/server/modules/module-monitoring/pom.xml | 2 +- id/server/modules/pom.xml | 3 +-- id/server/pom.xml | 2 +- id/server/proxy/pom.xml | 2 +- pom.xml | 4 ++-- 30 files changed, 44 insertions(+), 38 deletions(-) (limited to 'id/oa') diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 7f503d533..d3fbe9899 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -3,7 +3,7 @@ MOA id - 3.x + 4.0.1-snapshot 4.0.0 diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml index a3b3675ef..718471e05 100644 --- a/id/moa-id-webgui/pom.xml +++ b/id/moa-id-webgui/pom.xml @@ -3,7 +3,7 @@ MOA id - 3.x + 4.0.1-snapshot 4.0.0 diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index 992ace415..e8f71321e 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -3,11 +3,10 @@ MOA id - 3.x + 4.0.1-snapshot MOA.id moa-spss-container - ${moa-id-version} MOA-SPSS-Container-for-MOA-ID This module holds MOA-SPSS and all required library diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 07b84ed1b..4c5d16571 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -4,7 +4,7 @@ MOA id - 3.x + 4.0.1-snapshot 4.0.0 @@ -139,6 +139,19 @@ + + org.bouncycastle + bcpkix-jdk15on + 1.62 + test + + + + org.bouncycastle + bcprov-jdk15on + 1.62 + + diff --git a/id/pom.xml b/id/pom.xml index 4aff9f373..c9b13276e 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -3,12 +3,11 @@ MOA MOA - 2.x + 4.0.1-snapshot 4.0.0 id - 3.x pom MOA ID diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index 984eee6e4..f662f11e3 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot 4.0.0 diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index a18c986c2..f3705c1f7 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot 4.0.0 diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index c921dacf8..ae70a6a7e 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -4,12 +4,11 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot MOA.id.server moa-id-lib - ${moa-id-version} jar MOA ID API diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index aef981013..86771932f 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -4,12 +4,11 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot moa-id-commons moa-id-commons MOA.id.server - ${moa-id-version} diff --git a/id/server/moa-id-frontend-resources/pom.xml b/id/server/moa-id-frontend-resources/pom.xml index 4a960e359..39a7b2e47 100644 --- a/id/server/moa-id-frontend-resources/pom.xml +++ b/id/server/moa-id-frontend-resources/pom.xml @@ -3,12 +3,11 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot MOA.id.server moa-id-frontend-resources - ${moa-id-version} jar MOA-ID-Auth FrontEnd-Resources diff --git a/id/server/moa-id-jaxb_classes/pom.xml b/id/server/moa-id-jaxb_classes/pom.xml index 3d205bb06..1c1eb7121 100644 --- a/id/server/moa-id-jaxb_classes/pom.xml +++ b/id/server/moa-id-jaxb_classes/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot MOA.id.server moa-id-jaxb_classes diff --git a/id/server/moa-id-spring-initializer/pom.xml b/id/server/moa-id-spring-initializer/pom.xml index 967a7cc7c..7e10ba2f6 100644 --- a/id/server/moa-id-spring-initializer/pom.xml +++ b/id/server/moa-id-spring-initializer/pom.xml @@ -3,12 +3,11 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot MOA.id.server moa-id-spring-initializer - ${moa-id-version} jar MOA-ID Spring Initializer diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml index e5b38f9b6..74e7a963c 100644 --- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml +++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-modul-citizencard_authentication diff --git a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml index 481313035..2345d3bff 100644 --- a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml +++ b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-AT_eIDAS_connector moa-id-module-AT_eIDAS_connector diff --git a/id/server/modules/moa-id-module-E-ID_connector/pom.xml b/id/server/modules/moa-id-module-E-ID_connector/pom.xml index f945fa1d3..48723c8be 100644 --- a/id/server/modules/moa-id-module-E-ID_connector/pom.xml +++ b/id/server/modules/moa-id-module-E-ID_connector/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-EID_connector moa-id-module-E-ID_connector diff --git a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml index 0207eb6c9..882a2ad78 100644 --- a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml +++ b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-bkaMobilaAuthSAML2Test BKA MobileAuth Test for SAML2 applications diff --git a/id/server/modules/moa-id-module-eIDAS-v2/pom.xml b/id/server/modules/moa-id-module-eIDAS-v2/pom.xml index 2ad14a24f..e4e05a860 100644 --- a/id/server/modules/moa-id-module-eIDAS-v2/pom.xml +++ b/id/server/modules/moa-id-module-eIDAS-v2/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-eIDAS-v2 MOA-ID eIDAS module v2 diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml index 6dabb938e..199c6edb9 100644 --- a/id/server/modules/moa-id-module-eIDAS/pom.xml +++ b/id/server/modules/moa-id-module-eIDAS/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-eIDAS MOA-ID eIDAS Module diff --git a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml index 86cb4b1a7..6068c8d3d 100644 --- a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml +++ b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-elga_mandate_service ${moa-id-module-elga_mandate_client} diff --git a/id/server/modules/moa-id-module-openID/pom.xml b/id/server/modules/moa-id-module-openID/pom.xml index 9a8dbb236..a501f555a 100644 --- a/id/server/modules/moa-id-module-openID/pom.xml +++ b/id/server/modules/moa-id-module-openID/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-openID diff --git a/id/server/modules/moa-id-module-pvp2/pom.xml b/id/server/modules/moa-id-module-pvp2/pom.xml index 0a71e27ce..28de0c2a4 100644 --- a/id/server/modules/moa-id-module-pvp2/pom.xml +++ b/id/server/modules/moa-id-module-pvp2/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-pvp2 PVP2 Module diff --git a/id/server/modules/moa-id-module-sl20_authentication/pom.xml b/id/server/modules/moa-id-module-sl20_authentication/pom.xml index 6ad72adde..9a1151f25 100644 --- a/id/server/modules/moa-id-module-sl20_authentication/pom.xml +++ b/id/server/modules/moa-id-module-sl20_authentication/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-sl20_authentication moa-id-module-sl20_authentication diff --git a/id/server/modules/moa-id-module-ssoTransfer/pom.xml b/id/server/modules/moa-id-module-ssoTransfer/pom.xml index b15d7dc85..bd945b0c9 100644 --- a/id/server/modules/moa-id-module-ssoTransfer/pom.xml +++ b/id/server/modules/moa-id-module-ssoTransfer/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-ssoTransfer MOA-ID_SSO_Transfer_modul diff --git a/id/server/modules/moa-id-modules-federated_authentication/pom.xml b/id/server/modules/moa-id-modules-federated_authentication/pom.xml index 7e8ac86af..c3d8a970f 100644 --- a/id/server/modules/moa-id-modules-federated_authentication/pom.xml +++ b/id/server/modules/moa-id-modules-federated_authentication/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-modules-federated_authentication PVP2 ServiceProvider implementation for federated authentication diff --git a/id/server/modules/moa-id-modules-saml1/pom.xml b/id/server/modules/moa-id-modules-saml1/pom.xml index 3a401d80e..66fe46900 100644 --- a/id/server/modules/moa-id-modules-saml1/pom.xml +++ b/id/server/modules/moa-id-modules-saml1/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-saml1 diff --git a/id/server/modules/module-monitoring/pom.xml b/id/server/modules/module-monitoring/pom.xml index 252d20000..99b5b091d 100644 --- a/id/server/modules/module-monitoring/pom.xml +++ b/id/server/modules/module-monitoring/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - ${moa-id-version} + 4.0.1-snapshot moa-id-module-monitoring diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml index 85dc122dd..80451c89a 100644 --- a/id/server/modules/pom.xml +++ b/id/server/modules/pom.xml @@ -5,12 +5,11 @@ MOA.id moa-id - 3.x + 4.0.1-snapshot MOA.id.server.modules moa-id-modules - ${moa-id-version} pom MOA ID-Modules diff --git a/id/server/pom.xml b/id/server/pom.xml index 55bff295a..19b7a374e 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -4,7 +4,7 @@ MOA id - 3.x + 4.0.1-snapshot 4.0.0 diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index baef394a7..a672df2f6 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 2.x + 4.0.1-snapshot diff --git a/pom.xml b/pom.xml index 98b792a20..f1e4daec7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ MOA MOA pom - 2.x + 4.0.1-snapshot MOA @@ -26,7 +26,7 @@ 0.3 - 1.0.7 + 1.0.8 5.1.7.RELEASE 2.1.8.RELEASE 2.1.8.RELEASE -- cgit v1.2.3 From 9ac6dded6ec870f6d6ae03dbb43214ef2489e3c3 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 5 Aug 2019 15:21:30 +0200 Subject: update paths to maven repos --- id/ConfigWebTool/pom.xml | 4 ++-- id/moa-id-webgui/pom.xml | 2 +- id/oa/pom.xml | 4 ++-- id/server/auth-edu/pom.xml | 2 +- id/server/auth-final/pom.xml | 2 +- id/server/idserverlib/pom.xml | 2 +- id/server/moa-id-commons/pom.xml | 12 ++++++------ id/server/moa-id-jaxb_classes/pom.xml | 6 +++--- id/server/proxy/pom.xml | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'id/oa') diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index d3fbe9899..512b69a86 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -26,14 +26,14 @@ - local + moaid_local local file:${basedir}/../../repository shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ jboss diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml index 718471e05..9a7b55379 100644 --- a/id/moa-id-webgui/pom.xml +++ b/id/moa-id-webgui/pom.xml @@ -20,7 +20,7 @@ shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 4c5d16571..c57f09a44 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -22,12 +22,12 @@ shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ IAIK Local iaik/libs - http://nexus.iaik.tugraz.at/nexus/content/repositories/iaik/ + https://apps.egiz.gv.at/maven/ diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index f662f11e3..01b73f48d 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -21,7 +21,7 @@ shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index f3705c1f7..2fca5d6d4 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -21,7 +21,7 @@ shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index ae70a6a7e..b12b2cb17 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -20,7 +20,7 @@ shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 86771932f..1841a66ee 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -18,15 +18,15 @@ - local + moaid_local local file:${basedir}/../../../repository - shibboleth.internet2.edu - Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ - + shibboleth.internet2.edu + Internet2 + https://apps.egiz.gv.at/shibboleth_nexus/ + hyberjaxb http://repository.highsource.org/maven2/releases/ @@ -43,7 +43,7 @@ egiz-commons - https://demo.egiz.gv.at/int-repo/ + https://apps.egiz.gv.at/maven/ true diff --git a/id/server/moa-id-jaxb_classes/pom.xml b/id/server/moa-id-jaxb_classes/pom.xml index 1c1eb7121..324fe8af1 100644 --- a/id/server/moa-id-jaxb_classes/pom.xml +++ b/id/server/moa-id-jaxb_classes/pom.xml @@ -18,13 +18,13 @@ local - local + moaid_local file:${basedir}/../../../repository shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/nt/groups/public/ hyberjaxb @@ -42,7 +42,7 @@ egiz-commons - https://demo.egiz.gv.at/int-repo/ + https://apps.egiz.gv.at/maven/ true diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index a672df2f6..4a18f6b2e 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -13,7 +13,7 @@ shibboleth.internet2.edu Internet2 - https://build.shibboleth.net/nexus/content/groups/public/ + https://apps.egiz.gv.at/shibboleth_nexus/ -- cgit v1.2.3 From abc2537a4d2e6d6a06b3b24d7268daf379aa949b Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 9 Sep 2019 12:27:09 +0200 Subject: read requested LoA from configuration --- .../java/at/gv/egovernment/moa/id/demoOA/Configuration.java | 5 +++++ .../egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java | 12 ++++++++++-- id/server/data/deploy/conf/moa-id-oa/oa.properties | 10 ++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) (limited to 'id/oa') 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 8ada01cb6..d6c14fd07 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 @@ -187,6 +187,11 @@ public class Configuration { return Boolean.parseBoolean(props.getProperty("general.login.pvp2.req.set.authncontextclassref", "true")); } + public String getAuthnContextClassRefValue() { + return props.getProperty("general.login.pvp2.req.authncontextclassref.value"); + + } + public String getScopeRequesterId() { return props.getProperty("general.login.pvp2.sp.requesterId"); } 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 0671b8c14..4e8e12499 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 @@ -191,8 +191,16 @@ public class Authenticate extends HttpServlet { RequestedAuthnContext reqAuthContext = SAML2Utils.createSAMLObject(RequestedAuthnContext.class); AuthnContextClassRef authnClassRef = - SAML2Utils.createSAMLObject(AuthnContextClassRef.class); - authnClassRef.setAuthnContextClassRef("http://www.stork.gov.eu/1.0/citizenQAALevel/4"); + SAML2Utils.createSAMLObject(AuthnContextClassRef.class); + + if (MiscUtil.isNotEmpty(config.getAuthnContextClassRefValue())) { + authnClassRef.setAuthnContextClassRef(config.getAuthnContextClassRefValue()); + + } else { + authnClassRef.setAuthnContextClassRef("http://www.stork.gov.eu/1.0/citizenQAALevel/4"); + + } + reqAuthContext.setComparison(AuthnContextComparisonTypeEnumeration.MINIMUM); reqAuthContext.getAuthnContextClassRefs().add(authnClassRef); authReq.setRequestedAuthnContext(reqAuthContext); diff --git a/id/server/data/deploy/conf/moa-id-oa/oa.properties b/id/server/data/deploy/conf/moa-id-oa/oa.properties index ff5bd0c03..3f5cb53d9 100644 --- a/id/server/data/deploy/conf/moa-id-oa/oa.properties +++ b/id/server/data/deploy/conf/moa-id-oa/oa.properties @@ -25,3 +25,13 @@ general.login.pvp2.keystore.authrequest.sign.key.password=password general.login.pvp2.keystore.assertion.encryption.key.alias=pvp_encryption general.login.pvp2.keystore.assertion.encryption.key.password=password + +#### For testing and debugging +#general.login.pvp2.req.set.authncontextclassref=true +#general.login.pvp2.req.authncontextclassref.value=http://eidas.europa.eu/LoA/low + +#general.login.pvp2.req.set.nameIDPolicy=true +#general.login.pvp2.sp.requesterId= + +#general.login.pvp2.binding.req.redirect=true +#general.login.pvp2.binding.resp.redirect=false \ No newline at end of file -- cgit v1.2.3 From 31e23d3cedeecf980e39b9637237cb8f3d01ad9f Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 11 Dec 2019 16:08:19 +0100 Subject: change version to 4.1.0 --- id/ConfigWebTool/pom.xml | 2 +- id/moa-id-webgui/pom.xml | 2 +- id/moa-spss-container/pom.xml | 2 +- id/oa/pom.xml | 2 +- id/pom.xml | 2 +- id/server/auth-edu/pom.xml | 2 +- id/server/auth-final/pom.xml | 2 +- id/server/idserverlib/pom.xml | 2 +- id/server/moa-id-commons/pom.xml | 2 +- id/server/moa-id-frontend-resources/pom.xml | 2 +- id/server/moa-id-jaxb_classes/pom.xml | 2 +- id/server/moa-id-spring-initializer/pom.xml | 2 +- .../modules/moa-id-modul-citizencard_authentication/pom.xml | 2 +- id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml | 2 +- id/server/modules/moa-id-module-E-ID_connector/pom.xml | 2 +- id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml | 2 +- id/server/modules/moa-id-module-eIDAS/pom.xml | 2 +- id/server/modules/moa-id-module-elga_mandate_service/pom.xml | 2 +- id/server/modules/moa-id-module-openID/pom.xml | 2 +- id/server/modules/moa-id-module-sl20_authentication/pom.xml | 2 +- id/server/modules/moa-id-module-ssoTransfer/pom.xml | 2 +- .../modules/moa-id-modules-federated_authentication/pom.xml | 2 +- id/server/modules/moa-id-modules-saml1/pom.xml | 2 +- id/server/modules/module-monitoring/pom.xml | 2 +- id/server/modules/pom.xml | 2 +- id/server/pom.xml | 2 +- pom.xml | 10 +++++----- 27 files changed, 31 insertions(+), 31 deletions(-) (limited to 'id/oa') diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 84e938440..aabda170f 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -3,7 +3,7 @@ MOA id - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml index 9a7b55379..dc592c5d9 100644 --- a/id/moa-id-webgui/pom.xml +++ b/id/moa-id-webgui/pom.xml @@ -3,7 +3,7 @@ MOA id - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index e8f71321e..fb27ca174 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -3,7 +3,7 @@ MOA id - 4.0.1-snapshot + 4.1.0 MOA.id moa-spss-container diff --git a/id/oa/pom.xml b/id/oa/pom.xml index c57f09a44..29a37f2c4 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -4,7 +4,7 @@ MOA id - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/id/pom.xml b/id/pom.xml index c9b13276e..66a9e02ab 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -3,7 +3,7 @@ MOA MOA - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index 01b73f48d..d9e399552 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index 5e0e062f9..c957f6cd8 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -2,7 +2,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index b576c7a87..39f6068e4 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -4,7 +4,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 MOA.id.server diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index d4d0d0563..dfcad9bc7 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -4,7 +4,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 moa-id-commons moa-id-commons diff --git a/id/server/moa-id-frontend-resources/pom.xml b/id/server/moa-id-frontend-resources/pom.xml index 39a7b2e47..dcd4b3d75 100644 --- a/id/server/moa-id-frontend-resources/pom.xml +++ b/id/server/moa-id-frontend-resources/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 MOA.id.server diff --git a/id/server/moa-id-jaxb_classes/pom.xml b/id/server/moa-id-jaxb_classes/pom.xml index 324fe8af1..1fb1998b3 100644 --- a/id/server/moa-id-jaxb_classes/pom.xml +++ b/id/server/moa-id-jaxb_classes/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 MOA.id.server moa-id-jaxb_classes diff --git a/id/server/moa-id-spring-initializer/pom.xml b/id/server/moa-id-spring-initializer/pom.xml index 7e10ba2f6..994bab58f 100644 --- a/id/server/moa-id-spring-initializer/pom.xml +++ b/id/server/moa-id-spring-initializer/pom.xml @@ -3,7 +3,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 MOA.id.server diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml index 74e7a963c..6596312f3 100644 --- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml +++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-modul-citizencard_authentication diff --git a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml index 2345d3bff..748b6a247 100644 --- a/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml +++ b/id/server/modules/moa-id-module-AT_eIDAS_connector/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-AT_eIDAS_connector moa-id-module-AT_eIDAS_connector diff --git a/id/server/modules/moa-id-module-E-ID_connector/pom.xml b/id/server/modules/moa-id-module-E-ID_connector/pom.xml index 48723c8be..d21654fd1 100644 --- a/id/server/modules/moa-id-module-E-ID_connector/pom.xml +++ b/id/server/modules/moa-id-module-E-ID_connector/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-EID_connector moa-id-module-E-ID_connector diff --git a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml index 882a2ad78..12c5e1319 100644 --- a/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml +++ b/id/server/modules/moa-id-module-bkaMobilaAuthSAML2Test/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-bkaMobilaAuthSAML2Test BKA MobileAuth Test for SAML2 applications diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml index 6f09fa4fb..4562f3239 100644 --- a/id/server/modules/moa-id-module-eIDAS/pom.xml +++ b/id/server/modules/moa-id-module-eIDAS/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-eIDAS MOA-ID eIDAS Module diff --git a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml index 6068c8d3d..bdc83f686 100644 --- a/id/server/modules/moa-id-module-elga_mandate_service/pom.xml +++ b/id/server/modules/moa-id-module-elga_mandate_service/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-elga_mandate_service ${moa-id-module-elga_mandate_client} diff --git a/id/server/modules/moa-id-module-openID/pom.xml b/id/server/modules/moa-id-module-openID/pom.xml index a501f555a..f74177cd4 100644 --- a/id/server/modules/moa-id-module-openID/pom.xml +++ b/id/server/modules/moa-id-module-openID/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-openID diff --git a/id/server/modules/moa-id-module-sl20_authentication/pom.xml b/id/server/modules/moa-id-module-sl20_authentication/pom.xml index 9a1151f25..d41e221af 100644 --- a/id/server/modules/moa-id-module-sl20_authentication/pom.xml +++ b/id/server/modules/moa-id-module-sl20_authentication/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-sl20_authentication moa-id-module-sl20_authentication diff --git a/id/server/modules/moa-id-module-ssoTransfer/pom.xml b/id/server/modules/moa-id-module-ssoTransfer/pom.xml index bd945b0c9..68e984ef5 100644 --- a/id/server/modules/moa-id-module-ssoTransfer/pom.xml +++ b/id/server/modules/moa-id-module-ssoTransfer/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-ssoTransfer MOA-ID_SSO_Transfer_modul diff --git a/id/server/modules/moa-id-modules-federated_authentication/pom.xml b/id/server/modules/moa-id-modules-federated_authentication/pom.xml index c3d8a970f..044eb5732 100644 --- a/id/server/modules/moa-id-modules-federated_authentication/pom.xml +++ b/id/server/modules/moa-id-modules-federated_authentication/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-modules-federated_authentication PVP2 ServiceProvider implementation for federated authentication diff --git a/id/server/modules/moa-id-modules-saml1/pom.xml b/id/server/modules/moa-id-modules-saml1/pom.xml index 66fe46900..9c27134d0 100644 --- a/id/server/modules/moa-id-modules-saml1/pom.xml +++ b/id/server/modules/moa-id-modules-saml1/pom.xml @@ -3,7 +3,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-saml1 diff --git a/id/server/modules/module-monitoring/pom.xml b/id/server/modules/module-monitoring/pom.xml index 99b5b091d..1be1574a5 100644 --- a/id/server/modules/module-monitoring/pom.xml +++ b/id/server/modules/module-monitoring/pom.xml @@ -5,7 +5,7 @@ MOA.id.server.modules moa-id-modules - 4.0.1-snapshot + 4.1.0 moa-id-module-monitoring diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml index 80451c89a..72f568a8a 100644 --- a/id/server/modules/pom.xml +++ b/id/server/modules/pom.xml @@ -5,7 +5,7 @@ MOA.id moa-id - 4.0.1-snapshot + 4.1.0 MOA.id.server.modules diff --git a/id/server/pom.xml b/id/server/pom.xml index b9dc9e33d..efda789b3 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -4,7 +4,7 @@ MOA id - 4.0.1-snapshot + 4.1.0 4.0.0 diff --git a/pom.xml b/pom.xml index 73432a4db..e16484168 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ MOA MOA pom - 4.0.1-snapshot + 4.1.0 MOA @@ -12,14 +12,14 @@ UTF-8 - 4.0.1-snapshot + 4.1.0 - 4.0.1-snapshot - 4.0.1-snapshot + 4.1.0 + 4.1.0 2.0.1 - 3.0.1-snapshot + 3.0.1 2.0.6 1.3.2 -- cgit v1.2.3
Benutzerdaten:PrincipleId: <%= bean.getPrincipleId()%>
Benutzerdaten: <%= bean.getGivenName()%>  <%= bean.getFamilyName()%>  <%= bean.getDateOfBirth()%>