Add new language selection

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java

1 files changed, 44 insertions, 42 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index 3723a09e9..cfa00f0e1 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -30,6 +30,8 @@ import java.util.HashMap;
 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;
@@ -46,7 +48,7 @@ public class MOAConfigValidator {
 
 	private static final Logger log = Logger.getLogger(MOAConfigValidator.class);
 	
-	public List<String> validate(GeneralMOAIDConfig form) {
+	public List<String> validate(GeneralMOAIDConfig form, HttpServletRequest request) {
 		
 		List<String> errors = new ArrayList<String>();
 		
@@ -58,7 +60,7 @@ public class MOAConfigValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.warn("SAML1 SourceID contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.SAML1SourceID", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 	
@@ -66,11 +68,11 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validateURL(check)) {
 				log.info("Public URL Prefix is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid", request));
 			}				
 		} else {
 			log.info("PublicURL Prefix is empty.");
-			errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.empty", request));
 		}
 		
 		check = form.getTimeoutAssertion();
@@ -78,7 +80,7 @@ public class MOAConfigValidator {
 			if (!ValidationHelper.validateNumber(check)) {
 				log.warn("Assertion Timeout is no number " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.timeouts.assertion.valid", 
-						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()} ));
+						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
 			}
 		}
 		check = form.getTimeoutMOASessionCreated();
@@ -86,7 +88,7 @@ public class MOAConfigValidator {
 			if (!ValidationHelper.validateNumber(check)) {
 				log.warn("MOASessionCreated Timeout is no number " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.timeouts.moasessioncreated.valid", 
-						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()} ));
+						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
 			}
 		}
 		check = form.getTimeoutMOASessionUpdated();
@@ -94,7 +96,7 @@ public class MOAConfigValidator {
 			if (!ValidationHelper.validateNumber(check)) {
 				log.warn("MOASessionUpdated Timeout is no number " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.timeouts.moasessionupdated.valid", 
-						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()} ));
+						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
 			}
 		}
 		
@@ -103,18 +105,18 @@ public class MOAConfigValidator {
 			if (ValidationHelper.isValidOAIdentifier(check)) {
 				log.warn("CertStoreDirectory contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", 
-						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()} ));
+						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
 			}
 		} else {
 			log.info("CertStoreDirectory is empty.");
-			errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request));
 		}
 		
 		check = form.getDefaultBKUHandy();
 		if (MiscUtil.isNotEmpty(check)) {
 			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));
 			}
 		}
 		
@@ -122,7 +124,7 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			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));
 			}
 		}
 		
@@ -130,19 +132,19 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			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));
 			}
 		}
 		
 		check = form.getDefaultchainigmode();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty Defaultchainigmode");
-			errors.add(LanguageHelper.getErrorString("validation.general.Defaultchainigmode.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.Defaultchainigmode.empty", request));
 		} else {
 			Map<String, String> list = form.getChainigmodelist();
 			if (!list.containsKey(check)) {
 				log.info("Not valid Defaultchainigmode " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.Defaultchainigmode.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.Defaultchainigmode.valid", request));
 			}
 		}
 				
@@ -150,7 +152,7 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validateURL(check)) {
 				log.info("Not valid Online-Mandate Service URL");
-				errors.add(LanguageHelper.getErrorString("validation.general.mandateservice.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.mandateservice.valid", request));
 			}
 		}
 		
@@ -158,7 +160,7 @@ public class MOAConfigValidator {
 		List<String> authtranslist = new ArrayList<String>();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty MoaspssAuthTransformation");
-			errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.transformation.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.transformation.empty", request));
 		} else {
 			
 			//is only required if more then one transformation is in use
@@ -184,24 +186,24 @@ public class MOAConfigValidator {
 		check = form.getMoaspssAuthTrustProfile();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty MOA-SP/SS Authblock TrustProfile");
-			errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.empty", request));
 		} else {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("Authblock TrustProfile is not valid: " +check);
 				errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
 		check = form.getMoaspssIdlTrustProfile();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty MOA-SP/SS IdentityLink TrustProfile");
-			errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.empty", request));
 		} else {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("IdentityLink TrustProfile is not valid: " +check);
 				errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -209,7 +211,7 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validateURL(check)) {
 				log.info("Not valid MOA-SP/SS Service URL");
-				errors.add(LanguageHelper.getErrorString("validation.general.moaspss.url.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.moaspss.url.valid", request));
 			}
 		}
 		
@@ -218,7 +220,7 @@ public class MOAConfigValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("PVP2 IssuerName is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.issuername.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -227,7 +229,7 @@ public class MOAConfigValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("PVP2 organisation display name is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.org.displayname.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -236,7 +238,7 @@ public class MOAConfigValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("PVP2 organisation name is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.org.name.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -244,7 +246,7 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validateURL(check)) {
 				log.info("PVP2 organisation URL is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.org.url.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.org.url.valid", request));
 			}
 		}
 		
@@ -259,33 +261,33 @@ public class MOAConfigValidator {
 		check = form.getSLRequestTemplateHandy();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SLRequestTemplate Handy-BKU");
-			errors.add(LanguageHelper.getErrorString("validation.general.slrequest.handy.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.slrequest.handy.empty", request));
 		} else {
 			if (ValidationHelper.isNotValidIdentityLinkSigner(check)) {
 				log.info("SLRequestTemplate Handy-BKU is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.handy.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.handy.valid", request));
 			}
 		}
 		
 		check = form.getSLRequestTemplateLocal();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SLRequestTemplate local BKU");
-			errors.add(LanguageHelper.getErrorString("validation.general.slrequest.local.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.slrequest.local.empty", request));
 		} else {
 			if (ValidationHelper.isNotValidIdentityLinkSigner(check)) {
 				log.info("SLRequestTemplate local BKU is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.local.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.local.valid", request));
 			}
 		}
 		
 		check = form.getSLRequestTemplateOnline();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SLRequestTemplate Online-BKU");
-			errors.add(LanguageHelper.getErrorString("validation.general.slrequest.online.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.slrequest.online.empty", request));
 		} else {
 			if (ValidationHelper.isNotValidIdentityLinkSigner(check)) {
 				log.info("SLRequestTemplate Online-BKU is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.online.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.online.valid", request));
 			}
 		}
 		
@@ -294,7 +296,7 @@ public class MOAConfigValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("SSO friendlyname is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.sso.friendlyname.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -320,14 +322,14 @@ public class MOAConfigValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, true)) {
 				log.info("SSO SpecialText is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.sso.specialauthtext.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} , request));
 			}
 		}
 		
 		check = form.getSsoTarget();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SSO Target");
-			errors.add(LanguageHelper.getErrorString("validation.general.sso.target.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.sso.target.empty", request));
 			
 		} else {
 			if (!ValidationHelper.isValidAdminTarget(check)) {
@@ -335,7 +337,7 @@ public class MOAConfigValidator {
 				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 					log.warn("IdentificationNumber contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.general.sso.target.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				}
 				
 				String num = check.replaceAll(" ", "");
@@ -345,7 +347,7 @@ public class MOAConfigValidator {
 							num.startsWith(Constants.IDENIFICATIONTYPE_ERSB) ) ) {
 					
 					log.info("Not valid SSO Target");
-					errors.add(LanguageHelper.getErrorString("validation.general.sso.target.valid"));
+					errors.add(LanguageHelper.getErrorString("validation.general.sso.target.valid", request));
 				}
 								
 			}
@@ -355,20 +357,20 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validateURL(check)) {
 				log.info("SZRGW URL is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.szrgw.url.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.szrgw.url.valid", request));
 			}
 		}
 		
 		check = form.getTrustedCACerts();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty TrustCACerts Directory");
-			errors.add(LanguageHelper.getErrorString("validation.general.trustedcacerts.empty"));
+			errors.add(LanguageHelper.getErrorString("validation.general.trustedcacerts.empty", request));
 			
 		} else {
 			if (ValidationHelper.isNotValidIdentityLinkSigner(check)) {
 				log.info("Not valid TrustCACerts Directory");
 				errors.add(LanguageHelper.getErrorString("validation.general.trustedcacerts.valid", 
-						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()} ));
+						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
 			}
 		}
 		
@@ -382,7 +384,7 @@ public class MOAConfigValidator {
 				if (MiscUtil.isNotEmpty(filename)) {
 					if (ValidationHelper.containsPotentialCSSCharacter(filename, false)) {
 						log.info("SL Transformation Filename is not valid");
-						errors.add(LanguageHelper.getErrorString("validation.general.slrequest.filename.valid"));
+						errors.add(LanguageHelper.getErrorString("validation.general.slrequest.filename.valid", request));
 						
 					} else {
 						try {
@@ -394,7 +396,7 @@ public class MOAConfigValidator {
 							log.info("SecurtiyLayerTransformation with FileName "
 									+ filename +" can not be loaded." , e);
 							errors.add(LanguageHelper.getErrorString("validation.general.slrequest.file.valid", 
-									new Object[] {filename} ));
+									new Object[] {filename}, request ));
 						}	
 					}
 				}
@@ -406,7 +408,7 @@ public class MOAConfigValidator {
 		ContactForm contact = form.getPvp2Contact();
 		if (contact != null) {
 			PVP2ContactValidator pvp2validator = new PVP2ContactValidator();
-			errors.addAll(pvp2validator.validate(contact));
+			errors.addAll(pvp2validator.validate(contact, request));
 		}
 		
 		return errors;