refactor(auth): standardize session management and security
- Centralize secret retrieval using `getAdminSessionSecret` - Replace manual session parsing with `verifyRequestAdminSession` utility - Tighten API validation and improve security headers handling - Enforce environment variable security for production deployments
This commit is contained in:
1 parent
34519c07df
commit
177ed4a844
78 files changed
+6748
-3157
No files matched your search
+33
-16
@@ -1,4 +1,7 @@
|
||||
import { verifyAdminSessionToken } from "@/core/auth/adminSession";
|
||||
import {
|
||||
getAdminSessionSecret,
|
||||
verifyAdminSessionToken,
|
||||
} from "@/core/auth/adminSession";
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
|
||||
const SESSION_COOKIE = "datastack_admin_session";
|
||||
@@ -13,28 +16,37 @@ function isProtectedApi(pathname: string, method: string) {
|
||||
return pathname.startsWith("/api/");
|
||||
}
|
||||
|
||||
function isSameOriginRequest(request: NextRequest) {
|
||||
const originHeader = request.headers.get("origin");
|
||||
function matchesRequestHost(candidateUrl: string, request: NextRequest) {
|
||||
const requestHost = request.headers.get("host");
|
||||
const forwardedHost = request.headers
|
||||
.get("x-forwarded-host")
|
||||
?.split(",")[0]
|
||||
?.trim();
|
||||
if (!originHeader || (!requestHost && !forwardedHost)) return false;
|
||||
if (!requestHost && !forwardedHost) return false;
|
||||
|
||||
try {
|
||||
const origin = new URL(originHeader);
|
||||
const originHost = origin.host.toLowerCase();
|
||||
const matchesHost =
|
||||
(requestHost && originHost === requestHost.toLowerCase()) ||
|
||||
(forwardedHost && originHost === forwardedHost.toLowerCase());
|
||||
|
||||
return Boolean(matchesHost);
|
||||
const parsedHost = new URL(candidateUrl).host.toLowerCase();
|
||||
return Boolean(
|
||||
(requestHost && parsedHost === requestHost.toLowerCase()) ||
|
||||
(forwardedHost && parsedHost === forwardedHost.toLowerCase()),
|
||||
);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export function isSameOriginRequest(request: NextRequest) {
|
||||
const originHeader = request.headers.get("origin");
|
||||
if (originHeader) {
|
||||
return matchesRequestHost(originHeader, request);
|
||||
}
|
||||
const refererHeader = request.headers.get("referer");
|
||||
if (refererHeader) {
|
||||
return matchesRequestHost(refererHeader, request);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
export async function middleware(request: NextRequest) {
|
||||
const { pathname } = request.nextUrl;
|
||||
const isLoginPage = pathname === "/vcon/login";
|
||||
@@ -73,14 +85,19 @@ export async function middleware(request: NextRequest) {
|
||||
return NextResponse.next();
|
||||
}
|
||||
|
||||
const sessionSecret =
|
||||
process.env.DATASTACK_ADMIN_SESSION_SECRET ||
|
||||
"datastack-admin-session-default-secret-32-chars";
|
||||
const sessionSecret = getAdminSessionSecret();
|
||||
if (!sessionSecret && isAdminApi) {
|
||||
return NextResponse.json(
|
||||
{ error: "Admin authentication is not configured." },
|
||||
{ status: 503 },
|
||||
);
|
||||
}
|
||||
|
||||
const token = request.cookies.get(SESSION_COOKIE)?.value;
|
||||
const authenticated = Boolean(
|
||||
sessionSecret &&
|
||||
token &&
|
||||
(await verifyAdminSessionToken(token, sessionSecret)),
|
||||
token &&
|
||||
(await verifyAdminSessionToken(token, sessionSecret)),
|
||||
);
|
||||
|
||||
if (isLoginPage) {
|
||||
|
||||
Reference in new issue
Block a user