Update TLS check to use TLS context wrapper #8230
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yzhan289
commented
Dec 22, 2020
499068b to
89a21c6
Compare
Codecov Report
|
FlorianVeaux
requested changes
Dec 23, 2020
4 tasks
ea25abd to
8a9eb7b
Compare
184219b to
16ae6cd
Compare
16ae6cd to
1fe3ba4
Compare
FlorianVeaux
approved these changes
Dec 29, 2020
yzhan289
commented
Dec 30, 2020
Comment on lines
-339
to
-371
| def tls_context(self): | ||
| if self._tls_context is None: | ||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext | ||
| # https://docs.python.org/3/library/ssl.html#ssl.PROTOCOL_TLS | ||
| self._tls_context = ssl.SSLContext(protocol=PROTOCOL_TLS_CLIENT) | ||
|
|
||
| # Run our own validation later on if need be | ||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.check_hostname | ||
| # | ||
| # IMPORTANT: This must be set before verify_mode in Python 3.7+, see: | ||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.check_hostname | ||
| self._tls_context.check_hostname = False | ||
|
|
||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.verify_mode | ||
| self._tls_context.verify_mode = ssl.CERT_REQUIRED if self._validate_cert else ssl.CERT_NONE | ||
|
|
||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.load_verify_locations | ||
| if self._cafile or self._capath: # no cov | ||
| self._tls_context.load_verify_locations(self._cafile, self._capath, None) | ||
|
|
||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.load_default_certs | ||
| else: | ||
| self._tls_context.load_default_certs(ssl.Purpose.SERVER_AUTH) | ||
|
|
||
| # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.load_cert_chain | ||
| if self._cert: # no cov | ||
| self._tls_context.load_cert_chain(self._cert, keyfile=self._private_key) | ||
|
|
||
| # https://docs.python.org/3/library/ssl.html#ssl.create_default_context | ||
| if 'SSLv3' in self._allowed_versions: # no cov | ||
| self._tls_context.options &= ~ssl.OP_NO_SSLv3 | ||
|
|
||
| return self._tls_context |
There was a problem hiding this comment.
Currently seeing how to ensure the logic of creating this context while also using updated SSL context
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR updates the TLS check to use the new SSL context wrapper rather than creating it from scratch.
Motivation
Additional Notes
Review checklist (to be filled by reviewers)
changelog/andintegration/labels attached