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/firejail: allow to pass options to firejail #103813

Merged
merged 1 commit into from Dec 4, 2020

Conversation

symphorien
Copy link
Member

Motivation for this change

Allow to select a profile for binaries wrapped with firejail

This is backward compatible, as shown by the nixos test

cc @stigtsp

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.

Comment on lines +45 to +50
profile = mkOption {
type = types.nullOr types.path;
default = null;
description = "Profile to use";
example = literalExample "''${pkgs.firejail}/etc/firejail/firefox.profile";
};
Copy link
Member

@stigtsp stigtsp Nov 18, 2020

Choose a reason for hiding this comment

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

Would it make sense to have profile as a string instead so it's possible to do profile="firefox" for instance?

Copy link
Member Author

Choose a reason for hiding this comment

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

this would prevent profile = pkgs.writeText "name" "content"

Copy link
Member Author

Choose a reason for hiding this comment

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

Does this answer satisfy you?

Copy link
Member

Choose a reason for hiding this comment

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

Sorry forgot this PR, yes that was a use-case I didn't consider. :)

@stigtsp stigtsp requested a review from 7c6f434c December 1, 2020 14:29
@stigtsp
Copy link
Member

stigtsp commented Dec 1, 2020

@GrahamcOfBorg build firejail.tests

@stigtsp
Copy link
Member

stigtsp commented Dec 1, 2020

Looks good to me, @7c6f434c can you have a look as well?

@stigtsp
Copy link
Member

stigtsp commented Dec 4, 2020

@GrahamcOfBorg test firejail

Copy link
Member

@stigtsp stigtsp left a comment

Choose a reason for hiding this comment

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

LGTM

@stigtsp stigtsp merged commit 80e0a20 into NixOS:master Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants