mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-16 20:02:45 +03:00
In `whitelist` mode, an empty whitelist now lets requests through instead of blocking everyone. Switching to whitelist mode before adding any IP no longer locks the admin out of the dashboard; enforcement starts with the first entry (#13176). Approved by the maintainer as a policy change. Maintainer note: the existing `addToWhitelist/removeFromWhitelist: dynamic updates` test asserted the old fail-closed contract (remove the only entry → blocked). It now uses two entries to keep checking that removal blocks, plus an explicit assertion that removing the last entry returns to the new open state. That is the operator-visible consequence of this change: clearing the list disables enforcement. IP-filter suites: 53 cases green. Validated in one consolidated batch of this series (37 PRs boarded together on `release/v3.8.51`): `typecheck:core`, `check:open-sse-typecheck` and `check:dashboard-typecheck` clean; ESLint clean on every changed file; file-size, complexity, cognitive-complexity, changelog-integrity, docs-counts, docs-sync and migration-numbering gates green (only the pre-existing `open-sse/utils/stream.ts` file-size red remains, inherited from the base); 3,743 focused `node:test` cases plus 34 vitest cases green. Thanks @KooshaPari!
204 lines
8.0 KiB
TypeScript
204 lines
8.0 KiB
TypeScript
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";
|
|
|
|
// Isolate DATA_DIR before importing ipFilter: since #6131 the filter lazily
|
|
// loads/persists its config to the DB, so an un-isolated run would touch the
|
|
// real ~/.omniroute DB (side-effect + WAL-lock flake). Pin a throwaway dir.
|
|
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-ipfilter-unit-"));
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
|
|
const core = await import("../../src/lib/db/core.ts");
|
|
const {
|
|
checkIP,
|
|
configureIPFilter,
|
|
tempBanIP,
|
|
removeTempBan,
|
|
addToBlacklist,
|
|
removeFromBlacklist,
|
|
addToWhitelist,
|
|
removeFromWhitelist,
|
|
getIPFilterConfig,
|
|
checkRequestIP,
|
|
resetIPFilter,
|
|
} = 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(() => {
|
|
core.resetDbInstance();
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
|
|
fs.mkdirSync(TEST_DATA_DIR, { recursive: true });
|
|
resetIPFilter();
|
|
});
|
|
|
|
// ─── Disabled ───────────────────────────────────────────────────────────────
|
|
|
|
test("disabled: allows all IPs", () => {
|
|
assert.equal(checkIP("1.2.3.4").allowed, true);
|
|
});
|
|
|
|
// ─── Blacklist Mode ─────────────────────────────────────────────────────────
|
|
|
|
test("blacklist: blocks blacklisted IP", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist", blacklist: ["1.2.3.4"] });
|
|
assert.equal(checkIP("1.2.3.4").allowed, false);
|
|
assert.equal(checkIP("5.6.7.8").allowed, true);
|
|
});
|
|
|
|
test("blacklist: CIDR match", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist", blacklist: ["192.168.1.0/24"] });
|
|
assert.equal(checkIP("192.168.1.100").allowed, false);
|
|
assert.equal(checkIP("192.168.2.1").allowed, true);
|
|
});
|
|
|
|
test("blacklist: wildcard match", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist", blacklist: ["10.0.*.*"] });
|
|
assert.equal(checkIP("10.0.1.1").allowed, false);
|
|
assert.equal(checkIP("10.1.0.1").allowed, true);
|
|
});
|
|
|
|
// ─── Whitelist Mode ─────────────────────────────────────────────────────────
|
|
|
|
test("whitelist: only allows listed IPs", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["1.2.3.4"] });
|
|
assert.equal(checkIP("1.2.3.4").allowed, true);
|
|
assert.equal(checkIP("5.6.7.8").allowed, false);
|
|
});
|
|
|
|
test("whitelist: CIDR match", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["10.0.0.0/8"] });
|
|
assert.equal(checkIP("10.255.255.255").allowed, true);
|
|
assert.equal(checkIP("11.0.0.1").allowed, false);
|
|
});
|
|
|
|
test("whitelist: empty whitelist allows all IPs (admin can still reach dashboard)", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: [] });
|
|
assert.equal(checkIP("1.2.3.4").allowed, true);
|
|
assert.equal(checkIP("5.6.7.8").allowed, true);
|
|
});
|
|
|
|
test("whitelist: non-empty whitelist blocks unlisted IPs", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["1.2.3.4"] });
|
|
assert.equal(checkIP("1.2.3.4").allowed, true);
|
|
assert.equal(checkIP("5.6.7.8").allowed, false);
|
|
});
|
|
|
|
// ─── Whitelist Priority Mode ────────────────────────────────────────────────
|
|
|
|
test("whitelist-priority: whitelist overrides blacklist", () => {
|
|
configureIPFilter({
|
|
enabled: true,
|
|
mode: "whitelist-priority",
|
|
blacklist: ["192.168.1.0/24"],
|
|
whitelist: ["192.168.1.100"],
|
|
});
|
|
assert.equal(checkIP("192.168.1.100").allowed, true); // Whitelisted
|
|
assert.equal(checkIP("192.168.1.50").allowed, false); // Blacklisted
|
|
assert.equal(checkIP("10.0.0.1").allowed, true); // Neither
|
|
});
|
|
|
|
// ─── Temporary Bans ─────────────────────────────────────────────────────────
|
|
|
|
test("tempBanIP: bans temporarily", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist" });
|
|
tempBanIP("5.5.5.5", 60000, "abuse");
|
|
assert.equal(checkIP("5.5.5.5").allowed, false);
|
|
assert.ok(checkIP("5.5.5.5").reason.includes("banned"));
|
|
});
|
|
|
|
test("removeTempBan: removes ban", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist" });
|
|
tempBanIP("5.5.5.5", 60000, "abuse");
|
|
removeTempBan("5.5.5.5");
|
|
assert.equal(checkIP("5.5.5.5").allowed, true);
|
|
});
|
|
|
|
// ─── Dynamic List Management ────────────────────────────────────────────────
|
|
|
|
test("addToBlacklist/removeFromBlacklist: dynamic updates", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist" });
|
|
addToBlacklist("9.9.9.9");
|
|
assert.equal(checkIP("9.9.9.9").allowed, false);
|
|
removeFromBlacklist("9.9.9.9");
|
|
assert.equal(checkIP("9.9.9.9").allowed, true);
|
|
});
|
|
|
|
test("addToWhitelist/removeFromWhitelist: dynamic updates", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist" });
|
|
addToWhitelist("1.1.1.1");
|
|
addToWhitelist("2.2.2.2");
|
|
assert.equal(checkIP("1.1.1.1").allowed, true);
|
|
removeFromWhitelist("1.1.1.1");
|
|
assert.equal(checkIP("1.1.1.1").allowed, false);
|
|
// #13534: removing the last entry leaves an empty whitelist, which no longer
|
|
// enforces (so an admin who has not populated the list yet is not locked out).
|
|
removeFromWhitelist("2.2.2.2");
|
|
assert.equal(checkIP("1.1.1.1").allowed, true);
|
|
});
|
|
|
|
// ─── IPv6 Normalization ─────────────────────────────────────────────────────
|
|
|
|
test("normalizes ::ffff: prefix", () => {
|
|
configureIPFilter({ enabled: true, mode: "blacklist", blacklist: ["1.2.3.4"] });
|
|
assert.equal(checkIP("::ffff:1.2.3.4").allowed, false);
|
|
});
|
|
|
|
// ─── T07: X-Forwarded-For validation ───────────────────────────────────────
|
|
|
|
test("checkRequestIP: skips invalid XFF entries and uses next valid IP", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["1.2.3.4"] });
|
|
const req = {
|
|
headers: {
|
|
get(name) {
|
|
if (name === "x-forwarded-for") return "unknown, 1.2.3.4";
|
|
return null;
|
|
},
|
|
},
|
|
};
|
|
assert.equal(checkRequestIP(req).allowed, true);
|
|
});
|
|
|
|
test("checkRequestIP: all-invalid XFF falls back to x-real-ip", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["9.9.9.9"] });
|
|
const req = {
|
|
headers: {
|
|
get(name) {
|
|
if (name === "x-forwarded-for") return "unknown, -, not_an_ip";
|
|
if (name === "x-real-ip") return "9.9.9.9";
|
|
return null;
|
|
},
|
|
},
|
|
};
|
|
assert.equal(checkRequestIP(req).allowed, true);
|
|
});
|
|
|
|
test("checkRequestIP: empty headers fall back to request.ip", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["7.7.7.7"] });
|
|
const req = {
|
|
headers: {
|
|
get() {
|
|
return null;
|
|
},
|
|
},
|
|
ip: "7.7.7.7",
|
|
};
|
|
assert.equal(checkRequestIP(req).allowed, true);
|
|
});
|
|
|
|
// ─── Config API ─────────────────────────────────────────────────────────────
|
|
|
|
test("getIPFilterConfig: returns serializable config", () => {
|
|
configureIPFilter({ enabled: true, mode: "whitelist", whitelist: ["1.2.3.4"] });
|
|
const config = getIPFilterConfig();
|
|
assert.equal(config.enabled, true);
|
|
assert.equal(config.mode, "whitelist");
|
|
assert.ok(Array.isArray(config.whitelist));
|
|
assert.ok(config.whitelist.includes("1.2.3.4"));
|
|
});
|