* add OA specific BKU selection template

* add OA specific send-assertion template
* add OA specific applet height and width configuration
* add PVP2.x reload checkbox in PVP2.x OA configuration

* add new elements to MOA-ID configuration

1 files changed, 90 insertions, 0 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
new file mode 100644
index 000000000..8887aeaad
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.configuration.validation.oa;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+
+import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
+import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.util.Base64Utils;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class OAFileUploadValidation {
+
+	private static final Logger log = Logger.getLogger(OASSOConfigValidation.class);
+	
+	public List<String> validate(List<String> fileName, List<File> files, String errorMsgPreFix, Map<String, byte[]> output) {
+		
+		List<String> errors = new ArrayList<String>();
+		
+		if (fileName != null) {
+			
+			if (fileName.size() > 1) {
+				log.info("Only one BKU-selecten template file can be stored");
+				errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.selected"));
+			}
+			
+			for (int i=0; i<fileName.size(); i++) {
+				String filename = fileName.get(i);
+				
+				if (MiscUtil.isNotEmpty(filename)) {
+					if (ValidationHelper.containsPotentialCSSCharacter(filename, false)) {
+						log.info("Filename is not valid");
+						errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".filename.valid"));
+						
+					} else {
+						try {
+							File file = files.get(i);
+							InputStream stream = new FileInputStream(file);
+							output.put(filename, IOUtils.toByteArray(stream));
+							stream.close();
+							
+						} catch (IOException e) {
+							log.info("File with FileName "
+									+ filename +" can not be loaded." , e);
+							errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.valid", 
+									new Object[] {filename} ));
+						}	
+					}
+				}
+			}
+		}
+		
+		return errors;
+	}
+}