git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #96844 from peterhoeg/m/nfs

nixos/nfsd: run rpc-statd as a normal user

commit42eebd7adef51b36c597753b3aaf6347864d176e authorPeter Hoeg <peter@hoeg.com> dateWed 9 Sep 2020, 09:10 (6 years ago) parentb169bfcd626441
2 files changed+34−35
nixos/modules/services/network-filesystems/nfsd.nix+33−27 nixos/modules/tasks/filesystems/nfs.nix+1−8
nixos/modules/services/network-filesystems/nfsd.nix+33−27
@@ -8,6 +8,8 @@ let
88
99 exports = pkgs.writeText "exports" cfg.exports;
1010
11+ rpcUser = "statd";
12+
1113in
1214
1315{
@@ -140,36 +142,40 @@ in
140142
141143 environment.etc.exports.source = exports;
142144
143− systemd.services.nfs-server =
144− { enable = true;
145− wantedBy = [ "multi-user.target" ];
145+ systemd.services.nfs-server = {
146+ enable = true;
147+ wantedBy = [ "multi-user.target" ];
148+ };
146149
147− preStart =
148− ''
149− mkdir -p /var/lib/nfs/v4recovery
150− '';
151− };
150+ systemd.services.nfs-mountd = {
151+ enable = true;
152+ restartTriggers = [ exports ];
153+
154+ preStart = optionalString cfg.createMountPoints ''
155+ # create export directories:
156+ # skip comments, take first col which may either be a quoted
157+ # "foo bar" or just foo (-> man export)
158+ sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
159+ | xargs -d '\n' mkdir -p
160+ '';
161+ };
152162
153− systemd.services.nfs-mountd =
154− { enable = true;
155− restartTriggers = [ exports ];
156−
157− preStart =
158− ''
159− mkdir -p /var/lib/nfs
160−
161− ${optionalString cfg.createMountPoints
162− ''
163− # create export directories:
164− # skip comments, take first col which may either be a quoted
165− # "foo bar" or just foo (-> man export)
166− sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \
167− | xargs -d '\n' mkdir -p
168− ''
169− }
170− '';
163+ # rpc-statd will drop privileges by changing user from root to the owner of
164+ # /var/lib/nfs
165+ systemd.tmpfiles.rules = [
166+ "d /var/lib/nfs 0700 ${rpcUser} ${rpcUser} - -"
167+ ] ++ map (e:
168+ "d /var/lib/nfs/${e} 0755 root root - -"
169+ ) [ "recovery" "v4recovery" "sm" "sm.bak" ];
170+
171+ users = {
172+ groups."${rpcUser}" = {};
173+ users."${rpcUser}" = {
174+ description = "NFS RPC user";
175+ group = rpcUser;
176+ isSystemUser = true;
171177 };
172−
178+ };
173179 };
174180
175181}
nixos/modules/tasks/filesystems/nfs.nix+1−8
@@ -101,13 +101,6 @@ in
101101 };
102102
103103 systemd.services.rpc-statd =
104− { restartTriggers = [ nfsConfFile ];
105−
106− preStart =
107− ''
108− mkdir -p /var/lib/nfs/{sm,sm.bak}
109− '';
110− };
111−
104+ { restartTriggers = [ nfsConfFile ]; };
112105 };
113106}