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

nixos/stunnel: Fix CA files #63029

Open
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
2 participants
@dasJ
Copy link
Contributor

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.

nixos/stunnel: Fix CA files
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
@lschuermann

This comment has been minimized.

Copy link
Contributor

commented Jun 15, 2019

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.

@@ -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}"}

This comment has been minimized.

Copy link
@lschuermann

lschuermann Jun 15, 2019

Contributor

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.