github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import urllib3 from requests.packages

Browse Source
This commit is contained in:
Mike Fährmann
2019-05-04 16:01:36 +02:00
parent c68461026a
commit 5fd94c6b83
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gallery_dl/extractor/common.py
View File

@@ -405,30 +405,26 @@ http.cookiejar.MozillaCookieJar.magic_re = re.compile(
# Update default cipher list of urllib3 < 1.25 # Update default cipher list of urllib3 < 1.25
# to fix issues with Cloudflare and, by extension, Artstation (#227) # to fix issues with Cloudflare and, by extension, Artstation (#227)
try: import requests.packages.urllib3 as urllib3 # noqa
import urllib3 if urllib3.__version__ < "1.25":
except ImportError: from requests.packages.urllib3.util import ssl_
pass logging.getLogger("gallery-dl").debug(
else: "updating default urllib3 ciphers")
if urllib3.__version__ < "1.25": # cipher list taken from urllib3 1.25
from urllib3.util import ssl_ # https://github.com/urllib3/urllib3/blob/1.25/src/urllib3/util/ssl_.py
logging.getLogger("gallery-dl").debug( ssl_.DEFAULT_CIPHERS = (
"updating default urllib3 ciphers") "ECDHE+AESGCM:"
# cipher list taken from urllib3 1.25 "ECDHE+CHACHA20:"
# https://github.com/urllib3/urllib3/blob/1.25/src/urllib3/util/ssl_.py "DHE+AESGCM:"
ssl_.DEFAULT_CIPHERS = ( "DHE+CHACHA20:"
"ECDHE+AESGCM:" "ECDH+AESGCM:"
"ECDHE+CHACHA20:" "DH+AESGCM:"
"DHE+AESGCM:" "ECDH+AES:"
"DHE+CHACHA20:" "DH+AES:"
"ECDH+AESGCM:" "RSA+AESGCM:"
"DH+AESGCM:" "RSA+AES:"
"ECDH+AES:" "!aNULL:"
"DH+AES:" "!eNULL:"
"RSA+AESGCM:" "!MD5:"
"RSA+AES:" "!DSS"
"!aNULL:" )
"!eNULL:"
"!MD5:"
"!DSS"
)