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
190 lines
7.0 KiB
TypeScript
190 lines
7.0 KiB
TypeScript
// Proves the server-side invariant: captureException and trackEvent
|
|
// never send data to Sentry/PostHog when analytics is disabled or
|
|
// the request user has not opted in.
|
|
//
|
|
// Tests the FIXED captureException that accepts an optional request
|
|
// parameter and checks consent before forwarding to Sentry.
|
|
// Also tests the FIXED PII scrubbing regex that now correctly
|
|
// matches .heic and .heif extensions.
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
// The corrected regex from both apps/api and apps/web analytics modules.
|
|
// The fix changed `he[ic]f?` to `hei[cf]?` so .heic and .heif are matched.
|
|
const FILE_EXT_PATTERN =
|
|
/\.(jpe?g|png|pdf|webp|gif|tiff?|bmp|svg|hei[cf]?|avif|raw|cr2|nef|arw|dng|psd|tga|exr|hdr)\b/gi;
|
|
const FILE_PATH_PATTERN = /\/(tmp\/workspace|data\/files|data\/ai)\//g;
|
|
|
|
describe("Server-side Analytics No-Leak Invariant", () => {
|
|
describe("captureException consent gating (code review)", () => {
|
|
it("captureException checks isRequestOptedIn before sending to Sentry", async () => {
|
|
// Read the actual source to verify the consent check exists.
|
|
// The function signature is: captureException(error, request?)
|
|
// When request is provided, it checks isRequestOptedIn(request)
|
|
// and returns early if the user has not opted in.
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
|
|
expect(source).toContain(
|
|
"export async function captureException(error: unknown, request?: FastifyRequest)",
|
|
);
|
|
expect(source).toContain("if (request && !(await isRequestOptedIn(request))) return;");
|
|
});
|
|
|
|
it("error handler passes request to captureException", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/index.ts", "utf8");
|
|
expect(source).toContain("captureException(error, request)");
|
|
expect(source).not.toMatch(/captureException\(error\)[^,]/);
|
|
});
|
|
});
|
|
|
|
describe("isUserOptedIn logic (code review)", () => {
|
|
it("returns false for anonymous user", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
expect(source).toContain('if (userId === "anonymous") return false;');
|
|
});
|
|
|
|
it("checks ANALYTICS_ENABLED before user DB lookup", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
expect(source).toContain("if (!env.ANALYTICS_ENABLED) return false;");
|
|
});
|
|
});
|
|
|
|
describe("shouldSample logic", () => {
|
|
it("rate 0.0 always rejects (Math.random() < 0.0 is always false)", () => {
|
|
for (let i = 0; i < 100; i++) {
|
|
expect(Math.random() < 0.0).toBe(false);
|
|
}
|
|
});
|
|
|
|
it("rate 1.0 always accepts (checked before Math.random call)", () => {
|
|
const rate = 1.0;
|
|
expect(rate >= 1.0).toBe(true);
|
|
});
|
|
|
|
it("rate between 0 and 1 produces a mix", () => {
|
|
let trueCount = 0;
|
|
for (let i = 0; i < 1000; i++) {
|
|
if (Math.random() < 0.5) trueCount++;
|
|
}
|
|
expect(trueCount).toBeGreaterThan(0);
|
|
expect(trueCount).toBeLessThan(1000);
|
|
});
|
|
});
|
|
|
|
describe("trackEvent gating (code review)", () => {
|
|
it("trackEvent checks posthogClient, consent, and sampling", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
expect(source).toContain(
|
|
"if (!posthogClient || !(await isRequestOptedIn(request)) || !shouldSample()) return;",
|
|
);
|
|
});
|
|
|
|
it("trackEvent wraps capture in try-catch (never throws)", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
const trackEventBlock = source.slice(source.indexOf("export async function trackEvent"));
|
|
expect(trackEventBlock).toContain("try {");
|
|
expect(trackEventBlock).toContain("catch {");
|
|
});
|
|
});
|
|
|
|
describe("PII scrubbing regex - FILE_EXT_PATTERN", () => {
|
|
it("matches all common image extensions", () => {
|
|
const extensions = [
|
|
".jpg",
|
|
".jpeg",
|
|
".png",
|
|
".pdf",
|
|
".webp",
|
|
".gif",
|
|
".tiff",
|
|
".tif",
|
|
".bmp",
|
|
".svg",
|
|
".heic",
|
|
".heif",
|
|
".avif",
|
|
".raw",
|
|
".cr2",
|
|
".nef",
|
|
".arw",
|
|
".dng",
|
|
".psd",
|
|
".tga",
|
|
".exr",
|
|
".hdr",
|
|
];
|
|
for (const ext of extensions) {
|
|
FILE_EXT_PATTERN.lastIndex = 0;
|
|
expect(`file${ext}`, `Expected file${ext} to match`).toMatch(FILE_EXT_PATTERN);
|
|
}
|
|
});
|
|
|
|
it("does NOT match non-image extensions", () => {
|
|
const safe = [".js", ".ts", ".html", ".css", ".json", ".xml", ".txt", ".md"];
|
|
for (const ext of safe) {
|
|
FILE_EXT_PATTERN.lastIndex = 0;
|
|
expect(`file${ext}`).not.toMatch(FILE_EXT_PATTERN);
|
|
}
|
|
});
|
|
|
|
it("matches extensions in the middle of paths", () => {
|
|
FILE_EXT_PATTERN.lastIndex = 0;
|
|
expect("Error loading /uploads/photo.jpg from disk").toMatch(FILE_EXT_PATTERN);
|
|
});
|
|
|
|
it("replaces extensions with [REDACTED]", () => {
|
|
const input = "Failed to process /tmp/workspace/image.heic";
|
|
FILE_EXT_PATTERN.lastIndex = 0;
|
|
const result = input.replace(FILE_EXT_PATTERN, ".[REDACTED]");
|
|
expect(result).not.toContain(".heic");
|
|
expect(result).toContain(".[REDACTED]");
|
|
});
|
|
});
|
|
|
|
describe("PII scrubbing regex - FILE_PATH_PATTERN", () => {
|
|
it("matches workspace and data paths", () => {
|
|
const paths = ["/tmp/workspace/something", "/data/files/upload", "/data/ai/model"];
|
|
for (const p of paths) {
|
|
FILE_PATH_PATTERN.lastIndex = 0;
|
|
expect(p).toMatch(FILE_PATH_PATTERN);
|
|
}
|
|
});
|
|
|
|
it("does NOT match safe paths", () => {
|
|
const safe = ["/api/v1/health", "/node_modules/sharp", "/usr/local/bin"];
|
|
for (const p of safe) {
|
|
FILE_PATH_PATTERN.lastIndex = 0;
|
|
expect(p).not.toMatch(FILE_PATH_PATTERN);
|
|
}
|
|
});
|
|
|
|
it("replaces paths with [REDACTED]", () => {
|
|
FILE_PATH_PATTERN.lastIndex = 0;
|
|
const input = "Error in /tmp/workspace/job-123/output";
|
|
const result = input.replace(FILE_PATH_PATTERN, "/[REDACTED]/");
|
|
expect(result).not.toContain("/tmp/workspace/");
|
|
expect(result).toContain("/[REDACTED]/");
|
|
});
|
|
});
|
|
|
|
describe("initAnalytics gating (code review)", () => {
|
|
it("initAnalytics bails when ANALYTICS_ENABLED is false", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
expect(source).toContain("if (!env.ANALYTICS_ENABLED || !env.POSTHOG_API_KEY) return;");
|
|
});
|
|
|
|
it("shutdownAnalytics nulls both clients", async () => {
|
|
const fs = await import("node:fs");
|
|
const source = fs.readFileSync("apps/api/src/lib/analytics.ts", "utf8");
|
|
expect(source).toContain("posthogClient = null;");
|
|
expect(source).toContain("sentryModule = null;");
|
|
});
|
|
});
|
|
});
|