1 files changed, 27 insertions, 1 deletions
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 04b92f209..b6ffb0c59 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
@@ -35,13 +35,17 @@ import java.util.List;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import eu.stork.vidp.messages.common.STORKBootstrap;
+
 import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.id.config.stork.STORKConfig;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.util.StringUtils;
 import at.gv.egovernment.moa.util.XPathUtils;
 
 /**
@@ -183,6 +187,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
    */
   private List trustedBKUs;
   
+  /**
+   * Holds general information for STORK (e.g. C-PEPS connection parameter, SAML signing parameters, etc.)
+   */
+  private STORKConfig storkConfig;
+  
  /**
    * Return the single instance of configuration data.
    * 
@@ -263,7 +272,12 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 			} catch (MalformedURLException t) {
 				throw new ConfigurationException("config.03", null, t);
 		  }
-		  		  
+
+		//Initialize OpenSAML for STORK
+		Logger.trace("Starting initialization of OpenSAML...");
+		STORKBootstrap.bootstrap();
+		Logger.debug("OpenSAML successfully initialized");
+			
         // build the internal datastructures
     	builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
     	bKUConnectionParameter = builder.buildAuthBKUConnectionParameter();
@@ -293,6 +307,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
     	trustedCACertificates = builder.getTrustedCACertificates();
     	trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);
     	trustedBKUs = builder.getTrustedBKUs();
+    	storkConfig = new STORKConfig(builder.buildSTORKSignatureCreationParameter(),builder.buildSTORKSignatureVerificationParameter(), builder.buildSTORKcPEPSMap());
 
     } catch (Throwable t) {
       throw new ConfigurationException("config.02", null, t);
@@ -370,6 +385,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
   	}
     return null;
   }
+    
 
   /**
    * Return a string with a url-reference to the VerifyAuthBlock trust 
@@ -484,4 +500,14 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
     return defaultVerifyInfoboxParameters;
   }
 
+  /**
+   * Retruns the STORK Configuration
+   * @return STORK Configuration
+   */
+  public STORKConfig getStorkConfig() {
+		return storkConfig;
+  }
+	  
+  
+
 }
 \ No newline at end of file