@whyour/qinglong 2.22.0 → 2.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/back/protos/cron.proto +4 -0
- package/docs/development/node-cron-migration.md +49 -0
- package/docs/development/task-startup.md +78 -0
- package/docs/releases/2.22.0.md +8 -0
- package/docs/releases/2.23.0.md +33 -0
- package/docs/script-history.md +53 -0
- package/package.json +9 -8
- package/scripts/benchmark-script-history.cjs +39 -0
- package/scripts/publish-static.sh +34 -0
- package/scripts/sync-static.sh +20 -0
- package/scripts/wait-for-mirror.sh +214 -0
- package/shell/api.sh +56 -70
- package/shell/node_path_cache.sh +10 -2
- package/shell/otask.sh +7 -9
- package/shell/preload/sitecustomize.js +6 -2
- package/shell/preload/sitecustomize.py +4 -2
- package/shell/share.sh +1 -1
- package/shell/task-timeout.sh +63 -0
- package/shell/task.sh +8 -6
- package/shell/update.sh +40 -95
- package/shell/upgrade.cjs +8 -0
- package/static/build/api/config.js +2 -6
- package/static/build/api/env.js +15 -14
- package/static/build/api/open.js +2 -1
- package/static/build/api/script.js +155 -9
- package/static/build/api/subscription.js +3 -6
- package/static/build/api/system.js +35 -3
- package/static/build/config/grpcCerts.js +89 -40
- package/static/build/config/subscription.js +19 -11
- package/static/build/config/util.js +6 -4
- package/static/build/loaders/express.js +2 -0
- package/static/build/loaders/initData.js +20 -30
- package/static/build/loaders/initTask.js +11 -1
- package/static/build/middlewares/uniqueConstraintError.js +15 -0
- package/static/build/protos/cron.js +63 -2
- package/static/build/schedule/addCron.js +45 -63
- package/static/build/schedule/client.js +19 -1
- package/static/build/schedule/delCron.js +1 -1
- package/static/build/schedule/setConcurrency.js +27 -0
- package/static/build/services/config.js +2 -3
- package/static/build/services/cron.js +36 -10
- package/static/build/services/env.js +1 -1
- package/static/build/services/grpc.js +2 -1
- package/static/build/services/log.js +1 -1
- package/static/build/services/open.js +106 -31
- package/static/build/services/schedule.js +20 -10
- package/static/build/services/script.js +1 -1
- package/static/build/services/scriptHistory.js +30 -0
- package/static/build/services/sshKey.js +39 -14
- package/static/build/services/subscription.js +104 -53
- package/static/build/services/system.js +67 -32
- package/static/build/services/user.js +15 -10
- package/static/build/shared/cronCommand.js +17 -0
- package/static/build/shared/cronSchedule.js +101 -0
- package/static/build/shared/cronScheduler.js +73 -0
- package/static/build/shared/i18n.js +3 -2
- package/static/build/shared/logPath.js +15 -0
- package/static/build/shared/loginThrottle.js +45 -0
- package/static/build/shared/pLimit.js +19 -6
- package/static/build/shared/runCron.js +13 -4
- package/static/build/shared/scriptHistory.js +445 -0
- package/static/build/shared/shellQuote.js +11 -0
- package/static/build/shared/subscriptionMutationLock.js +34 -0
- package/static/build/shared/subscriptionPath.js +41 -0
- package/static/build/shared/subscriptionStorage.js +98 -0
- package/static/build/shared/utils.js +2 -1
- package/static/build/token.js +3 -14
- package/static/build/validation/schedule.js +3 -18
- package/static/dist/292.264757f0.async.js +1 -0
- package/static/dist/3512.95e41255.async.js +1 -0
- package/static/dist/index.html +2 -2
- package/static/dist/preload_helper.01fcd534.js +1 -0
- package/static/dist/src__pages__dependence__modal.0fa8b421.async.js +1 -0
- package/static/dist/src__pages__diff__index.b94e5dc5.async.js +1 -0
- package/static/dist/src__pages__script__editModal.afabf073.async.js +1 -0
- package/static/dist/src__pages__script__editNameModal.789ad87b.async.js +1 -0
- package/static/dist/src__pages__script__historyDrawer.8c58d958.async.js +1 -0
- package/static/dist/src__pages__script__historyDrawer.a449193a.chunk.css +1 -0
- package/static/dist/src__pages__script__index.ab360776.chunk.css +1 -0
- package/static/dist/src__pages__script__index.fc575945.async.js +1 -0
- package/static/dist/src__pages__script__saveModal.8fca1a22.async.js +1 -0
- package/static/dist/src__pages__script__saveWithHistory.99ece830.async.js +1 -0
- package/static/dist/src__pages__subscription__modal.30868ba8.async.js +1 -0
- package/static/dist/{umi.fc019050.js → umi.3a24a9fa.js} +1 -1
- package/test/back/advisory-input-security.test.cjs +416 -0
- package/test/back/code-scanning-security.test.cjs +189 -0
- package/test/back/cron-macros.test.cjs +51 -0
- package/test/back/cron-schedule-compatibility.test.cjs +69 -0
- package/test/back/cron-scheduler-routing.test.cjs +59 -0
- package/test/back/draft-path-security.test.cjs +235 -0
- package/test/back/env-import-security.test.cjs +91 -0
- package/test/back/execution-lifecycle.test.cjs +1 -1
- package/test/back/file-access-scope.test.cjs +180 -0
- package/test/back/grpc-mtls-security.test.cjs +136 -0
- package/test/back/http-security.test.cjs +105 -5
- package/test/back/legacy-cron-recovery.test.cjs +76 -0
- package/test/back/linux-mirror-result.test.cjs +176 -0
- package/test/back/listen-security.test.cjs +1 -0
- package/test/back/mirror-status.test.cjs +257 -0
- package/test/back/node-cron-migration.test.cjs +65 -0
- package/test/back/node-path-cache.test.cjs +29 -0
- package/test/back/node-path-lock.test.cjs +6 -2
- package/test/back/preload-lazy-notify.test.cjs +168 -0
- package/test/back/queued-cron-invalidation.test.cjs +98 -0
- package/test/back/restart-instance-recovery.test.cjs +116 -0
- package/test/back/scheduler-bulk-recovery.test.cjs +40 -0
- package/test/back/scheduler-concurrency.test.cjs +411 -0
- package/test/back/scheduler-reconciliation.test.cjs +58 -4
- package/test/back/script-file-access.test.cjs +210 -0
- package/test/back/script-history-api.test.cjs +551 -0
- package/test/back/script-history.test.cjs +383 -0
- package/test/back/shell-api-parsing.test.cjs +4 -4
- package/test/back/shell-translation-output.test.cjs +16 -0
- package/test/back/shell-upgrade.test.cjs +312 -0
- package/test/back/shellApiToken.test.cjs +151 -0
- package/test/back/ssh-config-home.test.cjs +113 -0
- package/test/back/static-mirror-trigger.test.cjs +441 -0
- package/test/back/static-mirror.test.cjs +179 -0
- package/test/back/stop-race.test.cjs +5 -1
- package/test/back/subscription-mutation-lock.test.cjs +83 -0
- package/test/back/subscription-review-regression.test.cjs +607 -0
- package/test/back/subscription-storage-regression.test.cjs +553 -0
- package/test/back/system-dependence-cache.test.cjs +1 -0
- package/test/back/system-export-history.test.cjs +119 -0
- package/test/back/systemTokenRenewal.test.cjs +497 -0
- package/test/back/task-shell-lifecycle.test.cjs +194 -0
- package/test/back/unique-constraint-error.test.cjs +72 -0
- package/test/back/upgrade-guards.test.cjs +285 -0
- package/test/back/upgrade-lifecycle.test.cjs +288 -0
- package/test/back/upgrade-transaction.test.cjs +133 -0
- package/test/back/user-security.test.cjs +102 -1
- package/test/back/wpush-grpc.test.cjs +1 -0
- package/test/fixtures/legacy-cron.json +1371 -0
- package/test/front/diff-file-routing.test.cjs +126 -0
- package/test/front/script-history-save.test.cjs +121 -0
- package/test/helpers/upgrade-fixture.cjs +30 -0
- package/version.yaml +14 -19
- package/static/dist/2096.6d98fd12.async.js +0 -1
- package/static/dist/4859.97d6653c.async.js +0 -1
- package/static/dist/6707.801b886b.async.js +0 -1
- package/static/dist/preload_helper.cf7de3fa.js +0 -1
- package/static/dist/src__pages__dependence__modal.a29c1a0f.async.js +0 -1
- package/static/dist/src__pages__diff__index.1714b941.async.js +0 -1
- package/static/dist/src__pages__script__editModal.22acdf7c.async.js +0 -1
- package/static/dist/src__pages__script__editNameModal.1a521cc0.async.js +0 -1
- package/static/dist/src__pages__script__index.60b6f827.chunk.css +0 -1
- package/static/dist/src__pages__script__index.a18b2692.async.js +0 -1
- package/static/dist/src__pages__script__saveModal.8965b74c.async.js +0 -1
- package/static/dist/src__pages__subscription__modal.38991e1e.async.js +0 -1
- /package/static/dist/{4859.1b962b29.chunk.css → 292.1b962b29.chunk.css} +0 -0
|
@@ -0,0 +1,288 @@
|
|
|
1
|
+
const test = require('node:test');
|
|
2
|
+
const assert = require('node:assert/strict');
|
|
3
|
+
const fs = require('node:fs/promises');
|
|
4
|
+
const os = require('node:os');
|
|
5
|
+
const path = require('node:path');
|
|
6
|
+
const { randomUUID } = require('node:crypto');
|
|
7
|
+
const { spawnSync } = require('node:child_process');
|
|
8
|
+
const {
|
|
9
|
+
runProcess,
|
|
10
|
+
withLifecycleHooks,
|
|
11
|
+
withUpgradeLock,
|
|
12
|
+
} = require('../../shell/upgrade.cjs');
|
|
13
|
+
|
|
14
|
+
const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
15
|
+
|
|
16
|
+
async function assertStopped(pid) {
|
|
17
|
+
for (let attempt = 0; attempt < 50; attempt++) {
|
|
18
|
+
try {
|
|
19
|
+
process.kill(pid, 0);
|
|
20
|
+
} catch (error) {
|
|
21
|
+
if (error.code === 'ESRCH') return;
|
|
22
|
+
throw error;
|
|
23
|
+
}
|
|
24
|
+
const state = spawnSync('ps', ['-o', 'stat=', '-p', String(pid)], {
|
|
25
|
+
encoding: 'utf8',
|
|
26
|
+
});
|
|
27
|
+
// Linux PID 1 can retain a dead orphan until it is reaped. It can also
|
|
28
|
+
// disappear between kill(0) and ps; neither state is a running installer.
|
|
29
|
+
if (
|
|
30
|
+
(state.status === 1 && !state.stdout.trim()) ||
|
|
31
|
+
/^Z/.test(state.stdout.trim())
|
|
32
|
+
)
|
|
33
|
+
return;
|
|
34
|
+
assert.equal(state.status, 0, state.stderr);
|
|
35
|
+
await delay(20);
|
|
36
|
+
}
|
|
37
|
+
assert.fail(`test process ${pid} is still running`);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
async function fixture(t, directory) {
|
|
41
|
+
const base = await fs.mkdtemp(
|
|
42
|
+
path.join(os.tmpdir(), 'ql-upgrade-lifecycle-'),
|
|
43
|
+
);
|
|
44
|
+
t.after(() => fs.rm(base, { recursive: true, force: true }));
|
|
45
|
+
const root = directory ? path.join(base, directory) : base;
|
|
46
|
+
const tmp = path.join(root, '.tmp');
|
|
47
|
+
await fs.mkdir(tmp, { recursive: true });
|
|
48
|
+
await fs.mkdir(path.join(root, 'shell/lang'), { recursive: true });
|
|
49
|
+
await fs.writeFile(path.join(root, 'shell/lang/zh.sh'), '');
|
|
50
|
+
await fs.writeFile(
|
|
51
|
+
path.join(root, 'shell/env.sh'),
|
|
52
|
+
await fs.readFile('shell/env.sh'),
|
|
53
|
+
);
|
|
54
|
+
return { root, tmp, env: { ...process.env, QL_DIR: root } };
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
test('installed stop/start hooks do not match their own pkill and survive shell replacement', async (t) => {
|
|
58
|
+
const f = await fixture(t);
|
|
59
|
+
// Only the test's random path can match; never signal a running panel.
|
|
60
|
+
const marker = `review/${randomUUID()}/app.js`;
|
|
61
|
+
const helpers = (await fs.readFile('shell/share.sh', 'utf8')).replaceAll(
|
|
62
|
+
'static/build/app.js',
|
|
63
|
+
marker,
|
|
64
|
+
);
|
|
65
|
+
await fs.writeFile(
|
|
66
|
+
path.join(f.root, 'shell/share.sh'),
|
|
67
|
+
`${helpers}
|
|
68
|
+
pm2() { printf '%s\\n' "$*" >> "$QL_DIR/pm2-calls"; }
|
|
69
|
+
${process.platform === 'darwin' ? 'pkill() { command pkill -a "$@"; }' : ''}
|
|
70
|
+
`,
|
|
71
|
+
);
|
|
72
|
+
await withUpgradeLock(f.tmp, () =>
|
|
73
|
+
withLifecycleHooks(f.root, f.tmp, f.env, async (hook) => {
|
|
74
|
+
await fs.writeFile(path.join(f.root, 'shell/share.sh'), 'exit 99');
|
|
75
|
+
await hook('stop');
|
|
76
|
+
await hook('start');
|
|
77
|
+
assert.match(
|
|
78
|
+
await fs.readFile(path.join(f.root, 'pm2-calls'), 'utf8'),
|
|
79
|
+
/startOrGracefulReload/,
|
|
80
|
+
);
|
|
81
|
+
}),
|
|
82
|
+
);
|
|
83
|
+
assert.deepEqual(await fs.readdir(f.tmp), []);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
test(
|
|
87
|
+
'the installed Node fallback starts successfully and its stop hook kills only the test backend',
|
|
88
|
+
{ timeout: 10000 },
|
|
89
|
+
async (t) => {
|
|
90
|
+
const f = await fixture(t);
|
|
91
|
+
const marker = `review/${randomUUID()}/app.js`;
|
|
92
|
+
let pid;
|
|
93
|
+
t.after(() => {
|
|
94
|
+
if (pid) {
|
|
95
|
+
try {
|
|
96
|
+
process.kill(pid, 'SIGKILL');
|
|
97
|
+
} catch (error) {
|
|
98
|
+
if (error.code !== 'ESRCH') throw error;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
const helpers = (await fs.readFile('shell/share.sh', 'utf8')).replaceAll(
|
|
103
|
+
'static/build/app.js',
|
|
104
|
+
marker,
|
|
105
|
+
);
|
|
106
|
+
await fs.writeFile(
|
|
107
|
+
path.join(f.root, 'shell/share.sh'),
|
|
108
|
+
`${helpers}
|
|
109
|
+
pm2() { return 1; }
|
|
110
|
+
${process.platform === 'darwin' ? 'pkill() { command pkill -a "$@"; }' : ''}
|
|
111
|
+
`,
|
|
112
|
+
);
|
|
113
|
+
await fs.mkdir(path.dirname(path.join(f.root, marker)), {
|
|
114
|
+
recursive: true,
|
|
115
|
+
});
|
|
116
|
+
await fs.mkdir(path.join(f.root, 'data/log'), { recursive: true });
|
|
117
|
+
await fs.writeFile(
|
|
118
|
+
path.join(f.root, marker),
|
|
119
|
+
`require('node:fs').writeFileSync(process.env.QL_DIR + '/backend-pid', String(process.pid)); setInterval(() => {}, 1000);`,
|
|
120
|
+
);
|
|
121
|
+
await withUpgradeLock(f.tmp, () =>
|
|
122
|
+
withLifecycleHooks(f.root, f.tmp, f.env, async (hook) => {
|
|
123
|
+
await hook('start');
|
|
124
|
+
for (let attempt = 0; attempt < 150; attempt++) {
|
|
125
|
+
try {
|
|
126
|
+
pid = Number(
|
|
127
|
+
await fs.readFile(path.join(f.root, 'backend-pid'), 'utf8'),
|
|
128
|
+
);
|
|
129
|
+
break;
|
|
130
|
+
} catch {
|
|
131
|
+
await delay(20);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
assert.ok(pid, 'fallback backend started');
|
|
135
|
+
process.kill(pid, 0);
|
|
136
|
+
await hook('stop');
|
|
137
|
+
await assertStopped(pid);
|
|
138
|
+
}),
|
|
139
|
+
);
|
|
140
|
+
},
|
|
141
|
+
);
|
|
142
|
+
|
|
143
|
+
for (const { redirect, ignoreShell } of [
|
|
144
|
+
{ redirect: false, ignoreShell: false },
|
|
145
|
+
{ redirect: true, ignoreShell: false },
|
|
146
|
+
{ redirect: false, ignoreShell: true },
|
|
147
|
+
])
|
|
148
|
+
test(
|
|
149
|
+
`cancelled installation stops descendants before releasing its lock (${JSON.stringify(
|
|
150
|
+
{ redirect, ignoreShell },
|
|
151
|
+
)})`,
|
|
152
|
+
{ timeout: 10000 },
|
|
153
|
+
async (t) => {
|
|
154
|
+
const f = await fixture(t);
|
|
155
|
+
const controller = new AbortController();
|
|
156
|
+
let pid;
|
|
157
|
+
t.after(() => {
|
|
158
|
+
controller.abort();
|
|
159
|
+
if (pid) {
|
|
160
|
+
try {
|
|
161
|
+
process.kill(pid, 'SIGKILL');
|
|
162
|
+
} catch (error) {
|
|
163
|
+
if (error.code !== 'ESRCH') throw error;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
const worker = path.join(f.root, 'installer.cjs');
|
|
168
|
+
await fs.writeFile(
|
|
169
|
+
worker,
|
|
170
|
+
`
|
|
171
|
+
const fs = require('node:fs'), path = require('node:path');
|
|
172
|
+
process.on('SIGTERM', () => {});
|
|
173
|
+
fs.writeFileSync(path.join(process.env.QL_DIR, 'installer-pid'), String(process.pid));
|
|
174
|
+
setInterval(() => fs.appendFileSync(path.join(process.env.QL_DIR, 'heartbeat'), 'x'), 20);
|
|
175
|
+
`,
|
|
176
|
+
);
|
|
177
|
+
await fs.writeFile(
|
|
178
|
+
path.join(f.root, 'shell/share.sh'),
|
|
179
|
+
`import_config() { :; }
|
|
180
|
+
npm_install_2() {
|
|
181
|
+
${ignoreShell ? "trap '' TERM" : ':'}
|
|
182
|
+
"$TEST_NODE" "$1"${redirect ? ' >/dev/null 2>&1' : ''}
|
|
183
|
+
exit_status=$?
|
|
184
|
+
}
|
|
185
|
+
`,
|
|
186
|
+
);
|
|
187
|
+
const operation = withUpgradeLock(f.tmp, () =>
|
|
188
|
+
withLifecycleHooks(
|
|
189
|
+
f.root,
|
|
190
|
+
f.tmp,
|
|
191
|
+
{ ...f.env, TEST_NODE: process.execPath },
|
|
192
|
+
(hook) => hook('install', [worker], controller.signal),
|
|
193
|
+
),
|
|
194
|
+
);
|
|
195
|
+
// Attach rejection handling before aborting the in-flight operation.
|
|
196
|
+
const rejection = assert.rejects(operation, /cancelled installation/);
|
|
197
|
+
for (let attempt = 0; attempt < 150; attempt++) {
|
|
198
|
+
try {
|
|
199
|
+
pid = Number(
|
|
200
|
+
await fs.readFile(path.join(f.root, 'installer-pid'), 'utf8'),
|
|
201
|
+
);
|
|
202
|
+
await fs.access(path.join(f.root, 'heartbeat'));
|
|
203
|
+
break;
|
|
204
|
+
} catch {
|
|
205
|
+
await delay(20);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
assert.ok(pid, 'installer started');
|
|
209
|
+
await fs.access(path.join(f.tmp, 'upgrade.lock'));
|
|
210
|
+
controller.abort(new Error('cancelled installation'));
|
|
211
|
+
await rejection;
|
|
212
|
+
assert.deepEqual(await fs.readdir(f.tmp), []);
|
|
213
|
+
const before = await fs.readFile(path.join(f.root, 'heartbeat'), 'utf8');
|
|
214
|
+
await delay(100);
|
|
215
|
+
assert.equal(
|
|
216
|
+
await fs.readFile(path.join(f.root, 'heartbeat'), 'utf8'),
|
|
217
|
+
before,
|
|
218
|
+
);
|
|
219
|
+
await assertStopped(pid);
|
|
220
|
+
},
|
|
221
|
+
);
|
|
222
|
+
|
|
223
|
+
test('an already cancelled command does not spawn and a spawn failure releases the upgrade lock', async (t) => {
|
|
224
|
+
const f = await fixture(t);
|
|
225
|
+
const controller = new AbortController();
|
|
226
|
+
controller.abort(new Error('cancelled before spawn'));
|
|
227
|
+
const script = path.join(f.root, 'never-run.sh');
|
|
228
|
+
await fs.writeFile(script, 'touch "$QL_DIR/spawned"');
|
|
229
|
+
await assert.rejects(
|
|
230
|
+
runProcess(f.env, 'bash', ['--', script], false, controller.signal),
|
|
231
|
+
/cancelled before spawn/,
|
|
232
|
+
);
|
|
233
|
+
await assert.rejects(fs.access(path.join(f.root, 'spawned')), {
|
|
234
|
+
code: 'ENOENT',
|
|
235
|
+
});
|
|
236
|
+
await assert.rejects(
|
|
237
|
+
withUpgradeLock(f.tmp, () =>
|
|
238
|
+
runProcess(f.env, path.join(f.root, 'missing-program'), []),
|
|
239
|
+
),
|
|
240
|
+
{ code: 'ENOENT' },
|
|
241
|
+
);
|
|
242
|
+
assert.deepEqual(await fs.readdir(f.tmp), []);
|
|
243
|
+
});
|
|
244
|
+
|
|
245
|
+
test('fixed lifecycle dispatch treats spaces, quotes and command substitutions in paths as data', async (t) => {
|
|
246
|
+
const special =
|
|
247
|
+
'panel spaces \u0027"; $(touch "$TEST_MARKER"); `touch "$TEST_MARKER"`';
|
|
248
|
+
const f = await fixture(t, special);
|
|
249
|
+
const marker = path.join(f.root, 'injected');
|
|
250
|
+
const source = path.join(f.root, 'source ' + special);
|
|
251
|
+
await fs.writeFile(
|
|
252
|
+
path.join(f.root, 'shell/share.sh'),
|
|
253
|
+
`
|
|
254
|
+
import_config() { :; }
|
|
255
|
+
delete_pm2() { printf stopped > "$QL_DIR/stopped"; }
|
|
256
|
+
reload_pm2() { printf started > "$QL_DIR/started"; }
|
|
257
|
+
npm_install_2() { printf '%s' "$1" > "$QL_DIR/installed"; exit_status=0; }
|
|
258
|
+
`,
|
|
259
|
+
);
|
|
260
|
+
await withUpgradeLock(f.tmp, () =>
|
|
261
|
+
withLifecycleHooks(
|
|
262
|
+
f.root,
|
|
263
|
+
f.tmp,
|
|
264
|
+
{ ...f.env, TEST_MARKER: marker },
|
|
265
|
+
async (hook) => {
|
|
266
|
+
await hook('stop');
|
|
267
|
+
await hook('start');
|
|
268
|
+
await hook('install', [source]);
|
|
269
|
+
assert.equal(
|
|
270
|
+
await fs.readFile(path.join(f.root, 'stopped'), 'utf8'),
|
|
271
|
+
'stopped',
|
|
272
|
+
);
|
|
273
|
+
assert.equal(
|
|
274
|
+
await fs.readFile(path.join(f.root, 'started'), 'utf8'),
|
|
275
|
+
'started',
|
|
276
|
+
);
|
|
277
|
+
assert.equal(
|
|
278
|
+
await fs.readFile(path.join(f.root, 'installed'), 'utf8'),
|
|
279
|
+
source,
|
|
280
|
+
);
|
|
281
|
+
await assert.rejects(fs.access(marker), { code: 'ENOENT' });
|
|
282
|
+
await assert.rejects(hook('touch "$TEST_MARKER"'), /exit 2/);
|
|
283
|
+
await assert.rejects(fs.access(marker), { code: 'ENOENT' });
|
|
284
|
+
},
|
|
285
|
+
),
|
|
286
|
+
);
|
|
287
|
+
assert.deepEqual(await fs.readdir(f.tmp), []);
|
|
288
|
+
});
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
const test = require('node:test');
|
|
2
|
+
const assert = require('node:assert/strict');
|
|
3
|
+
const fs = require('node:fs/promises');
|
|
4
|
+
const path = require('node:path');
|
|
5
|
+
const os = require('node:os');
|
|
6
|
+
const { replaceAndReload } = require('../../shell/upgrade.cjs');
|
|
7
|
+
|
|
8
|
+
async function fixture(t) {
|
|
9
|
+
const root = await fs.mkdtemp(
|
|
10
|
+
path.join(os.tmpdir(), 'ql-upgrade-transaction-'),
|
|
11
|
+
);
|
|
12
|
+
t.after(() => fs.rm(root, { recursive: true, force: true }));
|
|
13
|
+
const source = path.join(root, 'source'),
|
|
14
|
+
target = path.join(root, 'target');
|
|
15
|
+
for (const directory of [source, target]) await fs.mkdir(directory);
|
|
16
|
+
await fs.writeFile(path.join(source, 'version'), 'new');
|
|
17
|
+
await fs.writeFile(path.join(target, 'version'), 'old');
|
|
18
|
+
return { root, source, target };
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
for (const failure of ['backup', 'remove', 'replacement', 'start'])
|
|
22
|
+
test(`Bash transaction restores the full original after an overlay ${failure} failure`, async (t) => {
|
|
23
|
+
const f = await fixture(t);
|
|
24
|
+
const rename = fs.rename,
|
|
25
|
+
cp = fs.cp,
|
|
26
|
+
rm = fs.rm;
|
|
27
|
+
t.mock.method(fs, 'rename', async (source, target) => {
|
|
28
|
+
if (source === f.target || source.includes('.ql-backup-')) {
|
|
29
|
+
const error = new Error('overlay rename');
|
|
30
|
+
error.code = 'EXDEV';
|
|
31
|
+
throw error;
|
|
32
|
+
}
|
|
33
|
+
return rename(source, target);
|
|
34
|
+
});
|
|
35
|
+
let injected = false;
|
|
36
|
+
t.mock.method(fs, 'cp', async (source, target, options) => {
|
|
37
|
+
if (
|
|
38
|
+
!injected &&
|
|
39
|
+
((failure === 'backup' && source === f.target) ||
|
|
40
|
+
(failure === 'replacement' && source === f.source))
|
|
41
|
+
) {
|
|
42
|
+
injected = true;
|
|
43
|
+
await fs.mkdir(target, { recursive: true });
|
|
44
|
+
await fs.writeFile(path.join(target, 'partial'), 'partial');
|
|
45
|
+
throw new Error('copy failed');
|
|
46
|
+
}
|
|
47
|
+
return cp(source, target, options);
|
|
48
|
+
});
|
|
49
|
+
t.mock.method(fs, 'rm', async (target, options) => {
|
|
50
|
+
if (!injected && failure === 'remove' && target === f.target) {
|
|
51
|
+
injected = true;
|
|
52
|
+
await fs.unlink(path.join(target, 'version'));
|
|
53
|
+
throw new Error('remove failed');
|
|
54
|
+
}
|
|
55
|
+
return rm(target, options);
|
|
56
|
+
});
|
|
57
|
+
let starts = 0;
|
|
58
|
+
await assert.rejects(
|
|
59
|
+
replaceAndReload([f], {
|
|
60
|
+
stop: async () => {},
|
|
61
|
+
start: async () => {
|
|
62
|
+
if (++starts === 1 && failure === 'start')
|
|
63
|
+
throw new Error('start failed');
|
|
64
|
+
assert.equal(
|
|
65
|
+
await fs.readFile(path.join(f.target, 'version'), 'utf8'),
|
|
66
|
+
'old',
|
|
67
|
+
);
|
|
68
|
+
},
|
|
69
|
+
}),
|
|
70
|
+
/failed/,
|
|
71
|
+
);
|
|
72
|
+
assert.deepEqual(await fs.readdir(f.target), ['version']);
|
|
73
|
+
assert.ok(
|
|
74
|
+
!(await fs.readdir(f.root)).some((name) => name.includes('.ql-backup-')),
|
|
75
|
+
);
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
test('interrupted upgrade recovers the previous service outside cancellation', async (t) => {
|
|
79
|
+
const f = await fixture(t),
|
|
80
|
+
controller = new AbortController();
|
|
81
|
+
let starts = 0;
|
|
82
|
+
await assert.rejects(
|
|
83
|
+
replaceAndReload([f], {
|
|
84
|
+
signal: controller.signal,
|
|
85
|
+
stop: async () => {},
|
|
86
|
+
start: async (recover) => {
|
|
87
|
+
if (++starts === 1) {
|
|
88
|
+
assert.equal(
|
|
89
|
+
await fs.readFile(path.join(f.target, 'version'), 'utf8'),
|
|
90
|
+
'new',
|
|
91
|
+
);
|
|
92
|
+
controller.abort(new Error('interrupted'));
|
|
93
|
+
} else {
|
|
94
|
+
assert.equal(recover, true);
|
|
95
|
+
assert.equal(
|
|
96
|
+
await fs.readFile(path.join(f.target, 'version'), 'utf8'),
|
|
97
|
+
'old',
|
|
98
|
+
);
|
|
99
|
+
}
|
|
100
|
+
},
|
|
101
|
+
}),
|
|
102
|
+
/interrupted/,
|
|
103
|
+
);
|
|
104
|
+
assert.equal(starts, 2);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
test('failed stop during rollback retains backups without overwriting running files', async (t) => {
|
|
108
|
+
const f = await fixture(t);
|
|
109
|
+
let stops = 0;
|
|
110
|
+
await assert.rejects(
|
|
111
|
+
replaceAndReload([f], {
|
|
112
|
+
stop: async () => {
|
|
113
|
+
if (++stops === 2) throw new Error('stop failed');
|
|
114
|
+
},
|
|
115
|
+
start: async () => {
|
|
116
|
+
throw new Error('start failed');
|
|
117
|
+
},
|
|
118
|
+
}),
|
|
119
|
+
/stop failed/,
|
|
120
|
+
);
|
|
121
|
+
const backup = (await fs.readdir(f.root)).find((name) =>
|
|
122
|
+
name.includes('.ql-backup-'),
|
|
123
|
+
);
|
|
124
|
+
assert.ok(backup);
|
|
125
|
+
assert.equal(
|
|
126
|
+
await fs.readFile(path.join(f.root, backup, 'version'), 'utf8'),
|
|
127
|
+
'old',
|
|
128
|
+
);
|
|
129
|
+
assert.equal(
|
|
130
|
+
await fs.readFile(path.join(f.target, 'version'), 'utf8'),
|
|
131
|
+
'new',
|
|
132
|
+
);
|
|
133
|
+
});
|
|
@@ -48,7 +48,7 @@ function fixture(initial) {
|
|
|
48
48
|
},
|
|
49
49
|
'../shared/i18n': { t: (x) => x, tf: (x, y) => x.replace('%s', y) },
|
|
50
50
|
'../shared/clientIp': {
|
|
51
|
-
getClientIp: () =>
|
|
51
|
+
getClientIp: (request) => request.socket.remoteAddress,
|
|
52
52
|
normalizeClientIp: (x) => x,
|
|
53
53
|
},
|
|
54
54
|
ip2region: class {
|
|
@@ -246,3 +246,104 @@ test('default credentials with historical metadata still require initialization'
|
|
|
246
246
|
);
|
|
247
247
|
assert.equal(f.auth.token, '');
|
|
248
248
|
});
|
|
249
|
+
|
|
250
|
+
test('one source cannot lock out another or revive a persisted global lock', async () => {
|
|
251
|
+
const f = fixture({ ...initialized(), retries: 40, lastlogon: Date.now() });
|
|
252
|
+
const attacker = { ...req, socket: { remoteAddress: '192.0.2.1' } };
|
|
253
|
+
const owner = { ...req, socket: { remoteAddress: '192.0.2.2' } };
|
|
254
|
+
for (let i = 0; i < 3; i++) {
|
|
255
|
+
assert.equal(
|
|
256
|
+
(await f.user.login({ username: 'owner', password: 'wrong' }, attacker))
|
|
257
|
+
.code,
|
|
258
|
+
400,
|
|
259
|
+
);
|
|
260
|
+
}
|
|
261
|
+
assert.equal(
|
|
262
|
+
(
|
|
263
|
+
await f.user.login(
|
|
264
|
+
{ username: 'owner', password: 'old-password' },
|
|
265
|
+
attacker,
|
|
266
|
+
)
|
|
267
|
+
).code,
|
|
268
|
+
410,
|
|
269
|
+
);
|
|
270
|
+
assert.equal(
|
|
271
|
+
(await f.user.login({ username: 'owner', password: 'old-password' }, owner))
|
|
272
|
+
.code,
|
|
273
|
+
200,
|
|
274
|
+
);
|
|
275
|
+
// Another client's successful login does not reset the attacker's own budget.
|
|
276
|
+
assert.equal(
|
|
277
|
+
(await f.user.login({ username: 'owner', password: 'wrong' }, attacker))
|
|
278
|
+
.code,
|
|
279
|
+
410,
|
|
280
|
+
);
|
|
281
|
+
await f.user.resetAuthInfo({ retries: 0 });
|
|
282
|
+
assert.equal(
|
|
283
|
+
(
|
|
284
|
+
await f.user.login(
|
|
285
|
+
{ username: 'owner', password: 'old-password' },
|
|
286
|
+
attacker,
|
|
287
|
+
)
|
|
288
|
+
).code,
|
|
289
|
+
200,
|
|
290
|
+
);
|
|
291
|
+
});
|
|
292
|
+
|
|
293
|
+
test('TOTP guesses from another source do not lock the owner out', async () => {
|
|
294
|
+
const secret = authenticator.generateSecret();
|
|
295
|
+
const f = fixture({
|
|
296
|
+
...initialized(),
|
|
297
|
+
twoFactorActivated: true,
|
|
298
|
+
twoFactorSecret: secret,
|
|
299
|
+
});
|
|
300
|
+
const attacker = { ...req, socket: { remoteAddress: '192.0.2.1' } };
|
|
301
|
+
const owner = { ...req, socket: { remoteAddress: '192.0.2.2' } };
|
|
302
|
+
await f.user.login({ username: 'owner', password: 'old-password' }, owner);
|
|
303
|
+
const good = authenticator.generate(secret);
|
|
304
|
+
const bad = good === '000000' ? '111111' : '000000';
|
|
305
|
+
for (let i = 0; i < 3; i++) {
|
|
306
|
+
assert.equal(
|
|
307
|
+
(
|
|
308
|
+
await f.user.twoFactorLogin(
|
|
309
|
+
{ username: 'owner', password: 'old-password', code: bad },
|
|
310
|
+
attacker,
|
|
311
|
+
)
|
|
312
|
+
).code,
|
|
313
|
+
430,
|
|
314
|
+
);
|
|
315
|
+
}
|
|
316
|
+
assert.equal(
|
|
317
|
+
(
|
|
318
|
+
await f.user.twoFactorLogin(
|
|
319
|
+
{ username: 'owner', password: 'old-password', code: bad },
|
|
320
|
+
attacker,
|
|
321
|
+
)
|
|
322
|
+
).code,
|
|
323
|
+
410,
|
|
324
|
+
);
|
|
325
|
+
assert.equal(
|
|
326
|
+
(
|
|
327
|
+
await f.user.twoFactorLogin(
|
|
328
|
+
{ username: 'owner', password: 'old-password', code: good },
|
|
329
|
+
owner,
|
|
330
|
+
)
|
|
331
|
+
).code,
|
|
332
|
+
200,
|
|
333
|
+
);
|
|
334
|
+
});
|
|
335
|
+
|
|
336
|
+
test('source backoff is capped and expires after inactivity', () => {
|
|
337
|
+
const { LoginThrottle } = load(path.resolve('back/shared/loginThrottle.ts'));
|
|
338
|
+
const throttle = new LoginThrottle();
|
|
339
|
+
let now = 1;
|
|
340
|
+
for (let i = 0; i < 20; i++) {
|
|
341
|
+
throttle.fail('attacker', now);
|
|
342
|
+
const wait = throttle.retryAfter('attacker', now);
|
|
343
|
+
assert.ok(wait <= 300);
|
|
344
|
+
now += (wait + 1) * 1000;
|
|
345
|
+
}
|
|
346
|
+
assert.equal(throttle.retryAfter('owner', now), 0);
|
|
347
|
+
assert.equal(throttle.retryAfter('attacker', now + 15 * 60 * 1000), 0);
|
|
348
|
+
assert.equal(throttle.fail('attacker', now + 15 * 60 * 1000), 1);
|
|
349
|
+
});
|
|
@@ -66,6 +66,7 @@ test('decoded SystemNotify requests reach WPUSH with explicit or saved configura
|
|
|
66
66
|
'../data/dependence': {},
|
|
67
67
|
'../data/system': {},
|
|
68
68
|
'../shared/pLimit': {},
|
|
69
|
+
'../schedule/client': {},
|
|
69
70
|
'../shared/i18n': { t: (x) => x },
|
|
70
71
|
'./notify': {},
|
|
71
72
|
'./schedule': {},
|