X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfaserverproxy.py;h=6c11ee0603779522fabef175bc46385c72e6f0ed;hb=2b8fb7af76b173ad4ad6583dbedbdf11a49f9549;hp=d326b3aa3501284bb402b4609be103aa4a91d573;hpb=b835890db506439d1925577ccdc9ef4f0b3dc6ac;p=sfa.git

diff --git a/sfa/client/sfaserverproxy.py b/sfa/client/sfaserverproxy.py
index d326b3aa..6c11ee06 100644
--- a/sfa/client/sfaserverproxy.py
+++ b/sfa/client/sfaserverproxy.py
@@ -1,12 +1,9 @@
 # XMLRPC-specific code for SFA Client
 
-# starting with 2.7.9 we need to turn off server verification
-import ssl
-try:    turn_off_server_verify = { 'context' : ssl._create_unverified_context() } 
-except: turn_off_server_verify = {}
+from sfa.util.ssl import simple_ssl_context
 
-import xmlrpclib
-from httplib import HTTPS, HTTPSConnection
+import xmlrpc.client
+import http.client
 
 try:
     from sfa.util.sfalogging import logger
@@ -20,14 +17,17 @@ except:
 # Used to convert server exception strings back to an exception.
 #    from usenet, Raghuram Devarakonda
 
+
 class ServerException(Exception):
     pass
 
-class ExceptionUnmarshaller(xmlrpclib.Unmarshaller):
+
+class ExceptionUnmarshaller(xmlrpc.client.Unmarshaller):
+
     def close(self):
         try:
-            return xmlrpclib.Unmarshaller.close(self)
-        except xmlrpclib.Fault, e:
+            return xmlrpc.client.Unmarshaller.close(self)
+        except xmlrpc.client.Fault as e:
             raise ServerException(e.faultString)
 
 ##
@@ -37,21 +37,22 @@ class ExceptionUnmarshaller(xmlrpclib.Unmarshaller):
 
 # targetting only python-2.7 we can get rid of some older code
 
-class XMLRPCTransport(xmlrpclib.Transport):
-    
-    def __init__(self, key_file = None, cert_file = None, timeout = None):
-        xmlrpclib.Transport.__init__(self)
-        self.timeout=timeout
+
+class XMLRPCTransport(xmlrpc.client.Transport):
+
+    def __init__(self, key_file=None, cert_file=None, timeout=None):
+        xmlrpc.client.Transport.__init__(self)
+        self.timeout = timeout
         self.key_file = key_file
         self.cert_file = cert_file
-        
+
     def make_connection(self, host):
         # create a HTTPS connection object from a host descriptor
         # host may be a string, or a (host, x509-dict) tuple
         host, extra_headers, x509 = self.get_host_info(host)
-        conn = HTTPSConnection(host, None, key_file = self.key_file,
-                               cert_file = self.cert_file,
-                               **turn_off_server_verify)
+        conn = http.client.HTTPSConnection(
+            host, None, key_file=self.key_file,
+            cert_file=self.cert_file, context=simple_ssl_context())
 
         # Some logic to deal with timeouts. It appears that some (or all) versions
         # of python don't set the timeout after the socket is created. We'll do it
@@ -74,36 +75,41 @@ class XMLRPCTransport(xmlrpclib.Transport):
 
     def getparser(self):
         unmarshaller = ExceptionUnmarshaller()
-        parser = xmlrpclib.ExpatParser(unmarshaller)
+        parser = xmlrpc.client.ExpatParser(unmarshaller)
         return parser, unmarshaller
 
-class XMLRPCServerProxy(xmlrpclib.ServerProxy):
+
+class XMLRPCServerProxy(xmlrpc.client.ServerProxy):
+
     def __init__(self, url, transport, allow_none=True, verbose=False):
         # remember url for GetVersion
         # xxx not sure this is still needed as SfaServerProxy has this too
-        self.url=url
-        xmlrpclib.ServerProxy.__init__(self, url, transport, allow_none=allow_none,
-                                       verbose=verbose,
-                                       **turn_off_server_verify)
+        self.url = url
+        xmlrpc.client.ServerProxy.__init__(
+            self, url, transport, allow_none=allow_none,
+            context=simple_ssl_context(), verbose=verbose)
 
     def __getattr__(self, attr):
-        logger.debug ("xml-rpc %s method:%s" % (self.url, attr))
-        return xmlrpclib.ServerProxy.__getattr__(self, attr)
+        logger.debug("xml-rpc %s method:%s" % (self.url, attr))
+        return xmlrpc.client.ServerProxy.__getattr__(self, attr)
+
+# the object on which we can send methods that get sent over xmlrpc
+
 
-########## the object on which we can send methods that get sent over xmlrpc
 class SfaServerProxy:
 
-    def __init__ (self, url, keyfile, certfile, verbose=False, timeout=None):
+    def __init__(self, url, keyfile, certfile, verbose=False, timeout=None):
         self.url = url
         self.keyfile = keyfile
         self.certfile = certfile
         self.verbose = verbose
         self.timeout = timeout
-        # an instance of xmlrpclib.ServerProxy
+        # an instance of xmlrpc.client.ServerProxy
         transport = XMLRPCTransport(keyfile, certfile, timeout)
-        self.serverproxy = XMLRPCServerProxy(url, transport, allow_none=True, verbose=verbose)
+        self.serverproxy = XMLRPCServerProxy(
+            url, transport, allow_none=True, verbose=verbose)
 
-    # this is python magic to return the code to run when 
+    # this is python magic to return the code to run when
     # SfaServerProxy receives a method call
     # so essentially we send the same method with identical arguments
     # to the server_proxy object
@@ -111,4 +117,3 @@ class SfaServerProxy:
         def func(*args, **kwds):
             return getattr(self.serverproxy, name)(*args, **kwds)
         return func
-