From 3f2032efba5469589d5317b1796a0aec74457847 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 16 Mar 2021 15:13:22 +0100
Subject: update MOA-SPSS initialization to mitigate suspect behavior in
 EAAF-Components module

---
 .../moa/spss/server/init/SystemInitializer.java    | 34 ++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java')

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
index 6ef9c57..25bb6d9 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
@@ -51,6 +51,7 @@ import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 import at.gv.egovernment.moaspss.util.Constants;
 import at.gv.egovernment.moaspss.util.DOMUtils;
 import iaik.asn1.ObjectID;
+import iaik.server.ConfigurationData;
 import iaik.utils.RFC2253NameParser;
 
 /**
@@ -71,6 +72,8 @@ public class SystemInitializer {
 
   private static ServiceLoader<ExternalInitializer> initializerServices = 
 		  ServiceLoader.load(ExternalInitializer.class);
+  private static ConfigurationData iaikConfiguration;
+  private static ConfigurationProvider config;
   
   
   private static void runInitializer(ConfigurationProvider configurationProvider) {
@@ -84,8 +87,9 @@ public class SystemInitializer {
   
   /**
    * Initialize the MOA SP/SS webservice.
+ * @return 
    */
-  public static void init() {
+  public static StartupConfigurationHolder init() {
 	  
 	  logger.info("##############################################################################");
 	  logger.info("##############################################################################");
@@ -141,7 +145,7 @@ public class SystemInitializer {
     // initialize configuration
     try {
     	Logger.info("Initialize MOA-SP/SS configuration ... ");
-    	ConfigurationProvider config = ConfigurationProvider.getInstance();
+    	config = ConfigurationProvider.getInstance();
                   
     	//initialize TSL module
     	TSLConfiguration moaSPTslConfig = config.getTSLConfiguration();      
@@ -168,25 +172,23 @@ public class SystemInitializer {
     	
     	
         Logger.info("Building IAIK-MOA configuration ... ");
-        new IaikConfigurator().configure(config);        
+        iaikConfiguration = new IaikConfigurator().configure(config);        
         
         
       	runInitializer(config);      
       	Logger.info(new LogMsg(msg.getMessage("init.01", null)));
+      	      	
       	
     } catch (MOAException e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
+    	throw new RuntimeException(e);
       
     } catch (Throwable e) {
     	Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
     	throw new RuntimeException(e);
     	
-	} finally {
-		logger.info("Configuration initialized");
-	}
-
-    
-    
+	} 
+        
     // CHANGE IXSIL to XSECT
     // set IXSIL debug output
     //IXSILInit.setPrintDebugLog(
@@ -207,6 +209,20 @@ public class SystemInitializer {
     logger.info("==============================================================================");
     logger.info("===                            CONFIGURATION DONE                          ===");
     logger.info("==============================================================================");
+    
+    
+    return new StartupConfigurationHolder(config, iaikConfiguration);
+    
+  }
+  
+  /**
+   * Get configuration object from IAIK modules.
+   * 
+   * @return Configuration or <code>null</code> of it was not configurated yet
+   */
+  public static ConfigurationData getIaikConfiguration() {
+	  return iaikConfiguration;
+	  
   }
   
   private static void initTSLUpdateTask(TSLConfiguration tslconfig) {
-- 
cgit v1.2.3