Close SSL sockets when connections/validations fail #3318
Merged
Conversation
This file contains hidden or 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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
gerzse
approved these changes
Jul 17, 2024
|
@gerzse I'll resolve the merge conflict in |
kurtmckee
force-pushed
the
fix-ssl-socket-resource-warnings-issue-3317
branch
from
d688ea6 to
5e0a114
Compare
|
Rebased on |
|
Thanks @kurtmckee ! |
vladvildanov
pushed a commit
that referenced
this pull request
Sep 27, 2024
Handle more cases of failure when initializing SSL sockets, and make sure no socket is left unclosed in case of errors. Fixes #3317
vladvildanov
pushed a commit
that referenced
this pull request
Sep 27, 2024
Handle more cases of failure when initializing SSL sockets, and make sure no socket is left unclosed in case of errors. Fixes #3317
vladvildanov
pushed a commit
that referenced
this pull request
Sep 27, 2024
Handle more cases of failure when initializing SSL sockets, and make sure no socket is left unclosed in case of errors. Fixes #3317
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.
Fixes #3317
Pull Request check-list
Please make sure to review and check all of these items:
Note
CI may fail, as it currently does on the
masterbranch, but because the SSL sockets are getting closed, theResourceWarningdisplayed as pytest exits are now resolved.NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open.
Description of change
As noted in #3317, there are two places where SSL sockets might not get closed, and they both stem from a
RedisErrorgetting raised when either of two validation checks fail. This PR addresses the issue in these ways:RedisErroris now caught in addition toOSErrorso the first open socket can be closed