From bd9a5f8a5b5c548647b09feda52761e9b7cb286e Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 18 Feb 2019 15:00:27 +0100 Subject: Add bPKList PVP attribute definition for natural-person mandates --- .../main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java | 8 ++++++-- .../at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java | 5 +++++ eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/data/Pair.java | 6 ++++++ .../core/impl/idp/builder/attributes/BPKAttributeBuilder.java | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java index 3c3d467b..b60d39e1 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/EAAFConstants.java @@ -45,12 +45,16 @@ public class EAAFConstants { public static final String EIDAS_LOA_MATCHING_EXACT = "exact"; //Austrian specific prefixes for pseudonyms of users + public static final String URN_PART_WBPK = "wbpk+"; + public static final String URN_PART_EIDAS = "eidasid+"; + + public static final String URN_PREFIX = "urn:publicid:gv.at"; public static final String URN_PREFIX_BASEID = URN_PREFIX + ":baseid"; public static final String URN_PREFIX_CDID = URN_PREFIX + ":cdid+"; public static final String URN_PREFIX_BPK = URN_PREFIX_CDID + "bpk"; - public static final String URN_PREFIX_WBPK = URN_PREFIX + ":wbpk+"; - public static final String URN_PREFIX_EIDAS = URN_PREFIX + ":eidasid+"; + public static final String URN_PREFIX_WBPK = URN_PREFIX + ":" + URN_PART_WBPK; + public static final String URN_PREFIX_EIDAS = URN_PREFIX + ":" + URN_PART_EIDAS; //Authentication process data_constants public static final String UNIQUESESSIONIDENTIFIER = "eaaf_uniqueSessionIdentifier"; diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java index aff7eaf3..e7e9844a 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java @@ -214,6 +214,11 @@ public interface PVPAttributeDefinitions { public static final String MANDATE_NAT_PER_BPK_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-BPK"; public static final int MANDATE_NAT_PER_BPK_MAX_LENGTH = 1024; + public static final String MANDATE_NAT_PER_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.73"; + public static final String MANDATE_NAT_PER_BPK_LIST_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_BPK_LIST_OID; + public static final String MANDATE_NAT_PER_BPK_LIST_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-BPK-LIST"; + public static final int MANDATE_NAT_PER_ENC_LIST_MAX_LENGTH = 32767; + public static final String MANDATE_NAT_PER_ENC_BPK_LIST_OID = "1.2.40.0.10.2.1.1.261.72"; public static final String MANDATE_NAT_PER_ENC_BPK_LIST_NAME = URN_OID_PREFIX + MANDATE_NAT_PER_ENC_BPK_LIST_OID; public static final String MANDATE_NAT_PER_ENC_BPK_LIST_FRIENDLY_NAME = "MANDATOR-NATURAL-PERSON-ENC-BPK-LIST"; diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/data/Pair.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/data/Pair.java index 8119fdbd..1e2f6994 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/data/Pair.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/data/Pair.java @@ -46,4 +46,10 @@ public class Pair { public static Pair newInstance(final P1 newFirst, final P2 newSecond) { return new Pair(newFirst, newSecond); } + + @Override + public String toString() { + return "[bPK-Value: " + getFirst() + " bPK-Type: " + getSecond() + "]"; + + } } diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BPKAttributeBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BPKAttributeBuilder.java index a5c1e7d4..7005c930 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BPKAttributeBuilder.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BPKAttributeBuilder.java @@ -42,7 +42,7 @@ import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException; public class BPKAttributeBuilder implements IPVPAttributeBuilder { private static final Logger log = LoggerFactory.getLogger(BPKAttributeBuilder.class); - protected static final String DELIMITER_BPKTYPE_BPK = ":"; + public static final String DELIMITER_BPKTYPE_BPK = ":"; public String getName() { return BPK_NAME; -- cgit v1.2.3