Skip to content

Commit

Permalink
Added check for SubjectAltNameWarning exception in distributed_cleanu…
Browse files Browse the repository at this point in the history
…p.py

If urllib3 is v2.0 and greater then errors are produced when no subjectAltName is in the certificate.
For less than v2.0 we want to silence the SubjectAltNameWarning exception.

Ticket: ENT-11875
Changelog: none
  • Loading branch information
craigcomstock committed Jun 13, 2024
1 parent 281e679 commit 03c61a7
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions templates/federated_reporting/nova_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ def __init__(
basic_auth="{}:{}".format(self._api_user, self._api_password)
)
self._headers["Content-Type"] = "application/json"
# In order to avoid SubjectAltNameWarning with our self-signed certs, silence it
if not sys.warnoptions:
import warnings

warnings.simplefilter(
"ignore", category=urllib3.exceptions.SubjectAltNameWarning
)
# urllib3 v2.0 removed SubjectAltNameWarning and instead throws an error if no SubjectAltName is present in a certificate
if (hasattr(urllib3.exceptions, "SubjectAltNameWarning"):
# if urllib3 is < v2.0 then SubjectAltNameWarning will exist and should be silenced
if not sys.warnoptions:
import warnings

warnings.simplefilter(
"ignore", category=urllib3.exceptions.SubjectAltNameWarning
)

def __str__(self):
return str(self.__class__) + ":" + str(self.__dict__)
Expand Down

0 comments on commit 03c61a7

Please sign in to comment.