aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-11-03 17:19:55 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-11-03 17:19:55 +0100
commit7ed5f3385e7f8f9a455556404ded37e789a6e8e7 (patch)
tree6b598a0342bbbec87b9700e3c452eaa1cb5ac610 /id/server/moa-id-commons/src/main/java
parent4178b0c2811d509387f2f1ade59d7c009fef9973 (diff)
parente768a990fa26dc3f26034df9014a3b04593e8889 (diff)
downloadmoa-id-spss-7ed5f3385e7f8f9a455556404ded37e789a6e8e7.tar.gz
moa-id-spss-7ed5f3385e7f8f9a455556404ded37e789a6e8e7.tar.bz2
moa-id-spss-7ed5f3385e7f8f9a455556404ded37e789a6e8e7.zip
MOA-ID-3.1.5 was only a special version of 3.1.4 with a few cherry-picks for BRZ!!!
Merge branch 'Branch_MOA-ID-3.1.5' into eIDAS_node_implementation Conflicts: id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java id/history.txt id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java pom.xml
Diffstat (limited to 'id/server/moa-id-commons/src/main/java')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index d241dc5d5..b1abcdd06 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -982,7 +982,12 @@ public class ConfigurationMigrationUtils {
// transfer the incoming data to the database model
stork.setStorkLogonEnabled(Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_ENABLED)));
if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)))
- stork.seteIDAS_LOA(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL));
+ try {
+ stork.setQaa(Integer.valueOf(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)));
+ } catch (NumberFormatException e) {
+ Logger.info("Downgraded OA config found -> change eIDAS LoA to STORK QAA");
+ stork.setQaa(4);
+ }
if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES))
&& oa.get(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES).equals(MOAIDConfigurationConstants.PREFIX_VIDP))