nixos/opensnitch: fix eval for services.opensnitch.settings.ProcMonitorMethod different than default (ebpf) (#368415)

This commit is contained in:
Gaétan Lepage
2025-01-01 21:00:59 +01:00
committed by GitHub
2 changed files with 73 additions and 50 deletions
+11 -5
View File
@@ -150,7 +150,7 @@ in
};
Ebpf.ModulesPath = lib.mkOption {
type = lib.types.path;
type = lib.types.nullOr lib.types.path;
default =
if cfg.settings.ProcMonitorMethod == "ebpf" then
"${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd"
@@ -202,10 +202,16 @@ in
services.opensnitchd = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = [
""
"${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}"
];
ExecStart =
let
preparedSettings = removeAttrs cfg.settings (
lib.optional (cfg.settings.ProcMonitorMethod != "ebpf") "Ebpf"
);
in
[
""
"${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" preparedSettings}"
];
};
preStart = lib.mkIf (cfg.rules != { }) (
let
+62 -45
View File
@@ -1,5 +1,13 @@
import ./make-test-python.nix (
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
monitorMethods = [
"ebpf"
"proc"
"ftrace"
"audit"
];
in
{
name = "opensnitch";
@@ -7,10 +15,9 @@ import ./make-test-python.nix (
maintainers = [ onny ];
};
nodes = {
server =
{ ... }:
{
nodes =
{
server = {
networking.firewall.allowedTCPPorts = [ 80 ];
services.caddy = {
enable = true;
@@ -19,50 +26,60 @@ import ./make-test-python.nix (
'';
};
};
clientBlocked =
{ ... }:
{
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
};
};
clientAllowed =
{ ... }:
{
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
rules = {
curl = {
name = "curl";
enabled = true;
action = "allow";
duration = "always";
operator = {
type = "simple";
sensitive = false;
operand = "process.path";
data = "${pkgs.curl}/bin/curl";
}
// (lib.listToAttrs (
map (
m:
lib.nameValuePair "client_blocked_${m}" {
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
settings.ProcMonitorMethod = m;
};
}
) monitorMethods
))
// (lib.listToAttrs (
map (
m:
lib.nameValuePair "client_allowed_${m}" {
services.opensnitch = {
enable = true;
settings.DefaultAction = "deny";
settings.ProcMonitorMethod = m;
rules = {
curl = {
name = "curl";
enabled = true;
action = "allow";
duration = "always";
operator = {
type = "simple";
sensitive = false;
operand = "process.path";
data = "${pkgs.curl}/bin/curl";
};
};
};
};
};
};
};
}
) monitorMethods
));
testScript = ''
start_all()
server.wait_for_unit("caddy.service")
server.wait_for_open_port(80)
testScript =
''
start_all()
server.wait_for_unit("caddy.service")
server.wait_for_open_port(80)
''
+ lib.concatLines (
map (m: ''
client_blocked_${m}.wait_for_unit("opensnitchd.service")
client_blocked_${m}.fail("curl http://server")
clientBlocked.wait_for_unit("opensnitchd.service")
clientBlocked.fail("curl http://server")
clientAllowed.wait_for_unit("opensnitchd.service")
clientAllowed.succeed("curl http://server")
'';
client_allowed_${m}.wait_for_unit("opensnitchd.service")
client_allowed_${m}.succeed("curl http://server")
'') monitorMethods
);
}
)