From aa4583050d4bf6902862e137ae02c77942be757d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=A4=A7=E7=8C=AB?= <16399091+binaricat@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:48:33 +0800 Subject: [PATCH] fix(sftp): skip same-host directory cp when auto encoding resolves to non-UTF-8 --- electron/bridges/transferBridge.cjs | 5 +++ electron/bridges/transferBridge.test.cjs | 44 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/electron/bridges/transferBridge.cjs b/electron/bridges/transferBridge.cjs index b7aa796e8..5c2c44eee 100644 --- a/electron/bridges/transferBridge.cjs +++ b/electron/bridges/transferBridge.cjs @@ -8204,6 +8204,11 @@ async function sameHostCopyDirectory(event, payload) { } if (cpUnavailableSet.has(client)) return { success: false }; + const resolvedEncoding = resolveEncodingForRequest(sftpId, encoding); + if (resolvedEncoding && resolvedEncoding !== 'utf-8') { + return { success: false }; + } + const sshClient = client.client; if (!sshClient || typeof sshClient.exec !== 'function') { return { success: false }; diff --git a/electron/bridges/transferBridge.test.cjs b/electron/bridges/transferBridge.test.cjs index 2c0c40a56..de727716f 100644 --- a/electron/bridges/transferBridge.test.cjs +++ b/electron/bridges/transferBridge.test.cjs @@ -13246,6 +13246,50 @@ test("same-host directory copy rejected by a committed close leaves no lease or assert.equal(sftpTransferSessionLeaseStore.getLeaseCount(sftpId), 0); }); +test("same-host directory copy skips cp when auto encoding resolves to non-UTF-8", async (t) => { + const { + sftpTransferSessionLeaseStore, + } = require("./sftpTransferSessionLease.cjs"); + sftpTransferSessionLeaseStore.resetForTests(); + t.after(() => sftpTransferSessionLeaseStore.resetForTests()); + + const sftpId = "same-host-directory-auto-gb18030"; + // Seed the session's resolved encoding before the copy requests auto. + sftpBridge.resolveEncodingForRequest(sftpId, "gb18030"); + let execCalls = 0; + transferBridge.init({ + sftpClients: new Map([[sftpId, { + client: { + exec(_command, callback) { + execCalls += 1; + const stream = new EventEmitter(); + stream.stderr = new EventEmitter(); + callback(null, stream); + setImmediate(() => stream.emit("close", 0)); + }, + }, + }]]), + }); + const sender = createSender(); + + const result = await transferBridge.sameHostCopyDirectory( + { sender }, + { + transferId: "same-host-directory-auto-gb18030-copy", + sftpId, + sourcePath: "/source", + targetPath: "/\u76ee\u6807", + encoding: "auto", + }, + ); + + assert.equal(execCalls, 0); + assert.equal(result.success, false); + assert.deepEqual(sender.sent, []); + assert.equal(transferBridge._getActiveTransferCountForTests(), 0); + assert.equal(sftpTransferSessionLeaseStore.getLeaseCount(sftpId), 0); +}); + test("same-host directory copy cancellation aborts cp and releases its lease", async (t) => { const { sftpTransferSessionLeaseStore,