public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93702 from tnias/usbguard20200723

Browse Source 
nixos/usbguard: rework
This commit is contained in:
Florian Klink 2020-08-11 12:14:32 +02:00 committed by GitHub
commit 921da91c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -634,6 +634,11 @@ services.postgresql.dataDir = "/var/db/postgresql";
</programlisting> </programlisting>
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The USBGuard module now removes options and instead hardcodes values for <literal>IPCAccessControlFiles</literal>, <literal>ruleFiles</literal>, and <literal>auditFilePath</literal>. Audit logs can be found in the journal.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

120
nixos/modules/services/security/usbguard.nix
View File

@ -1,37 +1,39 @@
{config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.services.usbguard; cfg = config.services.usbguard;
# valid policy options # valid policy options
policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]); policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]);
defaultRuleFile = "/var/lib/usbguard/rules.conf";
# decide what file to use for rules # decide what file to use for rules
ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile; ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else defaultRuleFile;
daemonConf = '' daemonConf = ''
# generated by nixos/modules/services/security/usbguard.nix # generated by nixos/modules/services/security/usbguard.nix
RuleFile=${ruleFile} RuleFile=${ruleFile}
ImplicitPolicyTarget=${cfg.implictPolicyTarget} ImplicitPolicyTarget=${cfg.implictPolicyTarget}
PresentDevicePolicy=${cfg.presentDevicePolicy} PresentDevicePolicy=${cfg.presentDevicePolicy}
PresentControllerPolicy=${cfg.presentControllerPolicy} PresentControllerPolicy=${cfg.presentControllerPolicy}
InsertedDevicePolicy=${cfg.insertedDevicePolicy} InsertedDevicePolicy=${cfg.insertedDevicePolicy}
RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"} RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"}
# this does not seem useful for endusers to change # this does not seem useful for endusers to change
DeviceManagerBackend=uevent DeviceManagerBackend=uevent
IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers} IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers}
IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups} IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups}
IPCAccessControlFiles=${cfg.IPCAccessControlFiles} IPCAccessControlFiles=/var/lib/usbguard/IPCAccessControl.d/
DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"} DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"}
AuditFilePath=${cfg.auditFilePath} # HACK: that way audit logs still land in the journal
''; AuditFilePath=/dev/null
'';
daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf; daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf;
in { in
{
###### interface ###### interface
@ -49,22 +51,6 @@ in {
''; '';
}; };
ruleFile = mkOption {
type = types.path;
default = "/var/lib/usbguard/rules.conf";
description = ''
The USBGuard daemon will use this file to load the policy rule set
from it and to write new rules received via the IPC interface.
Running the command <literal>usbguard generate-policy</literal> as
root will generate a config for your currently plugged in devices.
For a in depth guide consult the official documentation.
Setting the <literal>rules</literal> option will ignore the
<literal>ruleFile</literal> option.
'';
};
rules = mkOption { rules = mkOption {
type = types.nullOr types.lines; type = types.nullOr types.lines;
default = null; default = null;
@ -72,16 +58,20 @@ in {
allow with-interface equals { 08:*:* } allow with-interface equals { 08:*:* }
''; '';
description = '' description = ''
The USBGuard daemon will load this policy rule set. Modifying it via The USBGuard daemon will load this as the policy rule set.
the IPC interface won't work if you use this option, since the As these rules are NixOS managed they are immutable and can't
contents of this option will be written into the nix-store it will be be changed by the IPC interface.
read-only.
You can still use <literal> usbguard generate-policy</literal> to If you do not set this option, the USBGuard daemon will load
generate rules, but you would have to insert them here. it's policy rule set from <literal>${defaultRuleFile}</literal>.
This file can be changed manually or via the IPC interface.
Setting the <literal>rules</literal> option will ignore the Running <literal>usbguard generate-policy</literal> as root will
<literal>ruleFile</literal> option. generate a config for your currently plugged in devices.
For more details see <citerefentry>
<refentrytitle>usbguard-rules.conf</refentrytitle>
<manvolnum>5</manvolnum></citerefentry>.
''; '';
}; };
@ -155,17 +145,6 @@ in {
''; '';
}; };
IPCAccessControlFiles = mkOption {
type = types.path;
default = "/var/lib/usbguard/IPCAccessControl.d/";
description = ''
The files at this location will be interpreted by the daemon as IPC
access control definition files. See the IPC ACCESS CONTROL section
in <citerefentry><refentrytitle>usbguard-daemon.conf</refentrytitle>
<manvolnum>5</manvolnum></citerefentry> for more details.
'';
};
deviceRulesWithPort = mkOption { deviceRulesWithPort = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -173,14 +152,6 @@ in {
Generate device specific rules including the "via-port" attribute. Generate device specific rules including the "via-port" attribute.
''; '';
}; };
auditFilePath = mkOption {
type = types.path;
default = "/var/log/usbguard/usbguard-audit.log";
description = ''
USBGuard audit events log file path.
'';
};
}; };
}; };
@ -197,17 +168,19 @@ in {
wantedBy = [ "basic.target" ]; wantedBy = [ "basic.target" ];
wants = [ "systemd-udevd.service" ]; wants = [ "systemd-udevd.service" ];
# make sure an empty rule file and required directories exist # make sure an empty rule file exists
preStart = '' preStart = ''[ -f "${ruleFile}" ] || touch ${ruleFile}'';
mkdir -p $(dirname "${cfg.ruleFile}") $(dirname "${cfg.auditFilePath}") "${cfg.IPCAccessControlFiles}" \
&& ([ -f "${cfg.ruleFile}" ] || touch ${cfg.ruleFile})
'';
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}''; ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}'';
Restart = "on-failure"; Restart = "on-failure";
StateDirectory = [
"usbguard"
"usbguard/IPCAccessControl.d"
];
AmbientCapabilities = ""; AmbientCapabilities = "";
CapabilityBoundingSet = "CAP_CHOWN CAP_FOWNER"; CapabilityBoundingSet = "CAP_CHOWN CAP_FOWNER";
DeviceAllow = "/dev/null rw"; DeviceAllow = "/dev/null rw";
@ -223,8 +196,8 @@ in {
ProtectKernelModules = true; ProtectKernelModules = true;
ProtectSystem = true; ProtectSystem = true;
ReadOnlyPaths = "-/"; ReadOnlyPaths = "-/";
ReadWritePaths = "-/dev/shm -${dirOf cfg.auditFilePath} -/tmp -${dirOf cfg.ruleFile}"; ReadWritePaths = "-/dev/shm -/tmp";
RestrictAddressFamilies = "AF_UNIX AF_NETLINK"; RestrictAddressFamilies = [ "AF_UNIX" "AF_NETLINK" ];
RestrictNamespaces = true; RestrictNamespaces = true;
RestrictRealtime = true; RestrictRealtime = true;
SystemCallArchitectures = "native"; SystemCallArchitectures = "native";
@ -233,4 +206,9 @@ in {
}; };
}; };
}; };
imports = [
(mkRemovedOptionModule [ "services" "usbguard" "ruleFile" ] "The usbguard module now uses ${defaultRuleFile} as ruleFile. Alternatively, use services.usbguard.rules to configure rules.")
(mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d.")
(mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.")
];
} }