From 27be6ee27f530e9abca5d83d7464a8b80e182f41 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 22 Jan 2016 13:16:39 +0100
Subject: fix some problems with configuration validation in
 moa-id-configuration

---
 .../id/configuration/data/GeneralMOAIDConfig.java  | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data')

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;
 	}
 
-- 
cgit v1.2.3