summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd Gamblin <gamblin2@llnl.gov>2022-12-04 23:46:27 -0800
committerGitHub <noreply@github.com>2022-12-05 08:46:27 +0100
commit94dc86e1634ca5e36d3bb9e03f8a3e99a957e087 (patch)
tree80e2113091d0786c6b5fad2d9459bef0ee0345db /lib
parent729b1c9fa63ac11475fa2f33795dbeebbc331df1 (diff)
downloadspack-94dc86e1634ca5e36d3bb9e03f8a3e99a957e087.tar.gz
spack-94dc86e1634ca5e36d3bb9e03f8a3e99a957e087.tar.bz2
spack-94dc86e1634ca5e36d3bb9e03f8a3e99a957e087.tar.xz
spack-94dc86e1634ca5e36d3bb9e03f8a3e99a957e087.zip
web: remove checks for SSL verification support (#34307)
We no longer support Python <3.6, so we don't need to check whether Python supports SSL verification in `spack.util.web`. - [x] Remove a bunch of logic we needed to appease Python 2
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/util/web.py36
1 files changed, 5 insertions, 31 deletions
diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py
index 543bb43c5c..5aa63c4bb2 100644
--- a/lib/spack/spack/util/web.py
+++ b/lib/spack/spack/util/web.py
@@ -78,35 +78,23 @@ def uses_ssl(parsed_url):
return False
-__UNABLE_TO_VERIFY_SSL = (lambda pyver: ((pyver < (2, 7, 9)) or ((3,) < pyver < (3, 4, 3))))(
- sys.version_info
-)
-
-
def read_from_url(url, accept_content_type=None):
url = url_util.parse(url)
context = None
- verify_ssl = spack.config.get("config:verify_ssl")
-
# Timeout in seconds for web requests
timeout = spack.config.get("config:connect_timeout", 10)
# Don't even bother with a context unless the URL scheme is one that uses
# SSL certs.
if uses_ssl(url):
- if verify_ssl:
- if __UNABLE_TO_VERIFY_SSL:
- # User wants SSL verification, but it cannot be provided.
- warn_no_ssl_cert_checking()
- else:
- # User wants SSL verification, and it *can* be provided.
- context = ssl.create_default_context() # novm
+ if spack.config.get("config:verify_ssl"):
+ # User wants SSL verification, and it *can* be provided.
+ context = ssl.create_default_context()
else:
# User has explicitly indicated that they do not want SSL
# verification.
- if not __UNABLE_TO_VERIFY_SSL:
- context = ssl._create_unverified_context()
+ context = ssl._create_unverified_context()
url_scheme = url.scheme
url = url_util.format(url)
@@ -154,22 +142,11 @@ def read_from_url(url, accept_content_type=None):
return response.geturl(), response.headers, response
-def warn_no_ssl_cert_checking():
- tty.warn(
- "Spack will not check SSL certificates. You need to update "
- "your Python to enable certificate verification."
- )
-
-
def push_to_url(local_file_path, remote_path, keep_original=True, extra_args=None):
if sys.platform == "win32":
if remote_path[1] == ":":
remote_path = "file://" + remote_path
remote_url = url_util.parse(remote_path)
- verify_ssl = spack.config.get("config:verify_ssl")
-
- if __UNABLE_TO_VERIFY_SSL and verify_ssl and uses_ssl(remote_url):
- warn_no_ssl_cert_checking()
remote_file_path = url_util.local_file_path(remote_url)
if remote_file_path is not None:
@@ -728,10 +705,7 @@ def _urlopen(req, *args, **kwargs):
except AttributeError:
pass
- # Note: 'context' parameter was only introduced starting
- # with versions 2.7.9 and 3.4.3 of Python.
- if __UNABLE_TO_VERIFY_SSL:
- del kwargs["context"]
+ del kwargs["context"]
opener = urlopen
if url_util.parse(url).scheme == "s3":