diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-02-10 13:04:47 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-02-10 13:04:47 +0100 |
| commit | 226db2c5c41c149256459bf18dff4585a07e5ea1 (patch) | |
| tree | 5dae6843a16a5aab872bde0cc6d20fda32c9d5bd /id/moa-id-webgui/src | |
| parent | b4e3813e3f0fc900b5c2194bc6c06e4908a14797 (diff) | |
| parent | cb57226d20f61b33e485144f2814edcd36589d5e (diff) | |
| download | moa-id-spss-226db2c5c41c149256459bf18dff4585a07e5ea1.tar.gz moa-id-spss-226db2c5c41c149256459bf18dff4585a07e5ea1.tar.bz2 moa-id-spss-226db2c5c41c149256459bf18dff4585a07e5ea1.zip | |
Merge branch 'eIDAS_node_implementation' into development_preview
Diffstat (limited to 'id/moa-id-webgui/src')
| -rw-r--r-- | id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java index 6d1dafd6c..fb675ad43 100644 --- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java +++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java @@ -125,7 +125,7 @@ public static final List<String> KEYWHITELIST; LanguageHelper.getErrorString("validation.stork.cpeps.cc", new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}))); } - if(!cc.toLowerCase().matches("^[a-z][a-z]$")) { + if(!cc.toLowerCase().matches("(^[a-z][a-z]$)|(^[a-z][a-z]-[a-z]*)")) { log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + cc); errors.add(new ValidationObjectIdentifier( MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST |