diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index 0ff60a656..2e8ec29de 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -125,7 +125,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) { log.info("Online-Applikation managemant disabled. Mail address is not verified."); - addActionError(LanguageHelper.getErrorString("error.editoa.mailverification")); + addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request)); return Constants.STRUTS_SUCCESS; } @@ -146,7 +146,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, generalOA.parse(onlineapplication); ssoOA.parse(onlineapplication); saml1OA.parse(onlineapplication); - oauth20OA.parse(onlineapplication); + oauth20OA.parse(onlineapplication, request); session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret()); storkOA.parse(onlineapplication); @@ -157,7 +157,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, session.setAttribute(Constants.SESSION_BKUFORMPREVIEW, map); - List<String> errors = pvp2OA.parse(onlineapplication); + List<String> errors = pvp2OA.parse(onlineapplication, request); if (errors.size() > 0) { for (String el : errors) @@ -200,7 +200,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) { log.info("Online-Applikation managemant disabled. Mail address is not verified."); - addActionError(LanguageHelper.getErrorString("error.editoa.mailverification")); + addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request)); return Constants.STRUTS_SUCCESS; } @@ -263,7 +263,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID()); if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) { log.info("Online-Applikation managemant disabled. Mail address is not verified."); - addActionError(LanguageHelper.getErrorString("error.editoa.mailverification")); + addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request)); return Constants.STRUTS_SUCCESS; } @@ -291,14 +291,14 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, String oaidentifier = generalOA.getIdentifier(); if (MiscUtil.isEmpty(oaidentifier)) { log.info("Empty OA identifier"); - errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.empty")); + errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.empty", request)); } else { if (!ValidationHelper.validateURL(oaidentifier)) { log.warn("OnlineapplikationIdentifier is not a valid URL: " + oaidentifier); errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.valid", - new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()})); + new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}, request)); } else { if (oaid == -1) { @@ -306,7 +306,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, newOA = true; if (onlineapplication != null) { log.info("The OAIdentifier is not unique"); - errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique")); + errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request)); } } else { @@ -315,7 +315,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) { log.info("The OAIdentifier is not unique"); - errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique")); + errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request)); } } } @@ -335,17 +335,17 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, OAOAUTH20ConfigValidation validatior_oauth20 = new OAOAUTH20ConfigValidation(); OAFileUploadValidation valiator_fileUpload = new OAFileUploadValidation(); - errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin())); - errors.addAll(validatior_pvp2.validate(pvp2OA)); - errors.addAll(validatior_saml1.validate(saml1OA, generalOA)); - errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin())); - errors.addAll(validator_stork.validate(storkOA)); - errors.addAll(validator_form.validate(formOA)); - errors.addAll(validatior_oauth20.validate(oauth20OA)); + errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin(), request)); + errors.addAll(validatior_pvp2.validate(pvp2OA, request)); + errors.addAll(validatior_saml1.validate(saml1OA, generalOA, request)); + errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin(), request)); + errors.addAll(validator_stork.validate(storkOA, request)); + errors.addAll(validator_form.validate(formOA, request)); + errors.addAll(validatior_oauth20.validate(oauth20OA, request)); //validate BKU-selection template List<String> templateError = valiator_fileUpload.validate(generalOA.getBkuSelectionFileUploadFileName() - , generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm); + , generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm, request); if (templateError != null && templateError.size() == 0) { if (bkuSelectionForm != null && bkuSelectionForm.size() > 0) session.setAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE, bkuSelectionForm); @@ -360,7 +360,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, //validate send-assertion template templateError = valiator_fileUpload.validate(generalOA.getSendAssertionFileUploadFileName() - , generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm); + , generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm, request); if (templateError != null && templateError.size() == 0) { if (sendAssertionForm != null && sendAssertionForm.size() > 0) session.setAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE, sendAssertionForm); @@ -377,7 +377,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, // Do not allow SSO in combination with special BKUSelection features if (ssoOA.isUseSSO() && (formOA.isOnlyMandateAllowed() || !formOA.isShowMandateLoginButton())) { log.warn("Special BKUSelection features can not be used in combination with SSO"); - errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid")); + errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid", request)); } if (errors.size() > 0) { @@ -568,14 +568,14 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID()); if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) { log.info("Online-Applikation managemant disabled. Mail address is not verified."); - addActionError(LanguageHelper.getErrorString("error.editoa.mailverification")); + addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request)); return Constants.STRUTS_SUCCESS; } String oaidentifier = generalOA.getIdentifier(); if (MiscUtil.isEmpty(oaidentifier)) { log.info("Empty OA identifier"); - addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.empty")); + addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.empty", request)); formID = Random.nextRandom(); session.setAttribute(Constants.SESSION_FORMID, formID); @@ -585,7 +585,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, if (ValidationHelper.isValidOAIdentifier(oaidentifier)) { log.warn("IdentificationNumber contains potentail XSS characters: " + oaidentifier); addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.valid", - new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()})); + new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}, request)); formID = Random.nextRandom(); session.setAttribute(Constants.SESSION_FORMID, formID); @@ -651,7 +651,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, HttpSession session = request.getSession(); if (session == null) { log.info("No http Session found."); - preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible"); + preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible", request); } else { InputStream input = null; @@ -708,13 +708,13 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, } } else { - preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible"); + preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible", request); } } catch (Exception e) { log.warn("BKUSelection Preview can not be generated.", e); - preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible"); + preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible", request); } } @@ -966,10 +966,10 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, } catch (CertificateException e) { log.info("Uploaded Certificate can not be found", e); - return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound"); + return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound", request); } catch (IOException e) { log.info("Uploaded Certificate can not be parsed", e); - return LanguageHelper.getErrorString("validation.pvp2.certificate.format"); + return LanguageHelper.getErrorString("validation.pvp2.certificate.format", request); } OASAML1 saml1 = authoa.getOASAML1(); @@ -1063,7 +1063,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware, } catch (MOADatabaseException e) { log.warn("Online-Application can not be stored.", e); - return LanguageHelper.getErrorString("error.db.oa.store"); + return LanguageHelper.getErrorString("error.db.oa.store", request); } return null; |