feat(auth): implement RBAC audit logging and session security
Integrate granular audit logging for admin actions, transition to role-based API access via `requireAdminApiSession`, and update session tokens to persist user roles and IDs for consistent multi-admin management.
This commit is contained in:
1 parent
2873b9904a
commit
5c977d6977
37 files changed
+5939
-349
No files matched your search
@@ -1,4 +1,5 @@
|
||||
import {
|
||||
type AdminRole,
|
||||
createAdminSessionToken,
|
||||
getAdminSessionSecret,
|
||||
getSessionCookieOptions,
|
||||
@@ -9,6 +10,7 @@ import {
|
||||
clearAdminLoginAttempts,
|
||||
consumeAdminLoginAttempt,
|
||||
} from "@/core/auth/adminUsers";
|
||||
import { recordAdminAuditLogAsync } from "@/core/auth/auditLog";
|
||||
import { extractClientIp } from "@/lib/adminAuth";
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
|
||||
@@ -79,7 +81,13 @@ export async function POST(request: NextRequest) {
|
||||
);
|
||||
}
|
||||
|
||||
let authResult: { authenticated: boolean; tokenVersion: number };
|
||||
let authResult: {
|
||||
authenticated: boolean;
|
||||
tokenVersion: number;
|
||||
role: AdminRole;
|
||||
memberId: string;
|
||||
email: string;
|
||||
};
|
||||
try {
|
||||
authResult = await authenticateAdminCredentials(email, password);
|
||||
} catch (err) {
|
||||
@@ -117,13 +125,29 @@ export async function POST(request: NextRequest) {
|
||||
const remember = body.remember === true;
|
||||
const maxAge = remember ? REMEMBERED_SESSION_SECONDS : SESSION_SECONDS;
|
||||
const expiresAt = Date.now() + maxAge * 1000;
|
||||
const effectiveEmail = authResult.email || email;
|
||||
const token = await createAdminSessionToken(
|
||||
email,
|
||||
effectiveEmail,
|
||||
sessionSecret,
|
||||
expiresAt,
|
||||
authResult.tokenVersion,
|
||||
authResult.role,
|
||||
authResult.memberId,
|
||||
);
|
||||
const response = NextResponse.json({ success: true });
|
||||
|
||||
await recordAdminAuditLogAsync({
|
||||
actorEmail: effectiveEmail,
|
||||
actorRole: authResult.role || "owner",
|
||||
action: "ADMIN_LOGIN",
|
||||
target: effectiveEmail,
|
||||
ipAddress: clientIp,
|
||||
metadata: { remember },
|
||||
});
|
||||
|
||||
const response = NextResponse.json({
|
||||
success: true,
|
||||
role: authResult.role || "owner",
|
||||
});
|
||||
|
||||
response.cookies.set(
|
||||
SESSION_COOKIE,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import {
|
||||
createAdminSessionToken,
|
||||
formatAdminRoleLabel,
|
||||
getSessionCookieOptions,
|
||||
} from "@/core/auth/adminSession";
|
||||
import {
|
||||
@@ -7,6 +8,8 @@ import {
|
||||
updateAdminAccount,
|
||||
verifyRequestAdminSession,
|
||||
} from "@/core/auth/adminUsers";
|
||||
import { recordAdminAuditLogAsync } from "@/core/auth/auditLog";
|
||||
import { extractClientIp } from "@/lib/adminAuth";
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
|
||||
const SESSION_COOKIE = "datastack_admin_session";
|
||||
@@ -33,10 +36,13 @@ export async function GET(request: NextRequest) {
|
||||
|
||||
try {
|
||||
const account = await getAdminAccountInfo(auth.session.email);
|
||||
const effectiveRole = auth.session.role || account.role || "owner";
|
||||
return NextResponse.json({
|
||||
profile: {
|
||||
email: account.email,
|
||||
role: "Owner",
|
||||
role: formatAdminRoleLabel(effectiveRole),
|
||||
roleKey: effectiveRole,
|
||||
memberId: auth.session.memberId || account.memberId || "owner-1",
|
||||
storageMode: account.storageMode,
|
||||
createdAt: account.createdAt,
|
||||
sessionExpiresAt: new Date(auth.session.expiresAt).toISOString(),
|
||||
@@ -125,24 +131,42 @@ export async function PUT(request: NextRequest) {
|
||||
);
|
||||
}
|
||||
|
||||
// Preserve remaining session duration (e.g., 30-day "Remember me" session)
|
||||
const remainingSeconds = Math.max(
|
||||
SESSION_SECONDS,
|
||||
Math.ceil((auth.session.expiresAt - Date.now()) / 1000),
|
||||
);
|
||||
const expiresAt = Date.now() + remainingSeconds * 1000;
|
||||
const effectiveRole = result.role || auth.session.role || "owner";
|
||||
const effectiveMemberId =
|
||||
result.memberId || auth.session.memberId || "owner-1";
|
||||
const nextToken = await createAdminSessionToken(
|
||||
result.email,
|
||||
auth.sessionSecret,
|
||||
expiresAt,
|
||||
result.tokenVersion,
|
||||
effectiveRole,
|
||||
effectiveMemberId,
|
||||
);
|
||||
|
||||
await recordAdminAuditLogAsync({
|
||||
actorEmail: result.email,
|
||||
actorRole: effectiveRole,
|
||||
action: newPassword ? "ADMIN_PASSWORD_UPDATED" : "ADMIN_PROFILE_UPDATED",
|
||||
target: result.email,
|
||||
ipAddress: extractClientIp(request),
|
||||
metadata: {
|
||||
emailChanged: result.email !== account.email,
|
||||
passwordRotated: Boolean(newPassword),
|
||||
},
|
||||
});
|
||||
|
||||
const response = NextResponse.json({
|
||||
success: true,
|
||||
profile: {
|
||||
email: result.email,
|
||||
role: "Owner",
|
||||
role: formatAdminRoleLabel(effectiveRole),
|
||||
roleKey: effectiveRole,
|
||||
memberId: effectiveMemberId,
|
||||
storageMode: account.storageMode,
|
||||
createdAt: account.createdAt,
|
||||
sessionExpiresAt: new Date(expiresAt).toISOString(),
|
||||
|
||||
Reference in new issue
Block a user