cacert: ensure that NIX_SSL_CERT_FILE is readable before using it #345322
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
Following on from NixOS#303307, we check that `NIX_SSL_CERT_FILE` is readable from the current environment before using it; otherwise we set it from the cacert package as before. We log a message if we're inheriting it, as well as if we're ignoring it, to leave a breadcrumb for people wondering why their custom SSL cert file isn't being used. Fixes NixOS#345226.
ofborg
bot
added
10.rebuild-darwin-stdenv
timbertson
reviewed
Sep 30, 2024
| echo "cacert/setup-hook: NIX_SSL_CERT_FILE in environment $NIX_SSL_CERT_FILE cannot be read; overriding" >&2 | ||
| fi | ||
| export NIX_SSL_CERT_FILE="@out@/etc/ssl/certs/ca-bundle.crt" | ||
| fi |
There was a problem hiding this comment.
I was thinking of this:
export NIX_SSL_CERT_FILE="${NIX_SSL_CERT_FILE:-@out@/etc/ssl/certs/ca-bundle.crt}"
if test ! -r "$NIX_SSL_CERT_FILE"; then
echo "cacert/setup-hook: NIX_SSL_CERT_FILE in environment $NIX_SSL_CERT_FILE cannot be read; overriding" >&2
export NIX_SSL_CERT_FILE="@out@/etc/ssl/certs/ca-bundle.crt"
fi
It's still a bit of duplication, but at least there's no edge cases around e.g. testing an empty file when NIX_SSL_CERT_FILE isn't set.
timbertson
approved these changes
Oct 10, 2024
wegank
added
the
12.approvals: 1
|
Is there something blocking this PR from getting merged? We are facing an issue that is fixed by this PR in our current setup. |
|
Nothing blocking it aside from attracting the attention / review of someone
with permission to merge, I'm afraid :/
…On Wed, 8 Jan 2025, 8:05 am Émile Grégoire, ***@***.***> wrote:
Is there something blocking this PR from getting merged? We are facing an
issue that is fixed by this PR in our current setup.
—
Reply to this email directly, view it on GitHub
<#345322 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAADOXCXXGBMVJCTP2EKS3D2JQ6QZAVCNFSM6AAAAABPB3F5DOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKNZWGIYTONRYGE>
.
You are receiving this because you commented.Message ID:
***@***.***>
|
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.
Description of changes
Following on from #303307, we check that
NIX_SSL_CERT_FILEis readable from the current environment before using it; otherwise we set it from the cacert package as before.We log a message if we're inheriting it, as well as if we're ignoring it, to leave a breadcrumb for people wondering why their custom SSL cert file isn't being used.
Fixes #345226.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.