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/amuled: add systemd hardening options #354517

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

someone-stole-my-name
Copy link
Contributor

Drops the script startup method in favor of directly executing the service under its own user and adds general hardening to the systemd unit.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 8, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 8, 2024
@xanderio
Copy link
Contributor

xanderio commented Dec 2, 2024

Thanks for your contribution, please make sure your commit messages match CONTRIBUTING.md.

@xanderio xanderio added the awaiting_changes (old Marvin label, do not use) label Dec 2, 2024
@SigmaSquadron SigmaSquadron removed the awaiting_changes (old Marvin label, do not use) label Jan 5, 2025
Drops the script startup method in favor of directly executing the service under its own user, and adds general hardening to the systemd unit.
@someone-stole-my-name someone-stole-my-name changed the title nixos/services.amule: add systemd hardening options nixos/amuled: add systemd hardening options Jan 5, 2025
@someone-stole-my-name
Copy link
Contributor Author

Thanks for the review @xanderio, I just squashed and edited the commit message, please take a look again.

Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

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

Changes LGTM

Haven't tried out the module yet

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 6, 2025
Copy link
Contributor

@xanderio xanderio left a comment

Choose a reason for hiding this comment

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

This looks good, feel free to dismiss my comments.

@@ -61,20 +63,46 @@ in
gid = config.ids.gids.amule;
} ];

systemd.tmpfiles.rules = [
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you maybe use the new systemd.tmpfiles.settings interface?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey, thanks for the new review. I wasn't aware of this new interface, added in c331196.

environment.HOME = cfg.dataDir;

serviceConfig = {
Type = "forking";
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason where using a forking service here, instead of dropping the --full-deamon arg below and letting systemd handle the rest?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just tested, and it works fine without it, changed in b055531, thanks.

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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
Development

Successfully merging this pull request may close these issues.

5 participants