add configuration-property to set ID Austria stage of a each eIDAS Connector

5 files changed, 58 insertions, 4 deletions

diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties
index e4f30544..e3bbedd1 100644
--- a/connector/src/main/resources/application.properties
+++ b/connector/src/main/resources/application.properties
@@ -198,6 +198,7 @@ eidas.ms.auth.eIDAS.proxy.mandates.enabled=false
 #eidas.ms.connector.0.mandates.enabled=false
 #eidas.ms.connector.0.mandates.natural=
 #eidas.ms.connector.0.mandates.legal=
+#eidas.ms.connector.0.auth.idaustria.entityId=
 
 
 ## PVP2 S-Profile communication with ID Austria System 
diff --git a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java
index 982bfb4f..afe7f962 100644
--- a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java
+++ b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java
@@ -71,6 +71,13 @@ public class IdAustriaAuthConstants {
   public static final String CONFIG_PROPS_REQUIRED_PVP_ATTRIBUTES_LIST = CONFIG_PROPS_PREFIX
       + "required.additional.attributes";
 
+  
+  /**
+   * SP specific EntityId of the ID Austria. 
+   */
+  public static final String CONFIG_PROPS_APPSPECIFIC_IDAUSTRIA_NODE_URL = "auth.idaustria.entityId";
+  
+  
   public static final List<Triple<String, String, Boolean>> DEFAULT_REQUIRED_MANDATE_NAT_PVP_ATTRIBUTES =
       Collections.unmodifiableList(new ArrayList<Triple<String, String, Boolean>>() {
         private static final long serialVersionUID = 1L;
diff --git a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
index 2141fee8..f044c259 100644
--- a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
+++ b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import at.asitplus.eidas.specific.modules.auth.idaustria.IdAustriaAuthConstants;
 import at.asitplus.eidas.specific.modules.auth.idaustria.utils.IdAustriaAuthCredentialProvider;
 import at.asitplus.eidas.specific.modules.auth.idaustria.utils.IdAustriaAuthMetadataProvider;
+import at.asitplus.eidas.specific.modules.auth.idaustria.utils.Utils;
 import at.asitplus.eidas.specific.modules.msproxyservice.MsProxyServiceConstants;
 import at.gv.egiz.eaaf.core.api.data.PvpAttributeDefinitions;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
@@ -143,8 +144,8 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
 
       } else {
         // validate entityId of response
-        final String idAustriaEntityID = authConfig.getBasicConfiguration(
-            IdAustriaAuthConstants.CONFIG_PROPS_IDAUSTRIA_ENTITYID);
+        final String idAustriaEntityID =
+            Utils.getIdAustriaEntityId(pendingReq.getServiceProviderConfiguration(), authConfig); 
         final String respEntityId = msg.getEntityID();
         if (!idAustriaEntityID.equals(respEntityId)) {
           log.warn("Response Issuer is not a 'ID Austria System'. Stopping eIDAS authentication ...");
diff --git a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java
index 0c91345f..282b452b 100644
--- a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java
+++ b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java
@@ -19,6 +19,7 @@ import at.asitplus.eidas.specific.modules.auth.idaustria.IdAustriaAuthConstants;
 import at.asitplus.eidas.specific.modules.auth.idaustria.config.IdAustriaAuthRequestBuilderConfiguration;
 import at.asitplus.eidas.specific.modules.auth.idaustria.utils.IdAustriaAuthCredentialProvider;
 import at.asitplus.eidas.specific.modules.auth.idaustria.utils.IdAustriaAuthMetadataProvider;
+import at.asitplus.eidas.specific.modules.auth.idaustria.utils.Utils;
 import at.asitplus.eidas.specific.modules.msproxyservice.protocol.ProxyServicePendingRequest;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions;
@@ -70,8 +71,8 @@ public class RequestIdAustriaSystemTask extends AbstractAuthServletTask {
       //revisionsLogger.logEvent(pendingReq, EidasAuthEventConstants.AUTHPROCESS_EIDAS_AT_CONNECTOR_SELECTED);
 
       // get entityID for central ID Austria system
-      final String idAustriaEntityID = authConfig.getBasicConfiguration(
-          IdAustriaAuthConstants.CONFIG_PROPS_IDAUSTRIA_ENTITYID);
+      final String idAustriaEntityID =
+          Utils.getIdAustriaEntityId(pendingReq.getServiceProviderConfiguration(), authConfig);           
       if (StringUtils.isEmpty(idAustriaEntityID)) {
         log.info("ID Austria authentication not possible -> NO EntityID for central central ID Austria System FOUND!");
         throw new EaafConfigurationException(IdAustriaAuthConstants.ERRORTYPE_00,
diff --git a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/utils/Utils.java b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/utils/Utils.java
new file mode 100644
index 00000000..1de6c33f
--- /dev/null
+++ b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/utils/Utils.java
@@ -0,0 +1,44 @@
+package at.asitplus.eidas.specific.modules.auth.idaustria.utils;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import at.asitplus.eidas.specific.modules.auth.idaustria.IdAustriaAuthConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+
+public class Utils {
+
+  /**
+   * Get the EntityId of the ID Austria system that
+   * should be used in this process.
+   *
+   * @param spConfiguration Service-Provider configuration that can include
+   *    {@linkplain IdAustriaAuthConstants.CONFIG_PROPS_APPSPECIFIC_IDAUSTRIA_NODE_URL}
+   * @param authConfig Basic application configuration that include
+   *    {@linkplain IdAustriaAuthConstants.CONFIG_PROPS_IDAUSTRIA_ENTITYID}
+   * @return EntityId, or <code>null</code> if no EntityId was found in configuration
+   */
+  @Nullable
+  public static String getIdAustriaEntityId(
+      ISpConfiguration spConfiguration, IConfiguration authConfig) {
+    // load from service-provider configuration
+    String msNodeEntityID = spConfiguration.getConfigurationValue(
+        IdAustriaAuthConstants.CONFIG_PROPS_APPSPECIFIC_IDAUSTRIA_NODE_URL);
+
+    if (StringUtils.isEmpty(msNodeEntityID)) {
+      msNodeEntityID = authConfig.getBasicConfiguration(
+          IdAustriaAuthConstants.CONFIG_PROPS_IDAUSTRIA_ENTITYID);
+
+    }
+
+    return msNodeEntityID;
+  }
+  
+  private Utils() {
+    //hide constructor of private class
+    
+  }
+  
+}