summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java12
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java31
2 files changed, 25 insertions, 18 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
index 8cc367d2..0b352334 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
@@ -27,16 +27,16 @@ import java.util.Date;
import java.util.Map;
import java.util.TimeZone;
-import org.apache.commons.collections4.map.HashedMap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import at.gv.egiz.eaaf.core.api.idp.IAuthData;
import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
import at.gv.egiz.eaaf.core.impl.idp.auth.builder.BpkBuilder;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Service-Provider specific authentication data.
*
@@ -291,7 +291,7 @@ public class AuthenticationData implements IAuthData, Serializable {
*/
public void setBpkType(final String bpkType) {
this.bpkType = BpkBuilder.normalizeBpkTargetIdentifierToCommonFormat(bpkType);
-
+
}
@Override
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
index 7a8bc67c..77fdf4fc 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
@@ -43,10 +43,11 @@ public class EaafConstants {
// Austrian specific prefixes for pseudonyms of users
public static final String URN_PART_BASEID = "baseid";
public static final String URN_PART_CDID = "cdid+";
+ public static final String URN_PART_ECDID = "ecdid+";
public static final String URN_PART_WBPK = "wbpk+";
+ public static final String URN_PART_EWBPK= "ewbpk+";
public static final String URN_PART_EIDAS = "eidasid+";
- public static final String URN_PART_ECDID = "ecdid+";
-
+
public static final String URN_PREFIX = "urn:publicid:gv.at";
public static final String URN_PREFIX_WITH_COLON = URN_PREFIX + ":";
public static final String URN_PREFIX_BASEID = URN_PREFIX_WITH_COLON + URN_PART_BASEID;
@@ -54,6 +55,7 @@ public class EaafConstants {
public static final String URN_PREFIX_ECDID = URN_PREFIX_WITH_COLON + URN_PART_ECDID;
public static final String URN_PREFIX_BPK = URN_PREFIX_CDID + "bpk";
public static final String URN_PREFIX_WBPK = URN_PREFIX_WITH_COLON + URN_PART_WBPK;
+ public static final String URN_PREFIX_EWBPK = URN_PREFIX_WITH_COLON + URN_PART_EWBPK;
public static final String URN_PREFIX_EIDAS = URN_PREFIX_WITH_COLON + URN_PART_EIDAS;
public static final String URN_PREFIX_OW_BPK = URN_PREFIX_CDID + "OW";
@@ -61,25 +63,30 @@ public class EaafConstants {
* encrypted bPK target identifier pattern with {0} as bPK target without prefix and {1} as VKZ/SourceId.
*/
public static final String URN_ECDID_TARGET_PATTERN = URN_PREFIX_ECDID + "{1}+{0}";
-
+
+ /**
+ * encrypted wbPK target identifier pattern with {0} as bPK target without prefix and {1} as VKZ/SourceId.
+ */
+ public static final String URN_EWBPK_TARGET_PATTERN = URN_PREFIX_EWBPK + "{1}+{0}";
+
public static final String URN_PREFIX_WBPK_TARGET_WITH_X = EaafConstants.URN_PREFIX_WBPK + "X";
private static final String WBPK_TARGET_FN = "FN";
private static final String WBPK_TARGET_ZVR = "ZVR";
private static final String WBPK_TARGET_ERSB = "ERSB";
-
- private static final String URN_PREFIX_WBPK_TARGET_XFN_TARGET =
+
+ private static final String URN_PREFIX_WBPK_TARGET_XFN_TARGET =
EaafConstants.URN_PREFIX_WBPK_TARGET_WITH_X + WBPK_TARGET_FN;
- private static final String URN_PREFIX_WBPK_TARGET_XZVR_TARGET =
+ private static final String URN_PREFIX_WBPK_TARGET_XZVR_TARGET =
EaafConstants.URN_PREFIX_WBPK_TARGET_WITH_X + WBPK_TARGET_ZVR;
- private static final String URN_PREFIX_WBPK_TARGET_XERSB_TARGET =
+ private static final String URN_PREFIX_WBPK_TARGET_XERSB_TARGET =
EaafConstants.URN_PREFIX_WBPK_TARGET_WITH_X + WBPK_TARGET_ERSB;
-
+
private static final String URN_PREFIX_WBPK_TARGET_FN_TARGET = EaafConstants.URN_PREFIX_WBPK + WBPK_TARGET_FN;
private static final String URN_PREFIX_WBPK_TARGET_ZVR_TARGET = EaafConstants.URN_PREFIX_WBPK + WBPK_TARGET_ZVR;
private static final String URN_PREFIX_WBPK_TARGET_ERSB_TARGET = EaafConstants.URN_PREFIX_WBPK + WBPK_TARGET_ERSB;
-
+
public static final Map<String, String> URN_WBPK_TARGET_X_TO_NONE_MAPPER;
-
+
static {
final Map<String, String> intMap = new LinkedHashMap<>();
intMap.put(URN_PREFIX_WBPK_TARGET_XFN_TARGET, URN_PREFIX_WBPK_TARGET_FN_TARGET);
@@ -88,8 +95,8 @@ public class EaafConstants {
URN_WBPK_TARGET_X_TO_NONE_MAPPER = Collections.unmodifiableMap(intMap);
}
-
-
+
+
// Authentication process data_constants
public static final String UNIQUESESSIONIDENTIFIER = "eaaf_uniqueSessionIdentifier";
public static final String AUTH_DATA_CREATED = "eaaf_authdata_created";