SMB servers: vendor smb-consumer-maxreadsize fixture (smb2 0.9.1)

smb2 0.9.1 promoted the chunked-IO fixture from its `internal/` set
to its consumer-class set. Re-vendor `.compose/` to pick up the new
`smb-consumer-maxreadsize` Dockerfile + smb.conf, bump the dep, and
add the container to `start.sh core` so the local rust check (and CI)
spin it up automatically. Provides a small 64 KB max_read/max_write
fixture for any test that needs to force the streaming-fallback path
without bringing in the smb2 internal-fixture compose stack.

Author: vdavid

Cargo.lock

@@ -170,7 +170,7 @@ mdns-sd = { version = "0.19", features = ["logging"] }
 # SMB2/3 protocol client for share enumeration (pure Rust, pipelined I/O).
 # When bumping: also re-vendor the test containers per
 # apps/desktop/test/smb-servers/.compose/VENDORED.md
-smb2 = "0.9.0"
+smb2 = "0.9.1"
 # NFD normalization for APFS collation and SMB path normalization
 unicode-normalization = "0.1"
 

apps/desktop/src-tauri/Cargo.toml

@@ -3,84 +3,90 @@ services:
     build:
       context: smb-consumer-guest
     ports:
-      - '${SMB_CONSUMER_GUEST_PORT:-10480}:445'
+      - "${SMB_CONSUMER_GUEST_PORT:-10480}:445"
 
   smb-consumer-auth:
     build:
       context: smb-consumer-auth
     ports:
-      - '${SMB_CONSUMER_AUTH_PORT:-10481}:445'
+      - "${SMB_CONSUMER_AUTH_PORT:-10481}:445"
 
   smb-consumer-both:
     build:
       context: smb-consumer-both
     ports:
-      - '${SMB_CONSUMER_BOTH_PORT:-10482}:445'
+      - "${SMB_CONSUMER_BOTH_PORT:-10482}:445"
 
   smb-consumer-50shares:
     build:
       context: smb-consumer-50shares
     ports:
-      - '${SMB_CONSUMER_50SHARES_PORT:-10483}:445'
+      - "${SMB_CONSUMER_50SHARES_PORT:-10483}:445"
 
   smb-consumer-unicode:
     build:
       context: smb-consumer-unicode
     ports:
-      - '${SMB_CONSUMER_UNICODE_PORT:-10484}:445'
+      - "${SMB_CONSUMER_UNICODE_PORT:-10484}:445"
 
   smb-consumer-longnames:
     build:
       context: smb-consumer-longnames
     ports:
-      - '${SMB_CONSUMER_LONGNAMES_PORT:-10485}:445'
+      - "${SMB_CONSUMER_LONGNAMES_PORT:-10485}:445"
 
   smb-consumer-deepnest:
     build:
       context: smb-consumer-deepnest
     ports:
-      - '${SMB_CONSUMER_DEEPNEST_PORT:-10486}:445'
+      - "${SMB_CONSUMER_DEEPNEST_PORT:-10486}:445"
 
   smb-consumer-manyfiles:
     build:
       context: smb-consumer-manyfiles
     ports:
-      - '${SMB_CONSUMER_MANYFILES_PORT:-10487}:445'
+      - "${SMB_CONSUMER_MANYFILES_PORT:-10487}:445"
 
   smb-consumer-readonly:
     build:
       context: smb-consumer-readonly
     ports:
-      - '${SMB_CONSUMER_READONLY_PORT:-10488}:445'
+      - "${SMB_CONSUMER_READONLY_PORT:-10488}:445"
 
   smb-consumer-windows:
     build:
       context: smb-consumer-windows
     ports:
-      - '${SMB_CONSUMER_WINDOWS_PORT:-10489}:445'
+      - "${SMB_CONSUMER_WINDOWS_PORT:-10489}:445"
 
   smb-consumer-synology:
     build:
       context: smb-consumer-synology
     ports:
-      - '${SMB_CONSUMER_SYNOLOGY_PORT:-10490}:445'
+      - "${SMB_CONSUMER_SYNOLOGY_PORT:-10490}:445"
 
   smb-consumer-linux:
     build:
       context: smb-consumer-linux
     ports:
-      - '${SMB_CONSUMER_LINUX_PORT:-10491}:445'
+      - "${SMB_CONSUMER_LINUX_PORT:-10491}:445"
 
   smb-consumer-flaky:
     build:
       context: smb-consumer-flaky
     ports:
-      - '${SMB_CONSUMER_FLAKY_PORT:-10492}:445'
+      - "${SMB_CONSUMER_FLAKY_PORT:-10492}:445"
 
   smb-consumer-slow:
     build:
       context: smb-consumer-slow
     ports:
-      - '${SMB_CONSUMER_SLOW_PORT:-10493}:445'
+      - "${SMB_CONSUMER_SLOW_PORT:-10493}:445"
     cap_add:
       - NET_ADMIN
+
+  smb-consumer-maxreadsize:
+    build:
+      context: smb-consumer-maxreadsize
+    ports:
+      - "${SMB_CONSUMER_MAXREADSIZE_PORT:-10494}:445"

apps/desktop/test/smb-servers/.compose/docker-compose.yml

@@ -0,0 +1,8 @@
+FROM alpine:3.21
+RUN apk add --no-cache samba
+COPY smb.conf /etc/samba/smb.conf
+RUN mkdir -p /shares/public && chmod 777 /shares/public
+EXPOSE 445
+HEALTHCHECK --interval=2s --timeout=3s --retries=10 \
+    CMD nc -z localhost 445
+CMD ["smbd", "--foreground", "--no-process-group", "--debug-stdout"]

apps/desktop/test/smb-servers/.compose/smb-consumer-maxreadsize/Dockerfile

@@ -0,0 +1,22 @@
+[global]
+server role = standalone server
+server min protocol = SMB2_02
+server max protocol = SMB3_11
+map to guest = Bad User
+log level = 1
+# Force tiny read/write sizes (64 KB) so every multi-MB transfer is
+# chunked. Lets consumer tests exercise the streaming-write fallback
+# path that historically deadlocked when wrapped in a single-shared-
+# session mutex; consumers can use this fixture as a regression guard
+# without standing up the internal-fixture smb-maxreadsize container.
+smb2 max read = 65536
+smb2 max write = 65536
+smb2 max trans = 65536
+
+[public]
+path = /shares/public
+read only = no
+guest ok = yes
+browseable = yes
+create mask = 0666
+directory mask = 0777

apps/desktop/test/smb-servers/.compose/smb-consumer-maxreadsize/smb.conf

@@ -40,10 +40,11 @@ case "$mode" in
     core)
         echo "Starting core SMB servers (auth scenarios + edge cases)..."
         services=(smb-consumer-guest smb-consumer-auth smb-consumer-both \
-                  smb-consumer-readonly smb-consumer-flaky smb-consumer-slow)
+                  smb-consumer-readonly smb-consumer-flaky smb-consumer-slow \
+                  smb-consumer-maxreadsize)
         ;;
     all)
-        echo "Starting all SMB servers (14 containers)..."
+        echo "Starting all SMB servers (15 containers)..."
         # Empty services list means "all defined in compose" for both `up` and
         # the post-up probe loop. We resolve the actual set via `compose ps`.
         ;;