rsync-net: fix sandboxing (dont set PrivateUsers: we lose perms in the root ns doing that)

This commit is contained in:
2024-08-03 11:25:50 +00:00
parent ee062d61d0
commit 04fc601c9c

View File

@@ -56,14 +56,16 @@ in
serviceConfig.CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
serviceConfig.ReadWritePaths = builtins.map (d: "${d}/zzz-rsync-net") cfg.dirs;
serviceConfig.ReadOnlyPaths = "/nix/persist/private";
serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
serviceConfig.RestrictAddressFamilies = "AF_INET AF_INET6";
serviceConfig.LockPersonality = true;
serviceConfig.MemoryDenyWriteExecute = true;
serviceConfig.NoNewPrivileges = true;
serviceConfig.PrivateDevices = true;
serviceConfig.PrivateMounts = true;
serviceConfig.PrivateUsers = true;
serviceConfig.PrivateTmp = true;
serviceConfig.ProcSubset = "pid";
serviceConfig.ProtectClock = "true";
serviceConfig.ProtectClock = true;
serviceConfig.ProtectControlGroups = true;
serviceConfig.ProtectHome = true;
serviceConfig.ProtectHostname = true;
@@ -73,13 +75,23 @@ in
serviceConfig.ProtectProc = "invisible";
serviceConfig.ProtectSystem = "strict";
serviceConfig.RemoveIPC = true;
serviceConfig.RestrictFileSystems = "@basic-api @common-block @temporary";
serviceConfig.RestrictNamespaces = true;
serviceConfig.RestrictSUIDSGID = true;
serviceConfig.SystemCallArchitectures = "native";
serviceConfig.SystemCallFilter = "@system-service @mount";
serviceConfig.SystemCallFilter = [
"@system-service"
"~@chown"
"~@cpu-emulation"
"~@keyring"
"~@setuid"
];
# hardening exceptions:
serviceConfig.NoNewPrivileges = false; #< bwrap'd dac_read_search
serviceConfig.PrivateDevices = false; #< passt/pasta
serviceConfig.RestrictNamespaces = false; #< bwrap
serviceConfig.PrivateUsers = false; #< CAP_DAC_READ_SEARCH in the root namespace means we can't do any user namespacing
# serviceConfig.NoNewPrivileges = false; #< bwrap'd dac_read_search
# serviceConfig.PrivateDevices = false; #< passt/pasta
# serviceConfig.RestrictNamespaces = false; #< bwrap
# serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK"; #< AF_NETLINK is for passt/pasta
};
systemd.timers.rsync-net = {
wantedBy = [ "multi-user.target" ];