particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

save the original URL and restore it on logout, to enable use of SSL for non-logged-in requests

Browse source
This commit is contained in:
Mike Bonnet 2010-07-07 15:23:50 -04:00 • committed by Mike McLean
parent ebc9e7d3ac
commit e6e2e21753
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
koji/__init__.py
View file

@ -1488,6 +1488,7 @@ class ClientSession(object):
if self.opts.get('timeout'):
self.proxyOpts['timeout'] = self.opts['timeout']
self.baseurl = baseurl
self.origurl = None
self.setSession(sinfo)
self.multicall = False
self._calls = []
@ -1501,8 +1502,9 @@ class ClientSession(object):
self.logged_in = False
self.callnum = None
# undo state changes made by ssl_login()
if self.baseurl.startswith('https:'):
self.baseurl = self.baseurl.replace('https:', 'http:')
if self.origurl:
self.baseurl = self.origurl
self.origurl = None
self.opts.pop('certs', None)
self.proxyOpts.pop('certs', None)
self.opts.pop('timeout', None)
@ -1612,7 +1614,8 @@ class ClientSession(object):
def ssl_login(self, cert, ca, serverca, proxyuser=None):
if not self.baseurl.startswith('https:'):
self.baseurl = self.baseurl.replace('http:', 'https:')
self.origurl = self.baseurl
self.baseurl = self.baseurl.replace('http:', 'https:', 1)
certs = {}
certs['key_and_cert'] = cert