Fix TLSContextWrapper to not override tls_verify #10098
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
ghost
added
the
Codecov Report
Flags with carried forward coverage won't be shown. Click here to find out more. |
yzhan289
previously approved these changes
Sep 13, 2021
FlorianVeaux
requested changes
Sep 13, 2021
There was a problem hiding this comment.
Couple of thoughts:
- This is a breaking behavioral change, a few integrations rely on this. It's not clear to me how much impact this change can have for integrations and users who are relying on this behavior. Maybe worse case scenario is that certs won't be verified anymore ?
- It still makes sense to force
tls_verifyto True iftls_ca_certis set. Indeed, passingtls_ca_certis only required for verifying a given cert based on some list of Certificat Authority. Passingtls_ca_certis useless if we don't plan to verify the cert.
I did that, initially because it doesn't make sense to set |
Thanks Florian, that makes sense. I've addressed this and added back the override for |
Comment on lines
46
to
48
| @pytest.mark.parametrize('param', ('tls_ca_cert', 'tls_cert', 'tls_private_key', 'tls_private_key_password')) | ||
| def test_config_overwrite(self, param): | ||
| config = {'tls_verify': False, param: 'foo'} | ||
| config = {param: param} |
There was a problem hiding this comment.
You should keep tls_verify: False here because the default is True.
And remove all but tls_ca_cert from the parametrize decorator
FlorianVeaux
approved these changes
Sep 13, 2021
ofek
approved these changes
Sep 13, 2021
yzhan289
approved these changes
Sep 13, 2021
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?
Previously, the
TLSContextWrapperwas overriding the configuredtls_verifyvalue and forcing it toTrueif any of these configs were present,tls_ca_cert,tls_cert,tls_private_key,tls_private_key_passwordeven iftls_verify: falseis configured. This PR updates the override to only forcetls_verify: trueiftls_ca_certis configured.Motivation
Customer support case
Additional Notes
Review checklist (to be filled by reviewers)
changelog/andintegration/labels attached