diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc24903..10dae18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,3 +26,4 @@ jobs: JWT_SECRET: "ci-placeholder-jwt-secret-min-32-chars" DATABASE_URL: "postgresql://placeholder:placeholder@localhost:5432/placeholder" DIRECT_URL: "postgresql://placeholder:placeholder@localhost:5432/placeholder" + ADMIN_PASSWORD: "ci-placeholder-admin-password" diff --git a/.jules/sentinel.md b/.jules/sentinel.md new file mode 100644 index 0000000..f722a22 --- /dev/null +++ b/.jules/sentinel.md @@ -0,0 +1,4 @@ +## 2024-05-24 - Hardcoded Admin Password +**Vulnerability:** Found a hardcoded `ADMIN_PASSWORD` secret in `packages/web/src/lib/server/admin-auth.ts`. +**Learning:** Hardcoding credentials makes them accessible in source control and compiled assets, leading to severe exposure. +**Prevention:** Store secrets as environment variables, validate their presence at startup using tools like Zod, and inject them via CI/CD pipelines instead of embedding them directly in source code. diff --git a/packages/web/.env.example b/packages/web/.env.example index e99d51e..73368e6 100644 --- a/packages/web/.env.example +++ b/packages/web/.env.example @@ -4,3 +4,4 @@ AUTH_SECRET=replace-with-min-32-char-random-string DATABASE_URL="postgresql://postgres.[project]:[password]@aws-0-ap-northeast-1.pooler.supabase.com:6543/postgres?pgbouncer=true" DIRECT_URL="postgresql://postgres.[project]:[password]@db.uwxfseowdzuuepeeudrx.supabase.co:5432/postgres" JWT_SECRET="replace-with-32-char-minimum-random-string" +ADMIN_PASSWORD=replace-with-secure-admin-password diff --git a/packages/web/src/app/api/admin/login/route.ts b/packages/web/src/app/api/admin/login/route.ts index dbf5d2e..24fabdb 100644 --- a/packages/web/src/app/api/admin/login/route.ts +++ b/packages/web/src/app/api/admin/login/route.ts @@ -20,7 +20,7 @@ const AdminLoginSchema = z.object({ export async function POST(req: Request) { try { const input = AdminLoginSchema.parse(await req.json()) - if (!verifyAdminCredentials(input)) { + if (!(await verifyAdminCredentials(input))) { return NextResponse.json({ error: 'Invalid username or password' }, { status: 401 }) } diff --git a/packages/web/src/lib/server/admin-auth.ts b/packages/web/src/lib/server/admin-auth.ts index 5390fa4..3c9a14f 100644 --- a/packages/web/src/lib/server/admin-auth.ts +++ b/packages/web/src/lib/server/admin-auth.ts @@ -1,19 +1,33 @@ import 'server-only' -import { createHmac, randomBytes, timingSafeEqual } from 'crypto' +import { createHmac, pbkdf2Sync, pbkdf2, randomBytes, timingSafeEqual } from 'crypto' import { cookies } from 'next/headers' import { NextRequest, NextResponse } from 'next/server' +import { promisify } from 'util' import { env } from './env' export const ADMIN_USERNAME = 'admin' -export const ADMIN_PASSWORD = 'og9oRajx7h88v1RIj3eDgdrh9jgLYVV3' +export const ADMIN_PASSWORD = env.ADMIN_PASSWORD const ADMIN_SESSION_COOKIE = 'argos_admin_session' const ADMIN_SESSION_TTL_MS = 12 * 60 * 60 * 1000 const ADMIN_IMPERSONATION_TTL_MS = 60 * 1000 const ADMIN_IMPERSONATION_PREFIX = 'argos_imp' +// Pre-compute the admin password hash at startup to avoid slow, synchronous operations +// later and to satisfy CodeQL's secure password hashing rule. +const ADMIN_PASSWORD_SALT = env.JWT_SECRET.substring(0, 16) +const EXPECTED_ADMIN_PASSWORD_HASH = pbkdf2Sync( + env.ADMIN_PASSWORD, + ADMIN_PASSWORD_SALT, + 100000, + 64, + 'sha512' +) + +const pbkdf2Async = promisify(pbkdf2) + function safeEqual(a: string, b: string): boolean { const aHash = createHmac('sha256', env.JWT_SECRET).update(a).digest() const bHash = createHmac('sha256', env.JWT_SECRET).update(b).digest() @@ -24,14 +38,21 @@ function sign(payload: string): string { return createHmac('sha256', env.JWT_SECRET).update(payload).digest('base64url') } -export function verifyAdminCredentials(input: { +export async function verifyAdminCredentials(input: { username: string password: string -}): boolean { - return ( - safeEqual(input.username, ADMIN_USERNAME) && - safeEqual(input.password, ADMIN_PASSWORD) +}): Promise { + if (!safeEqual(input.username, ADMIN_USERNAME)) return false + + const inputHash = await pbkdf2Async( + input.password, + ADMIN_PASSWORD_SALT, + 100000, + 64, + 'sha512' ) + + return timingSafeEqual(inputHash, EXPECTED_ADMIN_PASSWORD_HASH) } export function createAdminSessionCookieValue(): string { diff --git a/packages/web/src/lib/server/env.ts b/packages/web/src/lib/server/env.ts index 86ed9a3..8e6fc2f 100644 --- a/packages/web/src/lib/server/env.ts +++ b/packages/web/src/lib/server/env.ts @@ -5,6 +5,7 @@ const EnvSchema = z.object({ DATABASE_URL: z.string().min(1), DIRECT_URL: z.string().min(1), JWT_SECRET: z.string().min(32), + ADMIN_PASSWORD: z.string().min(8), }) export const env = EnvSchema.parse(process.env)