From 9b7b67ee1b3c00a3760e09c05fa9e65d4a4e80fa Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 24 Jul 2018 06:39:34 +0200 Subject: 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. --- .../processes/tasks/EvaluateCountrySelectionTask.java | 11 +++++++---- .../resources/properties/external_statuscodes_map.properties | 1 + .../main/resources/properties/status_messages_en.properties | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'connector/src/main') 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} -- cgit v1.2.3