feat(config): use minimal headscale config

This commit is contained in:
Aarnav Tale
2026-06-20 18:28:36 -04:00
parent 5aebc6d932
commit dc32427cff
11 changed files with 259 additions and 312 deletions
+10 -6
View File
@@ -48,7 +48,9 @@ export async function restrictionAction({ request, context }: Route.ActionArgs)
});
}
const domains = [...new Set([...(headscaleConfig.c?.oidc?.allowed_domains ?? []), domain])];
const domains = [
...new Set([...(headscaleConfig.getOIDCConfig()?.allowedDomains ?? []), domain]),
];
await headscaleConfig.patch([
{
@@ -69,7 +71,7 @@ export async function restrictionAction({ request, context }: Route.ActionArgs)
});
}
const storedDomains = headscaleConfig.c?.oidc?.allowed_domains ?? [];
const storedDomains = headscaleConfig.getOIDCConfig()?.allowedDomains ?? [];
if (!storedDomains.includes(domain)) {
// Domain not found in the list
throw data(`Domain "${domain}" not found in allowed domains.`, {
@@ -97,7 +99,9 @@ export async function restrictionAction({ request, context }: Route.ActionArgs)
});
}
const groups = [...new Set([...(headscaleConfig.c?.oidc?.allowed_groups ?? []), group])];
const groups = [
...new Set([...(headscaleConfig.getOIDCConfig()?.allowedGroups ?? []), group]),
];
await headscaleConfig.patch([
{
@@ -118,7 +122,7 @@ export async function restrictionAction({ request, context }: Route.ActionArgs)
});
}
const storedGroups = headscaleConfig.c?.oidc?.allowed_groups ?? [];
const storedGroups = headscaleConfig.getOIDCConfig()?.allowedGroups ?? [];
if (!storedGroups.includes(group)) {
// Group not found in the list
throw data(`Group "${group}" not found in allowed groups.`, {
@@ -147,7 +151,7 @@ export async function restrictionAction({ request, context }: Route.ActionArgs)
});
}
const users = [...new Set([...(headscaleConfig.c?.oidc?.allowed_users ?? []), user])];
const users = [...new Set([...(headscaleConfig.getOIDCConfig()?.allowedUsers ?? []), user])];
await headscaleConfig.patch([
{
@@ -168,7 +172,7 @@ export async function restrictionAction({ request, context }: Route.ActionArgs)
});
}
const storedUsers = headscaleConfig.c?.oidc?.allowed_users ?? [];
const storedUsers = headscaleConfig.getOIDCConfig()?.allowedUsers ?? [];
if (!storedUsers.includes(user)) {
// User not found in the list
throw data(`User "${user}" not found in allowed users.`, {
@@ -24,7 +24,8 @@ export async function loader({ request, context }: Route.LoaderArgs) {
});
}
if (!headscaleConfig.c?.oidc) {
const oidc = headscaleConfig.getOIDCConfig();
if (!oidc) {
throw data("OIDC is not configured on this Headscale instance.", {
status: 501,
});
@@ -33,9 +34,9 @@ export async function loader({ request, context }: Route.LoaderArgs) {
return {
access: auth.can(principal, Capabilities.configure_iam),
settings: {
domains: [...new Set(headscaleConfig.c.oidc.allowed_domains)],
groups: [...new Set(headscaleConfig.c.oidc.allowed_groups)],
users: [...new Set(headscaleConfig.c.oidc.allowed_users)],
domains: [...new Set(oidc.allowedDomains)],
groups: [...new Set(oidc.allowedGroups)],
users: [...new Set(oidc.allowedUsers)],
},
writable: headscaleConfig.writable(),
};