From 22a66cdf1b5f7916422034f3338e680202ddc31b Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 31 Oct 2014 17:35:35 +0100 Subject: phypersom --- id/server/stork2-saml-engine/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'id/server/stork2-saml-engine') diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 30f2bff7c..1979c770e 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -17,7 +17,7 @@ 0.5.2 0.5.1 1.4.0 - 2.6.2 + 2.6.0 ${maven.build.timestamp} ${basedir}/../../../repository @@ -89,6 +89,12 @@ + org.slf4j slf4j-api -- cgit v1.2.3 From b557ff02ff830682bfe1a1049cfad72e3d9a11e0 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 6 Nov 2014 15:28:31 +0100 Subject: Revert "Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot" This reverts commit 775e39a724baf237085280510216fbd688df6dd9, reversing changes made to 1fbff5f5a86733bc6a75c8ae901153baa0963441. --- .../moa/id/protocols/stork2/PhyPersonMandateContainer.java | 1 + id/server/stork2-commons/pom.xml | 5 ++--- id/server/stork2-saml-engine/pom.xml | 8 +------- pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) (limited to 'id/server/stork2-saml-engine') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java index 2ea6cce00..ba89663ab 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java @@ -127,4 +127,5 @@ public class PhyPersonMandateContainer extends MandateContainer { public void setPhyPersMandatorIdentificationType(String phyPersMandatorIdentificationType) { this.phyPersMandatorIdentificationType = phyPersMandatorIdentificationType; } + } diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 86b37a143..555d6cec7 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.4.0 - 2.6.1 + 2.6.3 ${stork.version} @@ -62,7 +62,7 @@ - + org.opensaml opensaml @@ -89,7 +89,6 @@ - org.bouncycastle diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 1979c770e..30f2bff7c 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -17,7 +17,7 @@ 0.5.2 0.5.1 1.4.0 - 2.6.0 + 2.6.2 ${maven.build.timestamp} ${basedir}/../../../repository @@ -89,12 +89,6 @@ - org.slf4j slf4j-api diff --git a/pom.xml b/pom.xml index e04d2e728..3407bfcd9 100644 --- a/pom.xml +++ b/pom.xml @@ -145,12 +145,12 @@ org.opensaml opensaml - 2.6.1 + 2.6.3 org.opensaml xmltooling - 1.4.1 + 1.4.3 -- cgit v1.2.3 From c6985f25c723291af7e4637862a1567c4db2d59c Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 7 Nov 2014 14:43:30 +0100 Subject: adding xmltooling due to error --- id/server/stork2-saml-engine/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'id/server/stork2-saml-engine') diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 30f2bff7c..a89abf70f 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -89,6 +89,12 @@ + + org.opensaml + xmltooling + 1.4.3 + + org.slf4j slf4j-api -- cgit v1.2.3 From f5d8d620a8a9ed8dda131cbcce5da934b8351c23 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Fri, 7 Nov 2014 15:21:46 +0100 Subject: update stork2-samlengine --- id/server/stork2-saml-engine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/server/stork2-saml-engine') diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index a89abf70f..a082a618b 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -60,7 +60,7 @@ org.opensaml opensaml - + ${opensaml.version} org.slf4j -- cgit v1.2.3 From d6637f8e82b41936b962f2197dee8cf89d0fe0b9 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 4 Dec 2014 15:10:37 +0100 Subject: health attributes update and bouncycastle bug workaround --- .../names/tc/stork/_1_0/assertion/IsHCPType.java | 145 --------------------- .../tc/stork/_1_0/assertion/ObjectFactory.java | 6 +- .../stork/peps/auth/engine/core/impl/SignSW.java | 18 ++- 3 files changed, 14 insertions(+), 155 deletions(-) delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHCPType.java (limited to 'id/server/stork2-saml-engine') diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHCPType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHCPType.java deleted file mode 100644 index 6a2d5fd2e..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHCPType.java +++ /dev/null @@ -1,145 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.04.12 at 12:22:50 PM GMT -// - - -package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isHCPType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - * 

- * <complexType name="isHCPType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="HCPType" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}HCPType"/>
- *         <element name="specialisation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}specialisationType"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isHCPType", propOrder = { - "nameOfOrganisation", - "hcpType", - "specialisation", - "aqaa" -}) -public class IsHCPType { - - @XmlElement(required = true) - protected String nameOfOrganisation; - @XmlElement(name = "HCPType", required = true) - protected String hcpType; - @XmlElement(required = true) - protected String specialisation; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the nameOfOrganisation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfOrganisation() { - return nameOfOrganisation; - } - - /** - * Sets the value of the nameOfOrganisation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfOrganisation(String value) { - this.nameOfOrganisation = value; - } - - /** - * Gets the value of the hcpType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHCPType() { - return hcpType; - } - - /** - * Sets the value of the hcpType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHCPType(String value) { - this.hcpType = value; - } - - /** - * Gets the value of the specialisation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSpecialisation() { - return specialisation; - } - - /** - * Sets the value of the specialisation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSpecialisation(String value) { - this.specialisation = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java index 217ca4ec4..f1ea05d65 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java @@ -243,9 +243,9 @@ public class ObjectFactory { * Create an instance of {@link IsHCPType } * */ - public IsHCPType createIsHCPType() { - return new IsHCPType(); - } + //public IsHCPType createIsHCPType() { + // return new IsHCPType(); + //} /** * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}} diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java index d415375e7..0984bb9ca 100644 --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java @@ -220,13 +220,17 @@ public class SignSW implements SAMLEngineSignI { final String serialNum = certificate.getSerialNumber() .toString(16); - X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName()); - X509Principal issuerDNConf = new X509Principal(issuer); - - if (serialNum.equalsIgnoreCase(serialNumber) - && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) { - alias = aliasCert; - find = true; + try { + X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName()); + X509Principal issuerDNConf = new X509Principal(issuer); + + if (serialNum.equalsIgnoreCase(serialNumber) + && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) { + alias = aliasCert; + find = true; + } + } catch (Exception ex) { + LOG.error("Exception during signing: " + ex.getMessage()); // Added as a workaround for Bouncycastle email error } } if (!find) { -- cgit v1.2.3