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/opensmtpd: add a setgid wrapper for smtpctl #89962

Merged
merged 1 commit into from Jun 10, 2020
Merged

nixos/opensmtpd: add a setgid wrapper for smtpctl #89962

merged 1 commit into from Jun 10, 2020

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Jun 9, 2020

Motivation for this change

The setgid is currently required for offline enqueuing, and unfortunately smtpctl is currently not split from sendmail so there's little running around it.

See #88640.

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.

@romildo romildo requested a review from Ekleog June 9, 2020 19:12
Ekleog
Ekleog approved these changes Jun 9, 2020
View reviewed changes
Copy link
Member

@Ekleog Ekleog left a comment

Choose a reason for hiding this comment

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

Let's merge as soon as the tiny nit gets in. Thank you! :)

nixos/modules/services/mail/opensmtpd.nix Outdated
source = "${cfg.package}/bin/smtpctl";
};

services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail {
Copy link
Member

Choose a reason for hiding this comment

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

Nit: could be written mkIf cfg.setSendmail config.security.wrappers.smtpctl; for DRY.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@romildo
nixos/opensmtpd: add a setgid wrapper for smtpctl
6df792e 
The setgid is currently required for offline enqueuing, and
unfortunately smtpctl is currently not split from sendmail so there's
little running around it.
@Ekleog
Copy link
Member

Ekleog commented Jun 10, 2020

Great, thank you! For the record and potential future people looking at this PR, even though we usually don't use rec to allow proper overriding, I agree that here the usage, while not mandatory, is legitimate to me.

@ofborg build nixosTests.opensmtpd

@Ekleog Ekleog merged commit a421af2 into NixOS:master Jun 10, 2020
@romildo romildo deleted the fix.opensmtpd branch June 10, 2020 14:32
@someplaceguy someplaceguy mentioned this pull request Sep 17, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ekleog Ekleog Ekleog approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@romildo @Ekleog