Merge branch 'multiple_IDP_publicURLPrefixes' into moa-id-3.0.0-snapshot

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java

2 files changed, 46 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
index c98a7d537..47abf78db 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
@@ -81,7 +81,13 @@ public interface AuthConfiguration extends ConfigurationProvider{
 
 	public boolean isAdvancedLoggingActive();
 
-	public String getPublicURLPrefix();
+	/**
+	 * Returns the PublicURLPrefix.
+	 * 
+	 * @return the PublicURLPrefix (one or more) of this IDP instance. All publicURLPrefix URLs are ends without / 
+	 * @throws ConfigurationException if no PublicURLPrefix is found.
+	 */
+	public List<String> getPublicURLPrefix()  throws ConfigurationException;
 
 	public boolean isPVP2AssertionEncryptionActive();
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
index 645831479..d3c26cdbe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
@@ -6,6 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,6 +24,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration;
+import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConfigurationProviderImpl;
 import at.gv.egovernment.moa.id.config.ConfigurationUtils;
@@ -791,20 +793,47 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 		return Boolean.valueOf(prop);
 	}
 
-	/**
-	 * Returns the PublicURLPrefix. NOTE: returns {@code null} if no PublicURLPrefix is set.
-	 * 
-	 * @return the PublicURLPrefix or {@code null}
-	 */
-	public String getPublicURLPrefix() {
-		try {
-			return configuration.getStringValue(
-					MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX);
+	public List<String> getPublicURLPrefix() throws ConfigurationException{
+		try {			
+			String publicURLPrefixList = configuration.getStringValue(
+					MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX);			
+			List<String> returnValues = new ArrayList<String>();
 			
+			if (publicURLPrefixList != null) {
+				publicURLPrefixList = KeyValueUtils.normalizeCSVValueString(publicURLPrefixList);
+				List<String> publicURLPrefixArray = Arrays.asList(publicURLPrefixList.split(","));
+				Logger.trace("Found " + publicURLPrefixArray.size() + " PublicURLPrefix in configuration.");
+				
+				
+				for (String el : publicURLPrefixArray) {
+					try {
+						new URL(el);
+						if (el.endsWith("/"))
+							returnValues.add(el.substring(0, el.length()-1));
+						else
+							returnValues.add(el);
+						
+					} catch (MalformedURLException e) {
+						Logger.warn("IDP PublicURLPrefix URL " + el + " is not a valid URL", e);
+					}										
+				}										
+			} 
+			
+			if (returnValues.size() > 0)
+				return returnValues;
+			
+			else {
+				Logger.warn("MOA-ID PublicURLPrefix is not found in configuration.");
+				throw new ConfigurationException("config.08", new Object[]{"IDP PublicURLPrefix"});
+				
+			}
+						
 		} catch (at.gv.egiz.components.configuration.api.ConfigurationException e) {
 			Logger.warn("MOA-ID PublicURLPrefix can not be read from configuration.", e);
-			return null;
+			throw new ConfigurationException("config.08", new Object[]{"IDP PublicURLPrefix"}, e);
+			
 		}
+		
 	}
 
 	/**