fix a lot of problems which occur with new eIDAS SAML Engine v1.1.0

5 files changed, 20 insertions, 4 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
index f980f299c..16d320ea5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
@@ -1107,10 +1107,15 @@ public class AuthenticationDataBuilder extends MOAIDAuthConstants {
 		
 		String eIDASOutboundCountry = pendingReq.getGenericData(RequestImpl.eIDAS_GENERIC_REQ_DATA_COUNTRY, String.class);
 		
+		//TODO: maybe find a better solution
+		String cititzenCountryCode = 
+				authConfig.getBasicMOAIDConfiguration("moa.id.protocols.eIDAS.node.countrycode", 
+						MOAIDAuthConstants.COUNTRYCODE_AUSTRIA);
+		
 		 if (Constants.URN_PREFIX_BASEID.equals(baseIDType)) {
-			 if (MiscUtil.isNotEmpty(eIDASOutboundCountry) && !COUNTRYCODE_AUSTRIA.equals(eIDASOutboundCountry)) {
+			 if (MiscUtil.isNotEmpty(eIDASOutboundCountry) && !cititzenCountryCode.equals(eIDASOutboundCountry)) {
 				 Pair<String, String> eIDASID = new BPKBuilder().buildeIDASIdentifer(baseIDType, baseID, 
-						 COUNTRYCODE_AUSTRIA, eIDASOutboundCountry);
+						 cititzenCountryCode, eIDASOutboundCountry);
 				 Logger.debug("Authenticate user with bPK:" + eIDASID.getFirst() + " Type:" + eIDASID.getSecond());	
 				 return eIDASID;
 				 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
index 348b1c45a..e62a4a8d5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
@@ -228,6 +228,12 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 		
 	}
 	
+	public String getBasicMOAIDConfiguration(final String key, final String defaultValue) {
+		return properties.getProperty(key, defaultValue);
+		
+	}
+	
+	
 	/* (non-Javadoc)
 	 * @see at.gv.egovernment.moa.id.config.auth.AuthConfiguration#getPropertyWithKey(java.lang.String)
 	 */
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
index 1e0dfca8a..ffc6012c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
@@ -57,6 +57,7 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	public static final String DATAID_REQUESTER_IP_ADDRESS = "requesterIP";
 	
 	public static final String eIDAS_GENERIC_REQ_DATA_COUNTRY = "country";
+	public static final String eIDAS_GENERIC_REQ_DATA_LEVELOFASSURENCE = "eIDAS_LoA";
 	
 	
 	
diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
index e69297301..226e4ac98 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
@@ -258,7 +258,7 @@ stork.29=Fehler bei der Generierung von STORK-Attribut (eIdentifier/eLPIdentifie
 

 eIDAS.00=eIDAS Engine initialization FAILED. Reason:{0}

 eIDAS.01=Received eIDAS AuthnRequest is not valid. Reason:{0}

-eIDAS.02=Generate eIDAS AuthnRequest FAILED. Reason:{0} 

+eIDAS.02=Generation of eIDAS AuthnRequest FAILED. Reason:{0} 

 eIDAS.03=Can not connect to eIDAS Node. Reason:No CitizenCountry selected.

 eIDAS.04=Can not connect to eIDAS Node. Reason:{0} is not a valid CitizenCountry.

 eIDAS.05=Can not generate eIDAS metadata. Reason:{0}

@@ -267,7 +267,9 @@ eIDAS.07=Missing eIDAS-Attribute:{0}
 eIDAS.08=No valid eIDAs-Node configuration for enityID:{0}

 eIDAS.09=Received eIDAS Response is not valid. Reason:{0}

 eIDAS.10=Internal server error. Reason:{0}

-eIDAS.11=Received eIDAS Error-Response. Reason:{0} 

+eIDAS.11=Received eIDAS Error-Response. Reason:{0}

+eIDAS.12=Received eIDAS AuthnRequest is not valid. Reason:{0} 

+eIDAS.13=Generation of eIDAS Response FAILED. Reason:{0}

 

 pvp2.01=Fehler beim kodieren der PVP2 Antwort

 pvp2.02=Ungueltiges Datumsformat

diff --git a/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties
index bfaf5ffb1..aa30073f0 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties
@@ -225,6 +225,8 @@ eIDAS.08=1304
 eIDAS.09=1301
 eIDAS.10=9199
 eIDAS.11=1302
+eIDAS.12=1305
+eIDAS.13=1307
 
 pvp2.01=6100
 pvp2.06=6100