fix some problems with configuration validation in moa-id-configuration

5 files changed, 46 insertions, 10 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index 820a07318..95af93af3 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -56,6 +56,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.VerifyAuthBlock
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.VerifyIdentityLink;
 import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.configuration.Constants;
+import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.util.MiscUtil;
 
@@ -135,6 +136,26 @@ public class GeneralMOAIDConfig {
 		 for (int i=0; i<values.length; i++) {
 			 chainigmodelist.put(values[i].value(), values[i].value());
 		 }
+		 
+		try {
+			ConfigurationProvider config = ConfigurationProvider.getInstance();
+			if (config != null) {
+				MOAIDConfiguration dbconfig = config.getDbRead().getMOAIDConfiguration();
+				List<TransformsInfoType> authBlockTrans = dbconfig.getAuthComponentGeneral().getSecurityLayer().getTransformsInfo();
+				
+				if (authBlockTrans != null && !authBlockTrans.isEmpty()) {
+					if (secLayerTransformation == null)
+						secLayerTransformation = new HashMap<String, byte[]>();
+					for (TransformsInfoType el : authBlockTrans)
+						secLayerTransformation.put(el.getFilename(), el.getTransformation());
+											
+				}									
+			}
+							 
+		} catch (Exception e) {
+			
+		}
+		  
 	}
 	
 	public void parse(MOAIDConfiguration config) {
@@ -840,6 +861,7 @@ public class GeneralMOAIDConfig {
 	 * @return the secLayerTransformation
 	 */
 	public Map<String, byte[]> getSecLayerTransformation() {
+				
 		return secLayerTransformation;
 	}
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 3871fe6e1..504b598c0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -23,8 +23,11 @@
 package at.gv.egovernment.moa.id.configuration.struts.action;
 
 import java.math.BigInteger;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -181,7 +184,12 @@ public class EditGeneralConfigAction extends BasicAction {
 			String error = saveFormToDatabase();			
 			if (error != null) {
 				log.warn("General MOA-ID config can not be stored in Database");
-				addActionError(error);
+				
+				//set new formID
+				formID = Random.nextRandom();
+				session.setAttribute(Constants.SESSION_FORMID, formID);
+				
+				addActionError(error);				
 				return Constants.STRUTS_ERROR_VALIDATION;
 			}
 			
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 dac25ad60..d4e8e957d 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
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -40,8 +39,6 @@ import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
-import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
-import at.gv.egovernment.moa.id.configuration.validation.CompanyNumberValidator;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
@@ -417,7 +414,7 @@ public class MOAConfigValidator {
 		
 
 		
-		if (form.getFileUploadFileName() != null) {
+		if (form.getFileUploadFileName() != null && !form.getFileUploadFileName().isEmpty()) {
 			HashMap<String, byte[]> map = new HashMap<String, byte[]>();
 			for (int i=0; i<form.getFileUploadFileName().size(); i++) {
 				String filename = form.getFileUploadFileName().get(i);
@@ -442,7 +439,15 @@ public class MOAConfigValidator {
 					}
 				}
 			}
+						
 			form.setSecLayerTransformation(map);
+			
+		} else {
+			if (form.getSecLayerTransformation() == null) {			
+				log.info("AuthBlock Transformation file is empty");
+				errors.add(LanguageHelper.getErrorString("validation.general.slrequest.file.empty", request));
+				
+			}			
 		}
 		
 		
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index 7641fbafb..ab404f65b 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -441,8 +441,8 @@ validation.general.szrgw.url.valid=Die URL des SZR Gateways hat kein g\u00F6ltig
 validation.general.trustedcacerts.empty=Das Feld TrustedCACertificates ist leer.
 validation.general.trustedcacerts.valid=Das Feld TrustedCACertificates enth\u00E4lt ein ung\u00FCltiges Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.slrequest.filename.valid=Der Dateiname der angegebenen SecurtityLayer Transformation enth\u00E4lt ein ung\u00FCltiges Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
-validation.general.slrequest.file.valid=Die angegebenen SecurtityLayer Transformation konnte nicht geladen werden.
-validation.general.slrequest.file.empty=Die SecurtityLayer Transformation fehlt.
+validation.general.slrequest.file.valid=Die angegebenen AuthBlock Transformation konnte nicht geladen werden.
+validation.general.slrequest.file.empty=Die AuthBlock Transformation fehlt.
 
 validation.general.aditionalauthblocktext=Der Zusatztext f\u00FCr den AuthBlock enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.bku.handy.empty=Die URL f\u00FCr die Handy-BKU ist leer.
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 2bf38f197..29db35a0e 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -439,7 +439,8 @@ validation.general.szrgw.url.valid=URL for SZR Gateway has invalid format.
 validation.general.trustedcacerts.empty=Field TrustedCACertificates is blank.
 validation.general.trustedcacerts.valid=Das Feld TrustedCACertificates contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.slrequest.filename.valid=File name of provided SecurityLayer Transformation contains forbidden characters. The following characters are not allowed\: {0}
-validation.general.slrequest.file.valid=The provided SecurityLayer Transformation could not be loaded.
+validation.general.slrequest.file.valid=The provided AuthBlock-Transformation is not loadable.
+validation.general.slrequest.file.empty=No AuthBlock-Transformation found.
 
 validation.general.aditionalauthblocktext=The additional text for AuthBlock contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.bku.handy.empty=URL for Mobile-CCE is blank.