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.

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

nixos/acme: apply chmod and ownership unconditionally #81369

Merged
merged 1 commit into from Mar 7, 2020
Merged

nixos/acme: apply chmod and ownership unconditionally #81369

merged 1 commit into from Mar 7, 2020

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Feb 29, 2020 •
edited

Also separate directory and file permissions so the certificate files
don't end up with the executable bit.

Fixes #81335

Motivation for this change

I believe this could address the issues I mentioned in #81335. This is completely untested, I will get to that later tonight.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@aanderse @emilazy @flokli @infinisil @arianvp @m1cr0man

@mweinelt
nixos/acme: apply chmod and ownership unconditionally
3575555 
Also separate directory and file permissions so the certificate files
don't end up with the executable bit.

Fixes NixOS#81335
emilazy
emilazy approved these changes Feb 29, 2020
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

LGTM and passes tests locally, except for the one local change I had to make which I see you've beaten me to :)

@mweinelt
Copy link
Member Author

Yup, tested it just now locally and stumbled on it myself. Otherwise looks to be working.

@lukateras
Copy link
Member

@GrahamcOfBorg test acme

@mweinelt mweinelt mentioned this pull request Mar 1, 2020
Merged
10 tasks
@infinisil infinisil merged commit 4f69262 into NixOS:master Mar 7, 2020
infinisil added a commit that referenced this pull request Mar 7, 2020
@infinisil
Merge pull request #81435 from mweinelt/pr/20.03/acme
883217d 
[20.03] nixos/acme: backport #81369 and #81371
@mweinelt mweinelt deleted the pr/acme-chmod branch March 7, 2020 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilazy emilazy emilazy approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

security.acme module will not fix ownership/mode if cert already exists and isn't newer
4 participants
@mweinelt @lukateras @emilazy @infinisil