SSO and Configuration updated

TODO:
  --PVP2 from configuration
  --UseIFrame for OAs
  --SSO with mandates
  --Resign IdentityLink
  --Encrypted MOASession in Database

3 files changed, 147 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java
new file mode 100644
index 000000000..b358a31c9
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java
@@ -0,0 +1,55 @@
+package at.gv.egovernment.moa.id.config;
+
+import java.util.Properties;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.ConnectionParameterClientAuthType;
+
+public abstract class ConnectionParameter {
+	
+	protected static final String PROP_IDENTIFIER_KEYSTORE = "clientKeyStore"; 
+	protected static final String PROP_IDENTIFIER_KEYSTOREPASSWORD = "clientKeyStorePassword"; 
+	protected static final String PROP_IDENTIFIER_ACCEPEDSERVERCERTS =  "acceptedServerCertificates";
+	
+	protected ConnectionParameterClientAuthType database;
+	protected Properties prop;
+	protected String basedirectory;
+	
+	public ConnectionParameter(ConnectionParameterClientAuthType database, Properties prop, String basedirectory) {
+		this.database = database;
+		this.prop = prop;
+		this.basedirectory = basedirectory;
+	}
+	
+	  /**
+	   * Returns the acceptedServerCertificates.
+	   * @return String
+	   */
+	  public abstract String getAcceptedServerCertificates();
+
+	  /**
+	   * Returns the clientKeyStore.
+	   * @return String
+	   */
+	  public abstract String getClientKeyStore();
+
+	  /**
+	   * Returns the clientKeyStorePassword.
+	   * @return String
+	   */
+	  public abstract String getClientKeyStorePassword();
+	
+	
+	public boolean isHTTPSURL() {
+		if (database==null)
+			return false;
+		else
+			return database.getURL().indexOf("https") == 0;
+	}
+	
+	public String getUrl() {
+		if (database == null)
+			return null;
+		else
+			return database.getURL();
+	}
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 922d86fc0..713fd538e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -49,6 +49,7 @@ import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ForeignIdentities;
+import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentityLinkSigners;
 import at.gv.egovernment.moa.id.commons.db.dao.config.LegacyAllowed;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
@@ -57,6 +58,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineMandates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Protocols;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SLRequestTemplates;
+import at.gv.egovernment.moa.id.commons.db.dao.config.SSO;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SecurityLayer;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TimeOuts;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TrustAnchor;
@@ -617,6 +619,95 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 		return null;
   }
   
+  public boolean isSSOBusinessService() throws ConfigurationException {
+	  AuthComponentGeneral auth = getAuthComponentGeneral();
+	  
+	  SSO sso = auth.getSSO();
+	  
+	  if (sso!= null) {		  
+		  if (sso.getIdentificationNumber() != null)
+			  return true;
+	  }
+	  return false;
+  }
+  
+  public IdentificationNumber getSSOBusinessService() throws ConfigurationException {
+	  AuthComponentGeneral auth = getAuthComponentGeneral();
+	  
+	  SSO sso = auth.getSSO();
+	
+	  if (sso!= null)		  
+		  return sso.getIdentificationNumber();
+	  
+	  return null;
+  }
+  
+  public String getSSOTarget() throws ConfigurationException {
+	  AuthComponentGeneral auth = getAuthComponentGeneral();
+	  
+	  SSO sso = auth.getSSO();
+	
+	  if (sso!= null)		  
+		  return sso.getTarget();
+	  
+	  return null;
+  }
+  
+  public String getSSOFriendlyName() {
+	  AuthComponentGeneral auth;
+	try {
+		auth = getAuthComponentGeneral();
+
+		SSO sso = auth.getSSO();
+		
+		  if (sso!= null)		  
+			  return sso.getFriendlyName();
+		  
+	} catch (ConfigurationException e) {
+		Logger.warn("No SSO FriendlyName found. Use default Name!!!");
+	}	  
+	  return "Default MOA-ID friendly name for SSO";
+  }
+  
+  public String getSSOSpecialText() {
+		try {
+			AuthComponentGeneral auth = getAuthComponentGeneral();
+
+			SSO sso = auth.getSSO();
+			
+			  if (sso!= null) {
+				  String text = sso.getSpecialText();
+				  if (MiscUtil.isEmpty(text))
+					  text = new String();
+				  return text;
+			  }
+				  
+			  
+		} catch (ConfigurationException e) {
+		}	  
+		  return new String();
+  }
+  
+  public String getSSOPublicUrl() {
+		try {
+			AuthComponentGeneral auth = getAuthComponentGeneral();
+
+			SSO sso = auth.getSSO();
+		
+			if (sso!= null) {
+				String url = sso.getPublicURL();
+				
+				if (MiscUtil.isEmpty(url))
+					url = new String();
+			
+				  return url;
+			}
+			  
+		} catch (ConfigurationException e) {
+		}	  
+		  return new String();
+  }
+  
   /**
    * Retruns the STORK Configuration
    * @return STORK Configuration
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
index 1536b907b..4ee9986ff 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
@@ -189,7 +189,7 @@ public class BuildFromLegacyConfig {
 	    	generalAuth.setSSO(auth_sso);
 	    	auth_sso.setTarget("BF");
 	    	auth_sso.setFriendlyName("EGIZ MOAID 2.0 Beta");
-	    	
+
 	    	
 	    	//set SecurityLayer Transformations
 	    	String[] transformsInfoFileNames = builder.buildTransformsInfoFileNames(builder.getConfigElem(), ConfigurationBuilder.AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);