extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2024-11-21 23:33:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup default cert loading

Browse Source
This commit is contained in:
Jakub Roztocil 2024-11-01 17:38:39 +01:00
parent fd30c4ef62
commit ff742581f4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httpie/ssl_.py
View File

@ -32,7 +32,7 @@ class HTTPieCertificate(NamedTuple):
def to_raw_cert(self): def to_raw_cert(self):
"""Synthesize a requests-compatible (2-item tuple of cert and key file) """Synthesize a requests-compatible (2-item tuple of cert and key file)
object from HTTPie's internal representation of a certificate.""" object from HTTPie's internal representation of a certificate."""
return (self.cert_file, self.key_file) return self.cert_file, self.key_file
class HTTPieHTTPSAdapter(HTTPAdapter): class HTTPieHTTPSAdapter(HTTPAdapter):
@ -48,13 +48,6 @@ class HTTPieHTTPSAdapter(HTTPAdapter):
ssl_version=ssl_version, ssl_version=ssl_version,
ciphers=ciphers, ciphers=ciphers,
) )
# workaround for a bug in requests 2.32.3, see:
# https://github.com/httpie/cli/issues/1583
if getattr(self._ssl_context, 'load_default_certs', None) is not None:
# if load_default_certs is present, get_ca_certs must be
# also, no need for another getattr
if not self._ssl_context.get_ca_certs():
self._ssl_context.load_default_certs()
super().__init__(**kwargs) super().__init__(**kwargs)
def init_poolmanager(self, *args, **kwargs): def init_poolmanager(self, *args, **kwargs):
@ -78,7 +71,7 @@ class HTTPieHTTPSAdapter(HTTPAdapter):
ssl_version: str = None, ssl_version: str = None,
ciphers: str = None, ciphers: str = None,
) -> 'ssl.SSLContext': ) -> 'ssl.SSLContext':
return create_urllib3_context( context = create_urllib3_context(
ciphers=ciphers, ciphers=ciphers,
ssl_version=resolve_ssl_version(ssl_version), ssl_version=resolve_ssl_version(ssl_version),
# Since we are using a custom SSL context, we need to pass this # Since we are using a custom SSL context, we need to pass this
@ -86,6 +79,11 @@ class HTTPieHTTPSAdapter(HTTPAdapter):
# in `super().cert_verify()`. # in `super().cert_verify()`.
cert_reqs=ssl.CERT_REQUIRED if verify else ssl.CERT_NONE cert_reqs=ssl.CERT_REQUIRED if verify else ssl.CERT_NONE
) )
if not context.get_ca_certs():
# Workaround for a bug in requests 2.32.3
# See <https://github.com/httpie/cli/issues/1583>
context.load_default_certs()
return context
@classmethod @classmethod
def get_default_ciphers_names(cls): def get_default_ciphers_names(cls):