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
143 lines
5.2 KiB
Bash
Executable File
143 lines
5.2 KiB
Bash
Executable File
#!/bin/sh
|
|
set -e
|
|
|
|
# --- Docker secret file convention (_FILE suffix) ---
|
|
# For each supported var, if VAR_FILE is set, read the secret from that file
|
|
# path into VAR. This lets users mount Docker/Kubernetes secrets instead of
|
|
# passing credentials as plain-text environment variables.
|
|
#
|
|
# Supported: DEFAULT_PASSWORD, S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY,
|
|
# OIDC_CLIENT_SECRET, COOKIE_SECRET, SNAPOTTER_LICENSE_KEY
|
|
resolve_file_env() {
|
|
var="$1"
|
|
file_var="${var}_FILE"
|
|
eval current_val="\"\${${var}:-}\""
|
|
eval file_path="\"\${${file_var}:-}\""
|
|
|
|
if [ -z "$file_path" ]; then
|
|
return
|
|
fi
|
|
|
|
if [ -n "$current_val" ]; then
|
|
echo "WARNING: Both $var and $file_var are set. $file_var takes precedence." >&2
|
|
fi
|
|
|
|
if [ ! -f "$file_path" ] || [ ! -r "$file_path" ]; then
|
|
echo "ERROR: $file_var points to '$file_path' but the file does not exist or is not readable." >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Command substitution strips trailing newlines (standard for secret files)
|
|
export "$var"="$(cat "$file_path")"
|
|
unset "$file_var"
|
|
}
|
|
|
|
resolve_file_env DEFAULT_PASSWORD
|
|
resolve_file_env S3_ACCESS_KEY_ID
|
|
resolve_file_env S3_SECRET_ACCESS_KEY
|
|
resolve_file_env OIDC_CLIENT_SECRET
|
|
resolve_file_env COOKIE_SECRET
|
|
resolve_file_env SNAPOTTER_LICENSE_KEY
|
|
|
|
# Apply auth defaults at runtime so they are never baked into image layers.
|
|
# Users can override any of these via -e flags at docker run time.
|
|
export AUTH_ENABLED="${AUTH_ENABLED:-true}"
|
|
export DEFAULT_USERNAME="${DEFAULT_USERNAME:-admin}"
|
|
export DEFAULT_PASSWORD="${DEFAULT_PASSWORD:-admin}"
|
|
|
|
# Clean up any interrupted bootstrap from a previous start
|
|
AI_VENV="/data/ai/venv"
|
|
AI_VENV_TMP="/data/ai/venv.bootstrapping"
|
|
|
|
if [ -d "$AI_VENV_TMP" ]; then
|
|
echo "Cleaning up interrupted venv bootstrap..."
|
|
rm -rf "$AI_VENV_TMP"
|
|
fi
|
|
|
|
# Bootstrap AI venv from base image on first run
|
|
if [ ! -d "$AI_VENV" ] && [ -d "/opt/venv" ]; then
|
|
echo "Bootstrapping AI venv from base image..."
|
|
mkdir -p /data/ai/models /data/ai/pip-cache
|
|
cp -r /opt/venv "$AI_VENV_TMP"
|
|
mv "$AI_VENV_TMP" "$AI_VENV"
|
|
echo "AI venv ready at $AI_VENV"
|
|
fi
|
|
|
|
# Wait for Postgres to be reachable before starting the app
|
|
if [ -n "${DATABASE_URL:-}" ]; then
|
|
echo "Waiting for Postgres..."
|
|
i=0
|
|
until node /app/docker/wait-for-postgres.mjs; do
|
|
i=$((i+1))
|
|
if [ "$i" -ge 60 ]; then echo "FATAL: Postgres unreachable after 60s"; exit 1; fi
|
|
sleep 1
|
|
done
|
|
echo "Postgres is reachable."
|
|
fi
|
|
|
|
print_banner() {
|
|
RST='\033[0m'
|
|
printf '\n'
|
|
printf ' \033[1;36m🦦 SnapOtter%b\n' "$RST"
|
|
printf ' \033[2m────────────────────────────────────────%b\n' "$RST"
|
|
printf '\n'
|
|
printf ' \033[32m➜%b Open \033[1;4mhttp://localhost:%s%b\n' "$RST" "${PORT:-1349}" "$RST"
|
|
printf ' \033[33m➜%b Login \033[1m%s%b / \033[1m[CHANGE ON FIRST LOGIN]%b\n' "$RST" "${DEFAULT_USERNAME}" "$RST" "$RST"
|
|
printf ' \033[36m➜%b Docs \033[2mhttps://docs.snapotter.com%b\n' "$RST" "$RST"
|
|
printf '\n'
|
|
}
|
|
|
|
# Fix ownership of mounted volumes so the non-root snapotter user can write.
|
|
# This runs as root, fixes permissions, then drops to snapotter via gosu.
|
|
if [ "$(id -u)" = "0" ]; then
|
|
# PUID/PGID support: remap the snapotter user/group to match host UID/GID.
|
|
# This prevents permission conflicts when using bind mounts.
|
|
PUID="${PUID:-$(id -u snapotter)}"
|
|
PGID="${PGID:-$(id -g snapotter)}"
|
|
|
|
if [ "$PUID" = "0" ] || [ "$PGID" = "0" ]; then
|
|
echo "WARNING: PUID=0 or PGID=0 would run the app as root. Ignoring — using default snapotter UID/GID." >&2
|
|
PUID=$(id -u snapotter)
|
|
PGID=$(id -g snapotter)
|
|
fi
|
|
|
|
CUR_UID=$(id -u snapotter)
|
|
CUR_GID=$(id -g snapotter)
|
|
|
|
if [ "$CUR_UID" != "$PUID" ] || [ "$CUR_GID" != "$PGID" ]; then
|
|
# Evict any conflicting user/group that holds the target UID/GID.
|
|
# Delete user first (may cascade-delete its primary group).
|
|
if [ "$CUR_UID" != "$PUID" ]; then
|
|
EXISTING_USER=$(getent passwd "$PUID" 2>/dev/null | cut -d: -f1 || true)
|
|
if [ -n "$EXISTING_USER" ] && [ "$EXISTING_USER" != "snapotter" ]; then
|
|
deluser "$EXISTING_USER" 2>/dev/null || userdel "$EXISTING_USER" 2>/dev/null || true
|
|
fi
|
|
fi
|
|
if [ "$CUR_GID" != "$PGID" ]; then
|
|
EXISTING_GROUP=$(getent group "$PGID" 2>/dev/null | cut -d: -f1 || true)
|
|
if [ -n "$EXISTING_GROUP" ] && [ "$EXISTING_GROUP" != "snapotter" ]; then
|
|
delgroup "$EXISTING_GROUP" 2>/dev/null || groupdel "$EXISTING_GROUP" 2>/dev/null || true
|
|
fi
|
|
groupmod -g "$PGID" snapotter 2>/dev/null || true
|
|
fi
|
|
if [ "$CUR_UID" != "$PUID" ]; then
|
|
usermod -u "$PUID" snapotter 2>/dev/null || true
|
|
fi
|
|
fi
|
|
|
|
# Ensure all writable subdirectories exist before chown
|
|
mkdir -p /data/files /data/ai/models /data/ai/pip-cache /data/ai/venv /tmp/workspace
|
|
|
|
# Chown writable directories (/data is the persistent volume, /tmp/workspace is ephemeral).
|
|
# /app and /opt/venv are read-only at runtime -- no chown needed.
|
|
chown -R snapotter:snapotter /data /tmp/workspace 2>&1 || \
|
|
echo "WARNING: Could not fix volume permissions. Use named volumes (not Windows bind mounts) to avoid this. See docs for details." >&2
|
|
|
|
print_banner
|
|
exec gosu snapotter "$@"
|
|
fi
|
|
|
|
# Already running as snapotter (e.g. Kubernetes runAsUser)
|
|
print_banner
|
|
exec "$@"
|