diff --git a/src/lib/server/auth.ts b/src/lib/server/auth.ts index 0a2b4b60a..ee910d94d 100644 --- a/src/lib/server/auth.ts +++ b/src/lib/server/auth.ts @@ -10,7 +10,7 @@ */ import os from 'node:os'; -import { createHash } from 'node:crypto'; +import { createHash, randomInt } from 'node:crypto'; import argon2 from 'argon2'; import type { Cookies } from '@sveltejs/kit'; import { @@ -886,7 +886,7 @@ function generateBackupCodes(): string[] { for (let i = 0; i < 10; i++) { let code = ''; for (let j = 0; j < 8; j++) { - code += chars.charAt(Math.floor(Math.random() * chars.length)); + code += chars.charAt(randomInt(chars.length)); } codes.push(code); } diff --git a/src/lib/server/backups/backup-service.ts b/src/lib/server/backups/backup-service.ts index 3768bd304..732d05dbd 100644 --- a/src/lib/server/backups/backup-service.ts +++ b/src/lib/server/backups/backup-service.ts @@ -468,7 +468,7 @@ export class BackupService { const { code, message } = errorInfo(err); try { await this.ports.setConfigStatus(job.configId, 'failed'); } catch { /* non-fatal */ } await op.close({ kind: 'error', code, message }, { errorCode: code }); - try { await this.ports.notify('backup_failed', { title: 'Backup failed', message: `Backup of "${job.targetName}" failed: ${message} (${code})`, type: 'error', target: job.targetName, kind: 'backup', errorCode: code, message }, envId); } catch { /* non-fatal */ } + try { await this.ports.notify('backup_failed', { title: 'Backup failed', message: `Backup of "${job.targetName}" failed: ${message} (${code})`, type: 'error', target: job.targetName, kind: 'backup', errorCode: code }, envId); } catch { /* non-fatal */ } // Per-config failure webhook. if (job.options.webhookFailure) { try { diff --git a/src/lib/server/chown-spec-core.ts b/src/lib/server/chown-spec-core.ts index 5e3b1d1c4..be1e1df19 100644 --- a/src/lib/server/chown-spec-core.ts +++ b/src/lib/server/chown-spec-core.ts @@ -7,7 +7,7 @@ // A single user or group token: a numeric id, or a name (letters, digits, and the // usual account punctuation `_ - .`, starting with a letter/digit/underscore). -const TOKEN = /^[A-Za-z0-9_][A-Za-z0-9_.-]*$/; +const TOKEN = /^\w[A-Za-z0-9_.-]*$/; export interface ChownSpec { /** The exact `owner[:group]` string to pass to chown. */ diff --git a/src/lib/server/db.ts b/src/lib/server/db.ts index 7cee5b847..3eab6b6ee 100644 --- a/src/lib/server/db.ts +++ b/src/lib/server/db.ts @@ -3354,7 +3354,10 @@ export async function getContainerTagIds(containerName: string, environmentId: n export async function getContainerTagsMap(environmentId: number | null): Promise> { const rows = await db.select().from(containerTags).where(envClause(containerTags.environmentId, environmentId)); const map: Record = {}; - for (const r of rows) (map[r.containerName] ??= []).push(r.tagId); + for (const r of rows) { + map[r.containerName] ??= []; + map[r.containerName].push(r.tagId); + } return map; } @@ -3379,7 +3382,10 @@ export async function getStackTagIds(stackName: string, environmentId: number | export async function getStackTagsMap(environmentId: number | null): Promise> { const rows = await db.select().from(stackTags).where(envClause(stackTags.environmentId, environmentId)); const map: Record = {}; - for (const r of rows) (map[r.stackName] ??= []).push(r.tagId); + for (const r of rows) { + map[r.stackName] ??= []; + map[r.stackName].push(r.tagId); + } return map; } diff --git a/src/lib/server/docker-demux-core.ts b/src/lib/server/docker-demux-core.ts index e39a39541..ce5c926c7 100644 --- a/src/lib/server/docker-demux-core.ts +++ b/src/lib/server/docker-demux-core.ts @@ -26,7 +26,7 @@ export function demuxDockerStream( return options?.separateStreams ? { stdout: raw, stderr: '' } : raw; } - const payload = buffer.slice(offset + 8, offset + 8 + frameSize).toString('utf-8'); + const payload = buffer.subarray(offset + 8, offset + 8 + frameSize).toString('utf-8'); if (streamType === 1) { stdout.push(payload); diff --git a/src/lib/server/docker.ts b/src/lib/server/docker.ts index c1daddecd..0e459dbe4 100644 --- a/src/lib/server/docker.ts +++ b/src/lib/server/docker.ts @@ -2366,8 +2366,8 @@ export async function createContainerFromMetadata( envId?: number | null, log?: (msg: string) => void ): Promise<{ Id: string }> { - const config = { ...metadata.config } || {}; - const hostConfig = { ...metadata.hostConfig } || {}; + const config = { ...metadata.config }; + const hostConfig = { ...metadata.hostConfig }; const networks: Record = metadata.networkSettings?.Networks || {}; const networkMode = hostConfig.NetworkMode || ''; diff --git a/src/lib/server/env-param.ts b/src/lib/server/env-param.ts new file mode 100644 index 000000000..1a262068e --- /dev/null +++ b/src/lib/server/env-param.ts @@ -0,0 +1,10 @@ +/** + * Parse the `?env=` query param that scopes a name-keyed API endpoint to an + * environment. Null (omit the param) targets the local/default environment. + * Shared by the tag/icon endpoints so the parse is defined once. + */ +export function parseEnvParam(raw: string | null): number | null { + if (!raw) return null; + const n = Number.parseInt(raw, 10); + return Number.isNaN(n) ? null : n; +} diff --git a/src/lib/server/scheduler/index.ts b/src/lib/server/scheduler/index.ts index 78e8b589d..f59003b50 100644 --- a/src/lib/server/scheduler/index.ts +++ b/src/lib/server/scheduler/index.ts @@ -901,7 +901,8 @@ export async function triggerSystemJob(jobId: string): Promise<{ success: boolea */ export async function triggerDeployLogReconcile(): Promise<{ success: boolean; executionId?: number; error?: string }> { try { - runDeployLogReconcileJob('manual'); + // Run in background - the job records its own execution row. + void runDeployLogReconcileJob('manual'); return { success: true }; } catch (error: any) { return { success: false, error: error.message }; diff --git a/src/lib/server/stats-calc-core.ts b/src/lib/server/stats-calc-core.ts index 0073f9296..45f20dc3e 100644 --- a/src/lib/server/stats-calc-core.ts +++ b/src/lib/server/stats-calc-core.ts @@ -57,8 +57,8 @@ export function calculateCpuPercent(stats: DockerStatsPayload | null | undefined // Wall-clock formula (matches Docker CLI / Portainer for Windows containers): // possIntervals = num_procs * elapsed-milliseconds; cpu% = cpuDelta / (possIntervals * 100). // read/preread are RFC3339 timestamps. No system_cpu_usage exists on Windows. - const readMs = stats.read ? new Date(stats.read).getTime() : NaN; - const prereadMs = stats.preread ? new Date(stats.preread).getTime() : NaN; + const readMs = stats.read ? new Date(stats.read).getTime() : Number.NaN; + const prereadMs = stats.preread ? new Date(stats.preread).getTime() : Number.NaN; const possIntervals = (stats.num_procs ?? 0) * (readMs - prereadMs); if (Number.isFinite(possIntervals) && possIntervals > 0 && cpuDelta > 0) { return cpuDelta / (possIntervals * 100); diff --git a/src/lib/utils/gutter-contrast.ts b/src/lib/utils/gutter-contrast.ts index 763369928..8cc982e69 100644 --- a/src/lib/utils/gutter-contrast.ts +++ b/src/lib/utils/gutter-contrast.ts @@ -13,7 +13,7 @@ export interface Rgb { // Returns null for anything else (e.g. "transparent", named colours, empty). export function parseRgb(color: string | null | undefined): Rgb | null { if (!color) return null; - const m = color.match(/rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/i); + const m = /rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/i.exec(color); if (!m) return null; return { r: Number(m[1]), g: Number(m[2]), b: Number(m[3]) }; } diff --git a/src/lib/utils/palette-filter.ts b/src/lib/utils/palette-filter.ts index 245e4a99d..bcf7904b4 100644 --- a/src/lib/utils/palette-filter.ts +++ b/src/lib/utils/palette-filter.ts @@ -20,12 +20,12 @@ export interface PaletteItem { export type DefaultCaps = Record; function escapeRegExp(s: string): string { - return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + return s.replace(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`); } /** The word-boundary matcher for a query: `q` starts a word (^, space, -, _, /). */ export function wordBoundaryRegex(q: string): RegExp { - return new RegExp(`(^|[\\s\\-_/])${escapeRegExp(q)}`); + return new RegExp(String.raw`(^|[\s\-_/])` + escapeRegExp(q)); } /** diff --git a/src/lib/utils/session-expiry.ts b/src/lib/utils/session-expiry.ts index 204f62245..f0aba008b 100644 --- a/src/lib/utils/session-expiry.ts +++ b/src/lib/utils/session-expiry.ts @@ -7,8 +7,10 @@ export function extractPath(input: RequestInfo | URL, origin: string): string | null { try { - const url = - typeof input === 'string' ? input : input instanceof Request ? input.url : String(input); + let url: string; + if (typeof input === 'string') url = input; + else if (input instanceof Request) url = input.url; + else url = String(input); return new URL(url, origin).pathname; } catch { return null; diff --git a/src/lib/utils/tags-core.ts b/src/lib/utils/tags-core.ts index 9ccda36bc..bb35a7450 100644 --- a/src/lib/utils/tags-core.ts +++ b/src/lib/utils/tags-core.ts @@ -90,7 +90,7 @@ export function matchesTagFilter( mode: TagFilterMode = 'all' ): boolean { if (!filterTagIds.length) return true; - if (!itemTagIds || !itemTagIds.length) return false; + if (!itemTagIds?.length) return false; const have = new Set(itemTagIds); return mode === 'any' ? filterTagIds.some((id) => have.has(id)) diff --git a/src/routes/api/container-icons/+server.ts b/src/routes/api/container-icons/+server.ts index 95c2ca300..e56f072cf 100644 --- a/src/routes/api/container-icons/+server.ts +++ b/src/routes/api/container-icons/+server.ts @@ -1,14 +1,9 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { getContainerIconOverrides } from '$lib/server/db'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: List all container icon overrides for an environment as a name -> icon map @@ -20,7 +15,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/container-icons/[name]/+server.ts b/src/routes/api/container-icons/[name]/+server.ts index 6d7300878..a2deb7f70 100644 --- a/src/routes/api/container-icons/[name]/+server.ts +++ b/src/routes/api/container-icons/[name]/+server.ts @@ -1,15 +1,10 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { getContainerIconOverride, setContainerIconOverride, deleteContainerIconOverride } from '$lib/server/db'; import { saveContainerIcon, deleteContainerIcon, getContainerIconBuffer, looksLikeImage } from '$lib/server/container-icons'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: Get a container's uploaded custom icon (raw image/webp bytes, not JSON) @@ -21,7 +16,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ params, url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } @@ -52,7 +47,7 @@ export const GET: RequestHandler = async ({ params, url, cookies }) => { */ export const POST: RequestHandler = async ({ params, url, request, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'edit', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } @@ -91,7 +86,7 @@ export const POST: RequestHandler = async ({ params, url, request, cookies }) => */ export const DELETE: RequestHandler = async ({ params, url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'edit', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/container-tags/+server.ts b/src/routes/api/container-tags/+server.ts index c81227636..93158cbbf 100644 --- a/src/routes/api/container-tags/+server.ts +++ b/src/routes/api/container-tags/+server.ts @@ -1,14 +1,9 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { getContainerTagsMap } from '$lib/server/db'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: List all container tag assignments for an environment as a name -> tagIds map @@ -20,7 +15,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/container-tags/[name]/+server.ts b/src/routes/api/container-tags/[name]/+server.ts index ef7d7b167..614a6e742 100644 --- a/src/routes/api/container-tags/[name]/+server.ts +++ b/src/routes/api/container-tags/[name]/+server.ts @@ -1,14 +1,9 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { getContainerTagIds, setContainerTagIds } from '$lib/server/db'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: Get the tag ids assigned to one container (by name) @@ -20,7 +15,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ params, url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } @@ -40,7 +35,7 @@ export const GET: RequestHandler = async ({ params, url, cookies }) => { */ export const PUT: RequestHandler = async ({ params, url, request, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('containers', 'edit', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/containers/[id]/exec/run/+server.ts b/src/routes/api/containers/[id]/exec/run/+server.ts index a68af935b..d36f58d97 100644 --- a/src/routes/api/containers/[id]/exec/run/+server.ts +++ b/src/routes/api/containers/[id]/exec/run/+server.ts @@ -39,7 +39,7 @@ export const POST: RequestHandler = async ({ params, request, cookies, url }) => const containerId = params.id; const envIdParam = url.searchParams.get('envId'); - const envId = envIdParam ? parseInt(envIdParam, 10) : undefined; + const envId = envIdParam ? Number.parseInt(envIdParam, 10) : undefined; if (!await auth.can('containers', 'exec', envId)) { return json({ error: 'Permission denied' }, { status: 403 }); diff --git a/src/routes/api/containers/[id]/files/chown/+server.ts b/src/routes/api/containers/[id]/files/chown/+server.ts index b27c099dc..41c89abd5 100644 --- a/src/routes/api/containers/[id]/files/chown/+server.ts +++ b/src/routes/api/containers/[id]/files/chown/+server.ts @@ -28,7 +28,7 @@ export const POST: RequestHandler = async ({ params, url, cookies, request }) => const auth = await authorize(cookies); const envId = url.searchParams.get('env'); - const envIdNum = envId ? parseInt(envId) : undefined; + const envIdNum = envId ? Number.parseInt(envId) : undefined; if (auth.authEnabled && !await auth.can('containers', 'exec', envIdNum)) { return json({ error: 'Permission denied' }, { status: 403 }); diff --git a/src/routes/api/containers/[id]/files/upload/+server.ts b/src/routes/api/containers/[id]/files/upload/+server.ts index cc4be0a6f..37ecb384c 100644 --- a/src/routes/api/containers/[id]/files/upload/+server.ts +++ b/src/routes/api/containers/[id]/files/upload/+server.ts @@ -111,7 +111,7 @@ export const POST: RequestHandler = async ({ params, url, request, cookies }) => const path = url.searchParams.get('path'); const envId = url.searchParams.get('env'); - const envIdNum = envId ? parseInt(envId) : undefined; + const envIdNum = envId ? Number.parseInt(envId) : undefined; // Permission check with environment context if (auth.authEnabled && !await auth.can('containers', 'exec', envIdNum)) { @@ -166,14 +166,14 @@ export const POST: RequestHandler = async ({ params, url, request, cookies }) => params.id, path, tar, - envId ? parseInt(envId) : undefined + envId ? Number.parseInt(envId) : undefined ); // chown the uploaded file to the requested (or container-default) owner. if (owner) { const targetPath = path.endsWith('/') ? `${path}${file.name}` : `${path}/${file.name}`; try { - await chownContainerPath(params.id, targetPath, owner, true, envId ? parseInt(envId) : undefined); + await chownContainerPath(params.id, targetPath, owner, true, envId ? Number.parseInt(envId) : undefined); } catch (e) { console.warn('Failed to set ownership on', targetPath, e); } diff --git a/src/routes/api/stack-tags/+server.ts b/src/routes/api/stack-tags/+server.ts index 21663fcad..5ea0b021b 100644 --- a/src/routes/api/stack-tags/+server.ts +++ b/src/routes/api/stack-tags/+server.ts @@ -1,14 +1,9 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { getStackTagsMap } from '$lib/server/db'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: List all stack tag assignments for an environment as a name -> tagIds map @@ -20,7 +15,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('stacks', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/stacks/[name]/icon/+server.ts b/src/routes/api/stacks/[name]/icon/+server.ts index 9a1c0324b..39a2cdca3 100644 --- a/src/routes/api/stacks/[name]/icon/+server.ts +++ b/src/routes/api/stacks/[name]/icon/+server.ts @@ -1,15 +1,10 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { updateStackSource, getStackSource } from '$lib/server/db'; import { saveStackIcon, deleteStackIcon, getStackIconBuffer, looksLikeImage } from '$lib/server/stack-icons'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: Get a stack's uploaded custom icon (raw image/webp bytes, not JSON) @@ -21,7 +16,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ params, url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('stacks', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } @@ -52,7 +47,7 @@ export const GET: RequestHandler = async ({ params, url, cookies }) => { */ export const POST: RequestHandler = async ({ params, url, request, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('stacks', 'edit', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } @@ -99,7 +94,7 @@ export const POST: RequestHandler = async ({ params, url, request, cookies }) => */ export const DELETE: RequestHandler = async ({ params, url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('stacks', 'edit', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/stacks/[name]/tags/+server.ts b/src/routes/api/stacks/[name]/tags/+server.ts index d2182163e..848b2cb45 100644 --- a/src/routes/api/stacks/[name]/tags/+server.ts +++ b/src/routes/api/stacks/[name]/tags/+server.ts @@ -1,14 +1,9 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { authorize } from '$lib/server/authorize'; +import { parseEnvParam } from '$lib/server/env-param'; import { getStackTagIds, setStackTagIds } from '$lib/server/db'; -function parseEnv(raw: string | null): number | null { - if (!raw) return null; - const n = parseInt(raw, 10); - return Number.isNaN(n) ? null : n; -} - /** * @openapi * summary: Get the tag ids assigned to one stack (by name) @@ -20,7 +15,7 @@ function parseEnv(raw: string | null): number | null { */ export const GET: RequestHandler = async ({ params, url, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('stacks', 'view', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } @@ -40,7 +35,7 @@ export const GET: RequestHandler = async ({ params, url, cookies }) => { */ export const PUT: RequestHandler = async ({ params, url, request, cookies }) => { const auth = await authorize(cookies); - const envId = parseEnv(url.searchParams.get('env')); + const envId = parseEnvParam(url.searchParams.get('env')); if (auth.authEnabled && !(await auth.can('stacks', 'edit', envId ?? undefined))) { return json({ error: 'Permission denied' }, { status: 403 }); } diff --git a/src/routes/api/tags/[id]/+server.ts b/src/routes/api/tags/[id]/+server.ts index db8740fa2..4a3e194dc 100644 --- a/src/routes/api/tags/[id]/+server.ts +++ b/src/routes/api/tags/[id]/+server.ts @@ -21,7 +21,7 @@ export const PUT: RequestHandler = async ({ params, request, cookies }) => { if (auth.authEnabled && !auth.isAdmin) { return json({ error: 'Only an administrator can manage the tag catalog' }, { status: 403 }); } - const tagId = parseInt(params.id, 10); + const tagId = Number.parseInt(params.id, 10); if (Number.isNaN(tagId)) return json({ error: 'Invalid tag id' }, { status: 400 }); const body = await request.json().catch(() => ({})); @@ -61,7 +61,7 @@ export const DELETE: RequestHandler = async ({ params, cookies }) => { if (auth.authEnabled && !auth.isAdmin) { return json({ error: 'Only an administrator can manage the tag catalog' }, { status: 403 }); } - const tagId = parseInt(params.id, 10); + const tagId = Number.parseInt(params.id, 10); if (Number.isNaN(tagId)) return json({ error: 'Invalid tag id' }, { status: 400 }); await deleteTag(tagId); return json({ success: true }); diff --git a/src/routes/settings/backups/BackupsTab.svelte b/src/routes/settings/backups/BackupsTab.svelte index bb4fb51da..8e13db472 100644 --- a/src/routes/settings/backups/BackupsTab.svelte +++ b/src/routes/settings/backups/BackupsTab.svelte @@ -917,9 +917,9 @@ { snapshotBrowseDestId = browseDestId; snapshotBrowseId = snap.id; snapshotBrowseName = group.name; snapshotBrowseOpen = true; }}>{snap.shortId} {formatDateTime(snap.time)} ({formatRelativeTime(snap.time)}) - + {/each} diff --git a/tests/env-param.test.ts b/tests/env-param.test.ts new file mode 100644 index 000000000..076a0e882 --- /dev/null +++ b/tests/env-param.test.ts @@ -0,0 +1,22 @@ +import { describe, test, expect } from 'bun:test'; +import { parseEnvParam } from '../src/lib/server/env-param'; + +describe('parseEnvParam', () => { + test('null/empty -> null (local/default env)', () => { + expect(parseEnvParam(null)).toBeNull(); + expect(parseEnvParam('')).toBeNull(); + }); + + test('numeric string -> number', () => { + expect(parseEnvParam('5')).toBe(5); + expect(parseEnvParam('42')).toBe(42); + }); + + test('non-numeric -> null (not NaN)', () => { + expect(parseEnvParam('abc')).toBeNull(); + }); + + test('leading number is taken (parseInt semantics)', () => { + expect(parseEnvParam('7x')).toBe(7); + }); +});