1 files changed, 67 insertions, 2 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 83795567c..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
@@ -54,7 +54,9 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TransformsInfoT
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TrustAnchor;
 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;
 
@@ -126,6 +128,7 @@ public class GeneralMOAIDConfig {
 	private String SLRequestTemplateHandy = "SLTemplates/template_handyBKU.html";
 	
 	private String publicURLPrefix = null;
+	private boolean virtualPublicURLPrefixEnabled = false;
 	
 	public GeneralMOAIDConfig() {
 		chainigmodelist = new HashMap<String, String>();
@@ -133,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) {
@@ -163,7 +186,26 @@ public class GeneralMOAIDConfig {
 					if (authgen.isTrustManagerRevocationChecking() != null)
 						trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking();
 					
-					publicURLPrefix = authgen.getPublicURLPreFix();
+					virtualPublicURLPrefixEnabled = 
+							KeyValueUtils.isCSVValueString(authgen.getPublicURLPreFix());
+					
+					if (virtualPublicURLPrefixEnabled) {
+						//format CSV values with newlines 
+						publicURLPrefix = KeyValueUtils.normalizeCSVValueString(
+								authgen.getPublicURLPreFix());
+												
+					} else {
+						String tmp = authgen.getPublicURLPreFix();
+						if (tmp.contains(KeyValueUtils.CSV_DELIMITER)) {
+							//remove trailing comma if exist
+							publicURLPrefix = tmp.substring(0, 
+									tmp.indexOf(KeyValueUtils.CSV_DELIMITER));
+														
+						} else							
+							publicURLPrefix = tmp;
+					}
+					
+					
 					
 					TimeOuts timeouts = authgen.getTimeOuts();
 					if (timeouts != null) {
@@ -819,6 +861,7 @@ public class GeneralMOAIDConfig {
 	 * @return the secLayerTransformation
 	 */
 	public Map<String, byte[]> getSecLayerTransformation() {
+				
 		return secLayerTransformation;
 	}
 
@@ -931,7 +974,12 @@ public class GeneralMOAIDConfig {
 	 * @param publicURLPrefix the publicURLPrefix to set
 	 */
 	public void setPublicURLPrefix(String publicURLPrefix) {
-		this.publicURLPrefix = publicURLPrefix;
+		if (MiscUtil.isNotEmpty(publicURLPrefix))
+			this.publicURLPrefix = 
+				KeyValueUtils.removeAllNewlineFromString(publicURLPrefix);
+		else
+			this.publicURLPrefix = publicURLPrefix;
+		
 	}
 
 	/**
@@ -961,6 +1009,23 @@ public class GeneralMOAIDConfig {
 	public void setMoaspssAuthTrustProfileTest(String moaspssAuthTrustProfileTest) {
 		this.moaspssAuthTrustProfileTest = moaspssAuthTrustProfileTest;
 	}
+
+	/**
+	 * @return the virtualPublicURLPrefixEnabled
+	 */
+	public boolean isVirtualPublicURLPrefixEnabled() {
+		return virtualPublicURLPrefixEnabled;
+	}
+
+	/**
+	 * @param virtualPublicURLPrefixEnabled the virtualPublicURLPrefixEnabled to set
+	 */
+	public void setVirtualPublicURLPrefixEnabled(
+			boolean virtualPublicURLPrefixEnabled) {
+		this.virtualPublicURLPrefixEnabled = virtualPublicURLPrefixEnabled;
+	}
+	
+