summaryrefslogtreecommitdiffstats
path: root/src/lib/Proxy.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-06 01:27:22 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-06 01:27:22 +0000
commit8a7bb7eeac0b154479835e7660ec05d631de5849 (patch)
tree19ede5cfe9bc366d60b342ca4d5ee4d5602dc2a1 /src/lib/Proxy.py
parentb7019744fa1ca11b6ecbb968e1292da496029e01 (diff)
downloadbcfg2-8a7bb7eeac0b154479835e7660ec05d631de5849.tar.gz
bcfg2-8a7bb7eeac0b154479835e7660ec05d631de5849.tar.bz2
bcfg2-8a7bb7eeac0b154479835e7660ec05d631de5849.zip
SSL Proxy: pass through key/cert/ca args to transport
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5192 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Proxy.py')
-rw-r--r--src/lib/Proxy.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py
index 59255b36e..432f32bd3 100644
--- a/src/lib/Proxy.py
+++ b/src/lib/Proxy.py
@@ -80,13 +80,12 @@ class XMLRPCTransport(xmlrpclib.Transport):
def make_connection(self, host):
host = self.get_host_info(host)[0]
- http = SSLHTTPConnection(host)
+ http = SSLHTTPConnection(host, key=self.key, cert=self.cert, ca=self.ca)
https = httplib.HTTP()
https._setup(http)
return https
-def ComponentProxy (url, user=None, password=None, fingerprint=None,
- key=None, cert=None, ca=None):
+def ComponentProxy (url, user=None, password=None, key=None, cert=None, ca=None):
"""Constructs proxies to components.