bdy 1.22.34-dev → 1.22.35-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.34-dev",
+  "version": "1.22.35-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/tunnel/server/sftp.js

@@ -9,6 +9,7 @@ const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 const node_os_1 = require("node:os");
+const utils_1 = require("../../utils");
 const { STATUS_CODE } = ssh2_1.default.utils.sftp;
 var SftpOpenFlag;
 (function (SftpOpenFlag) {
@@ -39,6 +40,7 @@ class ServerSftp {
     openHandlers;
     count;
     home;
+    isWindows;
     sftp;
     constructor(sftp) {
         logger_1.default.debug('Creating sftp server');
@@ -46,6 +48,7 @@ class ServerSftp {
         this.count = 0;
         this.sftp = sftp;
         this.home = (0, node_os_1.homedir)();
+        this.isWindows = (0, utils_1.isWindows)();
         // fix for sftp/scp exit status -1: send exit-status and EOF before channel close
         // https://github.com/mscdex/ssh2/pull/1492
         const s = sftp;
@@ -95,12 +98,37 @@ class ServerSftp {
     fixPath(p) {
         if (!p)
             p = '';
-        if (p.startsWith('~/') || p === '~')
-            p = p.replace('~', this.home);
+        if (p === '~' || p.startsWith('~/')) {
+            p = this.home.replace(/\\/g, '/') + p.slice(1);
+        }
+        if (this.isWindows) {
+            // SFTP-on-Windows convention: /C:/foo -> C:/foo
+            if (/^\/[A-Za-z]:\//.test(p))
+                p = p.slice(1);
+            // Drive-absolute: normalize to native
+            if (/^[A-Za-z]:[\\/]/.test(p))
+                return (0, path_1.normalize)(p);
+            // UNC: //server/share/... or \\server\share\... -> native UNC
+            if (/^[\\/]{2}[^\\/?.]/.test(p))
+                return (0, path_1.normalize)(p);
+            // Extended-length / UNC-extended: \\?\C:\... or \\?\UNC\server\...
+            if (/^[\\/]{2}\?[\\/]/.test(p))
+                return (0, path_1.normalize)(p);
+            // POSIX-absolute on Windows has no real meaning — anchor to home
+            if (p.startsWith('/'))
+                p = p.slice(1);
+            return (0, path_1.normalize)((0, path_1.join)(this.home, p));
+        }
         if (!p.startsWith('/'))
             p = `${this.home}/${p}`;
         return p;
     }
+    toSftpPath(p) {
+        if (!this.isWindows)
+            return p;
+        const fwd = p.replace(/\\/g, '/');
+        return /^[A-Za-z]:\//.test(fwd) ? `/${fwd}` : fwd;
+    }
     async open(reqId, fileName, flags, attrs) {
         const p = this.fixPath(fileName);
         const s = this.debugStart(`SFTP want to open file ${p}`);
@@ -301,7 +329,7 @@ class ServerSftp {
         let displayName = name;
         if (isLink) {
             const link = await promises_1.default.readlink(fullPath);
-            displayName = `${name} -> ${link}`;
+            displayName = `${name} -> ${this.toSftpPath(link)}`;
         }
         return [
             isDir ? 'd' : isLink ? 'l' : '-',
@@ -416,7 +444,7 @@ class ServerSftp {
             const longname = await this.longname(realPath, name, stat);
             this.sftp.name(reqId, [
                 {
-                    filename: realPath,
+                    filename: this.toSftpPath(realPath),
                     longname,
                     attrs: this.stats2attributes(stat)
                 },
@@ -432,13 +460,14 @@ class ServerSftp {
         const p = this.fixPath(path);
         const s = this.debugStart(`SFTP want readlink ${p}`);
         try {
-            const realPath = await promises_1.default.readlink(p);
-            const name = (0, path_1.basename)(realPath);
-            const stats = await promises_1.default.lstat(realPath);
-            const longname = await this.longname(realPath, name, stats);
+            const target = await promises_1.default.readlink(p);
+            const absTarget = (0, path_1.isAbsolute)(target) ? target : (0, path_1.join)((0, path_1.dirname)(p), target);
+            const name = (0, path_1.basename)(target);
+            const stats = await promises_1.default.lstat(absTarget);
+            const longname = await this.longname(absTarget, name, stats);
             this.sftp.name(reqId, [
                 {
-                    filename: realPath,
+                    filename: this.toSftpPath(target),
                     longname,
                     attrs: this.stats2attributes(stats)
                 },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.34-dev",
+  "version": "1.22.35-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {