1 files changed, 85 insertions, 12 deletions

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 dce7de526..18926046c 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;
@@ -21,8 +22,15 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 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.db.dao.config.deprecated.AuthComponentGeneral;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.MOASP;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.SecurityLayer;
+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.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConfigurationProviderImpl;
 import at.gv.egovernment.moa.id.config.ConfigurationUtils;
@@ -48,6 +56,8 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 	private final Properties properties = new Properties();
 	private ApplicationContext context = null;
 	
+	private boolean requireJDBCBackupImplementation = false;
+	
 	public PropertyBasedAuthConfigurationProvider() {
 		
 	}
@@ -84,6 +94,20 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 			AutowireCapableBeanFactory acbFactory = context.getAutowireCapableBeanFactory();
 			acbFactory.autowireBean(this);
 			
+			//Some databases do not allow the selection of a lob in SQL where expression  
+			String dbDriver = properties.getProperty("configuration.hibernate.connection.driver_class");					
+			if (MiscUtil.isNotEmpty(dbDriver)) {
+				for (String el:MOAIDConstants.JDBC_DRIVER_NEEDS_WORKAROUND) {
+					if (dbDriver.startsWith(el)) {
+						requireJDBCBackupImplementation = true;
+						Logger.info("JDBC driver '" + dbDriver 
+						+ "' is blacklisted --> Switch to alternative DB access methode implementation.");
+						
+					}					
+				}						
+			}
+			
+									
 		} catch (FileNotFoundException e) {
 			throw new ConfigurationException("config.03", null, e);
 		
@@ -796,20 +820,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);
+			
 		}
+		
 	}
 
 	/**
@@ -988,9 +1039,11 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 		Logger.trace("Get active OnlineApplication with ID " + id + " from database.");
 		Map<String, String> oaConfig = null;
 		try {
-			//OracleDB does not allow the selection of a lob in SQL where expression  
+			
+			//TODO:
+			//Some databases do not allow the selection of a lob in SQL where expression  
 			String dbDriver = properties.getProperty("configuration.hibernate.connection.driver_class");
-			if (MiscUtil.isNotEmpty(dbDriver) && dbDriver.startsWith("oracle.jdbc."))
+			if (requireJDBCBackupImplementation)
 				oaConfig = configuration.getOnlineApplicationBackupVersion(id);
 			
 			else
@@ -1125,4 +1178,24 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 		else
 			return getMoaSpIdentityLinkTrustProfileID();
 	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.config.auth.AuthConfiguration#isVirtualIDPsEnabled()
+	 */
+	@Override
+	public boolean isVirtualIDPsEnabled() {
+		try {
+			String value = configuration.getStringValue(
+					MOAIDConfigurationConstants.GENERAL_ISVIRTUALIDPSENABLED);
+			if (MiscUtil.isNotEmpty(value)) {
+				return Boolean.valueOf(value);
+			}
+			
+		} catch (at.gv.egiz.components.configuration.api.ConfigurationException e) {
+			Logger.error("Error during 'isVirutalIDPsEnabled' load operationen."  , e);
+	
+		}
+		
+		return false;
+	}
 }