fix: serialize managed profile Guardians

Protect every Guardian-reducing lifecycle transition with a record lock.\n\nReturn a recoverable refusal when the final Guardian remains.
This commit is contained in:
Marc-André Bombeck committed 2026-08-06 02:50:30 +02:00
1 parent 5059bc9b69
commit 523ab3220b
8 files changed
+318 -31

No files matched your search

@@ -35,6 +35,7 @@ import { auditLog } from "@/lib/auth/audit";
import { prisma } from "@/lib/db";
import { annotate } from "@/lib/logging/context";
import { GRANT_PARTY_SELECT, toGrantView } from "@/lib/sharing/grant-view";
import { LastManagedGuardianError } from "@/lib/managed-profiles/lifecycle";
import { GrantError, renounceGrantAndClearSwitch } from "@/lib/sharing/grants";
type RouteParams = { params: Promise<{ id: string }> };
@@ -76,6 +77,11 @@ export const POST = apiHandler(
});
} catch (err) {
if (err instanceof GrantError) return renounceErrorResponse(err);
if (err instanceof LastManagedGuardianError) {
return apiError("Add another Guardian before ending this access", 409, {
errorCode: "managed_profile.guardian.required",
});
}
throw err;
}
},
+6
View File
@@ -34,6 +34,7 @@ import { auditLog } from "@/lib/auth/audit";
import { prisma } from "@/lib/db";
import { annotate } from "@/lib/logging/context";
import { GRANT_PARTY_SELECT, toGrantView } from "@/lib/sharing/grant-view";
import { LastManagedGuardianError } from "@/lib/managed-profiles/lifecycle";
import { GrantError, revokeGrantAndClearSwitch } from "@/lib/sharing/grants";
type RouteParams = { params: Promise<{ id: string }> };
@@ -75,6 +76,11 @@ export const DELETE = apiHandler(
});
} catch (err) {
if (err instanceof GrantError) return revokeErrorResponse(err);
if (err instanceof LastManagedGuardianError) {
return apiError("Add another Guardian before ending this access", 409, {
errorCode: "managed_profile.guardian.required",
});
}
throw err;
}
},
@@ -0,0 +1,45 @@
import { NextRequest } from "next/server";
import {
apiHandler,
MFA_STEP_UP_MAX_AGE_SECONDS,
requireFreshMfa,
} from "@/lib/api-handler";
import { apiError, apiSuccess } from "@/lib/api-response";
import { auditLog } from "@/lib/auth/audit";
import {
deleteManagedProfile,
ManagedProfileLifecycleError,
} from "@/lib/managed-profiles/lifecycle";
import { annotate } from "@/lib/logging/context";
type RouteParams = { params: Promise<{ id: string }> };
/** Delete a managed record only after its cookie-backed Guardian proves MFA. */
export const DELETE = apiHandler(
async (_request: NextRequest, { params }: RouteParams) => {
const { user } = await requireFreshMfa(MFA_STEP_UP_MAX_AGE_SECONDS);
const { id } = await params;
try {
await deleteManagedProfile({ profileId: id, guardianId: user.id });
} catch (error) {
if (error instanceof ManagedProfileLifecycleError) {
return apiError("Managed profile not found", 404, {
errorCode: "managed_profile.not_found",
});
}
throw error;
}
await auditLog("managed_profile.deleted", {
userId: user.id,
details: { profileId: id },
}).catch(() => {});
annotate({
action: { name: "managed_profile.delete" },
meta: { profile_id: id },
});
return apiSuccess({ deleted: true });
},
);
+28 -11
View File
@@ -1,7 +1,6 @@
import { prisma } from "@/lib/db";
import { auditLog } from "@/lib/auth/audit";
import { apiSuccess, apiError, getClientIp } from "@/lib/api-response";
import { destroyAllSessions } from "@/lib/auth/session";
import { NextRequest } from "next/server";
import {
apiHandler,
@@ -9,6 +8,10 @@ import {
MFA_STEP_UP_MAX_AGE_SECONDS,
} from "@/lib/api-handler";
import { annotate } from "@/lib/logging/context";
import {
deleteGuardianAccountWithLifecycle,
LastManagedGuardianError,
} from "@/lib/managed-profiles/lifecycle";
export const dynamic = "force-dynamic";
@@ -63,18 +66,32 @@ export const DELETE = apiHandler(async (request: NextRequest) => {
details: { username },
});
// Destroy all sessions first
await destroyAllSessions(userId);
try {
await deleteGuardianAccountWithLifecycle(userId, async (tx) => {
// Destroy all sessions before the user row goes, inside the same record
// lifecycle transaction so a refusal leaves every account state intact.
await tx.session.deleteMany({ where: { userId } });
// Audit V3 NEW-V3-2 / GDPR Art. 17 fix: AuditLog rows have
// `onDelete: SetNull` in the schema, which keeps PII (IP addresses, login
// city geo) attached to the record after the user is deleted. We explicitly
// purge them inside the same logical operation so account deletion is
// genuinely complete erasure.
await prisma.auditLog.deleteMany({ where: { userId } });
// Audit V3 NEW-V3-2 / GDPR Art. 17 fix: AuditLog rows have
// `onDelete: SetNull` in the schema, which keeps PII (IP addresses, login
// city geo) attached to the record after the user is deleted. We explicitly
// purge them inside the same logical operation so account deletion is
// genuinely complete erasure.
await tx.auditLog.deleteMany({ where: { userId } });
// Delete user — all other related data is removed via onDelete: Cascade
await prisma.user.delete({ where: { id: userId } });
// Delete user — all other related data is removed via onDelete: Cascade.
await tx.user.delete({ where: { id: userId } });
});
} catch (error) {
if (error instanceof LastManagedGuardianError) {
return apiError(
"Add another Guardian or delete the managed profile first",
409,
{ errorCode: "managed_profile.guardian.required" },
);
}
throw error;
}
annotate({
action: { name: "settings.account.delete" },