The_Great_Archive/blockcheck
1
0
Fork 0
mirror of https://github.com/ValdikSS/blockcheck.git synced 2026-09-12 19:50:05 +05:00
Code Issues Packages Projects Releases Wiki Activity

Final fix for all HTTPS check problems. I promise. No false-posivides now.

Browse Source 
We handled SSLErrors as certificate masquerading errors, which is not always true.
For now we still search 'CERTIFICATE_VERIFY_FAILED' in SSLError exception
for compatibility with older Python versions.
This commit is contained in:
ValdikSS 2017-06-03 21:15:35 +03:00
parent 61dd7228b9
commit bc39552009
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blockcheck.py
View File

@ -301,11 +301,13 @@ def _get_url(url, proxy=None, ip=None, headers=False, follow_redirects=True):
(':' in ip if ip else False) else 'IPv4'))
try:
conn.connect((ip if ip else host, 443))
except (ssl.CertificateError, ssl.SSLError) as e:
except (ssl.CertificateError) as e:
print_debug("_get_url: ssl.CertificateError", repr(e))
return (-1, '')
except (socket.timeout, socket.error) as e:
except (ssl.SSLError, socket.timeout, socket.error) as e:
print_debug("_get_url: socket exception", repr(e))
if 'CERTIFICATE_VERIFY_FAILED' in str(e):
return (-1, '')
return (0, '')
finally:
try:
@ -351,10 +353,10 @@ def _get_url(url, proxy=None, ip=None, headers=False, follow_redirects=True):
if (headers):
output = str(opened.headers) + output
opened.close()
except (ssl.CertificateError, ssl.SSLError) as e:
except (ssl.CertificateError) as e:
print_debug("_get_url: late ssl.CertificateError", repr(e))
return (-1, '')
except (urllib.error.URLError, socket.error, socket.timeout) as e:
except (urllib.error.URLError, ssl.SSLError, socket.error, socket.timeout) as e:
print_debug("_get_url: late socket exception", repr(e))
if 'CERTIFICATE_VERIFY_FAILED' in str(e):
return (-1, '')