feat(admission): add group VPN exceptions
CI / validate (push) Successful in 5m45s
Release / release (push) Successful in 7m21s

This commit is contained in:
dmg
2026-08-02 10:16:16 -04:00
parent 24808b0f8c
commit 71856bb869
34 changed files with 1820 additions and 138 deletions
@@ -1,12 +1,15 @@
"use server";
import { randomUUID } from "node:crypto";
import {
formatManagedDiscordNickname,
lookupJavaProfile,
updateGuildNickname,
} from "@minecraft-account-manager/minecraft";
import { minecraftAccounts, users } from "@minecraft-account-manager/database";
import { and, eq, isNull, ne } from "drizzle-orm";
import { events, groups, minecraftAccounts, userGroupMemberships, users } from "@minecraft-account-manager/database";
import { getClientIp } from "@minecraft-account-manager/network";
import { and, eq, isNull, ne, sql } from "drizzle-orm";
import { headers } from "next/headers";
import { redirect } from "next/navigation";
import { recordAdminEvent } from "@/lib/audit";
import { requireAdminSession } from "@/lib/auth/require-admin";
@@ -19,6 +22,12 @@ function userPath(userId: string, query?: string) {
return `/admin/users/${encodeURIComponent(userId)}${query ? `?${query}` : ""}`;
}
function userRegistryPath(search: string, result: "saved=group" | "error=invalid-group-assignment") {
const query = new URLSearchParams(result);
if (search) query.set("q", search);
return `/admin/users?${query.toString()}`;
}
async function targetUser(userId: string) {
if (!UUID_PATTERN.test(userId)) return null;
const [user] = await db.select().from(users).where(eq(users.id, userId)).limit(1);
@@ -72,6 +81,61 @@ async function recordSyncFailure(
);
}
export async function assignUserGroupFromRegistry(formData: FormData) {
const admin = await requireAdminSession();
const userId = String(formData.get("userId") ?? "");
const groupId = String(formData.get("groupId") ?? "");
const search = String(formData.get("search") ?? "").trim().slice(0, 100);
if (!UUID_PATTERN.test(userId) || !UUID_PATTERN.test(groupId)) redirect(userRegistryPath(search, "error=invalid-group-assignment"));
const [[user], [targetGroup]] = await Promise.all([
db.select({ id: users.id }).from(users).where(eq(users.id, userId)).limit(1),
db.select({ id: groups.id, name: groups.name, isDefault: groups.isDefault }).from(groups).where(eq(groups.id, groupId)).limit(1),
]);
if (!user || !targetGroup) redirect(userRegistryPath(search, "error=invalid-group-assignment"));
const requestHeaders = await headers();
const ipAddress = getClientIp(requestHeaders, process.env.TRUST_PROXY === "true");
try {
await db.transaction(async (tx) => {
await tx.execute(sql`select ${users.id} from ${users} where ${users.id} = ${user.id} for update`);
const [previous] = await tx.select({ id: groups.id, name: groups.name })
.from(userGroupMemberships)
.innerJoin(groups, eq(groups.id, userGroupMemberships.groupId))
.where(eq(userGroupMemberships.userId, user.id))
.limit(1);
if (targetGroup.isDefault) {
await tx.delete(userGroupMemberships).where(eq(userGroupMemberships.userId, user.id));
} else {
await tx.insert(userGroupMemberships).values({ userId: user.id, groupId: targetGroup.id })
.onConflictDoUpdate({
target: userGroupMemberships.userId,
set: { groupId: targetGroup.id },
});
}
await tx.insert(events).values({
id: randomUUID(),
source: "/web/admin",
type: "games.minecraft.account-manager.group.assignment-updated",
subject: `user/${user.id}`,
time: new Date(),
data: {
groupId: targetGroup.id,
groupName: targetGroup.name,
previousGroupId: previous?.id ?? null,
previousGroupName: previous?.name ?? "everyone",
adminEmail: admin.email,
adminName: admin.name,
},
ipAddress: ipAddress ?? null,
});
});
} catch {
redirect(userRegistryPath(search, "error=invalid-group-assignment"));
}
redirect(userRegistryPath(search, "saved=group"));
}
export async function updateUserName(formData: FormData) {
const admin = await requireAdminSession();
const userId = String(formData.get("userId") ?? "");