diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-10-24 12:45:47 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-10-24 12:45:47 +0200 |
| commit | d1a5528b2f542c1f7004f6f47fba0b083ff03277 (patch) | |
| tree | 8e64bf5e8d51a81c449f79671f799fc6df43eb97 /id/moa-id-webgui/src/main/java | |
| parent | 479fb49056c4603069c50c43d38e7988efd733ee (diff) | |
| download | moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.tar.gz moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.tar.bz2 moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.zip | |
remove MOA-ID specific certStore directory.
From now, MOA-ID always use the MOA-SPSS certStore directory for chain building
Diffstat (limited to 'id/moa-id-webgui/src/main/java')
| -rw-r--r-- | id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java index 9b25f17e8..f66b4359f 100644 --- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java +++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java @@ -184,24 +184,25 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}) )); } } - - check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL, getKeyPrefix())); - if (MiscUtil.isNotEmpty(check)) { - if (ValidationHelper.isValidOAIdentifier(check)) { - log.warn("CertStoreDirectory contains potentail XSS characters: " + check); - errors.add(new ValidationObjectIdentifier( - MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL, - "Certificate - CertStore Directory", - LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", - new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}) )); - } - } else { - log.info("CertStoreDirectory is empty."); - errors.add(new ValidationObjectIdentifier( - MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL, - "Certificate - CertStore Directory", - LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty"))); - } + + //INFO: CertStore directory is not required any more since version 3.2.0, because MOA-SPSS certstore is always used +// check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL, getKeyPrefix())); +// if (MiscUtil.isNotEmpty(check)) { +// if (ValidationHelper.isValidOAIdentifier(check)) { +// log.warn("CertStoreDirectory contains potentail XSS characters: " + check); +// errors.add(new ValidationObjectIdentifier( +// MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL, +// "Certificate - CertStore Directory", +// LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", +// new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}) )); +// } +// } else { +// log.info("CertStoreDirectory is empty."); +// errors.add(new ValidationObjectIdentifier( +// MOAIDConfigurationConstants.GENERAL_AUTH_CERTSTORE_URL, +// "Certificate - CertStore Directory", +// LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty"))); +// } check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_HANDY, getKeyPrefix())); if (MiscUtil.isNotEmpty(check)) { |