nixos/radicale: harden systemd unit
This commit is contained in:
parent
022c5b0922
commit
762be5c86d
|
@ -721,6 +721,13 @@ environment.systemPackages = [
|
||||||
automatically based on <option>system.stateVersion</option>, the latest
|
automatically based on <option>system.stateVersion</option>, the latest
|
||||||
version is always used because old versions are not officially supported.
|
version is always used because old versions are not officially supported.
|
||||||
</para>
|
</para>
|
||||||
|
<para>
|
||||||
|
Furthermore, Radicale's systemd unit was hardened which might break some
|
||||||
|
deployments. In particular, a non-default
|
||||||
|
<literal>filesystem_folder</literal> has to be added to
|
||||||
|
<option>systemd.services.radicale.serviceConfig.ReadWritePaths</option> if
|
||||||
|
the deprecated <option>services.radicale.config</option> is used.
|
||||||
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
@ -21,6 +21,8 @@ let
|
||||||
|
|
||||||
rightsFile = format.generate "radicale.rights" cfg.rights;
|
rightsFile = format.generate "radicale.rights" cfg.rights;
|
||||||
|
|
||||||
|
bindLocalhost = cfg.settings != { } && !hasAttrByPath [ "server" "hosts" ] cfg.settings;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
options.services.radicale = {
|
options.services.radicale = {
|
||||||
enable = mkEnableOption "Radicale CalDAV and CardDAV server";
|
enable = mkEnableOption "Radicale CalDAV and CardDAV server";
|
||||||
|
@ -138,15 +140,9 @@ in {
|
||||||
|
|
||||||
environment.systemPackages = [ pkg ];
|
environment.systemPackages = [ pkg ];
|
||||||
|
|
||||||
users.users.radicale =
|
users.users.radicale.uid = config.ids.uids.radicale;
|
||||||
{ uid = config.ids.uids.radicale;
|
|
||||||
description = "radicale user";
|
|
||||||
home = "/var/lib/radicale";
|
|
||||||
createHome = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
users.groups.radicale =
|
users.groups.radicale.gid = config.ids.gids.radicale;
|
||||||
{ gid = config.ids.gids.radicale; };
|
|
||||||
|
|
||||||
systemd.services.radicale = {
|
systemd.services.radicale = {
|
||||||
description = "A Simple Calendar and Contact Server";
|
description = "A Simple Calendar and Contact Server";
|
||||||
|
@ -161,6 +157,41 @@ in {
|
||||||
));
|
));
|
||||||
User = "radicale";
|
User = "radicale";
|
||||||
Group = "radicale";
|
Group = "radicale";
|
||||||
|
StateDirectory = "radicale/collections";
|
||||||
|
StateDirectoryMode = "0750";
|
||||||
|
# Hardening
|
||||||
|
CapabilityBoundingSet = [ "" ];
|
||||||
|
DeviceAllow = [ "/dev/stdin" ];
|
||||||
|
DevicePolicy = "strict";
|
||||||
|
IPAddressAllow = mkIf bindLocalhost "localhost";
|
||||||
|
IPAddressDeny = mkIf bindLocalhost "any";
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
NoNewPrivileges = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateTmp = true;
|
||||||
|
PrivateUsers = true;
|
||||||
|
ProcSubset = "pid";
|
||||||
|
ProtectClock = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectProc = "invisible";
|
||||||
|
ProtectSystem = "strict";
|
||||||
|
ReadWritePaths = lib.optional
|
||||||
|
(hasAttrByPath [ "storage" "filesystem_folder" ] cfg.settings)
|
||||||
|
cfg.settings.storage.filesystem_folder;
|
||||||
|
RemoveIPC = true;
|
||||||
|
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
RestrictSUIDSGID = true;
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||||
|
UMask = "0027";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -86,5 +86,10 @@ in {
|
||||||
|
|
||||||
with subtest("Test web interface"):
|
with subtest("Test web interface"):
|
||||||
machine.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/")
|
machine.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/")
|
||||||
|
|
||||||
|
with subtest("Test security"):
|
||||||
|
output = machine.succeed("systemd-analyze security radicale.service")
|
||||||
|
machine.log(output)
|
||||||
|
assert output[-9:-1] == "SAFE :-}"
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue