v1.0.25
This commit is contained in:
1 parent
c210ef0a8e
commit
afee09866d
55 files changed
+7767
-131
No files matched your search
+4
-4
@@ -37,7 +37,7 @@ RUN APKO_ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "x86_64")
|
|||||||
" - busybox" \
|
" - busybox" \
|
||||||
" - tzdata" \
|
" - tzdata" \
|
||||||
" - docker-cli" \
|
" - docker-cli" \
|
||||||
" - docker-compose=5.0.2-r1" \
|
" - docker-compose=5.1.3-r0" \
|
||||||
" - docker-cli-buildx" \
|
" - docker-cli-buildx" \
|
||||||
" - sqlite" \
|
" - sqlite" \
|
||||||
" - postgresql-client" \
|
" - postgresql-client" \
|
||||||
@@ -77,8 +77,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
|
|
||||||
# Copy package files and install dependencies (--ignore-scripts blocks malicious postinstall hooks)
|
# Copy package files and install dependencies (--ignore-scripts blocks malicious postinstall hooks)
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json ./
|
||||||
RUN npm ci --ignore-scripts \
|
RUN MAKEFLAGS="-j$(nproc)" npm ci --ignore-scripts \
|
||||||
&& npm rebuild better-sqlite3 argon2
|
&& MAKEFLAGS="-j$(nproc)" npm rebuild better-sqlite3 argon2
|
||||||
|
|
||||||
# Copy source code and build
|
# Copy source code and build
|
||||||
COPY . .
|
COPY . .
|
||||||
@@ -93,7 +93,7 @@ RUN cp -r node_modules/better-sqlite3/build /tmp/better-sqlite3-build \
|
|||||||
&& rm -rf node_modules/@types /tmp/better-sqlite3-build
|
&& rm -rf node_modules/@types /tmp/better-sqlite3-build
|
||||||
|
|
||||||
# Build Go collector
|
# Build Go collector
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.25.8 AS go-builder
|
FROM --platform=$BUILDPLATFORM golang:1.25.9 AS go-builder
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY collector/ ./collector/
|
COPY collector/ ./collector/
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
module github.com/Finsys/dockhand/collector
|
module github.com/Finsys/dockhand/collector
|
||||||
|
|
||||||
go 1.25
|
go 1.25.9
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS "api_tokens" (
|
||||||
|
"id" serial PRIMARY KEY NOT NULL,
|
||||||
|
"user_id" integer NOT NULL,
|
||||||
|
"name" text NOT NULL,
|
||||||
|
"token_hash" text NOT NULL,
|
||||||
|
"token_prefix" text NOT NULL,
|
||||||
|
"last_used" timestamp,
|
||||||
|
"expires_at" timestamp,
|
||||||
|
"created_at" timestamp DEFAULT now(),
|
||||||
|
"updated_at" timestamp DEFAULT now(),
|
||||||
|
CONSTRAINT "api_tokens_token_hash_unique" UNIQUE("token_hash")
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
DO $$ BEGIN
|
||||||
|
ALTER TABLE "api_tokens" ADD CONSTRAINT "api_tokens_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
||||||
|
EXCEPTION
|
||||||
|
WHEN duplicate_object THEN null;
|
||||||
|
END $$;
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE INDEX IF NOT EXISTS "api_tokens_user_id_idx" ON "api_tokens" USING btree ("user_id");--> statement-breakpoint
|
||||||
|
CREATE INDEX IF NOT EXISTS "api_tokens_token_prefix_idx" ON "api_tokens" USING btree ("token_prefix");
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"id": "b10cba96-4947-484f-84a2-efb65205381f",
|
"id": "cefce4cc-994a-4b79-b55a-e995211b8f6a",
|
||||||
"prevId": "eef8322a-0ccc-418c-b0f6-f51972a1850e",
|
"prevId": "b10cba96-4947-484f-84a2-efb65205381f",
|
||||||
"version": "7",
|
"version": "7",
|
||||||
"dialect": "postgresql",
|
"dialect": "postgresql",
|
||||||
"tables": {
|
"tables": {
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -36,6 +36,13 @@
|
|||||||
"when": 1774155653752,
|
"when": 1774155653752,
|
||||||
"tag": "0004_add_git_stack_deploy_options",
|
"tag": "0004_add_git_stack_deploy_options",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 5,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1775312212996,
|
||||||
|
"tag": "0005_add_api_tokens",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
CREATE TABLE `api_tokens` (
|
||||||
|
`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
||||||
|
`user_id` integer NOT NULL,
|
||||||
|
`name` text NOT NULL,
|
||||||
|
`token_hash` text NOT NULL,
|
||||||
|
`token_prefix` text NOT NULL,
|
||||||
|
`last_used` text,
|
||||||
|
`expires_at` text,
|
||||||
|
`created_at` text DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
`updated_at` text DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE UNIQUE INDEX `api_tokens_token_hash_unique` ON `api_tokens` (`token_hash`);--> statement-breakpoint
|
||||||
|
CREATE INDEX `api_tokens_user_id_idx` ON `api_tokens` (`user_id`);--> statement-breakpoint
|
||||||
|
CREATE INDEX `api_tokens_token_prefix_idx` ON `api_tokens` (`token_prefix`);
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -36,6 +36,13 @@
|
|||||||
"when": 1774155653752,
|
"when": 1774155653752,
|
||||||
"tag": "0004_add_git_stack_deploy_options",
|
"tag": "0004_add_git_stack_deploy_options",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 5,
|
||||||
|
"version": "6",
|
||||||
|
"when": 1775311743346,
|
||||||
|
"tag": "0005_add_api_tokens",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+5
-4
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "dockhand",
|
"name": "dockhand",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.24",
|
"version": "1.0.25",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npx vite dev",
|
"dev": "npx vite dev",
|
||||||
@@ -77,11 +77,11 @@
|
|||||||
"croner": "9.1.0",
|
"croner": "9.1.0",
|
||||||
"cronstrue": "3.9.0",
|
"cronstrue": "3.9.0",
|
||||||
"devalue": "5.6.4",
|
"devalue": "5.6.4",
|
||||||
"drizzle-orm": "0.45.1",
|
"drizzle-orm": "0.45.2",
|
||||||
"fast-xml-parser": "5.5.8",
|
"fast-xml-parser": "5.5.8",
|
||||||
"js-yaml": "4.1.1",
|
"js-yaml": "4.1.1",
|
||||||
"ldapts": "8.1.3",
|
"ldapts": "8.1.3",
|
||||||
"nodemailer": "8.0.4",
|
"nodemailer": "8.0.5",
|
||||||
"otpauth": "9.4.1",
|
"otpauth": "9.4.1",
|
||||||
"postgres": "3.4.8",
|
"postgres": "3.4.8",
|
||||||
"qrcode": "1.5.4",
|
"qrcode": "1.5.4",
|
||||||
@@ -136,6 +136,7 @@
|
|||||||
"@codemirror/commands": "6.10.1",
|
"@codemirror/commands": "6.10.1",
|
||||||
"@codemirror/search": "6.6.0",
|
"@codemirror/search": "6.6.0",
|
||||||
"@lezer/common": "1.5.0",
|
"@lezer/common": "1.5.0",
|
||||||
"@lezer/highlight": "1.2.3"
|
"@lezer/highlight": "1.2.3",
|
||||||
|
"devalue": "5.6.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+91
-7
@@ -4,6 +4,8 @@ import { initDatabase, hasAdminUser } from '$lib/server/db';
|
|||||||
import { startSubprocesses, stopSubprocesses } from '$lib/server/subprocess-manager';
|
import { startSubprocesses, stopSubprocesses } from '$lib/server/subprocess-manager';
|
||||||
import { startScheduler } from '$lib/server/scheduler';
|
import { startScheduler } from '$lib/server/scheduler';
|
||||||
import { isAuthEnabled, validateSession } from '$lib/server/auth';
|
import { isAuthEnabled, validateSession } from '$lib/server/auth';
|
||||||
|
import { validateApiToken } from '$lib/server/api-tokens';
|
||||||
|
import { requestContext } from '$lib/server/request-context';
|
||||||
import { setServerStartTime } from '$lib/server/uptime';
|
import { setServerStartTime } from '$lib/server/uptime';
|
||||||
import { checkLicenseExpiry, getHostname } from '$lib/server/license';
|
import { checkLicenseExpiry, getHostname } from '$lib/server/license';
|
||||||
import { initCryptoFallback } from '$lib/server/crypto-fallback';
|
import { initCryptoFallback } from '$lib/server/crypto-fallback';
|
||||||
@@ -198,6 +200,58 @@ if (!initialized) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Bearer token auth failure rate limiting (per IP, 5-minute cooldown after 10 failures)
|
||||||
|
const bearerFailCounts = new Map<string, { count: number; firstFail: number }>();
|
||||||
|
const BEARER_FAIL_WINDOW_MS = 60_000; // 1-minute sliding window
|
||||||
|
const BEARER_FAIL_MAX = 15; // max failures per window
|
||||||
|
const BEARER_COOLDOWN_MS = 5 * 60 * 1000; // 5-minute cooldown after exceeding limit
|
||||||
|
const bearerCooldowns = new Map<string, number>(); // IP → cooldown-until timestamp
|
||||||
|
|
||||||
|
// Periodic cleanup
|
||||||
|
setInterval(() => {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [ip, until] of bearerCooldowns) {
|
||||||
|
if (now > until) bearerCooldowns.delete(ip);
|
||||||
|
}
|
||||||
|
for (const [ip, entry] of bearerFailCounts) {
|
||||||
|
if (now - entry.firstFail > BEARER_FAIL_WINDOW_MS) bearerFailCounts.delete(ip);
|
||||||
|
}
|
||||||
|
}, BEARER_COOLDOWN_MS).unref?.();
|
||||||
|
|
||||||
|
function getClientIp(event: { request: Request; getClientAddress?: () => string }): string {
|
||||||
|
// Prefer socket-level IP (SvelteKit resolves proxy headers via adapter config)
|
||||||
|
// This prevents X-Forwarded-For spoofing to bypass rate limiting
|
||||||
|
try {
|
||||||
|
const addr = event.getClientAddress?.();
|
||||||
|
if (addr) return addr;
|
||||||
|
} catch { /* getClientAddress may throw if unavailable */ }
|
||||||
|
return 'unknown';
|
||||||
|
}
|
||||||
|
|
||||||
|
function recordBearerFailure(ip: string): void {
|
||||||
|
const now = Date.now();
|
||||||
|
const entry = bearerFailCounts.get(ip);
|
||||||
|
if (!entry || now - entry.firstFail > BEARER_FAIL_WINDOW_MS) {
|
||||||
|
bearerFailCounts.set(ip, { count: 1, firstFail: now });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
entry.count++;
|
||||||
|
if (entry.count >= BEARER_FAIL_MAX) {
|
||||||
|
bearerCooldowns.set(ip, now + BEARER_COOLDOWN_MS);
|
||||||
|
bearerFailCounts.delete(ip);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isBearerRateLimited(ip: string): boolean {
|
||||||
|
const until = bearerCooldowns.get(ip);
|
||||||
|
if (!until) return false;
|
||||||
|
if (Date.now() > until) {
|
||||||
|
bearerCooldowns.delete(ip);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// Routes that don't require authentication
|
// Routes that don't require authentication
|
||||||
const PUBLIC_PATHS = [
|
const PUBLIC_PATHS = [
|
||||||
'/login',
|
'/login',
|
||||||
@@ -247,21 +301,51 @@ export const handle: Handle = async ({ event, resolve }) => {
|
|||||||
// Check if auth is enabled
|
// Check if auth is enabled
|
||||||
const authEnabled = await isAuthEnabled();
|
const authEnabled = await isAuthEnabled();
|
||||||
|
|
||||||
// If auth is disabled, allow everything (app works as before)
|
// If auth is disabled, allow everything
|
||||||
if (!authEnabled) {
|
if (!authEnabled) {
|
||||||
event.locals.user = null;
|
event.locals.user = null;
|
||||||
event.locals.authEnabled = false;
|
event.locals.authEnabled = false;
|
||||||
return compressResponse(event.request, await resolve(event));
|
const ctx = { user: null, authEnabled: false, authMethod: 'none' as const };
|
||||||
|
return requestContext.run(ctx, async () => compressResponse(event.request, await resolve(event)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auth is enabled - check session first
|
||||||
|
let user = await validateSession(event.cookies);
|
||||||
|
let authMethod: 'cookie' | 'bearer' | 'none' = user ? 'cookie' : 'none';
|
||||||
|
|
||||||
|
// If no session, try Bearer token on API routes
|
||||||
|
if (!user && event.url.pathname.startsWith('/api/')) {
|
||||||
|
const authHeader = event.request.headers.get('authorization');
|
||||||
|
if (authHeader && authHeader.startsWith('Bearer dh_') && authHeader.length <= 207) {
|
||||||
|
const clientIp = getClientIp(event);
|
||||||
|
|
||||||
|
// Rate limit failed Bearer attempts
|
||||||
|
if (isBearerRateLimited(clientIp)) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({ error: 'Too many failed authentication attempts' }),
|
||||||
|
{ status: 429, headers: { 'Content-Type': 'application/json', 'Retry-After': '300' } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const token = authHeader.substring(7); // strip "Bearer "
|
||||||
|
user = await validateApiToken(token);
|
||||||
|
|
||||||
|
if (user) {
|
||||||
|
authMethod = 'bearer';
|
||||||
|
} else {
|
||||||
|
recordBearerFailure(clientIp);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Auth is enabled - check session
|
|
||||||
const user = await validateSession(event.cookies);
|
|
||||||
event.locals.user = user;
|
event.locals.user = user;
|
||||||
event.locals.authEnabled = true;
|
event.locals.authEnabled = true;
|
||||||
|
|
||||||
|
const ctx = { user, authEnabled: true, authMethod };
|
||||||
|
|
||||||
// Public paths don't require authentication
|
// Public paths don't require authentication
|
||||||
if (isPublicPath(event.url.pathname)) {
|
if (isPublicPath(event.url.pathname)) {
|
||||||
return compressResponse(event.request, await resolve(event));
|
return requestContext.run(ctx, async () => compressResponse(event.request, await resolve(event)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// If not authenticated
|
// If not authenticated
|
||||||
@@ -270,7 +354,7 @@ export const handle: Handle = async ({ event, resolve }) => {
|
|||||||
// This enables the first admin user to be created during initial setup
|
// This enables the first admin user to be created during initial setup
|
||||||
const noAdminSetupMode = !(await hasAdminUser());
|
const noAdminSetupMode = !(await hasAdminUser());
|
||||||
if (noAdminSetupMode && event.url.pathname === '/api/users' && event.request.method === 'POST') {
|
if (noAdminSetupMode && event.url.pathname === '/api/users' && event.request.method === 'POST') {
|
||||||
return compressResponse(event.request, await resolve(event));
|
return requestContext.run(ctx, async () => compressResponse(event.request, await resolve(event)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// API routes return 401
|
// API routes return 401
|
||||||
@@ -289,7 +373,7 @@ export const handle: Handle = async ({ event, resolve }) => {
|
|||||||
redirect(307, `/login?redirect=${redirectUrl}`);
|
redirect(307, `/login?redirect=${redirectUrl}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return compressResponse(event.request, await resolve(event));
|
return requestContext.run(ctx, async () => compressResponse(event.request, await resolve(event)));
|
||||||
} finally {
|
} finally {
|
||||||
rssAfterOp('http', httpBefore);
|
rssAfterOp('http', httpBefore);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Sun, Moon } from 'lucide-svelte';
|
import { Sun, Moon } from 'lucide-svelte';
|
||||||
|
import { getTimeFormat } from '$lib/stores/settings';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
logs: string | null;
|
logs: string | null;
|
||||||
darkMode?: boolean;
|
darkMode?: boolean;
|
||||||
|
timezone?: string;
|
||||||
onToggleTheme?: () => void;
|
onToggleTheme?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { logs, darkMode = true, onToggleTheme }: Props = $props();
|
let { logs, darkMode = true, timezone, onToggleTheme }: Props = $props();
|
||||||
|
|
||||||
// Parse log lines with timestamp and content
|
// Parse log lines with timestamp and content
|
||||||
function parseLogLine(line: string): { timestamp: string; content: string; type: 'trivy' | 'grype' | 'error' | 'default' } {
|
function parseLogLine(line: string): { timestamp: string; content: string; type: 'trivy' | 'grype' | 'error' | 'default' } {
|
||||||
@@ -44,7 +46,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function formatTimestamp(timestamp: string): string {
|
function formatTimestamp(timestamp: string): string {
|
||||||
return timestamp.split('T')[1]?.replace('Z', '') || timestamp;
|
const d = new Date(timestamp);
|
||||||
|
if (isNaN(d.getTime())) return timestamp;
|
||||||
|
return new Intl.DateTimeFormat('en-GB', {
|
||||||
|
timeZone: timezone || undefined,
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
second: '2-digit',
|
||||||
|
hour12: getTimeFormat() === '12h'
|
||||||
|
}).format(d);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,25 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "1.0.25",
|
||||||
|
"date": "coming soon",
|
||||||
|
"comingSoon": true,
|
||||||
|
"changes": [
|
||||||
|
{ "type": "feature", "text": "API token authentication — Bearer tokens for CI/CD pipelines and scripts" },
|
||||||
|
{ "type": "feature", "text": "Telegram topic support — send notifications to supergroup topics (#855)" },
|
||||||
|
{ "type": "fix", "text": "allow removing healthcheck, ports, and honor startAfterUpdate=false during container edit (#892)" },
|
||||||
|
{ "type": "fix", "text": "validate stack names and prevent broken DB entries on invalid input (#876)" },
|
||||||
|
{ "type": "fix", "text": "use per-environment timezone for schedule execution log timestamps (#882)" },
|
||||||
|
{ "type": "fix", "text": "\"Pull image before update\" and \"Start after update\" settings ignored (#909)" },
|
||||||
|
{ "type": "fix", "text": "image prune timeout on hawser-standard when pruning many images (#905)" },
|
||||||
|
{ "type": "fix", "text": "bump Docker Compose to 5.1.3" },
|
||||||
|
{ "type": "fix", "text": "mask secret environment variables in container inspect modal (#924)" },
|
||||||
|
{ "type": "fix", "text": "viewer role can toggle, delete, and run schedules (#923)" },
|
||||||
|
{ "type": "fix", "text": "settings show defaults instead of saved values after login until page refresh (#921)" },
|
||||||
|
{ "type": "fix", "text": "settings toggle notifications show wrong state (#931)" },
|
||||||
|
{ "type": "fix", "text": "stack memory tooltip shows inflated total on multi-container stacks (#936)" }
|
||||||
|
],
|
||||||
|
"imageTag": "fnsys/dockhand:v1.0.25"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "1.0.24",
|
"version": "1.0.24",
|
||||||
"date": "2026-04-03",
|
"date": "2026-04-03",
|
||||||
|
|||||||
@@ -0,0 +1,272 @@
|
|||||||
|
/**
|
||||||
|
* API Token Management
|
||||||
|
*
|
||||||
|
* Provides Bearer token authentication for CI/CD pipelines and scripts.
|
||||||
|
* Tokens use `dh_` prefix, Argon2id hashing, and prefix-based lookup.
|
||||||
|
*
|
||||||
|
* Performance: An in-memory cache (SHA-256 key, 60s TTL) avoids running
|
||||||
|
* Argon2id on every request. First request: ~100ms. Subsequent: ~0ms.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { createHash } from 'node:crypto';
|
||||||
|
import { db, eq, and } from '$lib/server/db/drizzle';
|
||||||
|
import { hashPassword, verifyPassword, type AuthenticatedUser } from './auth';
|
||||||
|
import { secureRandomBytes } from './crypto-fallback';
|
||||||
|
import { getUserRoles, userHasAdminRole, type Permissions } from './db';
|
||||||
|
import { isEnterprise } from './license';
|
||||||
|
import { tokenCache, ensureCleanupInterval, invalidateTokenCacheForUser, clearTokenCache } from './token-cache';
|
||||||
|
|
||||||
|
// Re-export cache functions so existing consumers don't need to change imports
|
||||||
|
export { invalidateTokenCacheForUser, clearTokenCache } from './token-cache';
|
||||||
|
|
||||||
|
// Dynamic schema import (same pattern as db.ts)
|
||||||
|
let apiTokensTable: any;
|
||||||
|
|
||||||
|
async function getApiTokensTable() {
|
||||||
|
if (apiTokensTable) return apiTokensTable;
|
||||||
|
const isPostgres = !!(process.env.DATABASE_URL && (
|
||||||
|
process.env.DATABASE_URL.startsWith('postgres://') ||
|
||||||
|
process.env.DATABASE_URL.startsWith('postgresql://')
|
||||||
|
));
|
||||||
|
const schema = isPostgres
|
||||||
|
? await import('./db/schema/pg-schema.js')
|
||||||
|
: await import('./db/schema/index.js');
|
||||||
|
apiTokensTable = schema.apiTokens;
|
||||||
|
return apiTokensTable;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Token format: dh_ + 32 bytes base64url = dh_ + 43 chars
|
||||||
|
const TOKEN_PREFIX = 'dh_';
|
||||||
|
const TOKEN_BYTES = 32;
|
||||||
|
const PREFIX_LENGTH = 8; // chars after dh_ stored for identification
|
||||||
|
const MAX_TOKEN_LENGTH = 200;
|
||||||
|
const CACHE_TTL = 60_000; // 60 seconds
|
||||||
|
|
||||||
|
function cacheKey(rawToken: string): string {
|
||||||
|
return createHash('sha256').update(rawToken).digest('hex');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pre-computed dummy hash for timing protection on invalid prefixes
|
||||||
|
let dummyHash: string | null = null;
|
||||||
|
|
||||||
|
async function getDummyHash(): Promise<string> {
|
||||||
|
if (!dummyHash) {
|
||||||
|
dummyHash = await hashPassword('dh_dummy_token_for_timing_protection');
|
||||||
|
}
|
||||||
|
return dummyHash;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize dummy hash on import (fire and forget)
|
||||||
|
void getDummyHash();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate a new API token.
|
||||||
|
* Returns the plaintext token (shown once) and the database record.
|
||||||
|
*/
|
||||||
|
export async function generateApiToken(
|
||||||
|
userId: number,
|
||||||
|
name: string,
|
||||||
|
expiresAt?: string | null
|
||||||
|
): Promise<{ token: string; id: number; tokenPrefix: string }> {
|
||||||
|
const table = await getApiTokensTable();
|
||||||
|
|
||||||
|
// Generate random token
|
||||||
|
const randomBytes = secureRandomBytes(TOKEN_BYTES);
|
||||||
|
const rawToken = TOKEN_PREFIX + randomBytes.toString('base64url');
|
||||||
|
const tokenPrefix = rawToken.substring(TOKEN_PREFIX.length, TOKEN_PREFIX.length + PREFIX_LENGTH);
|
||||||
|
|
||||||
|
// Hash for storage
|
||||||
|
const tokenHash = await hashPassword(rawToken);
|
||||||
|
|
||||||
|
const result = await db.insert(table).values({
|
||||||
|
userId,
|
||||||
|
name,
|
||||||
|
tokenHash,
|
||||||
|
tokenPrefix,
|
||||||
|
expiresAt: expiresAt || null
|
||||||
|
}).returning();
|
||||||
|
|
||||||
|
return {
|
||||||
|
token: rawToken,
|
||||||
|
id: result[0].id,
|
||||||
|
tokenPrefix
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validate a Bearer token and return the associated user.
|
||||||
|
* Uses cache to avoid Argon2id on every request.
|
||||||
|
*/
|
||||||
|
export async function validateApiToken(rawToken: string): Promise<AuthenticatedUser | null> {
|
||||||
|
// Input validation
|
||||||
|
if (!rawToken || rawToken.length > MAX_TOKEN_LENGTH || !rawToken.startsWith(TOKEN_PREFIX)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check cache first
|
||||||
|
ensureCleanupInterval();
|
||||||
|
const key = cacheKey(rawToken);
|
||||||
|
const cached = tokenCache.get(key);
|
||||||
|
if (cached && cached.expiresAt > Date.now()) {
|
||||||
|
return cached.user;
|
||||||
|
}
|
||||||
|
|
||||||
|
const table = await getApiTokensTable();
|
||||||
|
|
||||||
|
// Extract prefix for lookup
|
||||||
|
const prefix = rawToken.substring(TOKEN_PREFIX.length, TOKEN_PREFIX.length + PREFIX_LENGTH);
|
||||||
|
|
||||||
|
// Find tokens with matching prefix (deleted tokens are gone, no isActive filter needed)
|
||||||
|
const candidates = await db
|
||||||
|
.select()
|
||||||
|
.from(table)
|
||||||
|
.where(eq(table.tokenPrefix, prefix));
|
||||||
|
|
||||||
|
if (candidates.length === 0) {
|
||||||
|
// Timing protection: run Argon2id anyway
|
||||||
|
await verifyPassword(rawToken, await getDummyHash());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify against each candidate (usually just one)
|
||||||
|
for (const candidate of candidates) {
|
||||||
|
const valid = await verifyPassword(rawToken, candidate.tokenHash);
|
||||||
|
if (!valid) continue;
|
||||||
|
|
||||||
|
// Check expiration AFTER hash verification to avoid timing oracle
|
||||||
|
if (candidate.expiresAt && new Date(candidate.expiresAt) < new Date()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build AuthenticatedUser from the token's user
|
||||||
|
const user = await buildUserFromToken(candidate);
|
||||||
|
if (!user) continue;
|
||||||
|
|
||||||
|
// Update lastUsed (fire and forget — non-critical audit field)
|
||||||
|
void db.update(table)
|
||||||
|
.set({ lastUsed: new Date().toISOString() })
|
||||||
|
.where(eq(table.id, candidate.id))
|
||||||
|
.catch((err) => {
|
||||||
|
if (typeof process !== 'undefined' && process.env.DB_VERBOSE_LOGGING === 'true') {
|
||||||
|
console.debug('[api-tokens] lastUsed update failed:', err?.message);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Cache the result — cap TTL at token expiry time if sooner
|
||||||
|
let cacheTtl = CACHE_TTL;
|
||||||
|
if (candidate.expiresAt) {
|
||||||
|
const timeUntilExpiry = new Date(candidate.expiresAt).getTime() - Date.now();
|
||||||
|
if (timeUntilExpiry < cacheTtl) {
|
||||||
|
cacheTtl = Math.max(0, timeUntilExpiry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tokenCache.set(key, { user, expiresAt: Date.now() + cacheTtl });
|
||||||
|
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build an AuthenticatedUser from a token's database record.
|
||||||
|
*/
|
||||||
|
async function buildUserFromToken(tokenRecord: any): Promise<AuthenticatedUser | null> {
|
||||||
|
// Import getUserWithoutPassword dynamically to avoid circular deps
|
||||||
|
// This avoids keeping passwordHash in memory unnecessarily
|
||||||
|
const { getUserWithoutPassword } = await import('./db');
|
||||||
|
|
||||||
|
const dbUser = await getUserWithoutPassword(tokenRecord.userId);
|
||||||
|
if (!dbUser || !dbUser.isActive) return null;
|
||||||
|
|
||||||
|
const enterprise = await isEnterprise();
|
||||||
|
let isAdmin = false;
|
||||||
|
let permissions: Permissions;
|
||||||
|
|
||||||
|
if (!enterprise) {
|
||||||
|
// Free edition: everyone is effectively admin
|
||||||
|
isAdmin = true;
|
||||||
|
const { getRoleByName } = await import('./db');
|
||||||
|
const adminRole = await getRoleByName('Admin');
|
||||||
|
permissions = adminRole?.permissions ?? {} as Permissions;
|
||||||
|
} else {
|
||||||
|
isAdmin = await userHasAdminRole(dbUser.id);
|
||||||
|
const roles = await getUserRoles(dbUser.id);
|
||||||
|
// Merge permissions from all roles
|
||||||
|
permissions = {} as Permissions;
|
||||||
|
for (const role of roles) {
|
||||||
|
const rolePerms = typeof role.permissions === 'string'
|
||||||
|
? JSON.parse(role.permissions)
|
||||||
|
: role.permissions;
|
||||||
|
for (const [key, actions] of Object.entries(rolePerms)) {
|
||||||
|
if (!permissions[key as keyof Permissions]) {
|
||||||
|
permissions[key as keyof Permissions] = [];
|
||||||
|
}
|
||||||
|
for (const action of actions as string[]) {
|
||||||
|
if (!permissions[key as keyof Permissions].includes(action)) {
|
||||||
|
permissions[key as keyof Permissions].push(action);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine provider from authProvider field
|
||||||
|
let provider: 'local' | 'ldap' | 'oidc' = 'local';
|
||||||
|
if (dbUser.authProvider?.startsWith('ldap')) provider = 'ldap';
|
||||||
|
else if (dbUser.authProvider?.startsWith('oidc')) provider = 'oidc';
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: dbUser.id,
|
||||||
|
username: dbUser.username,
|
||||||
|
email: dbUser.email ?? undefined,
|
||||||
|
displayName: dbUser.displayName ?? undefined,
|
||||||
|
avatar: dbUser.avatar ?? undefined,
|
||||||
|
isAdmin,
|
||||||
|
provider,
|
||||||
|
permissions
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List all tokens for a user (no hashes returned).
|
||||||
|
*/
|
||||||
|
export async function listUserTokens(userId: number) {
|
||||||
|
const table = await getApiTokensTable();
|
||||||
|
return db
|
||||||
|
.select({
|
||||||
|
id: table.id,
|
||||||
|
name: table.name,
|
||||||
|
tokenPrefix: table.tokenPrefix,
|
||||||
|
lastUsed: table.lastUsed,
|
||||||
|
expiresAt: table.expiresAt,
|
||||||
|
createdAt: table.createdAt
|
||||||
|
})
|
||||||
|
.from(table)
|
||||||
|
.where(eq(table.userId, userId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Revoke (delete) a token. Owner or admin can revoke.
|
||||||
|
*/
|
||||||
|
export async function revokeApiToken(tokenId: number, requestingUserId: number, isAdmin: boolean): Promise<boolean> {
|
||||||
|
const table = await getApiTokensTable();
|
||||||
|
|
||||||
|
// Find the token
|
||||||
|
const [token] = await db.select().from(table).where(eq(table.id, tokenId));
|
||||||
|
if (!token) return false;
|
||||||
|
|
||||||
|
// Check ownership or admin
|
||||||
|
if (token.userId !== requestingUserId && !isAdmin) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hard-delete
|
||||||
|
await db.delete(table).where(eq(table.id, tokenId));
|
||||||
|
|
||||||
|
// Clear cache — we can't map prefix to SHA-256 cache keys, so clear all
|
||||||
|
clearTokenCache();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -9,6 +9,7 @@ import type { RequestEvent } from '@sveltejs/kit';
|
|||||||
import { isEnterprise } from './license';
|
import { isEnterprise } from './license';
|
||||||
import { logAuditEvent, type AuditAction, type AuditEntityType, type AuditLogCreateData } from './db';
|
import { logAuditEvent, type AuditAction, type AuditEntityType, type AuditLogCreateData } from './db';
|
||||||
import { authorize } from './authorize';
|
import { authorize } from './authorize';
|
||||||
|
import { getRequestContext } from './request-context';
|
||||||
|
|
||||||
export interface AuditContext {
|
export interface AuditContext {
|
||||||
userId?: number | null;
|
userId?: number | null;
|
||||||
@@ -21,7 +22,8 @@ export interface AuditContext {
|
|||||||
* Extract audit context from a request event
|
* Extract audit context from a request event
|
||||||
*/
|
*/
|
||||||
export async function getAuditContext(event: RequestEvent): Promise<AuditContext> {
|
export async function getAuditContext(event: RequestEvent): Promise<AuditContext> {
|
||||||
const auth = await authorize(event.cookies);
|
const ctx = getRequestContext();
|
||||||
|
const user = ctx?.user ?? (await authorize(event.cookies)).user;
|
||||||
|
|
||||||
// Get IP address from various headers (proxied requests)
|
// Get IP address from various headers (proxied requests)
|
||||||
const forwardedFor = event.request.headers.get('x-forwarded-for');
|
const forwardedFor = event.request.headers.get('x-forwarded-for');
|
||||||
@@ -40,8 +42,8 @@ export async function getAuditContext(event: RequestEvent): Promise<AuditContext
|
|||||||
const userAgent = event.request.headers.get('user-agent') || null;
|
const userAgent = event.request.headers.get('user-agent') || null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
userId: auth.user?.id ?? null,
|
userId: user?.id ?? null,
|
||||||
username: auth.user?.username ?? 'anonymous',
|
username: user?.username ?? 'anonymous',
|
||||||
ipAddress,
|
ipAddress,
|
||||||
userAgent
|
userAgent
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ import {
|
|||||||
import { Client as LdapClient } from 'ldapts';
|
import { Client as LdapClient } from 'ldapts';
|
||||||
import { isEnterprise } from './license';
|
import { isEnterprise } from './license';
|
||||||
import { secureRandomBytes } from './crypto-fallback';
|
import { secureRandomBytes } from './crypto-fallback';
|
||||||
|
import { invalidateTokenCacheForUser } from './token-cache';
|
||||||
|
|
||||||
// Session cookie name
|
// Session cookie name
|
||||||
const SESSION_COOKIE_NAME = 'dockhand_session';
|
const SESSION_COOKIE_NAME = 'dockhand_session';
|
||||||
@@ -735,6 +736,9 @@ async function tryLdapAuth(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear cached token permissions after role sync
|
||||||
|
invalidateTokenCacheForUser(user.id);
|
||||||
|
|
||||||
if (!user.isActive) {
|
if (!user.isActive) {
|
||||||
return { success: false, error: 'Account is disabled' };
|
return { success: false, error: 'Account is disabled' };
|
||||||
}
|
}
|
||||||
@@ -1449,6 +1453,9 @@ export async function handleOidcCallback(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear cached token permissions after role sync
|
||||||
|
invalidateTokenCacheForUser(user.id);
|
||||||
|
|
||||||
if (!user.isActive) {
|
if (!user.isActive) {
|
||||||
return { success: false, error: 'Account is disabled' };
|
return { success: false, error: 'Account is disabled' };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import type { Permissions } from './db';
|
|||||||
import { getUserAccessibleEnvironments, userCanAccessEnvironment, userHasAdminRole } from './db';
|
import { getUserAccessibleEnvironments, userCanAccessEnvironment, userHasAdminRole } from './db';
|
||||||
import { validateSession, isAuthEnabled, checkPermission, type AuthenticatedUser } from './auth';
|
import { validateSession, isAuthEnabled, checkPermission, type AuthenticatedUser } from './auth';
|
||||||
import { isEnterprise } from './license';
|
import { isEnterprise } from './license';
|
||||||
|
import { getRequestContext } from './request-context';
|
||||||
|
|
||||||
export interface AuthorizationContext {
|
export interface AuthorizationContext {
|
||||||
/** Whether authentication is enabled globally */
|
/** Whether authentication is enabled globally */
|
||||||
@@ -113,7 +114,10 @@ export interface AuthorizationContext {
|
|||||||
export async function authorize(cookies: Cookies): Promise<AuthorizationContext> {
|
export async function authorize(cookies: Cookies): Promise<AuthorizationContext> {
|
||||||
const authEnabled = await isAuthEnabled();
|
const authEnabled = await isAuthEnabled();
|
||||||
const enterprise = await isEnterprise();
|
const enterprise = await isEnterprise();
|
||||||
const user = authEnabled ? await validateSession(cookies) : null;
|
|
||||||
|
// Try request context first (set by hook — handles both cookie and Bearer)
|
||||||
|
const reqCtx = getRequestContext();
|
||||||
|
const user = reqCtx?.user ?? (authEnabled ? await validateSession(cookies) : null);
|
||||||
|
|
||||||
// Determine admin status:
|
// Determine admin status:
|
||||||
// - Free edition: all authenticated users are effectively admins (full access)
|
// - Free edition: all authenticated users are effectively admins (full access)
|
||||||
|
|||||||
+44
-1
@@ -1185,6 +1185,37 @@ export async function getUser(id: number): Promise<UserData | null> {
|
|||||||
return results[0] as UserData || null;
|
return results[0] as UserData || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface SafeUserData {
|
||||||
|
id: number;
|
||||||
|
username: string;
|
||||||
|
email: string | null;
|
||||||
|
displayName: string | null;
|
||||||
|
avatar: string | null;
|
||||||
|
authProvider: string | null;
|
||||||
|
mfaEnabled: boolean;
|
||||||
|
isActive: boolean;
|
||||||
|
lastLogin: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getUserWithoutPassword(id: number): Promise<SafeUserData | null> {
|
||||||
|
const results = await db.select({
|
||||||
|
id: users.id,
|
||||||
|
username: users.username,
|
||||||
|
email: users.email,
|
||||||
|
displayName: users.displayName,
|
||||||
|
avatar: users.avatar,
|
||||||
|
authProvider: users.authProvider,
|
||||||
|
mfaEnabled: users.mfaEnabled,
|
||||||
|
isActive: users.isActive,
|
||||||
|
lastLogin: users.lastLogin,
|
||||||
|
createdAt: users.createdAt,
|
||||||
|
updatedAt: users.updatedAt
|
||||||
|
}).from(users).where(eq(users.id, id));
|
||||||
|
return results[0] as SafeUserData || null;
|
||||||
|
}
|
||||||
|
|
||||||
export async function hasAdminUser(): Promise<boolean> {
|
export async function hasAdminUser(): Promise<boolean> {
|
||||||
// Check if any user has the Admin role assigned
|
// Check if any user has the Admin role assigned
|
||||||
const adminRole = await db.select().from(roles).where(eq(roles.name, 'Admin')).limit(1);
|
const adminRole = await db.select().from(roles).where(eq(roles.name, 'Admin')).limit(1);
|
||||||
@@ -3046,7 +3077,7 @@ export type AuditAction =
|
|||||||
export type AuditEntityType =
|
export type AuditEntityType =
|
||||||
| 'container' | 'image' | 'stack' | 'volume' | 'network'
|
| 'container' | 'image' | 'stack' | 'volume' | 'network'
|
||||||
| 'user' | 'role' | 'settings' | 'environment' | 'registry' | 'git_repository' | 'git_credential'
|
| 'user' | 'role' | 'settings' | 'environment' | 'registry' | 'git_repository' | 'git_credential'
|
||||||
| 'config_set' | 'notification' | 'oidc_provider' | 'ldap_config' | 'git_stack';
|
| 'config_set' | 'notification' | 'oidc_provider' | 'ldap_config' | 'git_stack' | 'api_token';
|
||||||
|
|
||||||
export interface AuditLogData {
|
export interface AuditLogData {
|
||||||
id: number;
|
id: number;
|
||||||
@@ -4586,6 +4617,18 @@ export async function setStackEnvVars(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the set of secret key names for a stack.
|
||||||
|
* Used to mask secret values in container inspect responses.
|
||||||
|
*/
|
||||||
|
export async function getSecretKeyNames(
|
||||||
|
stackName: string,
|
||||||
|
environmentId?: number | null
|
||||||
|
): Promise<Set<string>> {
|
||||||
|
const vars = await getStackEnvVars(stackName, environmentId, true);
|
||||||
|
return new Set(vars.filter(v => v.isSecret).map(v => v.key));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get count of environment variables for a stack.
|
* Get count of environment variables for a stack.
|
||||||
* @param stackName - Name of the stack
|
* @param stackName - Name of the stack
|
||||||
|
|||||||
@@ -335,7 +335,8 @@ const REQUIRED_TABLES = [
|
|||||||
'audit_logs',
|
'audit_logs',
|
||||||
'container_events',
|
'container_events',
|
||||||
'schedule_executions',
|
'schedule_executions',
|
||||||
'user_preferences'
|
'user_preferences',
|
||||||
|
'api_tokens'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -768,7 +769,7 @@ async function seedDatabase(): Promise<void> {
|
|||||||
license: ['manage'],
|
license: ['manage'],
|
||||||
audit_logs: ['view'],
|
audit_logs: ['view'],
|
||||||
activity: ['view'],
|
activity: ['view'],
|
||||||
schedules: ['view']
|
schedules: ['view', 'edit', 'run']
|
||||||
});
|
});
|
||||||
|
|
||||||
const operatorPermissions = JSON.stringify({
|
const operatorPermissions = JSON.stringify({
|
||||||
@@ -787,7 +788,7 @@ async function seedDatabase(): Promise<void> {
|
|||||||
license: [],
|
license: [],
|
||||||
audit_logs: [],
|
audit_logs: [],
|
||||||
activity: ['view'],
|
activity: ['view'],
|
||||||
schedules: ['view']
|
schedules: ['view', 'edit', 'run']
|
||||||
});
|
});
|
||||||
|
|
||||||
const viewerPermissions = JSON.stringify({
|
const viewerPermissions = JSON.stringify({
|
||||||
@@ -898,6 +899,7 @@ export const userPreferences = schemaProxy.userPreferences;
|
|||||||
export const scheduleExecutions = schemaProxy.scheduleExecutions;
|
export const scheduleExecutions = schemaProxy.scheduleExecutions;
|
||||||
export const stackEnvironmentVariables = schemaProxy.stackEnvironmentVariables;
|
export const stackEnvironmentVariables = schemaProxy.stackEnvironmentVariables;
|
||||||
export const pendingContainerUpdates = schemaProxy.pendingContainerUpdates;
|
export const pendingContainerUpdates = schemaProxy.pendingContainerUpdates;
|
||||||
|
export const apiTokens = schemaProxy.apiTokens;
|
||||||
|
|
||||||
// Re-export types from SQLite schema (they're compatible with PostgreSQL)
|
// Re-export types from SQLite schema (they're compatible with PostgreSQL)
|
||||||
export type {
|
export type {
|
||||||
@@ -956,7 +958,9 @@ export type {
|
|||||||
StackEnvironmentVariable,
|
StackEnvironmentVariable,
|
||||||
NewStackEnvironmentVariable,
|
NewStackEnvironmentVariable,
|
||||||
PendingContainerUpdate,
|
PendingContainerUpdate,
|
||||||
NewPendingContainerUpdate
|
NewPendingContainerUpdate,
|
||||||
|
ApiToken,
|
||||||
|
NewApiToken
|
||||||
} from './schema/index.js';
|
} from './schema/index.js';
|
||||||
|
|
||||||
export { eq, and, or, desc, asc, like, sql, inArray, isNull, isNotNull } from 'drizzle-orm';
|
export { eq, and, or, desc, asc, like, sql, inArray, isNull, isNotNull } from 'drizzle-orm';
|
||||||
|
|||||||
@@ -467,6 +467,25 @@ export const pendingContainerUpdates = sqliteTable('pending_container_updates',
|
|||||||
envContainerUnique: unique().on(table.environmentId, table.containerId)
|
envContainerUnique: unique().on(table.environmentId, table.containerId)
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// =============================================================================
|
||||||
|
// API TOKENS TABLE
|
||||||
|
// =============================================================================
|
||||||
|
|
||||||
|
export const apiTokens = sqliteTable('api_tokens', {
|
||||||
|
id: integer('id').primaryKey({ autoIncrement: true }),
|
||||||
|
userId: integer('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }),
|
||||||
|
name: text('name').notNull(),
|
||||||
|
tokenHash: text('token_hash').notNull().unique(),
|
||||||
|
tokenPrefix: text('token_prefix').notNull(),
|
||||||
|
lastUsed: text('last_used'),
|
||||||
|
expiresAt: text('expires_at'),
|
||||||
|
createdAt: text('created_at').default(sql`CURRENT_TIMESTAMP`),
|
||||||
|
updatedAt: text('updated_at').default(sql`CURRENT_TIMESTAMP`)
|
||||||
|
}, (table) => ({
|
||||||
|
userIdIdx: index('api_tokens_user_id_idx').on(table.userId),
|
||||||
|
tokenPrefixIdx: index('api_tokens_token_prefix_idx').on(table.tokenPrefix)
|
||||||
|
}));
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// USER PREFERENCES TABLE (unified key-value store)
|
// USER PREFERENCES TABLE (unified key-value store)
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
@@ -570,3 +589,6 @@ export type NewStackEnvironmentVariable = typeof stackEnvironmentVariables.$infe
|
|||||||
|
|
||||||
export type PendingContainerUpdate = typeof pendingContainerUpdates.$inferSelect;
|
export type PendingContainerUpdate = typeof pendingContainerUpdates.$inferSelect;
|
||||||
export type NewPendingContainerUpdate = typeof pendingContainerUpdates.$inferInsert;
|
export type NewPendingContainerUpdate = typeof pendingContainerUpdates.$inferInsert;
|
||||||
|
|
||||||
|
export type ApiToken = typeof apiTokens.$inferSelect;
|
||||||
|
export type NewApiToken = typeof apiTokens.$inferInsert;
|
||||||
@@ -470,6 +470,25 @@ export const pendingContainerUpdates = pgTable('pending_container_updates', {
|
|||||||
envContainerUnique: unique().on(table.environmentId, table.containerId)
|
envContainerUnique: unique().on(table.environmentId, table.containerId)
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// =============================================================================
|
||||||
|
// API TOKENS TABLE
|
||||||
|
// =============================================================================
|
||||||
|
|
||||||
|
export const apiTokens = pgTable('api_tokens', {
|
||||||
|
id: serial('id').primaryKey(),
|
||||||
|
userId: integer('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }),
|
||||||
|
name: text('name').notNull(),
|
||||||
|
tokenHash: text('token_hash').notNull().unique(),
|
||||||
|
tokenPrefix: text('token_prefix').notNull(),
|
||||||
|
lastUsed: timestamp('last_used', { mode: 'string' }),
|
||||||
|
expiresAt: timestamp('expires_at', { mode: 'string' }),
|
||||||
|
createdAt: timestamp('created_at', { mode: 'string' }).defaultNow(),
|
||||||
|
updatedAt: timestamp('updated_at', { mode: 'string' }).defaultNow()
|
||||||
|
}, (table) => ({
|
||||||
|
userIdIdx: index('api_tokens_user_id_idx').on(table.userId),
|
||||||
|
tokenPrefixIdx: index('api_tokens_token_prefix_idx').on(table.tokenPrefix)
|
||||||
|
}));
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// USER PREFERENCES TABLE (unified key-value store)
|
// USER PREFERENCES TABLE (unified key-value store)
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
|
|||||||
+22
-10
@@ -415,7 +415,8 @@ export function httpsAgentRequest(
|
|||||||
if (!streaming) {
|
if (!streaming) {
|
||||||
const isComposeOperation = path === '/_hawser/compose';
|
const isComposeOperation = path === '/_hawser/compose';
|
||||||
const composeTimeoutMs = parseInt(process.env.COMPOSE_TIMEOUT || '900') * 1000;
|
const composeTimeoutMs = parseInt(process.env.COMPOSE_TIMEOUT || '900') * 1000;
|
||||||
reqOptions.timeout = isComposeOperation ? composeTimeoutMs : 30000;
|
const isPrune = path.endsWith('/prune');
|
||||||
|
reqOptions.timeout = isComposeOperation ? composeTimeoutMs : isPrune ? 300000 : 30000;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Honor AbortSignal from caller (e.g., AbortSignal.timeout(5000) for ping)
|
// Honor AbortSignal from caller (e.g., AbortSignal.timeout(5000) for ping)
|
||||||
@@ -884,7 +885,7 @@ export async function dockerFetch(
|
|||||||
body,
|
body,
|
||||||
headers,
|
headers,
|
||||||
streaming || false,
|
streaming || false,
|
||||||
(streaming || path === '/_hawser/compose') ? 300000 : 30000, // 5 min for streaming/compose, 30s for normal
|
(streaming || path === '/_hawser/compose' || path.endsWith('/prune')) ? 300000 : 30000, // 5 min for streaming/compose/prune, 30s for normal
|
||||||
isBinary,
|
isBinary,
|
||||||
fetchOptions.signal ?? undefined
|
fetchOptions.signal ?? undefined
|
||||||
);
|
);
|
||||||
@@ -960,7 +961,8 @@ export async function dockerFetch(
|
|||||||
if (!streaming && !finalOptions.signal) {
|
if (!streaming && !finalOptions.signal) {
|
||||||
const isComposeOperation = path === '/_hawser/compose';
|
const isComposeOperation = path === '/_hawser/compose';
|
||||||
const composeTimeoutMs = parseInt(process.env.COMPOSE_TIMEOUT || '900') * 1000;
|
const composeTimeoutMs = parseInt(process.env.COMPOSE_TIMEOUT || '900') * 1000;
|
||||||
finalOptions.signal = AbortSignal.timeout(isComposeOperation ? composeTimeoutMs : 30000);
|
const isPrune = path.endsWith('/prune');
|
||||||
|
finalOptions.signal = AbortSignal.timeout(isComposeOperation ? composeTimeoutMs : isPrune ? 300000 : 30000);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -1225,9 +1227,9 @@ export interface DeviceRequest {
|
|||||||
export interface CreateContainerOptions {
|
export interface CreateContainerOptions {
|
||||||
name: string;
|
name: string;
|
||||||
image: string;
|
image: string;
|
||||||
ports?: { [key: string]: { HostIp?: string; HostPort: string } };
|
ports?: { [key: string]: { HostIp?: string; HostPort: string } } | null;
|
||||||
volumes?: { [key: string]: {} };
|
volumes?: { [key: string]: {} };
|
||||||
volumeBinds?: string[];
|
volumeBinds?: string[] | null;
|
||||||
env?: string[];
|
env?: string[];
|
||||||
labels?: { [key: string]: string };
|
labels?: { [key: string]: string };
|
||||||
cmd?: string[];
|
cmd?: string[];
|
||||||
@@ -1247,7 +1249,7 @@ export interface CreateContainerOptions {
|
|||||||
networkGwPriority?: number;
|
networkGwPriority?: number;
|
||||||
user?: string | null;
|
user?: string | null;
|
||||||
privileged?: boolean;
|
privileged?: boolean;
|
||||||
healthcheck?: HealthcheckConfig;
|
healthcheck?: HealthcheckConfig | null;
|
||||||
memory?: number;
|
memory?: number;
|
||||||
memoryReservation?: number;
|
memoryReservation?: number;
|
||||||
memorySwap?: number;
|
memorySwap?: number;
|
||||||
@@ -1338,7 +1340,10 @@ export async function createContainer(options: CreateContainerOptions, envId?: n
|
|||||||
containerConfig.User = options.user ?? '';
|
containerConfig.User = options.user ?? '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.healthcheck) {
|
if (options.healthcheck === null) {
|
||||||
|
// Explicitly disable healthcheck (user cleared it)
|
||||||
|
containerConfig.Healthcheck = { Test: ["NONE"] };
|
||||||
|
} else if (options.healthcheck) {
|
||||||
containerConfig.Healthcheck = {};
|
containerConfig.Healthcheck = {};
|
||||||
if (options.healthcheck.test && options.healthcheck.test.length > 0) {
|
if (options.healthcheck.test && options.healthcheck.test.length > 0) {
|
||||||
containerConfig.Healthcheck.Test = options.healthcheck.test;
|
containerConfig.Healthcheck.Test = options.healthcheck.test;
|
||||||
@@ -1357,7 +1362,11 @@ export async function createContainer(options: CreateContainerOptions, envId?: n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.ports) {
|
if (options.ports === null) {
|
||||||
|
// Explicitly clear ports (user removed all mappings)
|
||||||
|
containerConfig.ExposedPorts = {};
|
||||||
|
containerConfig.HostConfig.PortBindings = {};
|
||||||
|
} else if (options.ports) {
|
||||||
containerConfig.ExposedPorts = {};
|
containerConfig.ExposedPorts = {};
|
||||||
containerConfig.HostConfig.PortBindings = {};
|
containerConfig.HostConfig.PortBindings = {};
|
||||||
|
|
||||||
@@ -1367,7 +1376,10 @@ export async function createContainer(options: CreateContainerOptions, envId?: n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.volumeBinds && options.volumeBinds.length > 0) {
|
if (options.volumeBinds === null) {
|
||||||
|
// Explicitly clear volume binds (user removed all)
|
||||||
|
containerConfig.HostConfig.Binds = [];
|
||||||
|
} else if (options.volumeBinds && options.volumeBinds.length > 0) {
|
||||||
containerConfig.HostConfig.Binds = options.volumeBinds;
|
containerConfig.HostConfig.Binds = options.volumeBinds;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2393,7 +2405,7 @@ export async function updateContainer(id: string, options: Partial<CreateContain
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 5. Start if needed
|
// 5. Start if needed
|
||||||
if (startAfterUpdate || wasRunning) {
|
if (startAfterUpdate) {
|
||||||
try {
|
try {
|
||||||
await newContainer.start();
|
await newContainer.start();
|
||||||
} catch (startError) {
|
} catch (startError) {
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
/**
|
||||||
|
* Request-scoped context using AsyncLocalStorage.
|
||||||
|
*
|
||||||
|
* The hook sets the authenticated user (from cookie or Bearer token)
|
||||||
|
* and wraps resolve() in requestContext.run(). Downstream code like
|
||||||
|
* authorize() reads the pre-resolved user from here instead of
|
||||||
|
* re-validating the session.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
||||||
|
import type { AuthenticatedUser } from './auth';
|
||||||
|
|
||||||
|
export interface RequestContext {
|
||||||
|
user: AuthenticatedUser | null;
|
||||||
|
authEnabled: boolean;
|
||||||
|
authMethod: 'cookie' | 'bearer' | 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
export const requestContext = new AsyncLocalStorage<RequestContext>();
|
||||||
|
|
||||||
|
export function getRequestContext(): RequestContext | undefined {
|
||||||
|
return requestContext.getStore();
|
||||||
|
}
|
||||||
@@ -752,9 +752,10 @@ async function loginToRegistries(dockerHost?: string, logPrefix = '[Stack]', api
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Extract registry host from URL
|
// Extract registry host from URL (parseRegistryUrl handles bare hostnames like 'ghcr.io')
|
||||||
const url = new URL(reg.url);
|
const { parseRegistryUrl } = await import('./docker.js');
|
||||||
const registryHost = url.host;
|
const { host } = parseRegistryUrl(reg.url);
|
||||||
|
const registryHost = host;
|
||||||
|
|
||||||
console.log(`${logPrefix} Logging into registry: ${registryHost}`);
|
console.log(`${logPrefix} Logging into registry: ${registryHost}`);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
/**
|
||||||
|
* API Token Cache — LRU with TTL
|
||||||
|
*
|
||||||
|
* In-memory cache for validated API tokens. Without this, every Bearer
|
||||||
|
* request would run Argon2id verification (~64MB RAM, ~100ms CPU per call).
|
||||||
|
*
|
||||||
|
* Cache key is SHA-256(fullToken) — safe to hold in memory (not reversible).
|
||||||
|
* TTL is 60s by default, capped at the token's expiry time if sooner.
|
||||||
|
*
|
||||||
|
* Uses a bounded LRU (max 1024 entries) to cap memory usage. On overflow
|
||||||
|
* the least-recently-used entry is evicted. Expired entries are also pruned
|
||||||
|
* every 5 minutes.
|
||||||
|
*
|
||||||
|
* Separated from api-tokens.ts to avoid circular dependencies
|
||||||
|
* (auth.ts ↔ api-tokens.ts).
|
||||||
|
*/
|
||||||
|
|
||||||
|
export interface TokenCacheEntry {
|
||||||
|
user: { id: number; [key: string]: any };
|
||||||
|
expiresAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const MAX_CACHE_SIZE = 1024;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Simple LRU cache backed by a Map.
|
||||||
|
* Map iteration order is insertion order, so we delete-and-re-set on every
|
||||||
|
* access to move the entry to the "newest" position. The oldest entry
|
||||||
|
* (Map.keys().next()) is evicted when the cache exceeds MAX_CACHE_SIZE.
|
||||||
|
*/
|
||||||
|
class LruTokenCache {
|
||||||
|
private map = new Map<string, TokenCacheEntry>();
|
||||||
|
|
||||||
|
get(key: string): TokenCacheEntry | undefined {
|
||||||
|
const entry = this.map.get(key);
|
||||||
|
if (!entry) return undefined;
|
||||||
|
// Move to end (most-recently-used)
|
||||||
|
this.map.delete(key);
|
||||||
|
this.map.set(key, entry);
|
||||||
|
return entry;
|
||||||
|
}
|
||||||
|
|
||||||
|
set(key: string, entry: TokenCacheEntry): void {
|
||||||
|
// If key already exists, delete first so re-insert moves it to end
|
||||||
|
if (this.map.has(key)) {
|
||||||
|
this.map.delete(key);
|
||||||
|
}
|
||||||
|
this.map.set(key, entry);
|
||||||
|
// Evict oldest if over capacity
|
||||||
|
if (this.map.size > MAX_CACHE_SIZE) {
|
||||||
|
const oldest = this.map.keys().next().value!;
|
||||||
|
this.map.delete(oldest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delete(key: string): void {
|
||||||
|
this.map.delete(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
clear(): void {
|
||||||
|
this.map.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
entries(): IterableIterator<[string, TokenCacheEntry]> {
|
||||||
|
return this.map.entries();
|
||||||
|
}
|
||||||
|
|
||||||
|
get size(): number {
|
||||||
|
return this.map.size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const tokenCache = new LruTokenCache();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invalidate all cached tokens for a specific user.
|
||||||
|
* Call when user permissions change, roles are updated, or user is deleted/deactivated.
|
||||||
|
*/
|
||||||
|
export function invalidateTokenCacheForUser(userId: number): void {
|
||||||
|
for (const [key, entry] of tokenCache.entries()) {
|
||||||
|
if (entry.user.id === userId) {
|
||||||
|
tokenCache.delete(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear the entire token cache.
|
||||||
|
* Called on revocation, role permission edits, and license state changes.
|
||||||
|
*/
|
||||||
|
export function clearTokenCache(): void {
|
||||||
|
tokenCache.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Periodic cleanup every 5 minutes
|
||||||
|
let cleanupInterval: ReturnType<typeof setInterval> | undefined;
|
||||||
|
|
||||||
|
export function ensureCleanupInterval(): void {
|
||||||
|
if (cleanupInterval) return;
|
||||||
|
cleanupInterval = setInterval(() => {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [key, entry] of tokenCache.entries()) {
|
||||||
|
if (entry.expiresAt <= now) {
|
||||||
|
tokenCache.delete(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 5 * 60 * 1000);
|
||||||
|
if (cleanupInterval.unref) cleanupInterval.unref();
|
||||||
|
}
|
||||||
@@ -349,7 +349,10 @@ function createSettingsStore() {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
// Manual refresh from database
|
// Manual refresh from database
|
||||||
refresh: loadSettings
|
refresh: () => {
|
||||||
|
initialized = false;
|
||||||
|
return loadSettings();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,164 @@
|
|||||||
|
import { json } from '@sveltejs/kit';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
import { generateApiToken, listUserTokens } from '$lib/server/api-tokens';
|
||||||
|
import { isAuthEnabled, verifyPassword } from '$lib/server/auth';
|
||||||
|
import { getUser } from '$lib/server/db';
|
||||||
|
import { audit } from '$lib/server/audit';
|
||||||
|
import { getRequestContext } from '$lib/server/request-context';
|
||||||
|
|
||||||
|
// Password confirmation rate limiting (per userId)
|
||||||
|
const pwFailCounts = new Map<number, { count: number; firstFail: number }>();
|
||||||
|
const pwCooldowns = new Map<number, number>();
|
||||||
|
const PW_FAIL_WINDOW = 60_000; // 1-minute sliding window
|
||||||
|
const PW_FAIL_MAX = 5; // max failures per window
|
||||||
|
const PW_COOLDOWN = 5 * 60 * 1000; // 5-minute cooldown
|
||||||
|
|
||||||
|
const MAX_TOKENS_PER_USER = 25;
|
||||||
|
|
||||||
|
// Periodic cleanup
|
||||||
|
setInterval(() => {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [id, until] of pwCooldowns) {
|
||||||
|
if (now > until) pwCooldowns.delete(id);
|
||||||
|
}
|
||||||
|
for (const [id, entry] of pwFailCounts) {
|
||||||
|
if (now - entry.firstFail > PW_FAIL_WINDOW) pwFailCounts.delete(id);
|
||||||
|
}
|
||||||
|
}, PW_COOLDOWN).unref?.();
|
||||||
|
|
||||||
|
function isPwRateLimited(userId: number): boolean {
|
||||||
|
const until = pwCooldowns.get(userId);
|
||||||
|
if (!until) return false;
|
||||||
|
if (Date.now() > until) {
|
||||||
|
pwCooldowns.delete(userId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function recordPwFailure(userId: number): void {
|
||||||
|
const now = Date.now();
|
||||||
|
const entry = pwFailCounts.get(userId);
|
||||||
|
if (!entry || now - entry.firstFail > PW_FAIL_WINDOW) {
|
||||||
|
pwFailCounts.set(userId, { count: 1, firstFail: now });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
entry.count++;
|
||||||
|
if (entry.count >= PW_FAIL_MAX) {
|
||||||
|
pwCooldowns.set(userId, now + PW_COOLDOWN);
|
||||||
|
pwFailCounts.delete(userId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/auth/tokens - List the current user's API tokens
|
||||||
|
*/
|
||||||
|
export const GET: RequestHandler = async ({ cookies }) => {
|
||||||
|
const authEnabled = await isAuthEnabled();
|
||||||
|
if (!authEnabled) {
|
||||||
|
return json({ error: 'Authentication is not enabled' }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (!auth.isAuthenticated || !auth.user) {
|
||||||
|
return json({ error: 'Authentication required' }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const tokens = await listUserTokens(auth.user.id);
|
||||||
|
return json(tokens);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* POST /api/auth/tokens - Create a new API token
|
||||||
|
*/
|
||||||
|
export const POST: RequestHandler = async (event) => {
|
||||||
|
const { cookies, request } = event;
|
||||||
|
|
||||||
|
const authEnabled = await isAuthEnabled();
|
||||||
|
if (!authEnabled) {
|
||||||
|
return json({ error: 'Authentication is not enabled' }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (!auth.isAuthenticated || !auth.user) {
|
||||||
|
return json({ error: 'Authentication required' }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Token creation requires a cookie session — a Bearer token cannot create new tokens
|
||||||
|
const reqCtx = getRequestContext();
|
||||||
|
if (reqCtx?.authMethod === 'bearer') {
|
||||||
|
return json({ error: 'Token creation requires a session login, not a Bearer token' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
|
let body: any;
|
||||||
|
try {
|
||||||
|
body = await request.json();
|
||||||
|
} catch {
|
||||||
|
return json({ error: 'Invalid request body' }, { status: 400 });
|
||||||
|
}
|
||||||
|
const { name, expiresAt, password } = body;
|
||||||
|
|
||||||
|
// Local users must confirm their password to create tokens
|
||||||
|
// SSO/OIDC and LDAP users skip this (they authenticated via their IdP)
|
||||||
|
if (auth.user.provider === 'local') {
|
||||||
|
if (isPwRateLimited(auth.user.id)) {
|
||||||
|
return json({ error: 'Too many failed password attempts. Try again later.' }, { status: 429 });
|
||||||
|
}
|
||||||
|
if (!password || typeof password !== 'string') {
|
||||||
|
return json({ error: 'Password is required to create an API token' }, { status: 400 });
|
||||||
|
}
|
||||||
|
const dbUser = await getUser(auth.user.id);
|
||||||
|
if (!dbUser) {
|
||||||
|
return json({ error: 'User not found' }, { status: 404 });
|
||||||
|
}
|
||||||
|
const valid = await verifyPassword(password, dbUser.passwordHash);
|
||||||
|
if (!valid) {
|
||||||
|
recordPwFailure(auth.user.id);
|
||||||
|
return json({ error: 'Invalid password' }, { status: 403 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// L2: Per-user token count limit
|
||||||
|
const existingTokens = await listUserTokens(auth.user.id);
|
||||||
|
if (existingTokens.length >= MAX_TOKENS_PER_USER) {
|
||||||
|
return json({ error: `Maximum of ${MAX_TOKENS_PER_USER} API tokens per user` }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate name
|
||||||
|
if (!name || typeof name !== 'string' || name.trim().length === 0) {
|
||||||
|
return json({ error: 'Token name is required' }, { status: 400 });
|
||||||
|
}
|
||||||
|
if (name.length > 255) {
|
||||||
|
return json({ error: 'Token name must be 255 characters or less' }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate expiration
|
||||||
|
if (expiresAt) {
|
||||||
|
const expiryDate = new Date(expiresAt);
|
||||||
|
if (isNaN(expiryDate.getTime())) {
|
||||||
|
return json({ error: 'Invalid expiration date' }, { status: 400 });
|
||||||
|
}
|
||||||
|
if (expiryDate <= new Date()) {
|
||||||
|
return json({ error: 'Expiration date must be in the future' }, { status: 400 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await generateApiToken(
|
||||||
|
auth.user.id,
|
||||||
|
name.trim(),
|
||||||
|
expiresAt || null
|
||||||
|
);
|
||||||
|
|
||||||
|
await audit(event, 'create', 'api_token', {
|
||||||
|
entityId: String(result.id),
|
||||||
|
entityName: name.trim(),
|
||||||
|
description: `API token "${name.trim()}" created`
|
||||||
|
});
|
||||||
|
|
||||||
|
return json({
|
||||||
|
id: result.id,
|
||||||
|
token: result.token,
|
||||||
|
tokenPrefix: result.tokenPrefix
|
||||||
|
}, { status: 201, headers: { 'Cache-Control': 'no-store' } });
|
||||||
|
};
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import { json } from '@sveltejs/kit';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
import { revokeApiToken } from '$lib/server/api-tokens';
|
||||||
|
import { isAuthEnabled } from '$lib/server/auth';
|
||||||
|
import { audit } from '$lib/server/audit';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DELETE /api/auth/tokens/[id] - Revoke an API token
|
||||||
|
*/
|
||||||
|
export const DELETE: RequestHandler = async (event) => {
|
||||||
|
const { cookies, params } = event;
|
||||||
|
|
||||||
|
const authEnabled = await isAuthEnabled();
|
||||||
|
if (!authEnabled) {
|
||||||
|
return json({ error: 'Authentication is not enabled' }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (!auth.isAuthenticated || !auth.user) {
|
||||||
|
return json({ error: 'Authentication required' }, { status: 401 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const tokenId = parseInt(params.id);
|
||||||
|
if (isNaN(tokenId)) {
|
||||||
|
return json({ error: 'Invalid token ID' }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const success = await revokeApiToken(tokenId, auth.user.id, auth.isAdmin);
|
||||||
|
if (!success) {
|
||||||
|
return json({ error: 'Token not found or access denied' }, { status: 404 });
|
||||||
|
}
|
||||||
|
|
||||||
|
await audit(event, 'delete', 'api_token', {
|
||||||
|
entityId: params.id,
|
||||||
|
description: `API token revoked`
|
||||||
|
});
|
||||||
|
|
||||||
|
return json({ success: true });
|
||||||
|
};
|
||||||
@@ -7,6 +7,7 @@ import {
|
|||||||
deleteAutoUpdateSchedule
|
deleteAutoUpdateSchedule
|
||||||
} from '$lib/server/db';
|
} from '$lib/server/db';
|
||||||
import { registerSchedule, unregisterSchedule } from '$lib/server/scheduler';
|
import { registerSchedule, unregisterSchedule } from '$lib/server/scheduler';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
|
||||||
export const GET: RequestHandler = async ({ params, url }) => {
|
export const GET: RequestHandler = async ({ params, url }) => {
|
||||||
try {
|
try {
|
||||||
@@ -38,7 +39,12 @@ export const GET: RequestHandler = async ({ params, url }) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const POST: RequestHandler = async ({ params, url, request }) => {
|
export const POST: RequestHandler = async ({ params, url, request, cookies }) => {
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (auth.authEnabled && !await auth.can('schedules', 'edit')) {
|
||||||
|
return json({ error: 'Permission denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const containerName = decodeURIComponent(params.containerName);
|
const containerName = decodeURIComponent(params.containerName);
|
||||||
const envIdParam = url.searchParams.get('env');
|
const envIdParam = url.searchParams.get('env');
|
||||||
@@ -101,7 +107,12 @@ export const POST: RequestHandler = async ({ params, url, request }) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const DELETE: RequestHandler = async ({ params, url }) => {
|
export const DELETE: RequestHandler = async ({ params, url, cookies }) => {
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (auth.authEnabled && !await auth.can('schedules', 'edit')) {
|
||||||
|
return json({ error: 'Permission denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const containerName = decodeURIComponent(params.containerName);
|
const containerName = decodeURIComponent(params.containerName);
|
||||||
const envIdParam = url.searchParams.get('env');
|
const envIdParam = url.searchParams.get('env');
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
removeContainer,
|
removeContainer,
|
||||||
getContainerLogs
|
getContainerLogs
|
||||||
} from '$lib/server/docker';
|
} from '$lib/server/docker';
|
||||||
import { deleteAutoUpdateSchedule, getAutoUpdateSetting, removePendingContainerUpdate } from '$lib/server/db';
|
import { deleteAutoUpdateSchedule, getAutoUpdateSetting, getSecretKeyNames, removePendingContainerUpdate } from '$lib/server/db';
|
||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { auditContainer } from '$lib/server/audit';
|
import { auditContainer } from '$lib/server/audit';
|
||||||
import { unregisterSchedule } from '$lib/server/scheduler';
|
import { unregisterSchedule } from '$lib/server/scheduler';
|
||||||
@@ -33,6 +33,24 @@ export const GET: RequestHandler = async ({ params, url, cookies }) => {
|
|||||||
try {
|
try {
|
||||||
|
|
||||||
const details = await inspectContainer(params.id, envIdNum);
|
const details = await inspectContainer(params.id, envIdNum);
|
||||||
|
|
||||||
|
// Mask secret env vars for containers belonging to a Compose stack
|
||||||
|
const stackName = details.Config?.Labels?.['com.docker.compose.project'];
|
||||||
|
if (stackName && Array.isArray(details.Config?.Env)) {
|
||||||
|
const secretKeys = await getSecretKeyNames(stackName, envIdNum);
|
||||||
|
if (secretKeys.size > 0) {
|
||||||
|
details.Config.Env = details.Config.Env.map((entry: string) => {
|
||||||
|
const eqIdx = entry.indexOf('=');
|
||||||
|
if (eqIdx === -1) return entry;
|
||||||
|
const key = entry.substring(0, eqIdx);
|
||||||
|
if (secretKeys.has(key)) {
|
||||||
|
return `${key}=***`;
|
||||||
|
}
|
||||||
|
return entry;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return json(details);
|
return json(details);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
if (error?.statusCode === 404) {
|
if (error?.statusCode === 404) {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
import { inspectContainer } from '$lib/server/docker';
|
import { inspectContainer } from '$lib/server/docker';
|
||||||
|
import { getSecretKeyNames } from '$lib/server/db';
|
||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { validateDockerIdParam } from '$lib/server/docker-validation';
|
import { validateDockerIdParam } from '$lib/server/docker-validation';
|
||||||
|
|
||||||
@@ -20,6 +21,24 @@ export const GET: RequestHandler = async ({ params, url, cookies }) => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const containerData = await inspectContainer(params.id, envIdNum);
|
const containerData = await inspectContainer(params.id, envIdNum);
|
||||||
|
|
||||||
|
// Mask secret env vars for containers belonging to a Compose stack
|
||||||
|
const stackName = containerData.Config?.Labels?.['com.docker.compose.project'];
|
||||||
|
if (stackName && Array.isArray(containerData.Config?.Env)) {
|
||||||
|
const secretKeys = await getSecretKeyNames(stackName, envIdNum);
|
||||||
|
if (secretKeys.size > 0) {
|
||||||
|
containerData.Config.Env = containerData.Config.Env.map((entry: string) => {
|
||||||
|
const eqIdx = entry.indexOf('=');
|
||||||
|
if (eqIdx === -1) return entry;
|
||||||
|
const key = entry.substring(0, eqIdx);
|
||||||
|
if (secretKeys.has(key)) {
|
||||||
|
return `${key}=***`;
|
||||||
|
}
|
||||||
|
return entry;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return json(containerData);
|
return json(containerData);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to inspect container:', error);
|
console.error('Failed to inspect container:', error);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import { pullImage, updateContainer, type CreateContainerOptions } from '$lib/server/docker';
|
import { inspectContainer, pullImage, updateContainer, type CreateContainerOptions } from '$lib/server/docker';
|
||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { auditContainer } from '$lib/server/audit';
|
import { auditContainer } from '$lib/server/audit';
|
||||||
import { removePendingContainerUpdate } from '$lib/server/db';
|
import { removePendingContainerUpdate } from '$lib/server/db';
|
||||||
@@ -25,6 +25,29 @@ export const POST: RequestHandler = async (event) => {
|
|||||||
const body = await request.json();
|
const body = await request.json();
|
||||||
const { startAfterUpdate, repullImage, ...options } = body;
|
const { startAfterUpdate, repullImage, ...options } = body;
|
||||||
|
|
||||||
|
// Resolve masked secret values (***) back to real values from the current container.
|
||||||
|
// The GET endpoint masks secrets in Config.Env, so the edit modal sends *** for unchanged secrets.
|
||||||
|
if (Array.isArray(options.env) && options.env.some((e: string) => e.endsWith('=***'))) {
|
||||||
|
const currentData = await inspectContainer(params.id, envIdNum);
|
||||||
|
const currentEnvMap = new Map<string, string>();
|
||||||
|
for (const entry of currentData.Config?.Env || []) {
|
||||||
|
const eqIdx = entry.indexOf('=');
|
||||||
|
if (eqIdx !== -1) {
|
||||||
|
currentEnvMap.set(entry.substring(0, eqIdx), entry.substring(eqIdx + 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
options.env = options.env.map((entry: string) => {
|
||||||
|
const eqIdx = entry.indexOf('=');
|
||||||
|
if (eqIdx === -1) return entry;
|
||||||
|
const key = entry.substring(0, eqIdx);
|
||||||
|
const value = entry.substring(eqIdx + 1);
|
||||||
|
if (value === '***' && currentEnvMap.has(key)) {
|
||||||
|
return `${key}=${currentEnvMap.get(key)}`;
|
||||||
|
}
|
||||||
|
return entry;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (repullImage) {
|
if (repullImage) {
|
||||||
console.log(`Pulling image...`);
|
console.log(`Pulling image...`);
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import type { RequestHandler } from './$types';
|
|||||||
import { getEnvironments, getEnvironmentByName, createEnvironment, assignUserRole, getRoleByName, getEnvironmentPublicIps, setEnvironmentPublicIp, getEnvUpdateCheckSettings, getEnvironmentTimezone, getImagePruneSettings, type Environment } from '$lib/server/db';
|
import { getEnvironments, getEnvironmentByName, createEnvironment, assignUserRole, getRoleByName, getEnvironmentPublicIps, setEnvironmentPublicIp, getEnvUpdateCheckSettings, getEnvironmentTimezone, getImagePruneSettings, type Environment } from '$lib/server/db';
|
||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { auditEnvironment } from '$lib/server/audit';
|
import { auditEnvironment } from '$lib/server/audit';
|
||||||
|
import { invalidateTokenCacheForUser } from '$lib/server/api-tokens';
|
||||||
import { refreshSubprocessEnvironments } from '$lib/server/subprocess-manager';
|
import { refreshSubprocessEnvironments } from '$lib/server/subprocess-manager';
|
||||||
import { serializeLabels, parseLabels, MAX_LABELS } from '$lib/utils/label-colors';
|
import { serializeLabels, parseLabels, MAX_LABELS } from '$lib/utils/label-colors';
|
||||||
import { cleanPem } from '$lib/utils/pem';
|
import { cleanPem } from '$lib/utils/pem';
|
||||||
@@ -130,6 +131,7 @@ export const POST: RequestHandler = async (event) => {
|
|||||||
const adminRole = await getRoleByName('Admin');
|
const adminRole = await getRoleByName('Admin');
|
||||||
if (adminRole) {
|
if (adminRole) {
|
||||||
await assignUserRole(user.id, adminRole.id, env.id);
|
await assignUserRole(user.id, adminRole.id, env.id);
|
||||||
|
invalidateTokenCacheForUser(user.id);
|
||||||
}
|
}
|
||||||
} catch (roleError) {
|
} catch (roleError) {
|
||||||
// Log but don't fail - environment was created successfully
|
// Log but don't fail - environment was created successfully
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import {
|
|||||||
getHostname
|
getHostname
|
||||||
} from '$lib/server/license';
|
} from '$lib/server/license';
|
||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
import { clearTokenCache } from '$lib/server/api-tokens';
|
||||||
|
|
||||||
// GET /api/license - Get current license status
|
// GET /api/license - Get current license status
|
||||||
// Any authenticated user can view license status (needed to determine if RBAC applies)
|
// Any authenticated user can view license status (needed to determine if RBAC applies)
|
||||||
@@ -59,6 +60,9 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Permission model changes between free/enterprise — clear cached tokens
|
||||||
|
clearTokenCache();
|
||||||
|
|
||||||
return json({
|
return json({
|
||||||
success: true,
|
success: true,
|
||||||
license: result.license
|
license: result.license
|
||||||
@@ -81,6 +85,8 @@ export const DELETE: RequestHandler = async ({ cookies }) => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await deactivateLicense();
|
await deactivateLicense();
|
||||||
|
// Permission model changes between free/enterprise — clear cached tokens
|
||||||
|
clearTokenCache();
|
||||||
return json({ success: true });
|
return json({ success: true });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error deactivating license:', error);
|
console.error('Error deactivating license:', error);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { json } from '@sveltejs/kit';
|
|||||||
import type { RequestHandler } from '@sveltejs/kit';
|
import type { RequestHandler } from '@sveltejs/kit';
|
||||||
import { getUser, updateUser as dbUpdateUser, deleteUserSessions, userHasAdminRole } from '$lib/server/db';
|
import { getUser, updateUser as dbUpdateUser, deleteUserSessions, userHasAdminRole } from '$lib/server/db';
|
||||||
import { validateSession, hashPassword, isAuthEnabled } from '$lib/server/auth';
|
import { validateSession, hashPassword, isAuthEnabled } from '$lib/server/auth';
|
||||||
|
import { invalidateTokenCacheForUser } from '$lib/server/api-tokens';
|
||||||
|
|
||||||
// GET /api/profile - Get current user's profile
|
// GET /api/profile - Get current user's profile
|
||||||
export const GET: RequestHandler = async ({ cookies }) => {
|
export const GET: RequestHandler = async ({ cookies }) => {
|
||||||
@@ -85,8 +86,9 @@ export const PUT: RequestHandler = async ({ request, cookies }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
updateData.passwordHash = await hashPassword(data.newPassword);
|
updateData.passwordHash = await hashPassword(data.newPassword);
|
||||||
// Invalidate other sessions on password change
|
// Invalidate other sessions and token cache on password change
|
||||||
deleteUserSessions(currentUser.id);
|
await deleteUserSessions(currentUser.id);
|
||||||
|
invalidateTokenCacheForUser(currentUser.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await dbUpdateUser(currentUser.id, updateData);
|
const user = await dbUpdateUser(currentUser.id, updateData);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { auditRole } from '$lib/server/audit';
|
import { auditRole } from '$lib/server/audit';
|
||||||
import { computeAuditDiff } from '$lib/utils/diff';
|
import { computeAuditDiff } from '$lib/utils/diff';
|
||||||
|
import { clearTokenCache } from '$lib/server/api-tokens';
|
||||||
|
|
||||||
// GET /api/roles/[id] - Get a specific role
|
// GET /api/roles/[id] - Get a specific role
|
||||||
export const GET: RequestHandler = async ({ params, cookies }) => {
|
export const GET: RequestHandler = async ({ params, cookies }) => {
|
||||||
@@ -75,6 +76,9 @@ export const PUT: RequestHandler = async (event) => {
|
|||||||
return json({ error: 'Failed to update role' }, { status: 500 });
|
return json({ error: 'Failed to update role' }, { status: 500 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear token cache — any cached user with this role has stale permissions
|
||||||
|
clearTokenCache();
|
||||||
|
|
||||||
// Compute diff for audit
|
// Compute diff for audit
|
||||||
const diff = computeAuditDiff(existingRole, role);
|
const diff = computeAuditDiff(existingRole, role);
|
||||||
|
|
||||||
@@ -128,6 +132,9 @@ export const DELETE: RequestHandler = async (event) => {
|
|||||||
return json({ error: 'Failed to delete role' }, { status: 500 });
|
return json({ error: 'Failed to delete role' }, { status: 500 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear token cache — users with this role may have stale cached permissions
|
||||||
|
clearTokenCache();
|
||||||
|
|
||||||
// Audit log
|
// Audit log
|
||||||
await auditRole(event, 'delete', id, role.name);
|
await auditRole(event, 'delete', id, role.name);
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,14 @@ import {
|
|||||||
deleteImagePruneSettings
|
deleteImagePruneSettings
|
||||||
} from '$lib/server/db';
|
} from '$lib/server/db';
|
||||||
import { unregisterSchedule } from '$lib/server/scheduler';
|
import { unregisterSchedule } from '$lib/server/scheduler';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
|
||||||
|
export const DELETE: RequestHandler = async ({ params, cookies }) => {
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (auth.authEnabled && !await auth.can('schedules', 'edit')) {
|
||||||
|
return json({ error: 'Permission denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
export const DELETE: RequestHandler = async ({ params }) => {
|
|
||||||
try {
|
try {
|
||||||
const { type, id } = params;
|
const { type, id } = params;
|
||||||
const scheduleId = parseInt(id, 10);
|
const scheduleId = parseInt(id, 10);
|
||||||
|
|||||||
@@ -11,8 +11,14 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
import { triggerContainerUpdate, triggerGitStackSync, triggerSystemJob, triggerEnvUpdateCheck, triggerImagePrune } from '$lib/server/scheduler';
|
import { triggerContainerUpdate, triggerGitStackSync, triggerSystemJob, triggerEnvUpdateCheck, triggerImagePrune } from '$lib/server/scheduler';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
|
||||||
|
export const POST: RequestHandler = async ({ params, cookies }) => {
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (auth.authEnabled && !await auth.can('schedules', 'run')) {
|
||||||
|
return json({ error: 'Permission denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
export const POST: RequestHandler = async ({ params }) => {
|
|
||||||
try {
|
try {
|
||||||
const { type, id } = params;
|
const { type, id } = params;
|
||||||
const scheduleId = parseInt(id, 10);
|
const scheduleId = parseInt(id, 10);
|
||||||
|
|||||||
@@ -7,8 +7,14 @@ import { json } from '@sveltejs/kit';
|
|||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
import { getAutoUpdateSettingById, updateAutoUpdateSettingById, getGitStack, updateGitStack, getEnvUpdateCheckSettings, setEnvUpdateCheckSettings, getImagePruneSettings, setImagePruneSettings } from '$lib/server/db';
|
import { getAutoUpdateSettingById, updateAutoUpdateSettingById, getGitStack, updateGitStack, getEnvUpdateCheckSettings, setEnvUpdateCheckSettings, getImagePruneSettings, setImagePruneSettings } from '$lib/server/db';
|
||||||
import { registerSchedule, unregisterSchedule } from '$lib/server/scheduler';
|
import { registerSchedule, unregisterSchedule } from '$lib/server/scheduler';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
|
||||||
|
export const POST: RequestHandler = async ({ params, cookies }) => {
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (auth.authEnabled && !await auth.can('schedules', 'edit')) {
|
||||||
|
return json({ error: 'Permission denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
export const POST: RequestHandler = async ({ params }) => {
|
|
||||||
try {
|
try {
|
||||||
const { type, id } = params;
|
const { type, id } = params;
|
||||||
const scheduleId = parseInt(id, 10);
|
const scheduleId = parseInt(id, 10);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
import { getScheduleExecution, deleteScheduleExecution } from '$lib/server/db';
|
import { getScheduleExecution, deleteScheduleExecution } from '$lib/server/db';
|
||||||
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
|
||||||
export const GET: RequestHandler = async ({ params }) => {
|
export const GET: RequestHandler = async ({ params }) => {
|
||||||
try {
|
try {
|
||||||
@@ -28,7 +29,12 @@ export const GET: RequestHandler = async ({ params }) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const DELETE: RequestHandler = async ({ params }) => {
|
export const DELETE: RequestHandler = async ({ params, cookies }) => {
|
||||||
|
const auth = await authorize(cookies);
|
||||||
|
if (auth.authEnabled && !await auth.can('schedules', 'edit')) {
|
||||||
|
return json({ error: 'Permission denied' }, { status: 403 });
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const id = parseInt(params.id, 10);
|
const id = parseInt(params.id, 10);
|
||||||
if (isNaN(id)) {
|
if (isNaN(id)) {
|
||||||
|
|||||||
@@ -144,10 +144,13 @@ export const POST: RequestHandler = async (event) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ALWAYS save compose file first - deployStack expects it to exist
|
// ALWAYS save compose file first - deployStack expects it to exist
|
||||||
await saveStackComposeFile(name, compose, true, envIdNum, {
|
const saveResult = await saveStackComposeFile(name, compose, true, envIdNum, {
|
||||||
composePath: composePath || undefined,
|
composePath: composePath || undefined,
|
||||||
envPath: envPath || undefined
|
envPath: envPath || undefined
|
||||||
});
|
});
|
||||||
|
if (!saveResult.success) {
|
||||||
|
return json({ error: saveResult.error }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
// Save environment variables BEFORE deploying so they're available during start
|
// Save environment variables BEFORE deploying so they're available during start
|
||||||
if (rawEnvContent || (envVars && Array.isArray(envVars) && envVars.length > 0)) {
|
if (rawEnvContent || (envVars && Array.isArray(envVars) && envVars.length > 0)) {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
} from '$lib/server/db';
|
} from '$lib/server/db';
|
||||||
import { hashPassword, createUserSession } from '$lib/server/auth';
|
import { hashPassword, createUserSession } from '$lib/server/auth';
|
||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
|
import { invalidateTokenCacheForUser } from '$lib/server/api-tokens';
|
||||||
import { auditUser } from '$lib/server/audit';
|
import { auditUser } from '$lib/server/audit';
|
||||||
|
|
||||||
// GET /api/users - List all users
|
// GET /api/users - List all users
|
||||||
@@ -108,6 +109,7 @@ export const POST: RequestHandler = async (event) => {
|
|||||||
const adminRole = await getRoleByName('Admin');
|
const adminRole = await getRoleByName('Admin');
|
||||||
if (adminRole) {
|
if (adminRole) {
|
||||||
await assignUserRole(user.id, adminRole.id, null);
|
await assignUserRole(user.id, adminRole.id, null);
|
||||||
|
invalidateTokenCacheForUser(user.id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { hashPassword } from '$lib/server/auth';
|
|||||||
import { authorize } from '$lib/server/authorize';
|
import { authorize } from '$lib/server/authorize';
|
||||||
import { auditUser } from '$lib/server/audit';
|
import { auditUser } from '$lib/server/audit';
|
||||||
import { computeAuditDiff } from '$lib/utils/diff';
|
import { computeAuditDiff } from '$lib/utils/diff';
|
||||||
|
import { invalidateTokenCacheForUser } from '$lib/server/api-tokens';
|
||||||
|
|
||||||
// GET /api/users/[id] - Get a specific user
|
// GET /api/users/[id] - Get a specific user
|
||||||
// Free for all - local users are needed for basic auth
|
// Free for all - local users are needed for basic auth
|
||||||
@@ -125,6 +126,7 @@ export const PUT: RequestHandler = async (event) => {
|
|||||||
if (isDeactivating) {
|
if (isDeactivating) {
|
||||||
updateData.isActive = false;
|
updateData.isActive = false;
|
||||||
await deleteUserSessions(userId);
|
await deleteUserSessions(userId);
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable authentication
|
// Disable authentication
|
||||||
@@ -142,6 +144,7 @@ export const PUT: RequestHandler = async (event) => {
|
|||||||
if (adminRole) {
|
if (adminRole) {
|
||||||
await removeUserRole(userId, adminRole.id, null);
|
await removeUserRole(userId, adminRole.id, null);
|
||||||
}
|
}
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
return json({
|
return json({
|
||||||
@@ -170,9 +173,10 @@ export const PUT: RequestHandler = async (event) => {
|
|||||||
}
|
}
|
||||||
if (data.isActive !== undefined) {
|
if (data.isActive !== undefined) {
|
||||||
updateData.isActive = data.isActive;
|
updateData.isActive = data.isActive;
|
||||||
// If deactivating, invalidate all sessions
|
// If deactivating, invalidate all sessions and token cache
|
||||||
if (!data.isActive) {
|
if (!data.isActive) {
|
||||||
await deleteUserSessions(userId);
|
await deleteUserSessions(userId);
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -183,8 +187,9 @@ export const PUT: RequestHandler = async (event) => {
|
|||||||
return json({ error: 'Password must be at least 8 characters' }, { status: 400 });
|
return json({ error: 'Password must be at least 8 characters' }, { status: 400 });
|
||||||
}
|
}
|
||||||
updateData.passwordHash = await hashPassword(data.password);
|
updateData.passwordHash = await hashPassword(data.password);
|
||||||
// Invalidate all sessions on password change (except current)
|
// Invalidate all sessions and token cache on password change
|
||||||
await deleteUserSessions(userId);
|
await deleteUserSessions(userId);
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await dbUpdateUser(userId, updateData);
|
const user = await dbUpdateUser(userId, updateData);
|
||||||
@@ -198,8 +203,10 @@ export const PUT: RequestHandler = async (event) => {
|
|||||||
if (adminRole) {
|
if (adminRole) {
|
||||||
if (shouldPromote) {
|
if (shouldPromote) {
|
||||||
await assignUserRole(userId, adminRole.id, null);
|
await assignUserRole(userId, adminRole.id, null);
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
} else if (shouldDemote) {
|
} else if (shouldDemote) {
|
||||||
await removeUserRole(userId, adminRole.id, null);
|
await removeUserRole(userId, adminRole.id, null);
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -284,6 +291,7 @@ export const DELETE: RequestHandler = async (event) => {
|
|||||||
|
|
||||||
// User confirmed - proceed with deletion and disable auth
|
// User confirmed - proceed with deletion and disable auth
|
||||||
await deleteUserSessions(id);
|
await deleteUserSessions(id);
|
||||||
|
invalidateTokenCacheForUser(id);
|
||||||
const deleted = await dbDeleteUser(id);
|
const deleted = await dbDeleteUser(id);
|
||||||
if (!deleted) {
|
if (!deleted) {
|
||||||
return json({ error: 'Failed to delete user' }, { status: 500 });
|
return json({ error: 'Failed to delete user' }, { status: 500 });
|
||||||
@@ -299,8 +307,9 @@ export const DELETE: RequestHandler = async (event) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete all sessions first
|
// Delete all sessions and invalidate token cache
|
||||||
await deleteUserSessions(id);
|
await deleteUserSessions(id);
|
||||||
|
invalidateTokenCacheForUser(id);
|
||||||
|
|
||||||
const deleted = await dbDeleteUser(id);
|
const deleted = await dbDeleteUser(id);
|
||||||
if (!deleted) {
|
if (!deleted) {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
getRole
|
getRole
|
||||||
} from '$lib/server/db';
|
} from '$lib/server/db';
|
||||||
import { auditUser } from '$lib/server/audit';
|
import { auditUser } from '$lib/server/audit';
|
||||||
|
import { invalidateTokenCacheForUser } from '$lib/server/api-tokens';
|
||||||
|
|
||||||
// GET /api/users/[id]/roles - Get roles assigned to a user
|
// GET /api/users/[id]/roles - Get roles assigned to a user
|
||||||
export const GET: RequestHandler = async ({ params, cookies }) => {
|
export const GET: RequestHandler = async ({ params, cookies }) => {
|
||||||
@@ -69,6 +70,7 @@ export const POST: RequestHandler = async (event) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const userRole = await assignUserRole(userId, roleId, environmentId);
|
const userRole = await assignUserRole(userId, roleId, environmentId);
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
|
|
||||||
// Audit log - role assigned
|
// Audit log - role assigned
|
||||||
const role = await getRole(roleId);
|
const role = await getRole(roleId);
|
||||||
@@ -117,6 +119,7 @@ export const DELETE: RequestHandler = async (event) => {
|
|||||||
if (!deleted) {
|
if (!deleted) {
|
||||||
return json({ error: 'Role assignment not found' }, { status: 404 });
|
return json({ error: 'Role assignment not found' }, { status: 404 });
|
||||||
}
|
}
|
||||||
|
invalidateTokenCacheForUser(userId);
|
||||||
|
|
||||||
// Audit log - role removed
|
// Audit log - role removed
|
||||||
if (user) {
|
if (user) {
|
||||||
|
|||||||
@@ -864,6 +864,8 @@
|
|||||||
retries: healthcheckRetries,
|
retries: healthcheckRetries,
|
||||||
startPeriod: healthcheckStartPeriod * 1e9
|
startPeriod: healthcheckStartPeriod * 1e9
|
||||||
};
|
};
|
||||||
|
} else if (!healthcheckEnabled) {
|
||||||
|
healthcheck = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const devices = deviceMappings
|
const devices = deviceMappings
|
||||||
@@ -902,8 +904,8 @@
|
|||||||
const payload = {
|
const payload = {
|
||||||
name: name.trim(),
|
name: name.trim(),
|
||||||
image: image.trim(),
|
image: image.trim(),
|
||||||
ports: Object.keys(ports).length > 0 ? ports : undefined,
|
ports: Object.keys(ports).length > 0 ? ports : null,
|
||||||
volumeBinds: volumeBinds.length > 0 ? volumeBinds : undefined,
|
volumeBinds: volumeBinds.length > 0 ? volumeBinds : null,
|
||||||
env: env.length > 0 ? env : undefined,
|
env: env.length > 0 ? env : undefined,
|
||||||
labels: Object.keys(labelsObj).length > 0 ? labelsObj : undefined,
|
labels: Object.keys(labelsObj).length > 0 ? labelsObj : undefined,
|
||||||
cmd,
|
cmd,
|
||||||
@@ -1081,8 +1083,8 @@
|
|||||||
bind:restartPolicy
|
bind:restartPolicy
|
||||||
bind:restartMaxRetries
|
bind:restartMaxRetries
|
||||||
bind:networkMode
|
bind:networkMode
|
||||||
startAfterCreate={startAfterUpdate}
|
bind:startAfterCreate={startAfterUpdate}
|
||||||
{repullImage}
|
bind:repullImage
|
||||||
bind:portMappings
|
bind:portMappings
|
||||||
bind:volumeMappings
|
bind:volumeMappings
|
||||||
bind:envVars
|
bind:envVars
|
||||||
|
|||||||
@@ -241,8 +241,8 @@
|
|||||||
{vuln.severity}
|
{vuln.severity}
|
||||||
</Badge>
|
</Badge>
|
||||||
</td>
|
</td>
|
||||||
<td class="py-1 px-2">
|
<td class="py-1 px-2 max-w-[300px]">
|
||||||
<code class="text-xs">{vuln.package}</code>
|
<code class="text-xs block truncate" title={vuln.package}>{vuln.package}</code>
|
||||||
</td>
|
</td>
|
||||||
<td class="py-1 px-2">
|
<td class="py-1 px-2">
|
||||||
<code class="text-xs text-muted-foreground">{vuln.version}</code>
|
<code class="text-xs text-muted-foreground">{vuln.version}</code>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
import { Loader2, LogIn, Shield, AlertCircle, Network, User, KeyRound, TriangleAlert } from 'lucide-svelte';
|
import { Loader2, LogIn, Shield, AlertCircle, Network, User, KeyRound, TriangleAlert } from 'lucide-svelte';
|
||||||
import { authStore } from '$lib/stores/auth';
|
import { authStore } from '$lib/stores/auth';
|
||||||
import { environments } from '$lib/stores/environment';
|
import { environments } from '$lib/stores/environment';
|
||||||
|
import { appSettings } from '$lib/stores/settings';
|
||||||
import * as Alert from '$lib/components/ui/alert';
|
import * as Alert from '$lib/components/ui/alert';
|
||||||
import { themeStore, applyTheme } from '$lib/stores/theme';
|
import { themeStore, applyTheme } from '$lib/stores/theme';
|
||||||
|
|
||||||
@@ -114,7 +115,8 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Success - refresh environments (they were cleared during pre-login fetch) then redirect
|
// Success - refresh settings and environments (they were fetched before auth) then redirect
|
||||||
|
await appSettings.refresh();
|
||||||
await environments.refresh();
|
await environments.refresh();
|
||||||
goto(redirectUrl);
|
goto(redirectUrl);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
Shield,
|
Shield,
|
||||||
ShieldCheck,
|
ShieldCheck,
|
||||||
Key,
|
Key,
|
||||||
|
KeyRound,
|
||||||
RefreshCw,
|
RefreshCw,
|
||||||
Check,
|
Check,
|
||||||
Smartphone,
|
Smartphone,
|
||||||
@@ -22,7 +23,8 @@
|
|||||||
Camera,
|
Camera,
|
||||||
Trash2,
|
Trash2,
|
||||||
TriangleAlert,
|
TriangleAlert,
|
||||||
Palette
|
Palette,
|
||||||
|
Plus
|
||||||
} from 'lucide-svelte';
|
} from 'lucide-svelte';
|
||||||
import { authStore } from '$lib/stores/auth';
|
import { authStore } from '$lib/stores/auth';
|
||||||
import { formatDateTime } from '$lib/stores/settings';
|
import { formatDateTime } from '$lib/stores/settings';
|
||||||
@@ -32,6 +34,9 @@
|
|||||||
import ChangePasswordModal from './ChangePasswordModal.svelte';
|
import ChangePasswordModal from './ChangePasswordModal.svelte';
|
||||||
import MfaSetupModal from './MfaSetupModal.svelte';
|
import MfaSetupModal from './MfaSetupModal.svelte';
|
||||||
import DisableMfaModal from './DisableMfaModal.svelte';
|
import DisableMfaModal from './DisableMfaModal.svelte';
|
||||||
|
import ApiTokenModal from './ApiTokenModal.svelte';
|
||||||
|
import ConfirmPopover from '$lib/components/ConfirmPopover.svelte';
|
||||||
|
import * as Table from '$lib/components/ui/table';
|
||||||
import ThemeSelector from '$lib/components/ThemeSelector.svelte';
|
import ThemeSelector from '$lib/components/ThemeSelector.svelte';
|
||||||
import { themeStore } from '$lib/stores/theme';
|
import { themeStore } from '$lib/stores/theme';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -73,6 +78,49 @@
|
|||||||
let mfaError = $state('');
|
let mfaError = $state('');
|
||||||
let showDisableMfaModal = $state(false);
|
let showDisableMfaModal = $state(false);
|
||||||
|
|
||||||
|
// API tokens state
|
||||||
|
interface ApiToken {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
tokenPrefix: string;
|
||||||
|
lastUsed: string | null;
|
||||||
|
expiresAt: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
let apiTokens = $state<ApiToken[]>([]);
|
||||||
|
let showApiTokenModal = $state(false);
|
||||||
|
let tokensLoading = $state(false);
|
||||||
|
|
||||||
|
async function fetchApiTokens() {
|
||||||
|
tokensLoading = true;
|
||||||
|
try {
|
||||||
|
const response = await fetch('/api/auth/tokens');
|
||||||
|
if (response.ok) {
|
||||||
|
apiTokens = await response.json();
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Silently fail - tokens section will show empty
|
||||||
|
} finally {
|
||||||
|
tokensLoading = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function revokeToken(tokenId: number) {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/auth/tokens/${tokenId}`, { method: 'DELETE' });
|
||||||
|
if (response.ok) {
|
||||||
|
apiTokens = apiTokens.filter(t => t.id !== tokenId);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isTokenExpired(expiresAt: string | null): boolean {
|
||||||
|
if (!expiresAt) return false;
|
||||||
|
return new Date(expiresAt) < new Date();
|
||||||
|
}
|
||||||
|
|
||||||
// Avatar state
|
// Avatar state
|
||||||
let showAvatarCropper = $state(false);
|
let showAvatarCropper = $state(false);
|
||||||
let avatarSaving = $state(false);
|
let avatarSaving = $state(false);
|
||||||
@@ -291,6 +339,7 @@
|
|||||||
if (!profileFetched) {
|
if (!profileFetched) {
|
||||||
profileFetched = true;
|
profileFetched = true;
|
||||||
fetchProfile();
|
fetchProfile();
|
||||||
|
fetchApiTokens();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -300,7 +349,7 @@
|
|||||||
<title>Profile - Dockhand</title>
|
<title>Profile - Dockhand</title>
|
||||||
</svelte:head>
|
</svelte:head>
|
||||||
|
|
||||||
<div class="container mx-auto p-6 max-w-4xl">
|
<div class="container mx-auto p-6">
|
||||||
<div class="flex items-center gap-3 mb-6">
|
<div class="flex items-center gap-3 mb-6">
|
||||||
<PageHeader icon={User} title="Profile" showConnection={false}>
|
<PageHeader icon={User} title="Profile" showConnection={false}>
|
||||||
<p class="text-muted-foreground text-sm">Manage your account settings</p>
|
<p class="text-muted-foreground text-sm">Manage your account settings</p>
|
||||||
@@ -330,6 +379,9 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!-- Row 1: Account info + Profile details -->
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||||
|
|
||||||
<!-- Account info card -->
|
<!-- Account info card -->
|
||||||
<Card.Root>
|
<Card.Root>
|
||||||
<Card.Header>
|
<Card.Header>
|
||||||
@@ -431,14 +483,14 @@
|
|||||||
</Card.Root>
|
</Card.Root>
|
||||||
|
|
||||||
<!-- Profile details card -->
|
<!-- Profile details card -->
|
||||||
<Card.Root>
|
<Card.Root class="flex flex-col">
|
||||||
<Card.Header>
|
<Card.Header>
|
||||||
<Card.Title class="flex items-center gap-2">
|
<Card.Title class="flex items-center gap-2">
|
||||||
<Mail class="w-5 h-5" />
|
<Mail class="w-5 h-5" />
|
||||||
Profile details
|
Profile details
|
||||||
</Card.Title>
|
</Card.Title>
|
||||||
</Card.Header>
|
</Card.Header>
|
||||||
<Card.Content class="space-y-4">
|
<Card.Content class="flex-1 flex flex-col space-y-4">
|
||||||
{#if formError}
|
{#if formError}
|
||||||
<Alert.Root variant="destructive">
|
<Alert.Root variant="destructive">
|
||||||
<TriangleAlert class="h-4 w-4" />
|
<TriangleAlert class="h-4 w-4" />
|
||||||
@@ -446,7 +498,7 @@
|
|||||||
</Alert.Root>
|
</Alert.Root>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="grid grid-cols-2 gap-4">
|
<div class="space-y-4 flex-1">
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<Label>Display name</Label>
|
<Label>Display name</Label>
|
||||||
<Input
|
<Input
|
||||||
@@ -477,8 +529,13 @@
|
|||||||
</Card.Content>
|
</Card.Content>
|
||||||
</Card.Root>
|
</Card.Root>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Row 2: Security + API tokens -->
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||||
|
|
||||||
<!-- Security card -->
|
<!-- Security card -->
|
||||||
<Card.Root>
|
<Card.Root class="flex flex-col">
|
||||||
<Card.Header>
|
<Card.Header>
|
||||||
<Card.Title class="flex items-center gap-2">
|
<Card.Title class="flex items-center gap-2">
|
||||||
<Shield class="w-5 h-5" />
|
<Shield class="w-5 h-5" />
|
||||||
@@ -582,6 +639,81 @@
|
|||||||
</Card.Content>
|
</Card.Content>
|
||||||
</Card.Root>
|
</Card.Root>
|
||||||
|
|
||||||
|
<!-- API tokens card -->
|
||||||
|
<Card.Root>
|
||||||
|
<Card.Header>
|
||||||
|
<Card.Title class="flex items-center gap-2 justify-between">
|
||||||
|
<span class="flex items-center gap-2">
|
||||||
|
<KeyRound class="w-5 h-5" />
|
||||||
|
API tokens
|
||||||
|
</span>
|
||||||
|
<Button variant="outline" size="sm" onclick={() => showApiTokenModal = true}>
|
||||||
|
<Plus class="w-4 h-4 mr-1" />
|
||||||
|
Generate token
|
||||||
|
</Button>
|
||||||
|
</Card.Title>
|
||||||
|
<Card.Description>Create tokens for CI/CD pipelines and scripts</Card.Description>
|
||||||
|
</Card.Header>
|
||||||
|
<Card.Content>
|
||||||
|
{#if tokensLoading}
|
||||||
|
<p class="text-sm text-muted-foreground">Loading tokens...</p>
|
||||||
|
{:else if apiTokens.length === 0}
|
||||||
|
<p class="text-sm text-muted-foreground">No API tokens created yet.</p>
|
||||||
|
{:else}
|
||||||
|
<Table.Root>
|
||||||
|
<Table.Header>
|
||||||
|
<Table.Row>
|
||||||
|
<Table.Head>Name</Table.Head>
|
||||||
|
<Table.Head>Prefix</Table.Head>
|
||||||
|
<Table.Head>Last used</Table.Head>
|
||||||
|
<Table.Head>Expires</Table.Head>
|
||||||
|
<Table.Head class="w-[80px]"></Table.Head>
|
||||||
|
</Table.Row>
|
||||||
|
</Table.Header>
|
||||||
|
<Table.Body>
|
||||||
|
{#each apiTokens as token (token.id)}
|
||||||
|
<Table.Row class={isTokenExpired(token.expiresAt) ? 'opacity-50' : ''}>
|
||||||
|
<Table.Cell class="font-medium">{token.name}</Table.Cell>
|
||||||
|
<Table.Cell>
|
||||||
|
<code class="text-xs bg-muted px-1.5 py-0.5 rounded">dh_{token.tokenPrefix}...</code>
|
||||||
|
</Table.Cell>
|
||||||
|
<Table.Cell class="text-sm text-muted-foreground">
|
||||||
|
{token.lastUsed ? formatDateTime(token.lastUsed) : 'Never'}
|
||||||
|
</Table.Cell>
|
||||||
|
<Table.Cell class="text-sm">
|
||||||
|
{#if isTokenExpired(token.expiresAt)}
|
||||||
|
<Badge variant="destructive">Expired</Badge>
|
||||||
|
{:else if token.expiresAt}
|
||||||
|
{formatDateTime(token.expiresAt)}
|
||||||
|
{:else}
|
||||||
|
<span class="text-muted-foreground">Never</span>
|
||||||
|
{/if}
|
||||||
|
</Table.Cell>
|
||||||
|
<Table.Cell>
|
||||||
|
<ConfirmPopover
|
||||||
|
title="Revoke token"
|
||||||
|
description="This token will stop working immediately."
|
||||||
|
confirmText="Revoke"
|
||||||
|
onConfirm={() => revokeToken(token.id)}
|
||||||
|
>
|
||||||
|
<Button variant="ghost" size="sm" class="text-destructive hover:text-destructive">
|
||||||
|
<Trash2 class="w-4 h-4" />
|
||||||
|
</Button>
|
||||||
|
</ConfirmPopover>
|
||||||
|
</Table.Cell>
|
||||||
|
</Table.Row>
|
||||||
|
{/each}
|
||||||
|
</Table.Body>
|
||||||
|
</Table.Root>
|
||||||
|
{/if}
|
||||||
|
</Card.Content>
|
||||||
|
</Card.Root>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Row 3: Appearance (left-aligned with Security) -->
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||||
|
|
||||||
<!-- Appearance card -->
|
<!-- Appearance card -->
|
||||||
<Card.Root>
|
<Card.Root>
|
||||||
<Card.Header>
|
<Card.Header>
|
||||||
@@ -595,6 +727,8 @@
|
|||||||
<ThemeSelector userId={profile.id} />
|
<ThemeSelector userId={profile.id} />
|
||||||
</Card.Content>
|
</Card.Content>
|
||||||
</Card.Root>
|
</Card.Root>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
@@ -625,6 +759,13 @@
|
|||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!-- API Token Modal -->
|
||||||
|
<ApiTokenModal
|
||||||
|
bind:open={showApiTokenModal}
|
||||||
|
onCreated={fetchApiTokens}
|
||||||
|
provider={profile?.provider ?? 'local'}
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Avatar Cropper Modal -->
|
<!-- Avatar Cropper Modal -->
|
||||||
<AvatarCropper
|
<AvatarCropper
|
||||||
show={showAvatarCropper}
|
show={showAvatarCropper}
|
||||||
|
|||||||
@@ -0,0 +1,237 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import * as Dialog from '$lib/components/ui/dialog';
|
||||||
|
import { Button } from '$lib/components/ui/button';
|
||||||
|
import { Input } from '$lib/components/ui/input';
|
||||||
|
import { Label } from '$lib/components/ui/label';
|
||||||
|
import * as Select from '$lib/components/ui/select';
|
||||||
|
import * as Alert from '$lib/components/ui/alert';
|
||||||
|
import { KeyRound, Copy, Check, TriangleAlert } from 'lucide-svelte';
|
||||||
|
|
||||||
|
let {
|
||||||
|
open = $bindable(false),
|
||||||
|
onCreated,
|
||||||
|
provider = 'local'
|
||||||
|
}: {
|
||||||
|
open: boolean;
|
||||||
|
onCreated: () => void;
|
||||||
|
provider?: string;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
let name = $state('');
|
||||||
|
let password = $state('');
|
||||||
|
let expirationOption = $state('none');
|
||||||
|
let customDate = $state('');
|
||||||
|
let creating = $state(false);
|
||||||
|
let error = $state('');
|
||||||
|
|
||||||
|
const isLocalUser = $derived(provider === 'local');
|
||||||
|
|
||||||
|
// After creation
|
||||||
|
let createdToken = $state('');
|
||||||
|
let copied = $state(false);
|
||||||
|
|
||||||
|
function reset() {
|
||||||
|
name = '';
|
||||||
|
password = '';
|
||||||
|
expirationOption = 'none';
|
||||||
|
customDate = '';
|
||||||
|
creating = false;
|
||||||
|
error = '';
|
||||||
|
createdToken = '';
|
||||||
|
copied = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getExpiresAt(): string | null {
|
||||||
|
const now = new Date();
|
||||||
|
switch (expirationOption) {
|
||||||
|
case '30d':
|
||||||
|
return new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000).toISOString();
|
||||||
|
case '90d':
|
||||||
|
return new Date(now.getTime() + 90 * 24 * 60 * 60 * 1000).toISOString();
|
||||||
|
case '1y':
|
||||||
|
return new Date(now.getTime() + 365 * 24 * 60 * 60 * 1000).toISOString();
|
||||||
|
case 'custom':
|
||||||
|
return customDate ? new Date(customDate + 'T23:59:59').toISOString() : null;
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createToken() {
|
||||||
|
if (!name.trim()) {
|
||||||
|
error = 'Token name is required';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (isLocalUser && !password) {
|
||||||
|
error = 'Password is required';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
creating = true;
|
||||||
|
error = '';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const payload: Record<string, any> = {
|
||||||
|
name: name.trim(),
|
||||||
|
expiresAt: getExpiresAt()
|
||||||
|
};
|
||||||
|
if (isLocalUser) {
|
||||||
|
payload.password = password;
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch('/api/auth/tokens', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify(payload)
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json();
|
||||||
|
createdToken = data.token;
|
||||||
|
} else {
|
||||||
|
const data = await response.json();
|
||||||
|
error = data.error || 'Failed to create token';
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
error = 'Failed to create token';
|
||||||
|
} finally {
|
||||||
|
creating = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copyToken() {
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(createdToken);
|
||||||
|
copied = true;
|
||||||
|
setTimeout(() => copied = false, 2000);
|
||||||
|
} catch {
|
||||||
|
// Fallback: select the input text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleClose() {
|
||||||
|
if (createdToken) {
|
||||||
|
onCreated();
|
||||||
|
}
|
||||||
|
open = false;
|
||||||
|
// Reset after animation
|
||||||
|
setTimeout(reset, 200);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get minimum date for custom picker (tomorrow)
|
||||||
|
const minDate = $derived(() => {
|
||||||
|
const tomorrow = new Date();
|
||||||
|
tomorrow.setDate(tomorrow.getDate() + 1);
|
||||||
|
return tomorrow.toISOString().split('T')[0];
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Dialog.Root bind:open onOpenChange={(v) => { if (!v) handleClose(); }}>
|
||||||
|
<Dialog.Content class="max-w-md">
|
||||||
|
<Dialog.Header>
|
||||||
|
<Dialog.Title class="flex items-center gap-2">
|
||||||
|
<KeyRound class="w-5 h-5" />
|
||||||
|
{createdToken ? 'Token created' : 'Generate API token'}
|
||||||
|
</Dialog.Title>
|
||||||
|
</Dialog.Header>
|
||||||
|
|
||||||
|
{#if createdToken}
|
||||||
|
<!-- Token created - show it once -->
|
||||||
|
<div class="space-y-4">
|
||||||
|
<Alert.Root variant="destructive">
|
||||||
|
<TriangleAlert class="h-4 w-4" />
|
||||||
|
<Alert.Description>
|
||||||
|
Copy this token now. It will not be shown again.
|
||||||
|
</Alert.Description>
|
||||||
|
</Alert.Root>
|
||||||
|
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<Input
|
||||||
|
value={createdToken}
|
||||||
|
readonly
|
||||||
|
class="font-mono text-xs"
|
||||||
|
/>
|
||||||
|
<Button variant="outline" size="icon" onclick={copyToken}>
|
||||||
|
{#if copied}
|
||||||
|
<Check class="w-4 h-4 text-green-500" />
|
||||||
|
{:else}
|
||||||
|
<Copy class="w-4 h-4" />
|
||||||
|
{/if}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-end">
|
||||||
|
<Button onclick={handleClose}>Done</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<!-- Token creation form -->
|
||||||
|
<div class="space-y-4">
|
||||||
|
<div class="space-y-2">
|
||||||
|
<Label for="token-name">Name</Label>
|
||||||
|
<Input
|
||||||
|
id="token-name"
|
||||||
|
bind:value={name}
|
||||||
|
placeholder="e.g., CI/CD pipeline"
|
||||||
|
maxlength={255}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if isLocalUser}
|
||||||
|
<div class="space-y-2">
|
||||||
|
<Label for="token-password">Password</Label>
|
||||||
|
<Input
|
||||||
|
id="token-password"
|
||||||
|
type="password"
|
||||||
|
bind:value={password}
|
||||||
|
placeholder="Confirm your password"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<Label>Expiration</Label>
|
||||||
|
<Select.Root type="single" bind:value={expirationOption}>
|
||||||
|
<Select.Trigger class="w-full">
|
||||||
|
{#if expirationOption === 'none'}No expiration
|
||||||
|
{:else if expirationOption === '30d'}30 days
|
||||||
|
{:else if expirationOption === '90d'}90 days
|
||||||
|
{:else if expirationOption === '1y'}1 year
|
||||||
|
{:else if expirationOption === 'custom'}Custom date
|
||||||
|
{/if}
|
||||||
|
</Select.Trigger>
|
||||||
|
<Select.Content>
|
||||||
|
<Select.Item value="none">No expiration</Select.Item>
|
||||||
|
<Select.Item value="30d">30 days</Select.Item>
|
||||||
|
<Select.Item value="90d">90 days</Select.Item>
|
||||||
|
<Select.Item value="1y">1 year</Select.Item>
|
||||||
|
<Select.Item value="custom">Custom date</Select.Item>
|
||||||
|
</Select.Content>
|
||||||
|
</Select.Root>
|
||||||
|
|
||||||
|
{#if expirationOption === 'custom'}
|
||||||
|
<Input
|
||||||
|
type="date"
|
||||||
|
bind:value={customDate}
|
||||||
|
min={minDate()}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if error}
|
||||||
|
<Alert.Root variant="destructive">
|
||||||
|
<TriangleAlert class="h-4 w-4" />
|
||||||
|
<Alert.Description>{error}</Alert.Description>
|
||||||
|
</Alert.Root>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="flex justify-end gap-2">
|
||||||
|
<Button variant="outline" onclick={handleClose}>Cancel</Button>
|
||||||
|
<Button onclick={createToken} disabled={creating || !name.trim() || (isLocalUser && !password)}>
|
||||||
|
{creating ? 'Creating...' : 'Generate token'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</Dialog.Content>
|
||||||
|
</Dialog.Root>
|
||||||
@@ -41,13 +41,17 @@
|
|||||||
import { DataGrid } from '$lib/components/data-grid';
|
import { DataGrid } from '$lib/components/data-grid';
|
||||||
import type { DataGridRowState } from '$lib/components/data-grid';
|
import type { DataGridRowState } from '$lib/components/data-grid';
|
||||||
import { toast } from 'svelte-sonner';
|
import { toast } from 'svelte-sonner';
|
||||||
import { formatDateTime, appSettings } from '$lib/stores/settings';
|
import { formatDateTime, getTimeFormat, appSettings } from '$lib/stores/settings';
|
||||||
import EnvironmentIcon from '$lib/components/EnvironmentIcon.svelte';
|
import EnvironmentIcon from '$lib/components/EnvironmentIcon.svelte';
|
||||||
import ConfirmPopover from '$lib/components/ConfirmPopover.svelte';
|
import ConfirmPopover from '$lib/components/ConfirmPopover.svelte';
|
||||||
import ScannerSeverityPills from '$lib/components/ScannerSeverityPills.svelte';
|
import ScannerSeverityPills from '$lib/components/ScannerSeverityPills.svelte';
|
||||||
import VulnerabilityCriteriaBadge from '$lib/components/VulnerabilityCriteriaBadge.svelte';
|
import VulnerabilityCriteriaBadge from '$lib/components/VulnerabilityCriteriaBadge.svelte';
|
||||||
import UpdateSummaryStats from '$lib/components/UpdateSummaryStats.svelte';
|
import UpdateSummaryStats from '$lib/components/UpdateSummaryStats.svelte';
|
||||||
import ExecutionLogViewer from '$lib/components/ExecutionLogViewer.svelte';
|
import ExecutionLogViewer from '$lib/components/ExecutionLogViewer.svelte';
|
||||||
|
import { canAccess } from '$lib/stores/auth';
|
||||||
|
|
||||||
|
const canEditSchedules = $derived($canAccess('schedules', 'edit'));
|
||||||
|
const canRunSchedules = $derived($canAccess('schedules', 'run'));
|
||||||
import { vulnerabilityCriteriaIcons, vulnerabilityCriteriaLabels } from '$lib/utils/update-steps';
|
import { vulnerabilityCriteriaIcons, vulnerabilityCriteriaLabels } from '$lib/utils/update-steps';
|
||||||
import type { VulnerabilityCriteria } from '$lib/server/db';
|
import type { VulnerabilityCriteria } from '$lib/server/db';
|
||||||
import cronstrue from 'cronstrue';
|
import cronstrue from 'cronstrue';
|
||||||
@@ -183,7 +187,7 @@
|
|||||||
|
|
||||||
// State
|
// State
|
||||||
let schedules = $state<Schedule[]>([]);
|
let schedules = $state<Schedule[]>([]);
|
||||||
let environments = $state<{ id: number; name: string; icon: string }[]>([]);
|
let environments = $state<{ id: number; name: string; icon: string; timezone?: string }[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
let refreshing = $state(false);
|
let refreshing = $state(false);
|
||||||
let searchQuery = $state('');
|
let searchQuery = $state('');
|
||||||
@@ -204,6 +208,11 @@
|
|||||||
let selectedExecution = $state<ScheduleExecution | null>(null);
|
let selectedExecution = $state<ScheduleExecution | null>(null);
|
||||||
let loadingExecutionDetail = $state(false);
|
let loadingExecutionDetail = $state(false);
|
||||||
let logDarkMode = $state(true);
|
let logDarkMode = $state(true);
|
||||||
|
let selectedExecutionTimezone = $derived(
|
||||||
|
selectedExecution?.environmentId
|
||||||
|
? environments.find(e => e.id === selectedExecution!.environmentId)?.timezone
|
||||||
|
: undefined
|
||||||
|
);
|
||||||
|
|
||||||
function toggleLogTheme() {
|
function toggleLogTheme() {
|
||||||
logDarkMode = !logDarkMode;
|
logDarkMode = !logDarkMode;
|
||||||
@@ -736,9 +745,21 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatTimestamp(iso: string | null): string {
|
function formatTimestamp(iso: string | null, tz?: string): string {
|
||||||
if (!iso) return '-';
|
if (!iso) return '-';
|
||||||
return formatDateTime(iso, true);
|
if (!tz) return formatDateTime(iso, true);
|
||||||
|
const d = new Date(iso);
|
||||||
|
if (isNaN(d.getTime())) return iso;
|
||||||
|
return new Intl.DateTimeFormat('en-GB', {
|
||||||
|
timeZone: tz,
|
||||||
|
year: 'numeric',
|
||||||
|
month: '2-digit',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
second: '2-digit',
|
||||||
|
hour12: getTimeFormat() === '12h'
|
||||||
|
}).format(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatDuration(ms: number | null): string {
|
function formatDuration(ms: number | null): string {
|
||||||
@@ -1287,27 +1308,31 @@
|
|||||||
<FileText class="w-3 h-3 text-muted-foreground hover:text-blue-500" />
|
<FileText class="w-3 h-3 text-muted-foreground hover:text-blue-500" />
|
||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
<button
|
{#if canEditSchedules}
|
||||||
type="button"
|
<button
|
||||||
onclick={(e) => { e.stopPropagation(); toggleScheduleEnabled(schedule); }}
|
type="button"
|
||||||
title={schedule.enabled ? 'Pause schedule' : 'Resume schedule'}
|
onclick={(e) => { e.stopPropagation(); toggleScheduleEnabled(schedule); }}
|
||||||
class="p-0.5 rounded hover:bg-muted transition-colors opacity-70 hover:opacity-100 cursor-pointer"
|
title={schedule.enabled ? 'Pause schedule' : 'Resume schedule'}
|
||||||
>
|
class="p-0.5 rounded hover:bg-muted transition-colors opacity-70 hover:opacity-100 cursor-pointer"
|
||||||
{#if schedule.enabled}
|
>
|
||||||
<Pause class="w-3 h-3 text-muted-foreground hover:text-amber-500" />
|
{#if schedule.enabled}
|
||||||
{:else}
|
<Pause class="w-3 h-3 text-muted-foreground hover:text-amber-500" />
|
||||||
<PlayCircle class="w-3 h-3 text-muted-foreground hover:text-green-500" />
|
{:else}
|
||||||
{/if}
|
<PlayCircle class="w-3 h-3 text-muted-foreground hover:text-green-500" />
|
||||||
</button>
|
{/if}
|
||||||
<button
|
</button>
|
||||||
type="button"
|
{/if}
|
||||||
onclick={(e) => { e.stopPropagation(); triggerSchedule(schedule); }}
|
{#if canRunSchedules}
|
||||||
title="Run now"
|
<button
|
||||||
class="p-0.5 rounded hover:bg-muted transition-colors opacity-70 hover:opacity-100 cursor-pointer"
|
type="button"
|
||||||
>
|
onclick={(e) => { e.stopPropagation(); triggerSchedule(schedule); }}
|
||||||
<Play class="w-3 h-3 text-muted-foreground hover:text-green-500" />
|
title="Run now"
|
||||||
</button>
|
class="p-0.5 rounded hover:bg-muted transition-colors opacity-70 hover:opacity-100 cursor-pointer"
|
||||||
{#if !schedule.isSystem}
|
>
|
||||||
|
<Play class="w-3 h-3 text-muted-foreground hover:text-green-500" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
{#if canEditSchedules && !schedule.isSystem}
|
||||||
{@const scheduleKey = getScheduleKey(schedule)}
|
{@const scheduleKey = getScheduleKey(schedule)}
|
||||||
<ConfirmPopover
|
<ConfirmPopover
|
||||||
open={confirmDeleteId === scheduleKey}
|
open={confirmDeleteId === scheduleKey}
|
||||||
@@ -1335,7 +1360,7 @@
|
|||||||
<div class="p-4 pl-12 shadow-inner bg-muted isolate sticky left-0 max-w-[calc(100vw-18rem)]">
|
<div class="p-4 pl-12 shadow-inner bg-muted isolate sticky left-0 max-w-[calc(100vw-18rem)]">
|
||||||
<div class="flex items-center justify-between mb-2">
|
<div class="flex items-center justify-between mb-2">
|
||||||
<h4 class="text-xs font-medium">Execution history</h4>
|
<h4 class="text-xs font-medium">Execution history</h4>
|
||||||
{#if executions.length > 0}
|
{#if executions.length > 0 && canEditSchedules}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onclick={() => deleteAllExecutions(schedule)}
|
onclick={() => deleteAllExecutions(schedule)}
|
||||||
@@ -1412,14 +1437,16 @@
|
|||||||
>
|
>
|
||||||
<FileText class="w-3 h-3 text-muted-foreground hover:text-blue-500" />
|
<FileText class="w-3 h-3 text-muted-foreground hover:text-blue-500" />
|
||||||
</button>
|
</button>
|
||||||
<button
|
{#if canEditSchedules}
|
||||||
type="button"
|
<button
|
||||||
onclick={() => deleteExecution(schedule, exec.id)}
|
type="button"
|
||||||
title="Delete execution"
|
onclick={() => deleteExecution(schedule, exec.id)}
|
||||||
class="p-0.5 rounded hover:bg-muted transition-colors opacity-70 hover:opacity-100 cursor-pointer"
|
title="Delete execution"
|
||||||
>
|
class="p-0.5 rounded hover:bg-muted transition-colors opacity-70 hover:opacity-100 cursor-pointer"
|
||||||
<Trash2 class="w-3 h-3 text-muted-foreground hover:text-red-500" />
|
>
|
||||||
</button>
|
<Trash2 class="w-3 h-3 text-muted-foreground hover:text-red-500" />
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -1491,7 +1518,7 @@
|
|||||||
</Dialog.Title>
|
</Dialog.Title>
|
||||||
{#if selectedExecution}
|
{#if selectedExecution}
|
||||||
<span class="text-xs text-muted-foreground shrink-0 pr-6 whitespace-nowrap inline-flex items-center gap-1">
|
<span class="text-xs text-muted-foreground shrink-0 pr-6 whitespace-nowrap inline-flex items-center gap-1">
|
||||||
{formatTimestamp(selectedExecution.triggeredAt)} · <Timer class="w-3 h-3 -mt-px" /> {formatDuration(selectedExecution.duration)}
|
{formatTimestamp(selectedExecution.triggeredAt, selectedExecutionTimezone)} · <Timer class="w-3 h-3 -mt-px" /> {formatDuration(selectedExecution.duration)}
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
</Dialog.Header>
|
</Dialog.Header>
|
||||||
@@ -1628,6 +1655,7 @@
|
|||||||
<ExecutionLogViewer
|
<ExecutionLogViewer
|
||||||
logs={selectedExecution.logs}
|
logs={selectedExecution.logs}
|
||||||
darkMode={logDarkMode}
|
darkMode={logDarkMode}
|
||||||
|
timezone={selectedExecutionTimezone}
|
||||||
onToggleTheme={toggleLogTheme}
|
onToggleTheme={toggleLogTheme}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -135,7 +135,9 @@
|
|||||||
{ key: 'view', label: 'View audit logs' }
|
{ key: 'view', label: 'View audit logs' }
|
||||||
],
|
],
|
||||||
schedules: [
|
schedules: [
|
||||||
{ key: 'view', label: 'View schedules' }
|
{ key: 'view', label: 'View schedules' },
|
||||||
|
{ key: 'edit', label: 'Edit schedules' },
|
||||||
|
{ key: 'run', label: 'Run schedules' }
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -242,6 +244,7 @@
|
|||||||
disconnect: Unplug,
|
disconnect: Unplug,
|
||||||
edit: Pencil,
|
edit: Pencil,
|
||||||
test: Play,
|
test: Play,
|
||||||
|
run: Play,
|
||||||
manage: Settings
|
manage: Settings
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -94,13 +94,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleScheduleCleanupEnabledChange() {
|
function handleScheduleCleanupEnabledChange() {
|
||||||
appSettings.setScheduleCleanupEnabled(!scheduleCleanupEnabled);
|
const newState = !scheduleCleanupEnabled;
|
||||||
toast.success(scheduleCleanupEnabled ? 'Schedule cleanup disabled' : 'Schedule cleanup enabled');
|
appSettings.setScheduleCleanupEnabled(newState);
|
||||||
|
toast.success(newState ? 'Schedule cleanup enabled' : 'Schedule cleanup disabled');
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleEventCleanupEnabledChange() {
|
function handleEventCleanupEnabledChange() {
|
||||||
appSettings.setEventCleanupEnabled(!eventCleanupEnabled);
|
const newState = !eventCleanupEnabled;
|
||||||
toast.success(eventCleanupEnabled ? 'Event cleanup disabled' : 'Event cleanup enabled');
|
appSettings.setEventCleanupEnabled(newState);
|
||||||
|
toast.success(newState ? 'Event cleanup enabled' : 'Event cleanup disabled');
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleGrypeImageBlur(e: Event) {
|
function handleGrypeImageBlur(e: Event) {
|
||||||
@@ -199,9 +201,9 @@
|
|||||||
<Label>Show stopped containers</Label>
|
<Label>Show stopped containers</Label>
|
||||||
<TogglePill
|
<TogglePill
|
||||||
checked={showStoppedContainers}
|
checked={showStoppedContainers}
|
||||||
onchange={() => {
|
onchange={(checked) => {
|
||||||
appSettings.setShowStoppedContainers(!showStoppedContainers);
|
appSettings.setShowStoppedContainers(checked);
|
||||||
toast.success(showStoppedContainers ? 'Stopped containers hidden' : 'Stopped containers shown');
|
toast.success(checked ? 'Stopped containers shown' : 'Stopped containers hidden');
|
||||||
}}
|
}}
|
||||||
disabled={!$canAccess('settings', 'edit')}
|
disabled={!$canAccess('settings', 'edit')}
|
||||||
/>
|
/>
|
||||||
@@ -213,9 +215,9 @@
|
|||||||
<Label>Highlight available updates</Label>
|
<Label>Highlight available updates</Label>
|
||||||
<TogglePill
|
<TogglePill
|
||||||
checked={highlightUpdates}
|
checked={highlightUpdates}
|
||||||
onchange={() => {
|
onchange={(checked) => {
|
||||||
appSettings.setHighlightUpdates(!highlightUpdates);
|
appSettings.setHighlightUpdates(checked);
|
||||||
toast.success(highlightUpdates ? 'Update highlighting disabled' : 'Update highlighting enabled');
|
toast.success(checked ? 'Update highlighting enabled' : 'Update highlighting disabled');
|
||||||
}}
|
}}
|
||||||
disabled={!$canAccess('settings', 'edit')}
|
disabled={!$canAccess('settings', 'edit')}
|
||||||
/>
|
/>
|
||||||
@@ -227,9 +229,9 @@
|
|||||||
<Label>Compact port display</Label>
|
<Label>Compact port display</Label>
|
||||||
<TogglePill
|
<TogglePill
|
||||||
checked={compactPorts}
|
checked={compactPorts}
|
||||||
onchange={() => {
|
onchange={(checked) => {
|
||||||
appSettings.setCompactPorts(!compactPorts);
|
appSettings.setCompactPorts(checked);
|
||||||
toast.success(compactPorts ? 'Showing all ports' : 'Compact port display enabled');
|
toast.success(checked ? 'Compact port display enabled' : 'Showing all ports');
|
||||||
}}
|
}}
|
||||||
disabled={!$canAccess('settings', 'edit')}
|
disabled={!$canAccess('settings', 'edit')}
|
||||||
/>
|
/>
|
||||||
@@ -337,9 +339,9 @@
|
|||||||
<Label>Confirm destructive actions</Label>
|
<Label>Confirm destructive actions</Label>
|
||||||
<TogglePill
|
<TogglePill
|
||||||
checked={confirmDestructive}
|
checked={confirmDestructive}
|
||||||
onchange={() => {
|
onchange={(checked) => {
|
||||||
appSettings.setConfirmDestructive(!confirmDestructive);
|
appSettings.setConfirmDestructive(checked);
|
||||||
toast.success(confirmDestructive ? 'Confirmations disabled' : 'Confirmations enabled');
|
toast.success(checked ? 'Confirmations enabled' : 'Confirmations disabled');
|
||||||
}}
|
}}
|
||||||
disabled={!$canAccess('settings', 'edit')}
|
disabled={!$canAccess('settings', 'edit')}
|
||||||
/>
|
/>
|
||||||
@@ -405,9 +407,9 @@
|
|||||||
<Label>Format log timestamps</Label>
|
<Label>Format log timestamps</Label>
|
||||||
<TogglePill
|
<TogglePill
|
||||||
checked={formatLogTimestamps}
|
checked={formatLogTimestamps}
|
||||||
onchange={() => {
|
onchange={(checked) => {
|
||||||
appSettings.setFormatLogTimestamps(!formatLogTimestamps);
|
appSettings.setFormatLogTimestamps(checked);
|
||||||
toast.success(formatLogTimestamps ? 'Log timestamp formatting disabled' : 'Log timestamp formatting enabled');
|
toast.success(checked ? 'Log timestamp formatting enabled' : 'Log timestamp formatting disabled');
|
||||||
}}
|
}}
|
||||||
disabled={!$canAccess('settings', 'edit')}
|
disabled={!$canAccess('settings', 'edit')}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -260,7 +260,7 @@
|
|||||||
if (stats) {
|
if (stats) {
|
||||||
cpuPercent += stats.cpuPercent;
|
cpuPercent += stats.cpuPercent;
|
||||||
memoryUsage += stats.memoryUsage;
|
memoryUsage += stats.memoryUsage;
|
||||||
memoryLimit += stats.memoryLimit;
|
memoryLimit = Math.max(memoryLimit, stats.memoryLimit);
|
||||||
networkRx += stats.networkRx;
|
networkRx += stats.networkRx;
|
||||||
networkTx += stats.networkTx;
|
networkTx += stats.networkTx;
|
||||||
blockRead += stats.blockRead;
|
blockRead += stats.blockRead;
|
||||||
|
|||||||
@@ -867,6 +867,9 @@ services:
|
|||||||
if (!newStackName.trim()) {
|
if (!newStackName.trim()) {
|
||||||
errors.stackName = 'Stack name is required';
|
errors.stackName = 'Stack name is required';
|
||||||
hasErrors = true;
|
hasErrors = true;
|
||||||
|
} else if (!/^[a-z0-9][a-z0-9_-]*$/.test(newStackName.trim())) {
|
||||||
|
errors.stackName = 'Must be lowercase, start with a letter or number, and only contain letters, numbers, hyphens, and underscores';
|
||||||
|
hasErrors = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const content = composeContent || defaultCompose;
|
const content = composeContent || defaultCompose;
|
||||||
@@ -903,6 +906,7 @@ services:
|
|||||||
// Prepare env vars for creating - syncs variables and rawContent
|
// Prepare env vars for creating - syncs variables and rawContent
|
||||||
const prepared = envVarsPanelRef?.prepareForSave() || { rawContent: '', variables: [] };
|
const prepared = envVarsPanelRef?.prepareForSave() || { rawContent: '', variables: [] };
|
||||||
|
|
||||||
|
let response: Response | undefined;
|
||||||
try {
|
try {
|
||||||
// Build request body
|
// Build request body
|
||||||
const requestBody: Record<string, unknown> = {
|
const requestBody: Record<string, unknown> = {
|
||||||
@@ -930,7 +934,7 @@ services:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create the stack
|
// Create the stack
|
||||||
const response = await fetch(appendEnvParam('/api/stacks', envId), {
|
response = await fetch(appendEnvParam('/api/stacks', envId), {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify(requestBody)
|
body: JSON.stringify(requestBody)
|
||||||
@@ -955,9 +959,10 @@ services:
|
|||||||
message: e.message || 'An error occurred while creating the stack',
|
message: e.message || 'An error occurred while creating the stack',
|
||||||
details: e.details
|
details: e.details
|
||||||
};
|
};
|
||||||
// If start=true, files were saved and stack is in DB — transition to edit mode
|
// Only transition to edit mode if the stack was actually persisted (response was ok
|
||||||
// so the user can fix and redeploy without leaving the modal
|
// but deploy failed). A 400 from validation means nothing was saved — stay in create
|
||||||
if (start) {
|
// mode so the name field remains visible and the user can fix the error.
|
||||||
|
if (start && response?.ok) {
|
||||||
mode = 'edit';
|
mode = 'edit';
|
||||||
stackName = newStackName.trim();
|
stackName = newStackName.trim();
|
||||||
onSuccess(); // refresh stack list so the new stack appears
|
onSuccess(); // refresh stack list so the new stack appears
|
||||||
|
|||||||
Reference in new issue
Block a user