1 files changed, 14 insertions, 37 deletions

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index bcd9416b8..a5f861c52 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
@@ -33,9 +33,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.net.InetAddress;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.security.Principal;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -48,8 +46,6 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.logging.LogMsg;
 import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.spss.server.MOASecurityManagerExtended;
-import at.gv.egovernment.moa.spss.server.MOASecurityManagerSimple;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
 import at.gv.egovernment.moa.util.DOMUtils;
 
@@ -373,8 +369,11 @@ public class ConfigurationProvider
       
       if (allowExternalUris_)
     	  blackListedUris_ = builder.buildPermitExternalUris();
-      else
+      else {
+    	  info("config.35", null);
     	  blackListedUris_ = null;
+      }
+    	
       
 //      Set set = crlRetentionIntervals.entrySet();
 //      Iterator i = set.iterator();
@@ -383,37 +382,7 @@ public class ConfigurationProvider
 //        System.out.println("Key: " + me.getKey() + " - Value: " + me.getValue() );
 //      }
       
-      
-      // set SecurityManager for permitting/disallowing external URIs
-      SecurityManager sm = System.getSecurityManager();      
-      
-      if (sm == null) {
-    	  // no security manager exists - create a new one
-    	  Logger.debug(new LogMsg("Create new MOASecurityManagerSimple"));
-    	  sm = new MOASecurityManagerSimple(allowExternalUris_, blackListedUris_);
-    	  
-    	  
-    	  Logger.debug(new LogMsg("Set the new MOASecurityManagerSimple"));
-          System.setSecurityManager(sm);
-        
-      }      
-      else {    	
-    	  String classname = sm.getClass().getName();
-    	  if (!classname.equalsIgnoreCase("at.gv.egovernment.moa.spss.server.MOASecurityManagerSimple") &&
-    		  !classname.equalsIgnoreCase("at.gv.egovernment.moa.spss.server.MOASecurityManagerExtended")) {
-    		  // if SecurityManager is not already a MOASecurityManager
-    		  
-    		  Logger.debug(new LogMsg("Create new MOASecurityManagerExtended (including existing SecurityManager)"));
-    		  sm = new MOASecurityManagerExtended(allowExternalUris_, blackListedUris_);
-    		  
-    		  Logger.debug(new LogMsg("Set the new MOASecurityManagerSimple"));
-    		  System.setSecurityManager(sm);
-    	  }
-    	  Logger.debug(new LogMsg("No new MOASecurityManager instantiated"));
-      }
-
-      
-      
+            
     } catch (Throwable t) {
       throw new ConfigurationException("config.11", null, t);
     } finally {
@@ -446,7 +415,15 @@ public class ConfigurationProvider
   public String getDigestMethodAlgorithmName() {
     return digestMethodAlgorithmName;
   }
-
+  
+  public boolean getAllowExternalUris() {
+	  return this.allowExternalUris_;
+  }
+  
+  public List getBlackListedUris() {
+	  return this.blackListedUris_;
+  }
+  
   /**
    * Return the name of the canonicalization algorithm used during signature
    * creation.