saltcorn-samba 0.4.10 → 0.4.11

package/CHANGELOG.md

@@ -4,6 +4,74 @@ All notable changes to `saltcorn-samba` are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.4.11] – 2026-07-06
+
+### Changed – **Ehrliche Fehlerpropagation statt stiller Fallback**
+
+In 0.4.10 wurde der neue `readdir-compat.js`-Wrapper eingeführt, der
+vor dem eigentlichen `QUERY_DIRECTORY` die FileInformationClass
+automatisch von 37 → 3 → 1 durchprobiert. Zwei Probleme kamen dabei
+zum Vorschein:
+
+1. **Alle drei Info-Klassen lieferten weiterhin `0xC0000033`** auf
+   dem betroffenen Server. Das Umschalten der Info-Klasse ist also
+   *nicht* die eigentliche Ursache — die Annahme aus 0.4.10 war falsch.
+2. **Der Wrapper in `smb-client.js` fiel bei totalem Compat-Fehler
+   still auf das kaputte `client.readdir()` zurück**, das exakt
+   dieselbe (kaputte) FileInformationClass 37 verwendet. Dadurch
+   wurde die 0.4.10-Diagnostik komplett verschluckt und das Symptom
+   sah unverändert aus wie vor 0.4.10.
+
+**Fixes in 0.4.11:**
+
+- `smb-client.js` erkennt jetzt den 0xC0000033-Erschöpfungsfehler aus
+  dem Compat-Modul (Muster `"all classes exhausted"`) und propagiert
+  ihn direkt — kein stiller Retry mehr über das kaputte
+  `client.readdir()`.
+- `readdir-compat.js` wirft bei Ausschöpfung aller drei Klassen einen
+  synthetischen Fehler mit klarem Wortlaut:
+  `"QUERY_DIRECTORY failed: 0xC0000033 (all classes exhausted; no
+  working FileInformationClass on this server). Tried:
+  FileIdBothDirectoryInformation=37, FileBothDirectoryInformation=3,
+  FileDirectoryInformation=1."`
+  Der Fehler trägt zusätzlich ein `.attempts`-Array mit den
+  NT-Statuscodes pro Klasse für spätere Diagnose.
+
+### Was das für dich bedeutet
+
+Der gelbe Hinweis und `QUERY_DIRECTORY failed: 0xC0000033` sind
+**noch nicht behoben** — 0.4.11 macht den Fehler nur ehrlich sichtbar,
+sodass wir aus dem nächsten Diagnoselauf echte Signale bekommen.
+
+**Nächster Schritt — bitte auf dem Saltcorn-Server ausführen** (im
+entpackten Plugin-Verzeichnis, oder direkt aus dem ZIP):
+
+```bash
+cd /pfad/zu/saltcorn-samba
+node tools/diag-basepath.js \
+  --host 192.168.110.10 \
+  --share buero \
+  --path static \
+  --user 01_vassen \
+  --domain buero.ib-vassen.de \
+  --password 'DEIN_PASSWORT'
+```
+
+Das Skript führt 6 Sonden mit rohen NT-Statuscodes aus (TREE_CONNECT,
+CREATE, QUERY_DIRECTORY mit allen drei Info-Klassen, `stat`-Probe).
+Die Ausgabe zeigt, an welcher Stelle Samba den Fehler wirft und mit
+welchem Statuscode. Damit können wir 0.4.12 gezielt schreiben statt
+weiter zu raten.
+
+Ein heißer Kandidat für 0.4.12 (Wire-Format-Bug in `smb3-client`):
+`encodeQueryDirectoryRequest` setzt `FileNameOffset` immer auf 96,
+auch wenn kein Suchmuster gesendet wird — laut
+[MS-SMB2 §2.2.33](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/10906442-294c-46d3-8515-c277efe1f752)
+MUSS das Feld dann 0 sein. Bestätigung dafür aber bitte erst nach
+der Diagnose.
+
+---
+
 ## [0.4.10] – 2026-07-05
 
 ### Fixed – **`0xC0000033` beim tatsächlichen Auflisten (Tree-View, File-Manager) endgültig behoben**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saltcorn-samba",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "Saltcorn plugin: browse, upload, rename and delete files on a Samba/CIFS share via SMB 3.1.1 (AES-CMAC signing, optional encryption). File-manager view, directory tree, inline PDF viewer, external-app open (smb://).",
   "main": "index.js",
   "scripts": {

package/readdir-compat.js

@@ -331,6 +331,7 @@ async function readdirCompat(rawClient, sharePath) {
       : TRY_ORDER.slice();
 
     let lastErr = null;
+    const attempts = [];
     for (const cls of order) {
       try {
         const entries = await queryAll({
@@ -349,9 +350,10 @@ async function readdirCompat(rawClient, sharePath) {
         return entries.map(dirEntryToPluginEntry);
       } catch (err) {
         lastErr = err;
+        const msg = String((err && err.message) || err || "");
+        attempts.push({ class: cls.name, code: cls.code, error: msg });
         // Only retry with a different class on OBJECT_NAME_INVALID / info-class
         // rejection — any other error (auth, connection, missing) is fatal.
-        const msg = String((err && err.message) || err || "");
         const isInfoClassBug =
           /0xC0000033|OBJECT_NAME_INVALID|STATUS_INVALID_INFO_CLASS/i.test(msg);
         if (!isInfoClassBug) {
@@ -360,7 +362,18 @@ async function readdirCompat(rawClient, sharePath) {
         // else: fall through to next class in order
       }
     }
-    throw lastErr;
+    // All classes tried and all failed with 0xC0000033. Report a
+    // synthesised error that is uniquely identifiable ("all classes
+    // exhausted") so the caller can decide not to fall back to
+    // smb3-client's own readdir (which uses class 37 again).
+    const finalMsg =
+      "QUERY_DIRECTORY failed: 0xC0000033 (all classes exhausted; " +
+      "no working FileInformationClass on this server). Tried: " +
+      attempts.map((a) => a.class + "=" + a.code).join(", ") + ".";
+    const summary = new Error(finalMsg);
+    summary.cause = lastErr;
+    summary.attempts = attempts;
+    throw summary;
   } finally {
     // Always close the handle. Ignore errors.
     try {

package/smb-client.js

@@ -274,30 +274,34 @@ async function buildClient(config) {
      */
     async readdir(rel) {
       const full = resolvePath(rel);
-      // v0.4.10: use the compat readdir which tries multiple
-      // FileInformationClass values so we survive Samba 4.23's rejection
-      // of FileIdBothDirectoryInformation (37) — the class smb3-client
-      // hardcodes and which many Samba configurations answer with
-      // STATUS_OBJECT_NAME_INVALID (0xC0000033). readdirCompat also
-      // returns rich entries (name+isDir+size+mtime+ctime) directly, so
-      // we skip the per-entry stat fan-out on success.
-      let entriesFromCompat = null;
+      // v0.4.11: prefer the compat readdir (which tries multiple
+      // FileInformationClass values). If it succeeds we are done — no
+      // extra per-entry stat fan-out needed because compat returns rich
+      // entries directly. If it fails, we ONLY fall back to smb3-client's
+      // built-in readdir when the compat failure was not itself the
+      // Samba-4.23 bug (0xC0000033 across all classes). If it *was*, the
+      // built-in readdir will produce the exact same 0xC0000033 — no
+      // point trying it, and it would hide the diagnostics compat has
+      // gathered. Instead we rethrow the compat error verbatim so the
+      // caller sees the true root cause.
+      let compatErr = null;
       try {
-        entriesFromCompat = await readdirCompat(client, full);
-        return entriesFromCompat;
+        return await readdirCompat(client, full);
       } catch (err) {
-        // Fall back to smb3-client's built-in readdir with the same error
-        // handling as before. This preserves prior behaviour for servers
-        // where the compat path fails for reasons unrelated to the
-        // FileInformationClass bug (e.g. missing dir, permission).
+        compatErr = err;
         const compatMsg = String((err && err.message) || err || "");
-        const compatIsInfoClassOnly =
-          /STATUS_INVALID_INFO_CLASS/i.test(compatMsg);
-        if (!compatIsInfoClassOnly) {
-          // Not an info-class problem — surface below by re-running
-          // through the classic path so the existing German error
-          // rewrites still apply.
+        // If compat ran into the exact same info-class rejection with
+        // ALL classes exhausted, the built-in readdir cannot possibly
+        // help — it uses class 37, which compat already tried. Rethrow
+        // now so callers see the real reason.
+        if (/0xC0000033|OBJECT_NAME_INVALID/i.test(compatMsg) &&
+            /all classes exhausted|no working FileInformationClass/i.test(compatMsg)) {
+          throw err;
         }
+        // Otherwise (compat failed for structural reasons like an unknown
+        // internal-module path, or a transient socket error) fall through
+        // to the classic path so the existing German error rewrites still
+        // apply.
       }
       let dirents;
       try {