nixos/clash-verge: harden systemd service; nixos/clash-verge: readd tunMode (#402545)

Aleksana 0191ef92 919cb06a

Changed files
+38 -4
nixos
modules
programs
+38 -4
nixos/modules/programs/clash-verge.nix
···
{
imports = [
-
(lib.mkRemovedOptionModule [ "programs" "clash-verge" "tunMode" ] ''
-
The tunMode will work with service mode which is enabled by default.
-
'')
];
options.programs.clash-verge = {
enable = lib.mkEnableOption "Clash Verge";
···
default = pkgs.clash-verge-rev;
defaultText = lib.literalExpression "pkgs.clash-verge-rev";
};
+
serviceMode = lib.mkEnableOption "Service Mode";
+
tunMode = lib.mkEnableOption "Setcap for TUN Mode. DNS settings won't work on this way";
autoStart = lib.mkEnableOption "Clash Verge auto launch";
};
···
))
];
-
systemd.services.clash-verge = {
+
security.wrappers.clash-verge = lib.mkIf cfg.tunMode {
+
owner = "root";
+
group = "root";
+
capabilities = "cap_net_bind_service,cap_net_raw,cap_net_admin=+ep";
+
source = "${lib.getExe cfg.package}";
+
};
+
+
systemd.services.clash-verge = lib.mkIf cfg.serviceMode {
enable = true;
description = "Clash Verge Service Mode";
serviceConfig = {
ExecStart = "${cfg.package}/bin/clash-verge-service";
Restart = "on-failure";
+
ProtectSystem = "strict";
+
NoNewPrivileges = true;
+
ProtectHostname = true;
+
ProtectProc = "invisible";
+
ProcSubset = "pid";
+
SystemCallArchitectures = "native";
+
PrivateTmp = true;
+
PrivateMounts = true;
+
ProtectKernelTunables = true;
+
ProtectKernelModules = true;
+
ProtectKernelLogs = true;
+
ProtectControlGroups = true;
+
LockPersonality = true;
+
RestrictRealtime = true;
+
ProtectClock = true;
+
MemoryDenyWriteExecute = true;
+
RestrictSUIDSGID = true;
+
RestrictNamespaces = [ "~user cgroup ipc mnt uts" ];
+
RestrictAddressFamilies = [
+
"AF_INET AF_INET6 AF_NETLINK AF_PACKET AF_RAW"
+
];
+
CapabilityBoundingSet = [
+
"CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SETUID CAP_SETGID CAP_CHOWN CAP_MKNOD"
+
];
+
SystemCallFilter = [
+
"~@aio @chown @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @pkey @privileged @raw-io @reboot @sandbox @setuid @swap @timer"
+
];
+
SystemCallErrorNumber = "EPERM";
};
wantedBy = [ "multi-user.target" ];
};