Fix REQUESTS_CA_BUNDLE directory support in _setup_ssl_cert#3681
Open
armorbreak001 wants to merge 1 commit intoboto:developfrom
Open
Fix REQUESTS_CA_BUNDLE directory support in _setup_ssl_cert#3681armorbreak001 wants to merge 1 commit intoboto:developfrom
armorbreak001 wants to merge 1 commit intoboto:developfrom
Conversation
When REQUESTS_CA_BUNDLE is set to a directory path (supported by requests/urllib3 for CA cert bundles), botocore raised an error because it unconditionally set the path as ca_certs (file-only). Use ca_cert_dir when the path is a directory to match urllib3's expected usage.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
When
REQUESTS_CA_BUNDLEis set to a directory path (which is valid per the requests documentation), botocore raises anOSError: Is a directoryerror because_setup_ssl_certunconditionally assigns the path toconn.ca_certs, which expects a file path.The fix checks whether the cert path is a directory and uses
conn.ca_cert_dirinstead, which is the correct urllib3 attribute for CA certificate directories.Issue
Fixes #2731
Changes
_setup_ssl_cert(), checkos.path.isdir(cert_path)before assigning to connection attributesca_cert_dirfor directories,ca_certsfor files (existing behavior)Diff: 5 lines added, 1 line removed