diff options
Diffstat (limited to 'id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesBKUSelectionTask.java')
-rw-r--r-- | id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesBKUSelectionTask.java | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesBKUSelectionTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesBKUSelectionTask.java index 7ed9751cb..b6561ccf4 100644 --- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesBKUSelectionTask.java +++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesBKUSelectionTask.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,6 +37,7 @@ import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants; import at.gv.egovernment.moa.id.commons.validation.ValidationHelper; import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationTaskValidationException; import at.gv.egovernment.moa.id.config.webgui.exception.ValidationObjectIdentifier; +import at.gv.egovernment.moa.id.config.webgui.helper.GUIDataParser; import at.gv.egovernment.moa.id.config.webgui.helper.LanguageHelper; import at.gv.egovernment.moa.id.config.webgui.validation.task.AbstractTaskValidator; import at.gv.egovernment.moa.id.config.webgui.validation.task.ITaskValidator; @@ -94,6 +94,18 @@ public class ServicesBKUSelectionTask extends AbstractTaskValidator implements I } + String bkuSelectionFileUpload = input.get(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_BKUSELECTION_DATA); + String bkuSelectionFile = GUIDataParser.getBase64ContentFromGUIUpload(bkuSelectionFileUpload); + if (bkuSelectionFile != null) + newConfigValues.put(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_BKUSELECTION_DATA, + bkuSelectionFile); + + String sendAssertionTemplateUpload = input.get(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_BKUSELECTION_DATA); + String sendAssertionTemplate = GUIDataParser.getBase64ContentFromGUIUpload(sendAssertionTemplateUpload); + if (sendAssertionTemplate != null) + newConfigValues.put(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_BKUSELECTION_DATA, + sendAssertionTemplate); + if (newConfigValues.isEmpty()) return null; else @@ -148,13 +160,8 @@ public class ServicesBKUSelectionTask extends AbstractTaskValidator implements I } - String[] bkuSelectTemplateSplitted = bkuSelectionFileUpload.split(","); - if (bkuSelectTemplateSplitted.length > 1) - bkuSelectTemplate = bkuSelectTemplateSplitted[1]; - else - bkuSelectTemplate = bkuSelectionFileUpload; - - if (!Base64.isBase64(bkuSelectTemplate)) { + bkuSelectTemplate = GUIDataParser.getBase64ContentFromGUIUpload(bkuSelectionFileUpload); + if (bkuSelectTemplate == null) { log.info("BKU Selection Template is not decodeable."); errors.add(new ValidationObjectIdentifier( MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_BKUSELECTION_DATA, @@ -202,13 +209,8 @@ public class ServicesBKUSelectionTask extends AbstractTaskValidator implements I } - String[] sendAssertionTemplateSplitted = sendAssertionFileUpload.split(","); - if (sendAssertionTemplateSplitted.length > 1) - sendAssertionTemplate = sendAssertionTemplateSplitted[1]; - else - sendAssertionTemplate = sendAssertionFileUpload; - - if (!Base64.isBase64(sendAssertionTemplate)) { + sendAssertionTemplate = GUIDataParser.getBase64ContentFromGUIUpload(sendAssertionFileUpload); + if (sendAssertionTemplate == null) { log.info("Send Assertion Template is not decodeable."); errors.add(new ValidationObjectIdentifier( MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_SENDASSERTION_DATA, |