authoravatarclover caruso<git@paperclover.net>2026-10-19 23:07:05-07:00
committeravatarclover caruso<git@paperclover.net>2026-10-21 02:52:29-07:00
log3686f33e539528b7d31b311509c6e76d60de83f5
tree5b060eb320b73cb3781325f9f23e867c65d9c0e0
parent5e3b2f6f1899255cd817a4f1b588f217a31b0987
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Enable the NFSv4.0 protocol used by macOS mounts

Explicitly enable minor version zero and use structured NFS settings. The isolated client now pins vers=4.0 and verifies I/O, locking, mount guards, and retained data after server restart and its recovery grace period. Assisted-by: gpt-6-astra Assisted-by: gpt-6.1-sol

2 files changed, 11 insertions(+), 8 deletions(-)

nixos/mac-studio-sandbox.nix+6-5
...@@ -49,15 +49,16 @@ in...@@ -49,15 +49,16 @@ in
49 services.nfs.server = {49 services.nfs.server = {
50 enable = true;50 enable = true;
51 hostName = "10.0.0.1";51 hostName = "10.0.0.1";
52 extraNfsdConfig = ''
53 vers3 = n
54 udp = n
55 tcp = y
56 '';
57 exports = ''52 exports = ''
58 ${mountPoint} 10.0.0.222(rw,sync,fsid=0,no_subtree_check,all_squash,anonuid=${toString config.users.users.clo.uid},anongid=${toString config.users.groups.chloe.gid},insecure)53 ${mountPoint} 10.0.0.222(rw,sync,fsid=0,no_subtree_check,all_squash,anonuid=${toString config.users.users.clo.uid},anongid=${toString config.users.groups.chloe.gid},insecure)
59 '';54 '';
60 };55 };
56 services.nfs.settings.nfsd = {
57 vers3 = false;
58 "vers4.0" = true;
59 udp = false;
60 tcp = true;
61 };
6162
62 systemd.services.nfs-mountd = {63 systemd.services.nfs-mountd = {
63 path = [ pkgs.gawk ];64 path = [ pkgs.gawk ];
nixos/tests/mac-studio-sandbox.nix+5-3
...@@ -64,7 +64,9 @@ pkgs.testers.runNixOSTest {...@@ -64,7 +64,9 @@ pkgs.testers.runNixOSTest {
64 assert server.succeed(f"cat {mountpoint}/retained") == "retained"64 assert server.succeed(f"cat {mountpoint}/retained") == "retained"
65 server.wait_for_unit("nfs-server.service")65 server.wait_for_unit("nfs-server.service")
66 server.succeed("exportfs -v")66 server.succeed("exportfs -v")
67 assert "-3" in server.succeed("cat /proc/fs/nfsd/versions").split()67 versions = server.succeed("cat /proc/fs/nfsd/versions").split()
68 print(f"Enabled NFS versions: {versions}")
69 assert "-3" in versions and "+4" in versions and "-4.0" not in versions
6870
69 with subtest("shared guard accepts the dataset bind and rejects a covering wrong mount"):71 with subtest("shared guard accepts the dataset bind and rejects a covering wrong mount"):
70 server.succeed(f"mkdir -p /mnt/guard-bind /mnt/guard-wrong; mount --bind {mountpoint} /mnt/guard-bind")72 server.succeed(f"mkdir -p /mnt/guard-bind /mnt/guard-wrong; mount --bind {mountpoint} /mnt/guard-bind")
...@@ -74,7 +76,7 @@ pkgs.testers.runNixOSTest {...@@ -74,7 +76,7 @@ pkgs.testers.runNixOSTest {
74 server.succeed("umount /mnt/guard-bind; umount /mnt/guard-bind; umount /mnt/guard-wrong")76 server.succeed("umount /mnt/guard-bind; umount /mnt/guard-bind; umount /mnt/guard-wrong")
7577
76 with subtest("NFS ordinary writes, fsync, rename, execute bits and case distinctions"):78 with subtest("NFS ordinary writes, fsync, rename, execute bits and case distinctions"):
77 client.succeed("mkdir -p /mnt/sandbox; timeout 30 mount -t nfs -o vers=4,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox")79 client.succeed("mkdir -p /mnt/sandbox; timeout 30 mount -t nfs -o vers=4.0,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox")
78 client.succeed(r"""python3 - <<'PY'80 client.succeed(r"""python3 - <<'PY'
79 from pathlib import Path81 from pathlib import Path
80 import os82 import os
...@@ -139,7 +141,7 @@ pkgs.testers.runNixOSTest {...@@ -139,7 +141,7 @@ pkgs.testers.runNixOSTest {
139 assert server.succeed(f"cat {mountpoint}/wrong-sentinel") == "untouched"141 assert server.succeed(f"cat {mountpoint}/wrong-sentinel") == "untouched"
140 server.succeed(f"zfs unmount globe/wrong; zfs set mountpoint=none globe/wrong; zfs mount {dataset}")142 server.succeed(f"zfs unmount globe/wrong; zfs set mountpoint=none globe/wrong; zfs mount {dataset}")
141 server.succeed("systemctl reset-failed; systemctl start mac-studio-sandbox.service nfs-server.service")143 server.succeed("systemctl reset-failed; systemctl start mac-studio-sandbox.service nfs-server.service")
142 client.succeed("timeout 30 mount -t nfs -o vers=4,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox")144 client.succeed("timeout 30 mount -t nfs -o vers=4.0,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox")
143 assert client.succeed("cat /mnt/sandbox/finished") == "synthetic native NFS bytes\n"145 assert client.succeed("cat /mnt/sandbox/finished") == "synthetic native NFS bytes\n"
144 client.succeed("timeout 30 umount /mnt/sandbox")146 client.succeed("timeout 30 umount /mnt/sandbox")
145 server.succeed("systemctl stop nfs-server.service nfs-mountd.service; zpool status -x")147 server.succeed("systemctl stop nfs-server.service nfs-mountd.service; zpool status -x")