Merge branch 'master' into moa-sig-dependency-fixup

6 files changed, 98 insertions, 16 deletions

diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java
index 2a92e5f3..e4ebe433 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/PVPAttributeDefinitions.java
@@ -133,6 +133,30 @@ public interface PVPAttributeDefinitions {
 	public static final String EID_CITIZEN_EIDAS_QAA_LEVEL_OID = "1.2.40.0.10.2.1.1.261.108";	
 	public static final String EID_CITIZEN_EIDAS_QAA_LEVEL_NAME = URN_OID_PREFIX + EID_CITIZEN_EIDAS_QAA_LEVEL_OID;
 	public static final String EID_CITIZEN_EIDAS_QAA_LEVEL_FRIENDLY_NAME = "EID-CITIZEN-QAA-EIDAS-LEVEL";
+
+	public static final String EID_IDENTITY_STATUS_LEVEL_OID = "1.2.40.0.10.2.1.1.261.109";	
+	public static final String EID_IDENTITY_STATUS_LEVEL_NAME = URN_OID_PREFIX + EID_IDENTITY_STATUS_LEVEL_OID;
+	public static final String EID_IDENTITY_STATUS_LEVEL_FRIENDLY_NAME = "EID-IDENTITY-STATUS-LEVEL";
+	public enum EID_IDENTITY_STATUS_LEVEL_VALUES {
+		IDENTITY("http://eid.gv.at/eID/status/identity"), 
+		TESTIDENTITY("http://eid.gv.at/eID/status/testidentity"),
+		SYSTEM("http://eid.gv.at/eID/status/system");
+		
+		private final String uri;
+		
+		private EID_IDENTITY_STATUS_LEVEL_VALUES(String uri) {
+			this.uri = uri; 
+		}
+		
+		/**
+		 * Get the URI based status identifier of an E-ID
+		 * 
+		 * @return
+		 */
+		public String getURI() {
+			return this.uri;
+		}
+	};
 	
 	public static final String EID_ISSUING_NATION_OID = "1.2.40.0.10.2.1.1.261.32";
 	public static final String EID_ISSUING_NATION_NAME = URN_OID_PREFIX + EID_ISSUING_NATION_OID;
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
index eceec2a6..7d564b58 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
@@ -57,27 +57,35 @@ public interface IConfiguration {
 	 */
 	public String getBasicConfiguration(final String key, final String defaultValue);
 	
+	
 	/**
-	 * Get a set of configuration values from file based configuration that starts with this prefix
-	 * <br><br>
-	 * <b>Important:</b> The configuration values must be of type String! 
+	 * Get a configuration value from file based configuration
 	 * 
-	 * @param prefix Prefix of the configuration key
-	 * @return Map<String, String> without prefix, but never null
+	 * @param key configuration key 
+	 * @return configuration value as {@link Boolean.parseBoolean(value)} or <code>null</code> if key does not exist
 	 */
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(final String prefix);
-	
+	public Boolean getBasicConfigurationBoolean(final String key);
 	
 	/**
-	 * Get a boolean value from basic MOA-ID configuration file
+	 * Get a configuration value from file based configuration
 	 * 
-	 * @param key Configuration key
-	 * @param defaultValue Default result
-	 * @return returns the value of the configuration key, or the default value if the key is not set
+	 * @param key configuration key 
+	 * @param defaultValue Default value if no value with this key is found
+	 * @return configuration value as {@link Boolean.parseBoolean(value)} or <code>defaultValue</code> if key does not exist
 	 */
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue);
+	public boolean getBasicConfigurationBoolean(final String key, final boolean defaultValue);
 	
 	/**
+	 * Get a set of configuration values from file based configuration that starts with this prefix
+	 * <br><br>
+	 * <b>Important:</b> The configuration values must be of type String! 
+	 * 
+	 * @param prefix Prefix of the configuration key
+	 * @return Map<String, String> without prefix, but never null
+	 */
+	public Map<String, String> getBasicConfigurationWithPrefix(final String prefix);
+		
+	/**
 	 * Get a configuration entry for a specific Service Provider 
 	 * 
 	 * @param uniqueID Unique identifier of the Service Provider
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IEidAuthData.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IEidAuthData.java
new file mode 100644
index 00000000..74c84468
--- /dev/null
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IEidAuthData.java
@@ -0,0 +1,45 @@
+package at.gv.egiz.eaaf.core.api.idp;
+
+import at.gv.egiz.eaaf.core.api.data.PVPAttributeDefinitions;
+
+public interface IEidAuthData extends IAuthData {
+
+	/**
+	 * Get the serialized signing certificate that was used to sign the consent
+	 * 
+	 * @return
+	 */
+	byte[] getSignerCertificate();
+
+	
+	/**
+	 * Get the serialized E-ID token that can be used to validate the Identity-Link
+	 * 
+	 * @return
+	 */
+	byte[] getEIDToken();
+
+
+	/**
+	 * Get the status of the E-ID  
+	 * 
+	 * @return {@link PVPAttributeDefinitions.EID_IDENTITY_STATUS_LEVEL_VALUES}
+	 */
+	PVPAttributeDefinitions.EID_IDENTITY_STATUS_LEVEL_VALUES getEIDStatus();
+	
+	
+	/**
+	 * Get the URL of the VDA EndPoint, that was used for authentication
+	 * 
+	 * @return 
+	 */
+	String getVdaEndPointUrl();
+	
+	
+	/**
+	 * Flag that mandates are used
+	 * 
+	 * @return true if mandates are used, otherwise false
+	 */
+	boolean isUseMandate();
+}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/AttributeBuilderException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/AttributeBuilderException.java
index efeecbe5..f02b3bf6 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/AttributeBuilderException.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/AttributeBuilderException.java
@@ -30,8 +30,8 @@ public class AttributeBuilderException extends EAAFIDPException {
 
 	private static final long serialVersionUID = 1L;
 
-	public AttributeBuilderException(String msg) {
-		super(msg);
+	public AttributeBuilderException(String attrName) {
+		super("builder.12", new Object[] {attrName});
 	}
 
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFIDPException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFIDPException.java
index 8af806d0..7f504a5a 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFIDPException.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFIDPException.java
@@ -38,4 +38,9 @@ public class EAAFIDPException extends EAAFException {
 		
 	}
 
+	public EAAFIDPException(String msg, Object[] params) {
+		super(msg, params);
+		
+	}
+	
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/UnavailableAttributeException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/UnavailableAttributeException.java
index d87af4d1..626cbea7 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/UnavailableAttributeException.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/UnavailableAttributeException.java
@@ -33,10 +33,10 @@ public class UnavailableAttributeException extends AttributeBuilderException {
 	 */
 	private static final long serialVersionUID = -1114323185905118432L;
 
-	private String attributeName;
+	private final String attributeName;
 	
 	public UnavailableAttributeException(String attributeName) {
-		super("Attribute " + attributeName + " is not available.");
+		super(attributeName);
 		this.attributeName = attributeName;
 	}