diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-05-08 11:07:27 +0200 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-05-08 11:26:50 +0200 |
| commit | 19738b6958813fcfa6299655e3a0e863702de3f5 (patch) | |
| tree | 4d2f7bf4a8a7f973420ff0385a074b0a821fd498 | |
| parent | 29dee3abb55d0f0c6b91b311f30521b45d7e46b6 (diff) | |
| download | vyos-1x-19738b6958813fcfa6299655e3a0e863702de3f5.tar.gz vyos-1x-19738b6958813fcfa6299655e3a0e863702de3f5.zip | |
dhcp-server, dhcpv6-server: T2432: chown lease file to nobody:nogroup
Commits f37194604 and 0cbad2850 migrated isc-dhcp-server(6) from
SysVInit to SystemD, changing the user and group dhcpd is started as.
This caused a permission error when dhcpd tried to write to lease files:
dhcpd[2829]: Can't create new lease file: Permission denied
As dhcpd is started as nobody:nogroup, setting the permissions on the
lease files to 664 root:vyattacfg would make dhcpd unable to write to
them. We can't make the files other-writable, as that would be a big
security issue, so we need to set either the owner or group of the files
to be dhcpd writeble. There should be no harm in changing both to
nobody:nogroup, as they were previously root:root.
If some other VyOS code doesn't like the ownership of these files in
/config, they can be either excluded from the check (possibly moved into
their own directory), or changed back to root:vyattacfg and vyattacfg added
to nogroup.
| -rw-r--r-- | src/systemd/isc-dhcp-server.service | 5 | ||||
| -rw-r--r-- | src/systemd/isc-dhcp-server6.service | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/systemd/isc-dhcp-server.service b/src/systemd/isc-dhcp-server.service index d848e3df1..88910bdee 100644 --- a/src/systemd/isc-dhcp-server.service +++ b/src/systemd/isc-dhcp-server.service @@ -7,12 +7,11 @@ After=vyos-router.service [Service] WorkingDirectory=/run/dhcp-server -# The leases files need to be root:vyattacfg even when dropping privileges ExecStart=/bin/sh -ec '\ CONFIG_FILE=/run/dhcp-server/dhcpd.conf; \ [ -e /config/dhcpd.leases ] || touch /config/dhcpd.leases; \ - chown root:vyattacfg /config/dhcpd.leases; \ - chmod 664 /config/dhcpd.leases; \ + chown nobody:nogroup /config/dhcpd.leases*; \ + chmod 664 /config/dhcpd.leases*; \ exec /usr/sbin/dhcpd -user nobody -group nogroup -f -4 -pf /run/dhcp-server/dhcpd.pid -cf $CONFIG_FILE -lf /config/dhcpd.leases' [Install] diff --git a/src/systemd/isc-dhcp-server6.service b/src/systemd/isc-dhcp-server6.service index 27bebc57f..c5d4bad99 100644 --- a/src/systemd/isc-dhcp-server6.service +++ b/src/systemd/isc-dhcp-server6.service @@ -7,11 +7,10 @@ After=vyos-router.service [Service] WorkingDirectory=/run/dhcp-server -# The leases files need to be root:vyattacfg even when dropping privileges ExecStart=/bin/sh -ec '\ [ -e /config/dhcpdv6.leases ] || touch /config/dhcpdv6.leases; \ - chown root:vyattacfg /config/dhcpdv6.leases; \ - chmod 664 /config/dhcpdv6.leases; \ + chown nobody:nogroup /config/dhcpdv6.leases*; \ + chmod 664 /config/dhcpdv6.leases*; \ exec /usr/sbin/dhcpd -user nobody -group nogroup -f -6 -pf /run/dhcp-server/dhcpdv6.pid -cf /run/dhcp-server/dhcpdv6.conf -lf /config/dhcpdv6.leases' [Install] |