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

nixos/duosec: replace insecure skey option with secure secretKeyFile option #78938

Merged
merged 3 commits into from
Mar 23, 2020
Merged

nixos/duosec: replace insecure skey option with secure secretKeyFile option #78938

merged 3 commits into from
Mar 23, 2020
+70 −38

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Jan 31, 2020 •
edited
Loading

Motivation for this change

Waiting on #78902 to be merged.

I tested this with the ssh.enable option set to true, though I did not test with the pam.enable option set to true as I'm not clear on how that is supposed to be configured.

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.

Sorry, something went wrong.

@aanderse aanderse requested review from flokli and sdier January 31, 2020 02:24
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 31, 2020
@aanderse aanderse force-pushed the duo-activation-scripts branch 3 times, most recently from 34629be to cf0279c Compare January 31, 2020 20:34
@aanderse aanderse force-pushed the duo-activation-scripts branch 2 times, most recently from 4722673 to 4e1ace6 Compare February 2, 2020 14:29
@aanderse aanderse force-pushed the duo-activation-scripts branch 2 times, most recently from cf0279c to 2f21158 Compare February 22, 2020 02:23
@aanderse aanderse marked this pull request as ready for review March 11, 2020 02:38
@aanderse
Copy link
Member Author

I just noticed this is against 20.03... will target 20.09.

@aanderse
nixos/duosec: fix indentation

Verified

This commit was signed with the committer’s verified signature. The key has expired.
grahamc Graham Christensen
GPG key ID: FE918C3A98C1030F
Expired
Verified
Learn about vigilant mode
4f9cea7
@aanderse aanderse force-pushed the duo-activation-scripts branch from 2f21158 to 84f500a Compare March 21, 2020 14:49
@aanderse
Copy link
Member Author

@sdier I'm planning on merging this shortly. Any remaining concerns?

sdier
sdier approved these changes Mar 22, 2020
View reviewed changes
Copy link
Contributor

@sdier sdier left a comment

Choose a reason for hiding this comment

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

LGTM. Sorry I've been non-responsive, my routine has been very different lately.

aanderse added 2 commits March 22, 2020 20:23
@aanderse
nixos/duosec: replace insecure skey option with secure secretKeyFile …

Verified

This commit was signed with the committer’s verified signature. The key has expired.
grahamc Graham Christensen
GPG key ID: FE918C3A98C1030F
Expired
Verified
Learn about vigilant mode
b9dca76 
…option
@aanderse
nixos/duosec: rename ikey option to integrationKey

Verified

This commit was signed with the committer’s verified signature. The key has expired.
grahamc Graham Christensen
GPG key ID: FE918C3A98C1030F
Expired
Verified
Learn about vigilant mode
6f0c1cd
@aanderse aanderse force-pushed the duo-activation-scripts branch from 84f500a to 6f0c1cd Compare March 23, 2020 00:26
@aanderse
Copy link
Member Author

Summary:

  • I've done some final testing, all good 👍
  • While storing a secret under /etc/duo with restricted permissions isn't perfect, it sure is better than storing a secret under /nix/store which is word readable
  • Existing user @sdier has no problems

So merge it is.

@aanderse aanderse merged commit b69b7a1 into NixOS:master Mar 23, 2020
@aanderse
Copy link
Member Author

LGTM. Sorry I've been non-responsive, my routine has been very different lately.

No problems. Thanks for circling back, I appreciate it 🎉

@aanderse aanderse deleted the duo-activation-scripts branch March 23, 2020 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc

@infinisil infinisil

@sdier sdier

@flokli flokli

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@aanderse @grahamc @sdier @infinisil