"""Leverage curl to make XMLRPC requests that check the server's credentials."""
-from subprocess import PIPE, Popen
import xmlrpclib
+import curlwrapper
-CURL = '/usr/bin/curl'
-class CertificateCheckingSafeTransport(xmlrpclib.Transport):
+class CertificateCheckingSafeTransport (xmlrpclib.Transport):
+
+ def __init__(self, cacert, timeout):
+ self.cacert = cacert
+ self.timeout = timeout
+
def request(self, host, handler, request_body, verbose=0):
self.verbose = verbose
- p = Popen((CURL, '--cacert', '/usr/boot/cacert.pem', '--data', '@-', 'https://%s%s' % (host, handler)), stdin=PIPE, stdout=PIPE, stderr=PIPE)
- p.stdin.write(request_body)
- p.stdin.close()
- contents = p.stdout.read()
- p.stdout.close()
- error = p.stderr.read()
- p.stderr.close()
- rc = p.wait()
- if rc != 0: raise xmlrpclib.ProtocolError(host + handler, rc, error, '')
+ 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)