mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-20 07:04:53 +00:00
* fix #1079: preserve remote file mode when rz overwrites a same-named file #1070's overwrite path rm's the remote file and lets rz re-create it, which writes with the remote umask and drops the original permission bits — e.g. a 0755 script became 0644 after choosing "replace". (It didn't happen before because rz used to skip same-named files, leaving the original untouched.) Capture each conflicting file's mode during the pre-upload probe (stat -c %a, BSD stat -f %Lp fallback) and chmod it back once the transfer finishes and the files are on disk. Restore is best-effort: any failure silently falls back to today's behavior. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix #1079: probe file mode with `stat -- "$n"` for dash-prefixed names Without `--`, `stat -c %a "-x.sh"` (and the BSD `-f %Lp` fallback) parse a leading-dash filename as options, so the mode was never captured and overwrite fell back to rz defaults — losing permission preservation for a valid filename class. Mirrors the existing `rm -f --` handling. (chmod left as-is: its path is always absolute, and BSD chmod doesn't accept `--`.) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
75 lines
3.1 KiB
JavaScript
75 lines
3.1 KiB
JavaScript
const test = require("node:test");
|
|
const assert = require("node:assert/strict");
|
|
const { buildUploadPlan, buildModeRestores } = require("./zmodemHelper.cjs");
|
|
|
|
const never = () => { throw new Error("resolver should not be called"); };
|
|
|
|
test("no conflicts: all indices offered, none removed, resolver untouched", async () => {
|
|
const plan = await buildUploadPlan(["a.txt", "b.txt"], [], never);
|
|
assert.deepEqual(plan, { offerIndices: [0, 1], removeIndices: [], aborted: false });
|
|
});
|
|
|
|
test("overwrite a conflict: index both removed and offered", async () => {
|
|
const plan = await buildUploadPlan(["a.txt", "b.txt"], ["b.txt"], async () => ({ action: "overwrite" }));
|
|
assert.deepEqual(plan, { offerIndices: [0, 1], removeIndices: [1], aborted: false });
|
|
});
|
|
|
|
test("skip a conflict: index omitted from offer and remove", async () => {
|
|
const plan = await buildUploadPlan(["a.txt", "b.txt"], ["b.txt"], async () => ({ action: "skip" }));
|
|
assert.deepEqual(plan, { offerIndices: [0], removeIndices: [], aborted: false });
|
|
});
|
|
|
|
test("cancel aborts the whole transfer", async () => {
|
|
const plan = await buildUploadPlan(["a.txt", "b.txt"], ["b.txt"], async () => ({ action: "cancel" }));
|
|
assert.deepEqual(plan, { offerIndices: [], removeIndices: [], aborted: true });
|
|
});
|
|
|
|
test("applyToRest reuses the action and stops prompting", async () => {
|
|
let calls = 0;
|
|
const plan = await buildUploadPlan(["a", "b", "c"], ["a", "b", "c"],
|
|
async () => { calls++; return { action: "overwrite", applyToRest: true }; });
|
|
assert.equal(calls, 1);
|
|
assert.deepEqual(plan, { offerIndices: [0, 1, 2], removeIndices: [0, 1, 2], aborted: false });
|
|
});
|
|
|
|
test("only conflicting files invoke the resolver; order preserved", async () => {
|
|
const seen = [];
|
|
const plan = await buildUploadPlan(["a", "b", "c"], ["b"],
|
|
async (n) => { seen.push(n); return { action: "skip" }; });
|
|
assert.deepEqual(seen, ["b"]);
|
|
assert.deepEqual(plan.offerIndices, [0, 2]);
|
|
});
|
|
|
|
test("duplicate basenames keep independent per-file decisions", async () => {
|
|
// Two different local files share a basename; skip the first, overwrite the second.
|
|
const actions = ["skip", "overwrite"];
|
|
let i = 0;
|
|
const plan = await buildUploadPlan(["x.txt", "x.txt"], ["x.txt"],
|
|
async () => ({ action: actions[i++] }));
|
|
assert.deepEqual(plan, { offerIndices: [1], removeIndices: [1], aborted: false });
|
|
});
|
|
|
|
// Issue #1079: overwriting (rm + rz re-create) drops the original permission
|
|
// bits. buildModeRestores resolves which overwritten files to chmod back.
|
|
|
|
test("buildModeRestores maps overwritten files to their captured modes", () => {
|
|
assert.deepEqual(
|
|
buildModeRestores("/home/u", ["a.sh", "b.txt"], [0], { "a.sh": "755" }),
|
|
[{ path: "/home/u/a.sh", mode: "755" }],
|
|
);
|
|
});
|
|
|
|
test("buildModeRestores skips files whose mode was not captured", () => {
|
|
assert.deepEqual(
|
|
buildModeRestores("/srv", ["a", "b"], [0, 1], { a: "644" }),
|
|
[{ path: "/srv/a", mode: "644" }],
|
|
);
|
|
});
|
|
|
|
test("buildModeRestores strips trailing slashes and dedupes duplicate basenames", () => {
|
|
assert.deepEqual(
|
|
buildModeRestores("/srv//", ["x", "x"], [0, 1], { x: "600" }),
|
|
[{ path: "/srv/x", mode: "600" }],
|
|
);
|
|
});
|