Allow specifying a certificate bundle with TLDR_CERT #243
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
Setting TLDR_CERT will use that as the certificate bundle for updates
sebastiaanspeck
approved these changes
Apr 18, 2024
vitorhcl
reviewed
Jun 11, 2024
| @@ -34,12 +34,15 @@ | |||
| USE_NETWORK = int(os.environ.get('TLDR_NETWORK_ENABLED', '1')) > 0 | |||
| USE_CACHE = int(os.environ.get('TLDR_CACHE_ENABLED', '1')) > 0 | |||
| MAX_CACHE_AGE = int(os.environ.get('TLDR_CACHE_MAX_AGE', 24*7)) | |||
| CAFILE = os.path.expanduser(os.environ.get('TLDR_CERT', None)) | |||
There was a problem hiding this comment.
Suggested change
| CAFILE = os.path.expanduser(os.environ.get('TLDR_CERT', None)) | |
| CAFILE = None if os.environ.get('TLDR_CERT', None) is None else Path(os.environ.get('TLDR_CERT')).expanduser() |
This change should fix the error when $TLDR_CERT is not set. Also, we prefer to use pathlib instead of os.path.
|
|
||
| URLOPEN_CONTEXT = None | ||
| if int(os.environ.get('TLDR_ALLOW_INSECURE', '0')) == 1: | ||
| URLOPEN_CONTEXT = ssl.create_default_context() | ||
| URLOPEN_CONTEXT.check_hostname = False | ||
| URLOPEN_CONTEXT.verify_mode = ssl.CERT_NONE | ||
| elif CAFILE: | ||
| URLOPEN_CONTEXT = ssl.create_default_context(cafile=CAFILE) |
There was a problem hiding this comment.
I don't know if this method accepts a path argument or it will need str(CAFILE)
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.
This pull request makes it possible to specificy a different certificate store/bundle by setting:
TLDR_CERT=/path/to/certificates.crtThis is a more secure alternative to disabling SSL verification entirely when behind an SSL proxy.