mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +03:00
3d4f3e4960
* test(infra): retry recursive temp-dir removal instead of failing a shard on ENOTEMPTY (#11966) Two shards on release/v3.8.51 went red in one day with the same signature — "ENOTEMPTY, Directory not empty: /tmp/omniroute-<test>-XXXXXX" — from combo-same-provider-cascade (Unit Tests fast-path 4/4, on a PR that touches only .github/) and auth-policy-embeddings-webfetch-7785 (the 20k-test TIA step). Both pass alone and on re-run: the cleanup races something still writing into the directory (SQLite WAL/-shm checkpoint, a worker, the backup) and under a loaded hosted runner the window opens. 1154 test files do their own cleanup with fs.rmSync(dir, { recursive: true, force: true }); 57 already asked for retries. One-shot codemod (scripts/ad-hoc/codemod-rm-maxretries.mjs, kept for the record): every rm / rmSync / rmdirSync option object with `recursive: true` and no `maxRetries` gains `maxRetries: 5, retryDelay: 100` — Node itself then retries ENOTEMPTY/EBUSY/EPERM for up to ~0.5 s before giving up. 2243 call sites in 1292 files under tests/, the shared tests/_setup/isolateDataDir.ts exit hook included. Only the option object changes: no call site, assertion or import is touched. Validation: prettier and ESLint (with the frozen suppressions) clean on all 1292 files; a random 20-file sample runs green (quota-redis-store hangs identically on the untouched tree — it needs a Redis on localhost, an environment matter). The four unit shards on this PR are the full run. * fix(quality): let check-forgotten-sibling-tests read a 1,000-file diff The gate shells out to `git diff` through execFileSync with Node's default 1 MB maxBuffer; the 1,292-file codemod in this PR is the first diff large enough to overflow it, and the gate died with `spawnSync git ENOBUFS` before comparing anything. 64 MB is far above any real PR and costs nothing when unused.
97 lines
3.6 KiB
TypeScript
97 lines
3.6 KiB
TypeScript
// Regression for #6131: the IP filter config lived in memory only, so every
|
|
// restart (i.e. every OmniRoute update) reset it to Disabled + empty lists and
|
|
// blacklisted IPs were never actually blocked. This locks the fix:
|
|
// 1. configure/blacklist persists to the DB and survives a simulated restart;
|
|
// 2. after the restart the blacklisted IP is still blocked by checkIP.
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-ipfilter-6131-"));
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
|
|
const core = await import("../../src/lib/db/core.ts");
|
|
const ipFilter = await import("../../open-sse/services/ipFilter.ts");
|
|
|
|
test.after(() => {
|
|
core.resetDbInstance();
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
|
|
});
|
|
|
|
test.beforeEach(() => {
|
|
// Fresh DB per test + fresh in-memory module state.
|
|
core.resetDbInstance();
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
|
|
fs.mkdirSync(TEST_DATA_DIR, { recursive: true });
|
|
ipFilter.resetIPFilter();
|
|
});
|
|
|
|
// Simulate an OmniRoute restart: the module's in-memory state is wiped (as it
|
|
// would be on a fresh import) but the DB file persists — exactly what happens
|
|
// across an update/restart.
|
|
function simulateRestart() {
|
|
ipFilter.resetIPFilter();
|
|
}
|
|
|
|
test("#6131 blacklist + enabled survive a restart (persisted to DB)", () => {
|
|
ipFilter.configureIPFilter({ enabled: true, mode: "blacklist" });
|
|
ipFilter.addToBlacklist("203.0.113.7");
|
|
ipFilter.addToBlacklist("198.51.100.42");
|
|
|
|
simulateRestart();
|
|
|
|
const cfg = ipFilter.getIPFilterConfig();
|
|
assert.equal(cfg.enabled, true, "enabled must persist across restart");
|
|
assert.equal(cfg.mode, "blacklist");
|
|
assert.deepEqual(cfg.blacklist.sort(), ["198.51.100.42", "203.0.113.7"]);
|
|
});
|
|
|
|
test("#6131 blacklisted IP is still blocked after a restart", () => {
|
|
ipFilter.configureIPFilter({ enabled: true, mode: "blacklist" });
|
|
ipFilter.addToBlacklist("203.0.113.7");
|
|
|
|
simulateRestart();
|
|
|
|
assert.equal(ipFilter.checkIP("203.0.113.7").allowed, false);
|
|
assert.equal(ipFilter.checkIP("203.0.113.8").allowed, true);
|
|
});
|
|
|
|
test("#6131 removing an IP and disabling also persist across restart", () => {
|
|
ipFilter.configureIPFilter({ enabled: true, mode: "blacklist" });
|
|
ipFilter.addToBlacklist("203.0.113.7");
|
|
ipFilter.addToBlacklist("203.0.113.8");
|
|
ipFilter.removeFromBlacklist("203.0.113.7");
|
|
ipFilter.configureIPFilter({ enabled: false });
|
|
|
|
simulateRestart();
|
|
|
|
const cfg = ipFilter.getIPFilterConfig();
|
|
assert.equal(cfg.enabled, false);
|
|
assert.deepEqual(cfg.blacklist, ["203.0.113.8"]);
|
|
// Disabled → everything allowed regardless of the persisted blacklist.
|
|
assert.equal(ipFilter.checkIP("203.0.113.8").allowed, true);
|
|
});
|
|
|
|
test("#6131 whitelist mode persists across restart", () => {
|
|
ipFilter.configureIPFilter({ enabled: true, mode: "whitelist" });
|
|
ipFilter.addToWhitelist("203.0.113.7");
|
|
|
|
simulateRestart();
|
|
|
|
const cfg = ipFilter.getIPFilterConfig();
|
|
assert.equal(cfg.mode, "whitelist");
|
|
assert.deepEqual(cfg.whitelist, ["203.0.113.7"]);
|
|
assert.equal(ipFilter.checkIP("203.0.113.7").allowed, true);
|
|
assert.equal(ipFilter.checkIP("10.0.0.1").allowed, false);
|
|
});
|
|
|
|
test("#6131 defaults are safe when nothing was ever persisted (disabled, allow-all)", () => {
|
|
simulateRestart();
|
|
const cfg = ipFilter.getIPFilterConfig();
|
|
assert.equal(cfg.enabled, false);
|
|
assert.deepEqual(cfg.blacklist, []);
|
|
assert.equal(ipFilter.checkIP("203.0.113.7").allowed, true);
|
|
});
|