From 0bd26683804af1feab6a6d5237e244ce3cc6dbfb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 19 Jan 2016 16:20:48 +0100
Subject: remove MOA-SP calls via WebService URL

---
 .../moa/id/auth/MOAIDAuthInitializer.java          | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index 953a478be..70de73a3e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
@@ -4,7 +4,6 @@
 package at.gv.egovernment.moa.id.auth;
 
 import iaik.pki.PKIException;
-import iaik.pki.jsse.IAIKX509TrustManager;
 import iaik.security.ecc.provider.ECCProvider;
 import iaik.security.provider.IAIK;
 
@@ -13,14 +12,11 @@ import java.security.GeneralSecurityException;
 
 import javax.activation.CommandMap;
 import javax.activation.MailcapCommandMap;
-import javax.net.ssl.SSLSocketFactory;
 
 import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigLoader;
 import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
-import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.util.SSLUtils;
 import at.gv.egovernment.moa.logging.Logger;
@@ -140,12 +136,15 @@ public class MOAIDAuthInitializer {
         // Loads the configuration
         try {
         	AuthConfiguration authConf = AuthConfigurationProviderFactory.reload();
+
         	
-            ConnectionParameter moaSPConnParam = authConf
-                    .getMoaSpConnectionParameter();
+        	//MOA-SP is only use by API calls since MOA-ID 3.0.0  
+
+        	//            ConnectionParameter moaSPConnParam = authConf
+//                    .getMoaSpConnectionParameter();
 
             // If MOA-SP API calls: loads MOA-SP configuration and configures IAIK
-            if (moaSPConnParam == null) {
+//            if (moaSPConnParam == null) {
                 try {
                     LoggingContextManager.getInstance().setLoggingContext(
                             new LoggingContext("startup"));
@@ -156,7 +155,7 @@ public class MOAIDAuthInitializer {
                     throw new ConfigurationException("config.10", new Object[] { ex
                             .toString() }, ex);
                 }
-            }
+//            }
      
             // Initializes IAIKX509TrustManager logging
             /*
@@ -169,11 +168,11 @@ public class MOAIDAuthInitializer {
 
             // Initializes the Axis secure socket factory for use in calling the
             // MOA-SP web service
-            if (moaSPConnParam != null && moaSPConnParam.isHTTPSURL()) {
-                SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(authConf,
-                        moaSPConnParam);
-                AxisSecureSocketFactory.initialize(ssf);
-            }
+//            if (moaSPConnParam != null && moaSPConnParam.isHTTPSURL()) {
+//                SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(authConf,
+//                        moaSPConnParam);
+//                AxisSecureSocketFactory.initialize(ssf);
+//            }
         	
         	
         } catch (ConfigurationException e) {
-- 
cgit v1.2.3