OA qaa and attributes validated and persisted

1 files changed, 33 insertions, 4 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index d12d918bd..31cf7bcee 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -3,15 +3,44 @@ package at.gv.egovernment.moa.id.configuration.validation.oa;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
+import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class OASTORKConfigValidation {
+
+	private static final Logger log = Logger.getLogger(OASTORKConfigValidation.class);
+
 	public List<String> validate(OASTORKConfig oageneral) {
-		
+
 		List<String> errors = new ArrayList<String>();
-		
-		// we only have a checkbox for now, so no need to validate anything here
-		
+
+		// check qaa
+		int qaa = oageneral.getQaa();
+		if(1 > qaa && 4 < qaa) {
+			log.warn("QAA is out of range : " + qaa);
+			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
+					new Object[] {qaa} ));
+		}
+
+		// check attributes
+		String check = oageneral.getAttributes();
+		if (MiscUtil.isNotEmpty(check)) {
+			if (ValidationHelper.containsPotentialCSSCharacter(check, true)) {
+				log.warn("attributes contains potentail XSS characters: " + check);
+				errors.add(LanguageHelper.getErrorString("validation.stork.requestedattributes",
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+			}
+			if(!check.toLowerCase().matches("^[a-z0-9, ]*$")) {
+					log.warn("attributes do not match the requested format : " + check);
+					errors.add(LanguageHelper.getErrorString("validation.stork.requestedattributes",
+							new Object[] {check} ));
+			}
+		}
+
 		return errors;
 	}
 }