mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-08 22:06:16 +01:00
Code

Merge pull request #1332 from dmach/fix-urllib3-verify_mode-CERT_NONE

Browse Source 
Fix ValueError: Cannot set verify_mode to CERT_NONE when check_hostname is enabled
This commit is contained in:
Daniel Mach 2023-05-31 10:09:01 +02:00 committed by GitHub
commit baff384678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osc/connection.py
View File

@ -252,9 +252,19 @@ def http_request(method: str, url: str, headers=None, data=None, file=None, retr
if purl.scheme == "https": if purl.scheme == "https":
ssl_context = oscssl.create_ssl_context() ssl_context = oscssl.create_ssl_context()
ssl_context.load_default_certs() ssl_context.load_default_certs()
# turn cert verification off if sslcertck = 0
pool_kwargs["cert_reqs"] = "CERT_REQUIRED" if options["sslcertck"] else "CERT_NONE"
pool_kwargs["ssl_context"] = ssl_context pool_kwargs["ssl_context"] = ssl_context
# turn cert verification off if sslcertck = 0
# urllib3 v1
pool_kwargs["cert_reqs"] = "CERT_REQUIRED" if options["sslcertck"] else "CERT_NONE"
# urllib3 v2
if options["sslcertck"]:
ssl_context.check_hostname = True
ssl_context.verify_mode = ssl.CERT_REQUIRED
else:
ssl_context.check_hostname = False
ssl_context.verify_mode = ssl.CERT_NONE
if purl.scheme == "http" and HTTP_PROXY_MANAGER and not urllib.request.proxy_bypass(url): if purl.scheme == "http" and HTTP_PROXY_MANAGER and not urllib.request.proxy_bypass(url):
# connection through HTTP proxy # connection through HTTP proxy