nginx: allow basic auth passwords to be specified in a file #38539
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
infinisil
requested changes
Apr 8, 2018
| ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)} | ||
| ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) '' | ||
| auth_basic secured; | ||
| auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else (mkHtpasswd vhostName vhost.basicAuth)}; |
There was a problem hiding this comment.
The parentheses aren't needed here.
lopsided98
force-pushed
the
nginx-basic-auth-file
branch
from
fd19099
to
f55cd06
Compare
|
Are the revised changes okay to merge? |
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.
Motivation for this change
Currently, basic auth passwords must be stored in plain text in the Nix store, which is insecure.
Things done
Adds an option to specify a htpasswd file for basic auth, which may be stored outside of the Nix store. Ideally, we would remove the ability to specify plain text basic auth passwords, and only allow hashed passwords or an external htpasswd, but this PR fixes the biggest issue. This will also check one of the boxes in #24288.
cc @globin
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)