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/stunnel: Fix CA files #63029

Merged
merged 2 commits into from Oct 25, 2019
Merged

nixos/stunnel: Fix CA files #63029

merged 2 commits into from Oct 25, 2019

Conversation

dasJ
Copy link
Member

@dasJ dasJ commented Jun 12, 2019

The default is the .crt file from the ssl package.
However, with CApath, it's assumed to be a directory containing
certificates, while with CAfile, it's properly recognised as a file.

Relevant strace output:
stat("/etc/ssl/certs/ca-certificates.crt/2e5ac55d.0", 0x7fc580f3d610) = -1 ENOTDIR (Not a directory)

cc @lschuermann

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lschuermann
Copy link
Member

Actually I have to admit that I never really used the client mode of stunnel in production with this module. If you're using it, maybe we should consider adding a meta maintainers field with us both as outlined here. I think this just means adding a meta.maintainers attribute.

lschuermann
lschuermann reviewed Jun 15, 2019
View reviewed changes
nixos/modules/services/networking/stunnel.nix Outdated
@@ -195,7 +195,7 @@ in
connect = ${v.connect}
verifyChain = ${yesNo v.verifyChain}
verifyPeer = ${yesNo v.verifyPeer}
${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"}
${optionalString (v.CAPath != null) "CAfile = ${v.CAPath}"}
Copy link
Member

Choose a reason for hiding this comment

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

I think there is nothing wrong with this option per se, but just the default value that gets substituted. Maybe it's sufficient to change ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt to ${pkgs.cacert}/etc/ssl/certs?

Otherwise, we should consider changing the option CAPath to CAfile or add both, as both variants are valid.

@lschuermann
Copy link
Member

lschuermann commented Oct 25, 2019 •
edited

Discussed the fixes in person at NixCon, similar to what I've proposed. This seems to be the right™ solution. Tested, working!

Thank you for discovering and fixing this, @dasJ! Really cool that we now have an official maintainer for the module's client side as well.

Ping @infinisil @Lassulus, as soon as @dasJ confirms this to be working, it can be merged IMHO.

@dasJ
Copy link
Member Author

dasJ commented Oct 25, 2019

Tested working

@lschuermann
Copy link
Member

@GrahamcOfBorg eval

@Lassulus Lassulus merged commit 2abe2b2 into NixOS:master Oct 25, 2019
@dasJ dasJ deleted the stunnel-fix-cert branch October 25, 2019 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lschuermann lschuermann lschuermann left review comments

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.

None yet
3 participants
@dasJ @lschuermann @Lassulus