MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 15:16:52 +01:00
Code Issues Projects Releases Wiki Activity

Workaround for bug in ssl.SSLContext.load_default_certs (#1118)

Browse Source 
* Remove old compat code
* Load certificates only when not using nocheckcertificate
* Load each certificate individually

Closes #1060
Related bugs.python.org/issue35665, bugs.python.org/issue4531
This commit is contained in:
pukkandan 2021-09-29 03:07:23 +05:30 committed by GitHub
parent 7687c8ac6e
commit 7756277882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
yt_dlp/utils.py
View File

@ -2352,29 +2352,35 @@ def formatSeconds(secs, delim=':', msec=False):
return '%s.%03d' % (ret, secs % 1) if msec else ret return '%s.%03d' % (ret, secs % 1) if msec else ret
def make_HTTPS_handler(params, **kwargs): def _ssl_load_windows_store_certs(ssl_context, storename):
opts_no_check_certificate = params.get('nocheckcertificate', False) # Code adapted from _load_windows_store_certs in https://github.com/python/cpython/blob/main/Lib/ssl.py
if hasattr(ssl, 'create_default_context'): # Python >= 3.4 or 2.7.9 try:
context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH) certs = [cert for cert, encoding, trust in ssl.enum_certificates(storename)
if opts_no_check_certificate: if encoding == 'x509_asn' and (
context.check_hostname = False trust is True or ssl.Purpose.SERVER_AUTH.oid in trust)]
context.verify_mode = ssl.CERT_NONE except PermissionError:
return
for cert in certs:
try: try:
return YoutubeDLHTTPSHandler(params, context=context, **kwargs) ssl_context.load_verify_locations(cadata=cert)
except TypeError: except ssl.SSLError:
# Python 2.7.8
# (create_default_context present but HTTPSHandler has no context=)
pass pass
if sys.version_info < (3, 2):
return YoutubeDLHTTPSHandler(params, **kwargs) def make_HTTPS_handler(params, **kwargs):
else: # Python < 3.4 opts_check_certificate = not params.get('nocheckcertificate')
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
context.verify_mode = (ssl.CERT_NONE context.check_hostname = opts_check_certificate
if opts_no_check_certificate context.verify_mode = ssl.CERT_REQUIRED if opts_check_certificate else ssl.CERT_NONE
else ssl.CERT_REQUIRED) if opts_check_certificate:
# Work around the issue in load_default_certs when there are bad certificates. See:
# https://github.com/yt-dlp/yt-dlp/issues/1060,
# https://bugs.python.org/issue35665, https://bugs.python.org/issue4531
if sys.platform == 'win32':
for storename in ('CA', 'ROOT'):
_ssl_load_windows_store_certs(context, storename)
context.set_default_verify_paths() context.set_default_verify_paths()
return YoutubeDLHTTPSHandler(params, context=context, **kwargs) return YoutubeDLHTTPSHandler(params, context=context, **kwargs)
def bug_reports_message(before=';'): def bug_reports_message(before=';'):