add virtual IDP configuration functionality to moa-id-configuration webGUI

3 files changed, 65 insertions, 12 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..820a07318 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,6 +54,7 @@ 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.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -126,6 +127,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>();
@@ -163,7 +165,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) {
@@ -931,7 +952,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 +987,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;
+	}
+	
+	
 	
 	
 	
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 36bf0ba7b..b4a0f9a77 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
@@ -26,6 +26,7 @@ import java.math.BigInteger;
 import java.util.*;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import at.gv.egiz.components.configuration.meta.api.ConfigurationStorageException;
@@ -249,17 +250,24 @@ public class EditGeneralConfigAction extends BasicAction {
 //		if (oldauth != null)
 //			oldauthgeneral = oldauth.getGeneralConfiguration();
 		
-		//set Public URL Prefix		
+		//set Public URL Prefix
 		String pubURLPrefix = moaconfig.getPublicURLPrefix();
-		String normalizedPubURLPrefix = KeyValueUtils.normalizeCSVValueString(pubURLPrefix);
+		if (moaconfig.isVirtualPublicURLPrefixEnabled()) {
+			dbauthgeneral.setPublicURLPreFix(
+					KeyValueUtils.normalizeCSVValueString(pubURLPrefix));
+			
+		} else {
+			if (pubURLPrefix.contains(KeyValueUtils.CSV_DELIMITER)) {
+				dbauthgeneral.setPublicURLPreFix(
+						pubURLPrefix.trim().substring(0, 
+								pubURLPrefix.indexOf(KeyValueUtils.CSV_DELIMITER)));
+				
+			} else
+				dbauthgeneral.setPublicURLPreFix(
+						StringUtils.chomp(pubURLPrefix.trim()));
+			
+		}
 				
-//		if(pubURLPrefix.endsWith("/")) {
-//			int length = pubURLPrefix.length();
-//			pubURLPrefix = pubURLPrefix.substring(0, length-1);
-//		}
-		
-		dbauthgeneral.setPublicURLPreFix(normalizedPubURLPrefix);
-		
 //		if (MiscUtil.isNotEmpty(moaconfig.getAlternativeSourceID()))
 //			dbauthgeneral.setAlternativeSourceID(moaconfig.getAlternativeSourceID());
 //		else {
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 bf72e117a..b640e8621 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
@@ -32,6 +32,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
@@ -68,7 +69,8 @@ public class MOAConfigValidator {
 		if (MiscUtil.isNotEmpty(check)) {
 			String[] publicURLPreFix = check.split(",");
 			for (String el : publicURLPreFix) {			
-				if (!ValidationHelper.validateURL(el)) {
+				if (!ValidationHelper.validateURL(
+						StringUtils.chomp(el.trim()))) {
 					log.info("Public URL Prefix " + el + " is not valid");
 					errors.add(LanguageHelper.getErrorString("validation.general.publicURLprefix.valid", new Object[]{el}, request));
 				}