mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
* feat(infra): add dev compose stack with postgres and redis
* fix(infra): comment dev env defaults until wired; harden dev compose restart and start_period
* chore(deps): add pg driver and testcontainers for postgres migration
* feat(db): translate schema to drizzle pg-core (timestamptz, boolean, pgEnum, jsonb)
Schema translation (apps/api/src/db/schema.ts):
- sqlite-core -> pg-core, all 10 tables preserved 1:1
- integer(mode:'timestamp') -> timestamp({ withTimezone: true })
- integer(mode:'boolean') -> boolean
- jobs.status text enum -> pgEnum('job_status') with same 4 values
- 7 columns changed from text to jsonb: jobs.inputFiles, jobs.settings,
pipelines.steps, apiKeys.permissions, roles.permissions,
auditLog.details, userFiles.toolChain
- settings.value stays text, jobs.error stays text, jobs.progress stays real
jsonb call-site sweep (removed JSON.stringify on writes, JSON.parse on reads):
- apps/api/src/routes/roles.ts: permissions read/write (3 sites)
- apps/api/src/routes/api-keys.ts: permissions write + read (2 sites)
- apps/api/src/routes/audit-log.ts: details read (1 site)
- apps/api/src/routes/pipeline.ts: steps write + read (2 sites)
- apps/api/src/routes/progress.ts: inputFiles write (2 sites)
- apps/api/src/routes/tool-factory.ts: toolChain read + write (2 sites)
- apps/api/src/routes/user-files.ts: toolChain read + write (4 sites)
- apps/api/src/permissions.ts: roles.permissions read (1 site)
- apps/api/src/lib/audit.ts: details write (1 site)
- apps/api/src/plugins/auth.ts: apiKeys.permissions read (1 site)
* refactor(db): type jsonb columns via $type and note raw CTE conversion requirements
* feat(db): archive sqlite migrations and generate postgres baseline
* chore(db): dockerignore legacy migrations, add archive breadcrumb, fix trailing newline
* feat(db): pg pool connection, advisory-locked boot migrations, DATABASE_URL config
* fix(db): friendly fatal on unreachable postgres, idempotent closeDb, lock-key convention note
* refactor(db): async drizzle calls in plugins, lib, permissions
* fix(api): analytics never throws, typed permission guard, single-query session invalidation
* refactor(db): async drizzle calls across all routes and bootstrap
Convert every route file and index.ts from sync SQLite drizzle
patterns to async node-postgres drizzle:
- .all() removed (bare await on select)
- .get() converted to destructured [row] = await ...
- .run() removed (bare await on insert/update/delete)
- .changes replaced with .rowCount (null-guarded) in progress.ts
- sqlite import removed from user-files.ts; raw CTEs converted to
await db.execute(sql`...`) with postgres-dialect recursive CTEs
- ChainRow types updated: tool_chain is parsed jsonb (string[] | null),
created_at is Date (timestamptz) with no * 1000 conversion
- All requirePermission() guard calls awaited (security: unawaited
async guard returns truthy Promise, bypassing permission check)
- All hasEffectivePermission() and getPermissions() calls awaited
- All auditLog() calls awaited (preserves write-before-response order)
- trackEvent() and captureException() left un-awaited (fire-and-forget
by design, guaranteed never-throw)
- ensureAnonymousUser(), startCleanupCron(), recoverStaleJobs() awaited
in bootstrap sequence
- ensureInstanceId() and ensureDefaultSettings() made async
Files converted: 14 (index.ts + 12 route files + tools/index.ts)
* fix(db): await async checkStorageQuota in user-files upload/save routes
* fix(db): await checkStorageQuota in save-result route (missed second call site)
* feat(db): sqlite-to-postgres migrator with CLI and first-boot import
* fix(db): migrator error context, honest force semantics, boot-hook fatal, null-variance tests
* test: run suite against per-file postgres databases via testcontainers
- Add tests/global-setup.ts: spins up a Postgres testcontainer,
creates a migrated template database once per vitest run.
- Rewrite tests/setup/per-fork-env.ts: each test file (forks pool)
clones the template into its own database via CREATE DATABASE ...
TEMPLATE, preserving the same per-file isolation granularity.
- Update vitest.config.ts: add globalSetup, pg alias, update comment.
- Fix tests/integration/test-server.ts: remove DB_PATH mkdir, async
runMigrations, async db operations, remove SQLite WAL checkpoint.
- Fix 21 unit test db/index mocks: add pool and closeDb exports.
- Fix 8 unit test files: add async/await for now-async permission,
audit, and analytics functions.
- Fix 18 integration test files: convert sync .run()/.all()/.get()
to async drizzle patterns, add async to callbacks.
- Production change: apps/api/src/routes/teams.ts: cast COUNT(*)
to ::int so Postgres returns a number instead of bigint string.
* fix(db): seed built-in roles, reject NUL bytes, cast COUNT, serialize job persists
- Seed built-in roles (admin, editor, user) at boot via ensureBuiltinRoles()
with onConflictDoNothing, restoring data that legacy SQLite migration 0007
provided via INSERT statements (the pg baseline is DDL-only).
- Reject NUL bytes in login credentials with 401 (postgres rejects \x00 in
text columns; valid usernames never contain NUL, matching 1.x behavior).
- Cast COUNT(*)::int in user-files, audit-log, and roles listing queries so
postgres returns a JS number instead of bigint-as-string.
- Serialize fire-and-forget job progress DB writes per jobId so the final
"completed" status is never overwritten by a late-arriving "processing"
write (race condition exposed by async postgres round-trips).
* test: fix teams race, seed roles in test server, poll for job status
- Add missing await to resetTeams() in teams PUT beforeEach (the async
delete raced with the subsequent insert under postgres).
- Call ensureBuiltinRoles() in test server bootstrap so integration tests
have the same built-in roles as production.
- Replace fixed 100ms flushPersist delay with a polling helper that waits
for terminal job status, eliminating timing-dependent failures caused by
postgres network round-trip latency.
* test: make heic temp-file cleanup assertion resilient to concurrent workers
Use a set-based diff instead of raw file count when checking that
decodeHeic cleans up temp files. Other concurrent test workers can
create heic-in-*/heic-out-* files in the shared tmpdir, inflating the
"after" count and causing spurious failures under full-suite load.
* fix(db): align builtin-role seed to post-0010 legacy state; test polish
* feat(docker): three-container compose (app, postgres, redis) with boot wait and migrations
* fix(docker): set TEST_DATABASE_URL so containerized tests skip testcontainers
* chore(docker): test compose project name, clearer 1.x upgrade comment, unref probe timer
* feat(enterprise): enforce D15 license boundary; move s3 storage into packages/enterprise
* fix(enterprise): restore lazy aws-sdk loading; community installs load no s3 code at boot
* fix(enterprise): boundary check catches dynamic imports; document getS3 concurrency
* feat(db)!: SnapOtter 2.0 phase 1 foundation: postgres, migrator, compose stack
BREAKING CHANGE: SQLite is no longer the runtime database. Deployments now
require Postgres (and Redis, used from phase 2). Existing installs migrate
with SQLITE_MIGRATE_PATH or 'pnpm --filter @snapotter/api migrate:sqlite'.
* fix(ci): postgres service + fresh e2e database per run; ignore unfixable torch CVE-2025-3000
200 lines
6.2 KiB
TypeScript
200 lines
6.2 KiB
TypeScript
/**
|
|
* Unit tests for settings route handlers.
|
|
*
|
|
* Tests the GET all settings, PUT upsert settings, and GET single setting
|
|
* logic including HTML tag validation, auth requirements, and error handling.
|
|
*/
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
// ── Mocks ───────────────────────────────────────────────────────────────
|
|
|
|
const mockDbRows: Array<{ key: string; value: string; updatedAt: Date }> = [];
|
|
const mockInsertRun = vi.fn();
|
|
const mockUpdateRun = vi.fn();
|
|
|
|
vi.mock("../../../apps/api/src/db/index.js", () => ({
|
|
db: {
|
|
select: () => ({
|
|
from: () => ({
|
|
where: () => ({
|
|
get: vi.fn(() => {
|
|
// Dynamically check mockDbRows
|
|
return null;
|
|
}),
|
|
}),
|
|
all: () => mockDbRows,
|
|
}),
|
|
}),
|
|
insert: () => ({
|
|
values: () => ({ run: mockInsertRun }),
|
|
}),
|
|
update: () => ({
|
|
set: () => ({ where: () => ({ run: mockUpdateRun }) }),
|
|
}),
|
|
},
|
|
pool: {},
|
|
closeDb: async () => {},
|
|
schema: {
|
|
settings: { key: {} },
|
|
},
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/config.js", () => ({
|
|
env: {
|
|
AUTH_ENABLED: true,
|
|
},
|
|
}));
|
|
|
|
// ── Test the validation and helper logic ────────────────────────────────
|
|
|
|
const HTML_TAG_PATTERN = /<[a-z/!?][^>]*>/i;
|
|
|
|
const settingsBodySchemaLogic = {
|
|
validate(body: unknown): { valid: boolean; error?: string } {
|
|
if (typeof body !== "object" || body === null || Array.isArray(body)) {
|
|
return { valid: false, error: "Request body must be a JSON object with key-value pairs" };
|
|
}
|
|
return { valid: true };
|
|
},
|
|
};
|
|
|
|
function validateEntries(body: Record<string, unknown>): {
|
|
entries: Array<{ key: string; strValue: string }>;
|
|
error?: string;
|
|
} {
|
|
const entries: Array<{ key: string; strValue: string }> = [];
|
|
|
|
for (const [key, value] of Object.entries(body)) {
|
|
if (typeof key !== "string" || key.length === 0) continue;
|
|
|
|
const strValue = typeof value === "string" ? value : JSON.stringify(value);
|
|
|
|
if (HTML_TAG_PATTERN.test(key) || HTML_TAG_PATTERN.test(strValue)) {
|
|
return { entries: [], error: "Settings keys and values must not contain HTML tags" };
|
|
}
|
|
|
|
entries.push({ key, strValue });
|
|
}
|
|
|
|
return { entries };
|
|
}
|
|
|
|
describe("settings route logic", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
mockDbRows.length = 0;
|
|
});
|
|
|
|
describe("body validation", () => {
|
|
it("rejects null body", () => {
|
|
expect(settingsBodySchemaLogic.validate(null).valid).toBe(false);
|
|
});
|
|
|
|
it("rejects array body", () => {
|
|
expect(settingsBodySchemaLogic.validate([]).valid).toBe(false);
|
|
});
|
|
|
|
it("accepts object body", () => {
|
|
expect(settingsBodySchemaLogic.validate({ theme: "dark" }).valid).toBe(true);
|
|
});
|
|
|
|
it("accepts empty object body", () => {
|
|
expect(settingsBodySchemaLogic.validate({}).valid).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("HTML tag validation", () => {
|
|
it("rejects HTML tags in keys", () => {
|
|
const result = validateEntries({ "<script>alert(1)</script>": "value" });
|
|
expect(result.error).toBe("Settings keys and values must not contain HTML tags");
|
|
});
|
|
|
|
it("rejects HTML tags in values", () => {
|
|
const result = validateEntries({ key: "<img src=x onerror=alert(1)>" });
|
|
expect(result.error).toBe("Settings keys and values must not contain HTML tags");
|
|
});
|
|
|
|
it("accepts clean keys and values", () => {
|
|
const result = validateEntries({ theme: "dark", locale: "en" });
|
|
expect(result.error).toBeUndefined();
|
|
expect(result.entries).toHaveLength(2);
|
|
});
|
|
|
|
it("stringifies non-string values", () => {
|
|
const result = validateEntries({ count: 42 as unknown as string });
|
|
expect(result.entries[0].strValue).toBe("42");
|
|
});
|
|
|
|
it("stringifies boolean values", () => {
|
|
const result = validateEntries({ enabled: true as unknown as string });
|
|
expect(result.entries[0].strValue).toBe("true");
|
|
});
|
|
|
|
it("stringifies object values", () => {
|
|
const result = validateEntries({ config: { a: 1 } as unknown as string });
|
|
expect(result.entries[0].strValue).toBe('{"a":1}');
|
|
});
|
|
|
|
it("rejects HTML tag in the middle of a value", () => {
|
|
const result = validateEntries({ key: "before <div>inside</div> after" });
|
|
expect(result.error).toBe("Settings keys and values must not contain HTML tags");
|
|
});
|
|
|
|
it("accepts values with angle brackets that are not HTML tags", () => {
|
|
const result = validateEntries({ math: "a > b && c < d" });
|
|
// "<" followed by space is not an HTML tag, but "< d" fails pattern if "d" is a letter
|
|
// The regex /<[a-z/!?][^>]*>/i would match "< d..." -- let's verify
|
|
const hasTag = HTML_TAG_PATTERN.test("a > b && c < d");
|
|
if (hasTag) {
|
|
expect(result.error).toBeDefined();
|
|
} else {
|
|
expect(result.error).toBeUndefined();
|
|
}
|
|
});
|
|
|
|
it("allows multiple settings entries", () => {
|
|
const result = validateEntries({
|
|
theme: "dark",
|
|
locale: "en",
|
|
fontSize: "14",
|
|
});
|
|
expect(result.entries).toHaveLength(3);
|
|
expect(result.entries.map((e) => e.key)).toEqual(["theme", "locale", "fontSize"]);
|
|
});
|
|
});
|
|
|
|
describe("HTML_TAG_PATTERN regex", () => {
|
|
it("matches <script> tags", () => {
|
|
expect(HTML_TAG_PATTERN.test("<script>")).toBe(true);
|
|
});
|
|
|
|
it("matches <img> tags", () => {
|
|
expect(HTML_TAG_PATTERN.test("<img src=x>")).toBe(true);
|
|
});
|
|
|
|
it("matches </div> closing tags", () => {
|
|
expect(HTML_TAG_PATTERN.test("</div>")).toBe(true);
|
|
});
|
|
|
|
it("matches <!-- comments -->", () => {
|
|
expect(HTML_TAG_PATTERN.test("<!-- comment -->")).toBe(true);
|
|
});
|
|
|
|
it("matches <?xml?> processing instructions", () => {
|
|
expect(HTML_TAG_PATTERN.test("<?xml version='1.0'?>")).toBe(true);
|
|
});
|
|
|
|
it("does not match plain text", () => {
|
|
expect(HTML_TAG_PATTERN.test("hello world")).toBe(false);
|
|
});
|
|
|
|
it("does not match empty string", () => {
|
|
expect(HTML_TAG_PATTERN.test("")).toBe(false);
|
|
});
|
|
|
|
it("does not match numeric comparisons", () => {
|
|
expect(HTML_TAG_PATTERN.test("5 > 3")).toBe(false);
|
|
});
|
|
});
|
|
});
|