aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
diff options
context:
space:
mode:
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java60
1 files changed, 31 insertions, 29 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
index 637500c1e..92bdc2052 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
@@ -26,6 +26,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.log4j.Logger;
import at.gv.egovernment.moa.id.configuration.Constants;
@@ -39,7 +41,7 @@ public class OAGeneralConfigValidation {
private static final Logger log = Logger.getLogger(OASSOConfigValidation.class);
- public List<String> validate(OAGeneralConfig form, boolean isAdmin) {
+ public List<String> validate(OAGeneralConfig form, boolean isAdmin, HttpServletRequest request) {
List<String> errors = new ArrayList<String>();
String check;
@@ -51,7 +53,7 @@ public class OAGeneralConfigValidation {
if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
log.warn("AditionalAuthBlockText contains potentail XSS characters: " + check);
errors.add(LanguageHelper.getErrorString("validation.general.aditionalauthblocktext",
- new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+ new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
}
}
}
@@ -66,7 +68,7 @@ public class OAGeneralConfigValidation {
// } else {
if (!ValidationHelper.validateURL(check)) {
log.info("Not valid Handy-BKU URL");
- errors.add(LanguageHelper.getErrorString("validation.general.bku.handy.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.bku.handy.valid", request));
}
}
@@ -78,7 +80,7 @@ public class OAGeneralConfigValidation {
// } else {
if (!ValidationHelper.validateURL(check)) {
log.info("Not valid Online-BKU URL");
- errors.add(LanguageHelper.getErrorString("validation.general.bku.local.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.bku.local.valid", request));
}
}
@@ -90,7 +92,7 @@ public class OAGeneralConfigValidation {
// } else {
if (!ValidationHelper.validateURL(check)) {
log.info("Not valid Online-BKU URL");
- errors.add(LanguageHelper.getErrorString("validation.general.bku.online.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.bku.online.valid", request));
}
}
}
@@ -101,11 +103,11 @@ public class OAGeneralConfigValidation {
if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
log.warn("OAFriendlyName contains potentail XSS characters: " + check);
errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid",
- new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+ new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
}
} else {
log.info("OA friendlyName is empty");
- errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty"));
+ errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty", request));
}
if (isAdmin) {
@@ -113,12 +115,12 @@ public class OAGeneralConfigValidation {
check = form.getKeyBoxIdentifier();
if (MiscUtil.isEmpty(check)) {
log.info("Empty KeyBoxIdentifier");
- errors.add(LanguageHelper.getErrorString("validation.general.keyboxidentifier.empty"));
+ errors.add(LanguageHelper.getErrorString("validation.general.keyboxidentifier.empty", request));
} else {
Map<String, String> list = form.getKeyBoxIdentifierList();
if (!list.containsKey(check)) {
log.info("Not valid KeyBoxIdentifier " + check);
- errors.add(LanguageHelper.getErrorString("validation.general.keyboxidentifier.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.keyboxidentifier.valid", request));
}
}
@@ -128,26 +130,26 @@ public class OAGeneralConfigValidation {
MiscUtil.isEmpty(form.getSLTemplateURL2()) &&
MiscUtil.isEmpty(form.getSLTemplateURL3()) ) {
log.info("Empty OA-specific SecurityLayer Templates");
- errors.add(LanguageHelper.getErrorString("validation.general.sltemplates.empty"));
+ errors.add(LanguageHelper.getErrorString("validation.general.sltemplates.empty", request));
} else {
check = form.getSLTemplateURL1();
if (MiscUtil.isNotEmpty(check) &&
ValidationHelper.isNotValidIdentityLinkSigner(check) ) {
log.info("First OA-specific SecurityLayer Templates is not valid");
- errors.add(LanguageHelper.getErrorString("validation.general.sltemplate1.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.sltemplate1.valid", request));
}
check = form.getSLTemplateURL2();
if (MiscUtil.isNotEmpty(check) &&
ValidationHelper.isNotValidIdentityLinkSigner(check) ) {
log.info("Second OA-specific SecurityLayer Templates is not valid");
- errors.add(LanguageHelper.getErrorString("validation.general.sltemplate2.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.sltemplate2.valid", request));
}
check = form.getSLTemplateURL3();
if (MiscUtil.isNotEmpty(check) &&
ValidationHelper.isNotValidIdentityLinkSigner(check) ) {
log.info("Third OA-specific SecurityLayer Templates is not valid");
- errors.add(LanguageHelper.getErrorString("validation.general.sltemplate3.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.sltemplate3.valid", request));
}
}
}
@@ -159,13 +161,13 @@ public class OAGeneralConfigValidation {
if (!form.isUseMandates()) {
log.info("MandateProfiles configured but useMandates is false.");
- errors.add(LanguageHelper.getErrorString("validation.general.mandate.usemandate"));
+ errors.add(LanguageHelper.getErrorString("validation.general.mandate.usemandate", request));
}
if (ValidationHelper.containsPotentialCSSCharacter(check, true)) {
log.warn("MandateProfiles contains potentail XSS characters: " + check);
errors.add(LanguageHelper.getErrorString("validation.general.mandate.profiles",
- new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+ new Object[] {ValidationHelper.getPotentialCSSCharacter(true)}, request ));
}
}
@@ -178,12 +180,12 @@ public class OAGeneralConfigValidation {
check = form.getStorkSPTargetCountry();
if ((check==null)||(check.length() < 1)) {
log.warn("Stork target country is not known");
- errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget"));
+ errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget", request));
}
if (check.length() > 10) {
log.warn("Incorrect size of Stork target country, too many characters");
- errors.add(LanguageHelper.getErrorString("validation.general.stork.sptargetsize"));
+ errors.add(LanguageHelper.getErrorString("validation.general.stork.sptargetsize", request));
}
@@ -194,27 +196,27 @@ public class OAGeneralConfigValidation {
check = form.getIdentificationType();
if (!form.getIdentificationTypeList().contains(check)) {
log.info("IdentificationType is not known.");
- errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget"));
+ errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget", request));
}
//check identification number
check = form.getIdentificationNumber();
if (MiscUtil.isEmpty(check)) {
log.info("Empty IdentificationNumber");
- errors.add(LanguageHelper.getErrorString("validation.general.identificationnumber.empty"));
+ errors.add(LanguageHelper.getErrorString("validation.general.identificationnumber.empty", request));
} else {
if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
log.warn("IdentificationNumber contains potentail XSS characters: " + check);
errors.add(LanguageHelper.getErrorString("validation.general.identificationnumber.valid",
- new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+ new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
}
if (form.getIdentificationType().equals(Constants.IDENIFICATIONTYPE_FN)) {
CompanyNumberValidator val = new CompanyNumberValidator();
if (!val.validate(check)) {
log.info("Not valid CompanyNumber");
- errors.add(LanguageHelper.getErrorString("validation.general.identificationnumber.fn.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.identificationnumber.fn.valid", request));
}
}
}
@@ -225,7 +227,7 @@ public class OAGeneralConfigValidation {
if (MiscUtil.isNotEmpty(check)) {
if (!ValidationHelper.isValidAdminTarget(check)) {
log.info("Not valid Target-Subsector");
- errors.add(LanguageHelper.getErrorString("validation.general.target.subsector.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.target.subsector.valid", request));
}
}
@@ -235,7 +237,7 @@ public class OAGeneralConfigValidation {
if (!ValidationHelper.isPublicServiceAllowed(form.getIdentifier())) {
log.warn("PublicURLPrefix does not allow PublicService: " + form.getIdentifier());
errors.add(LanguageHelper.getErrorString("validation.general.target.publicserviceurl",
- new Object[] {form.getIdentifier()} ));
+ new Object[] {form.getIdentifier()}, request ));
form.setBusinessService(true);
return errors;
@@ -245,12 +247,12 @@ public class OAGeneralConfigValidation {
check = form.getTarget();
if (MiscUtil.isEmpty(check)) {
log.info("Empty Target");
- errors.add(LanguageHelper.getErrorString("validation.general.target.empty"));
+ errors.add(LanguageHelper.getErrorString("validation.general.target.empty", request));
} else {
if (!ValidationHelper.isValidTarget(check)) {
log.info("Not valid Target");
- errors.add(LanguageHelper.getErrorString("validation.general.target.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.target.valid", request));
}
}
@@ -262,13 +264,13 @@ public class OAGeneralConfigValidation {
if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
log.warn("TargetFriendlyName contains potentail XSS characters: " + check);
errors.add(LanguageHelper.getErrorString("validation.general.targetfriendlyname",
- new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+ new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
}
}
if (MiscUtil.isEmpty(form.getTarget()) && MiscUtil.isEmpty(form.getTarget_admin())) {
log.info("Empty Target");
- errors.add(LanguageHelper.getErrorString("validation.general.target.empty"));
+ errors.add(LanguageHelper.getErrorString("validation.general.target.empty", request));
}
//check Target
@@ -276,7 +278,7 @@ public class OAGeneralConfigValidation {
if (MiscUtil.isNotEmpty(check)) {
if (!ValidationHelper.isValidTarget(check)) {
log.info("Not valid Target");
- errors.add(LanguageHelper.getErrorString("validation.general.target.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.target.valid", request));
}
}
@@ -285,7 +287,7 @@ public class OAGeneralConfigValidation {
if (MiscUtil.isNotEmpty(check)) {
if (!ValidationHelper.isValidAdminTarget(check)) {
log.info("Not valid Target");
- errors.add(LanguageHelper.getErrorString("validation.general.target.admin.valid"));
+ errors.add(LanguageHelper.getErrorString("validation.general.target.admin.valid", request));
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 23:52:54 +0000