aboutsummaryrefslogtreecommitdiff
path: root/connector
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2018-07-24 06:39:34 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2018-07-24 06:39:34 +0200
commit9b7b67ee1b3c00a3760e09c05fa9e65d4a4e80fa (patch)
tree05b83dd2396439737d30fb04f8b082a306cd5d02 /connector
parentb3e812dbac60546daff66fa0f6c53e42030921bb (diff)
downloadNational_eIDAS_Gateway-9b7b67ee1b3c00a3760e09c05fa9e65d4a4e80fa.tar.gz
National_eIDAS_Gateway-9b7b67ee1b3c00a3760e09c05fa9e65d4a4e80fa.tar.bz2
National_eIDAS_Gateway-9b7b67ee1b3c00a3760e09c05fa9e65d4a4e80fa.zip
update countrySelectionProcess to support more than one eIDAS Nodes for different production stages. This is required, because eIDAS Ref. Impl. 2.0 and 2.1 supports only one countryCode each instance.
Diffstat (limited to 'connector')
-rw-r--r--connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java11
-rw-r--r--connector/src/main/resources/properties/external_statuscodes_map.properties1
-rw-r--r--connector/src/main/resources/properties/status_messages_en.properties1
3 files changed, 9 insertions, 4 deletions
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
index ff3dc252..4ae97acf 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
@@ -45,10 +45,13 @@ public class EvaluateCountrySelectionTask extends AbstractAuthServletTask {
while(reqParamNames.hasMoreElements()) {
String paramName = reqParamNames.nextElement();
if (StringUtils.isNotEmpty(paramName) &&
- !EAAFConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName))
- executionContext.put(paramName,
- StringEscapeUtils.escapeHtml(request.getParameter(paramName)));
-
+ !EAAFConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
+ for (String el : MSeIDASNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST) {
+ if (el.equalsIgnoreCase(paramName))
+ executionContext.put(paramName,
+ StringEscapeUtils.escapeHtml(request.getParameter(paramName)));
+ }
+ }
}
log.info("Country selection finished. Starting auth. process for country ... ");
diff --git a/connector/src/main/resources/properties/external_statuscodes_map.properties b/connector/src/main/resources/properties/external_statuscodes_map.properties
index d2e2dab4..cf26832b 100644
--- a/connector/src/main/resources/properties/external_statuscodes_map.properties
+++ b/connector/src/main/resources/properties/external_statuscodes_map.properties
@@ -68,5 +68,6 @@ internal.02=9101
internal.03=9199
internal.04=9101
+config.08=9008
config.27=9008
config.30=9008 \ No newline at end of file
diff --git a/connector/src/main/resources/properties/status_messages_en.properties b/connector/src/main/resources/properties/status_messages_en.properties
index a6985d0f..e09f3691 100644
--- a/connector/src/main/resources/properties/status_messages_en.properties
+++ b/connector/src/main/resources/properties/status_messages_en.properties
@@ -66,5 +66,6 @@ internal.02=Internal error. Can not access data cache.
internal.03=Internal error. Can not initialize a cryptographic method.
internal.04=Internal error. Can not access data cache (Reason: {0}).
+config.08=Configuration value: {0} is missing.
config.27=Configuration parameter processing failed. Reason: {0}
config.30=External configuration not found. File: {0}