facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

sslutil: try harder to avoid getpeercert problems

Browse Source 
We wrap both calls to getpeercert in a try/except to make sure we
catch its bogus AttributeError.
This commit is contained in:
Matt Mackall 2013-04-05 12:20:14 -05:00
parent 00f2829f4e
commit 71c760e42b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mercurial/sslutil.py
View File

@ -111,9 +111,15 @@ class validator(object):
self.ui.warn(_("warning: certificate for %s can't be verified "
"(Python too old)\n") % host)
return
if not sock.cipher(): # work around http://bugs.python.org/issue13721
raise util.Abort(_('%s ssl connection error') % host)
peercert = sock.getpeercert(True)
try:
peercert = sock.getpeercert(True)
peercert2 = sock.getpeercert()
except AttributeError:
raise util.Abort(_('%s ssl connection error') % host)
if not peercert:
raise util.Abort(_('%s certificate error: '
'no certificate received') % host)
@ -129,7 +135,7 @@ class validator(object):
self.ui.debug('%s certificate matched fingerprint %s\n' %
(host, nicefingerprint))
elif cacerts:
msg = _verifycert(sock.getpeercert(), host)
msg = _verifycert(peercert2, host)
if msg:
raise util.Abort(_('%s certificate error: %s') % (host, msg),
hint=_('configure hostfingerprint %s or use '