Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow specifying a certificate bundle with TLDR_CERT #243

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Allow specifying a certificate bundle with TLDR_CERT #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e969362
Ignore .envrc and .direnv/
jtcbrule Apr 18, 2024
fdde55e
Add support for TLDR_CERT environmental variable
jtcbrule Apr 18, 2024
2511aeb
Document TLDR_CERT in README.md
jtcbrule Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ ENV/
env.bak/
venv.bak/

# direnv
.envrc
.direnv/

# Spyder project settings
.spyderproject
.spyproject
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ For networks that sit behind a proxy, it may be necessary to disable SSL verific

will disable SSL certificate inspection. This __should be avoided__ unless absolutely necessary.

It is possible to use a different certificate store/bundle by setting:

* `TLDR_CERT=/path/to/certificates.crt`

### Colors

Values of the `TLDR_COLOR_x` variables may consist of three parts:
Expand Down
3 changes: 3 additions & 0 deletions tldr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if this method accepts a path argument or it will need str(CAFILE)


OS_DIRECTORIES = {
"linux": "linux",
Expand Down
Loading