saltcorn-samba 0.4.6 → 0.4.8

package/CHANGELOG.md

@@ -4,6 +4,58 @@ 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.8] – 2026-07-05
+
+### Fixed – **Basispfad wurde beim Verbindungstest doppelt vorangestellt (die eigentliche Ursache)**
+
+In allen Vorgängerversionen (0.4.4 – 0.4.7) hat der Verbindungstest den
+konfigurierten Basispfad **zweimal** auf den Server geschickt und deshalb
+systematisch die Meldung *„Der Basispfad ist auf dem Server nicht auffindbar"*
+produziert — auch dann, wenn der Pfad in Wirklichkeit existierte und mit
+`smbclient` oder dem Windows-Explorer problemlos erreichbar war.
+
+**Ursache:** `buildClient(config)` speichert `config.base_path` intern als
+`client.basePath`. Der Wrapper-`resolvePath(rel)` baut daraus
+`<share>/<basePath>/<rel>`. Die Test-Route rief aber
+`client.readdir(testCfg.base_path)` auf und übergab den Basispfad **noch
+einmal** als relatives Argument. Ergebnis: aus `base_path = "static"` wurde
+auf der Leitung `buero/static/static` — den es natürlich nicht gibt. Die
+Diagnose-Ausgabe (`tested_path: static/static`) zeigte den Bug bereits
+klar an, wurde aber bisher als Symptom statt Ursache gelesen.
+
+**Fix:** Die Test-Route ruft jetzt `client.readdir("")` auf. Der Wrapper
+resolvet das intern korrekt zu `<share>/<basePath>` — also genau dem Pfad,
+den der Benutzer im Formular eingetragen hat. Für Anzeige-Zwecke (Meldungen,
+Diagnose-Kacheln, Fallback-Probes) wird der Basispfad separat in
+`baseForDisplay` gehalten.
+
+### Added – **Standalone-Diagnose-Skript `tools/diag-basepath.js`**
+
+Wer den Verbindungsproblemen auf den Grund gehen will, kann jetzt außerhalb
+von Saltcorn probieren, was smb3-client tatsächlich sieht:
+
+```bash
+node tools/diag-basepath.js \
+  --host 192.168.110.10 --share buero --path static \
+  --user 01_vassen --domain buero.ib-vassen.de --password ...
+```
+
+Das Skript führt sechs Probes durch (Share-Root, Share-Root mit Slash,
+`stat` auf Ziel, `readdir` auf Ziel, Groß-/Kleinschreibvariante) und
+druckt für jede den NT-Status-Code — hilfreich beim Aufspüren von
+Schreibvarianten oder ACL-Problemen.
+
+## [0.4.7] – 2026-07-05
+
+### Fixed – **Irreführende Windows-UNC-Anzeige in der Fehlermeldung**
+
+Die v0.4.6-Fehlermeldung zeigte den getesteten Pfad als Windows-UNC
+(`\\\\192.168.110.10\\buero\\static`). Das war irreführend, weil das
+Plugin an smb3-client tatsächlich Forward-Slash-Pfade schickt
+(`buero/static`) — die Backslash-Anzeige suggerierte einen Bug, der
+keiner ist. Jetzt wird der Pfad in genau der Form gezeigt, die auch
+tatsächlich über die Leitung geht: `<share>/<basispfad>`.
+
 ## [0.4.6] – 2026-07-05
 
 ### Fixed – **Schreibvarianten-Test verdoppelte den Basispfad**

package/index.js

@@ -853,72 +853,62 @@ code{background:#f4f4f4;padding:2px 6px;border-radius:3px;word-break:break-all}<
           // to stat("") — that already proves the whole handshake
           // (TCP + Negotiate + Session + TREE_CONNECT + Auth) works, which
           // is all the connection test actually promises.
-          const rel = testCfg.base_path ? sanitizeRelativePath(testCfg.base_path) : "";
-          // When a base_path is set, verify it exists and is a directory
-          // BEFORE trying to enumerate it. This turns the opaque
-          // "CREATE failed: STATUS_OBJECT_NAME_NOT_FOUND" into a clear
-          // "Basispfad existiert nicht" hint the user can act on.
-          // We used to run a stat() first. That turned out to be flaky:
-          // smb3-client's stat() sends a CREATE with createOptions=0
-          // (no directory hint) which some Samba configurations reject
-          // for directories with strict ACLs. readdir() sends
-          // createOptions=1 (DIRECTORY_FILE) and is the right primitive
-          // for a base_path check anyway — we want to know the folder
-          // can actually be listed, not just opened.
+          //
+          // IMPORTANT: buildClient already stores `base_path` as the
+          // wrapper's `basePath`, and wrapper.readdir(x) resolves to
+          // `share/basePath/x`. So we call readdir("") to list the
+          // configured basePath itself — not readdir(base_path), which
+          // would append it twice (bug fixed in 0.4.8).
+          const rel = "";
+          const baseForDisplay = testCfg.base_path ? sanitizeRelativePath(testCfg.base_path) : "";
           try {
             return await client.readdir(rel);
           } catch (err) {
             // Look at both the wrapper error and its underlying cause.
             const causeMsg = String((err && err.cause && err.cause.message) || "");
             const msg      = String((err && err.message) || err || "") + " " + causeMsg;
-            const isRootProbe = !rel;
+            // The path we effectively asked the server to enumerate is
+            // `share/basePath` (rel is always "" here — basePath is the
+            // subdirectory to test).
+            const effectivePath = testCfg.share + (baseForDisplay ? "/" + baseForDisplay : "");
+            const isRootProbe = !baseForDisplay;
             const isRootEnumBug = /0xC0000033|OBJECT_NAME_INVALID|Share-Root/i.test(msg);
             if (isRootProbe && isRootEnumBug) {
-              // Fall back: proof-of-life via stat on share root. This
-              // confirms TCP + Negotiate + Session + Auth + TREE_CONNECT
-              // without hitting the broken QUERY_DIRECTORY path.
+              // Share-root enumeration is a known smb3-client-vs-Samba
+              // limitation. Fall back to stat("") which proves the whole
+              // handshake works even if we can't list the root.
               try {
                 await client.stat("");
-                // Signal to the caller that the connection works, but
-                // the share root cannot be enumerated on this server.
                 const marker = [];
                 marker._rootNotEnumerable = true;
                 return marker;
               } catch (statErr) {
-                // stat also failed — surface the original error.
                 throw err;
               }
             }
-            // A non-existent base_path (or one hidden from this user by
-            // Samba's "hide unreadable" behaviour) surfaces here. Try to
-            // gather actionable diagnostics: list the parent directory
-            // (if not the share root) and probe common alternative
-            // spellings of the missing segment so we can distinguish
-            // typo / case-mismatch / permission problems.
+            // NAME_NOT_FOUND / PATH_NOT_FOUND on a configured base_path.
+            // Gather diagnostics: raw probes against alternate spellings
+            // and (if possible) a listing of the parent directory.
             const isMissing = /OBJECT_NAME_NOT_FOUND|OBJECT_PATH_NOT_FOUND|ENOENT|STATUS_NO_SUCH_FILE|existiert.*nicht/i.test(msg);
-            if (rel && isMissing) {
-              const parts = rel.split("/").filter(Boolean);
+            if (baseForDisplay && isMissing) {
+              const parts = baseForDisplay.split("/").filter(Boolean);
               const missing = parts[parts.length - 1];
               const parent = parts.slice(0, -1).join("/");
               const parentAbs = parent || "(Share-Root)";
-              // We must probe via the *raw* smb3-client because the
-              // wrapper's readdir() automatically prepends basePath —
-              // that would double up the segment we're trying to test
-              // (e.g. readdir("static") → "buero/static/static").
+              // Probe via the raw smb3-client so we bypass the wrapper's
+              // basePath prefix and can test siblings/alternate spellings
+              // directly from the share root.
               const raw = client._raw;
               const rawShare = client.shareName;
               async function rawReaddir(relFromShareRoot) {
-                const full = [rawShare, relFromShareRoot].filter(Boolean).join("/");
+                const full = relFromShareRoot ? rawShare + "/" + relFromShareRoot : rawShare;
                 return await raw.readdir(full, { withFileTypes: true });
               }
               let siblings = null;
               let parent_error = null;
               if (parent) {
                 try {
-                  // parent here is relative to basePath — but we want
-                  // absolute-from-share-root paths in the raw call.
-                  const parentFromShare = [client.basePath, parent].filter(Boolean).join("/");
-                  const listing = await rawReaddir(parentFromShare);
+                  const listing = await rawReaddir(parent);
                   siblings = Array.isArray(listing)
                     ? listing.map((d) => ({
                         name: d && d.name,
@@ -929,9 +919,7 @@ code{background:#f4f4f4;padding:2px 6px;border-radius:3px;word-break:break-all}<
                   parent_error = String((parentErr && parentErr.message) || parentErr || "");
                 }
               }
-              // Probe alternate spellings: original, upper, lower, capitalised.
-              // This lets us report "Ordner existiert unter anderem Namen" if
-              // Samba is running with case sensitive = yes / case-preserved.
+              // Probe alternate spellings of the missing segment.
               const probes = [];
               const seen = new Set();
               const addProbe = (name) => {
@@ -945,9 +933,9 @@ code{background:#f4f4f4;padding:2px 6px;border-radius:3px;word-break:break-all}<
               addProbe(missing.charAt(0).toUpperCase() + missing.slice(1).toLowerCase());
               const probe_results = [];
               for (const p of probes) {
-                // Build the *from-share-root* relative path so the probe
-                // does not accidentally get basePath prepended twice.
-                const relFromShare = [client.basePath, parent, p].filter(Boolean).join("/");
+                // From-share-root path: `parent/candidate`. NEVER include
+                // client.basePath here — the raw client is share-relative.
+                const relFromShare = [parent, p].filter(Boolean).join("/");
                 let ok = false;
                 let perr = null;
                 try {
@@ -961,7 +949,6 @@ code{background:#f4f4f4;padding:2px 6px;border-radius:3px;word-break:break-all}<
               const workingAlt = probe_results.find(
                 (r) => r.ok && r.candidate !== missing
               );
-              const testedPath = "\\\\" + testCfg.server + "\\" + testCfg.share + "\\" + rel.replace(/\//g, "\\");
               let hintText;
               if (workingAlt) {
                 hintText =
@@ -972,11 +959,11 @@ code{background:#f4f4f4;padding:2px 6px;border-radius:3px;word-break:break-all}<
                   "case-sensitive (\u201ecase sensitive = yes\u201c in smb.conf).";
               } else {
                 hintText =
-                  "Der Basispfad \u201e" + rel + "\u201c wurde auf der " +
+                  "Der Basispfad \u201e" + baseForDisplay + "\u201c wurde auf der " +
                   "Freigabe \u201e" + testCfg.share + "\u201c nicht " +
-                  "gefunden. Getestet wurde der Pfad: " + testedPath + ". " +
-                  "M\u00f6gliche Ursachen: (a) Ordner existiert unter genau " +
-                  "diesem Namen nicht in dieser Freigabe (Basispfad ist " +
+                  "gefunden. Intern getestet wurde: \u201e" + effectivePath +
+                  "\u201c. M\u00f6gliche Ursachen: (a) Ordner existiert unter " +
+                  "genau diesem Namen nicht in dieser Freigabe (Basispfad ist " +
                   "relativ zur Freigabe \u2014 also z.\u202fB. \u201eunterordner\u201c, " +
                   "nicht \u201e" + testCfg.share + "/unterordner\u201c); " +
                   "(b) der angemeldete Benutzer \u201e" +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saltcorn-samba",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "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": {