X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=safexmlrpc.py;h=c74af8e4c1cedc25b2f4aed3ed3d6baa6d323ec7;hb=49a4ce9cb926041815283409433793700ff386cd;hp=f4bd5afe3baf562f5c4d42b855d194af63987cff;hpb=191f762aee7f7412e3d3b3840de914b9326aa888;p=nodemanager.git

diff --git a/safexmlrpc.py b/safexmlrpc.py
index f4bd5af..c74af8e 100644
--- a/safexmlrpc.py
+++ b/safexmlrpc.py
@@ -1,18 +1,31 @@
+# $Id$
+
 """Leverage curl to make XMLRPC requests that check the server's credentials."""
 
-import curlwrapper
 import xmlrpclib
 
+import curlwrapper
+
+
+class CertificateCheckingSafeTransport (xmlrpclib.Transport):
 
-CURL = '/usr/bin/curl'
+    def __init__(self, cacert, timeout):
+        self.cacert = cacert
+        self.timeout = timeout
 
-class CertificateCheckingSafeTransport(xmlrpclib.Transport):
     def request(self, host, handler, request_body, verbose=0):
         self.verbose = verbose
-        try:
-            contents = curlwrapper.retrieve('https://%s%s' % (host, handler), request_body)
-            return xmlrpclib.loads(contents)[0]
-        except curlwrapper.CurlException, e: raise xmlrpclib.ProtocolError(host + handler, -1, str(e), '')
+        url='https://%s%s' % (host, handler)
+        # this might raise an xmlrpclib.Protocolerror exception
+        contents = curlwrapper.retrieve(url,
+                                        cacert = self.cacert,
+                                        postdata = request_body,
+                                        timeout = self.timeout)
+        return xmlrpclib.loads(contents)[0]
 
 class ServerProxy(xmlrpclib.ServerProxy):
-    def __init__(self, handler, *args, **kw_args): xmlrpclib.ServerProxy.__init__(self, handler, CertificateCheckingSafeTransport())
+
+    def __init__(self, uri, cacert, timeout = 300, **kwds):
+        xmlrpclib.ServerProxy.__init__(self, uri,
+                                       CertificateCheckingSafeTransport(cacert, timeout),
+                                       **kwds)