add client info page
This commit is contained in:
parent
d5b5f037ac
commit
32927dfd55
@ -14,4 +14,5 @@ IPV6_STARTING_ADDR=fd00:10:18:11::100:0
|
|||||||
IPV6_CLIENT_PREFIX_SIZE=112
|
IPV6_CLIENT_PREFIX_SIZE=112
|
||||||
IP_MAX_INDEX=100
|
IP_MAX_INDEX=100
|
||||||
VPN_ENDPOINT=vpn.lab.cazzzer.com:51820
|
VPN_ENDPOINT=vpn.lab.cazzzer.com:51820
|
||||||
|
VPN_DNS=10.18.11.1,fd00:10:18:11::1
|
||||||
MAX_CLIENTS_PER_USER=20
|
MAX_CLIENTS_PER_USER=20
|
||||||
|
33
src/lib/clients.ts
Normal file
33
src/lib/clients.ts
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import type { ClientDetails } from '$lib/types/clients';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert client details to WireGuard configuration.
|
||||||
|
*
|
||||||
|
* ```conf
|
||||||
|
* [Interface]
|
||||||
|
* PrivateKey = wPa07zR0H4wYoc1ljfeiqlSbR8Z28pPc6jplwE7zPms=
|
||||||
|
* Address = 10.18.11.100/32,fd00::1/128
|
||||||
|
* DNS = 10.18.11.1,fd00::0
|
||||||
|
*
|
||||||
|
* [Peer]
|
||||||
|
* PublicKey = BJ5faPVJsDP4CCxNYilmKnwlQXOtXEOJjqIwb4U/CgM=
|
||||||
|
* PresharedKey = uhZUVqXKF0oayP0BS6yPu6Gepgh68Nz9prtbE5Cuok0=
|
||||||
|
* Endpoint = vpn.lab.cazzzer.com:51820
|
||||||
|
* AllowedIPs = 0.0.0.0/0,::/0
|
||||||
|
* ```
|
||||||
|
* @param client
|
||||||
|
*/
|
||||||
|
export function clientDetailsToConfig(client: ClientDetails): string {
|
||||||
|
return `\
|
||||||
|
[Interface]
|
||||||
|
PrivateKey = ${client.privateKey}
|
||||||
|
Address = ${client.ips.join(', ')}
|
||||||
|
DNS = ${client.vpnDns}
|
||||||
|
|
||||||
|
[Peer]
|
||||||
|
PublicKey = ${client.vpnPublicKey}
|
||||||
|
PresharedKey = ${client.preSharedKey}
|
||||||
|
Endpoint = ${client.vpnEndpoint}
|
||||||
|
AllowedIPs = 0.0.0.0/0,::/0
|
||||||
|
`;
|
||||||
|
}
|
@ -1,17 +1,69 @@
|
|||||||
import type { User } from '$lib/server/db/schema';
|
import type { User } from '$lib/server/db/schema';
|
||||||
import { db } from '$lib/server/db';
|
import { db } from '$lib/server/db';
|
||||||
import { wgClients, ipAllocations } from '$lib/server/db/schema';
|
import { wgClients, ipAllocations } from '$lib/server/db/schema';
|
||||||
import { opnsenseAuth, opnsenseUrl, serverUuid } from '$lib/server/opnsense';
|
import { opnsenseAuth, opnsenseUrl, serverPublicKey, serverUuid } from '$lib/server/opnsense';
|
||||||
import { Address4, Address6 } from 'ip-address';
|
import { Address4, Address6 } from 'ip-address';
|
||||||
import {
|
import {
|
||||||
IP_MAX_INDEX,
|
IP_MAX_INDEX,
|
||||||
IPV4_STARTING_ADDR,
|
IPV4_STARTING_ADDR,
|
||||||
IPV6_CLIENT_PREFIX_SIZE,
|
IPV6_CLIENT_PREFIX_SIZE,
|
||||||
IPV6_STARTING_ADDR, MAX_CLIENTS_PER_USER,
|
IPV6_STARTING_ADDR,
|
||||||
|
MAX_CLIENTS_PER_USER,
|
||||||
|
VPN_DNS,
|
||||||
VPN_ENDPOINT,
|
VPN_ENDPOINT,
|
||||||
} from '$env/static/private';
|
} from '$env/static/private';
|
||||||
import { count, eq, isNull } from 'drizzle-orm';
|
import { and, count, eq, isNull } from 'drizzle-orm';
|
||||||
import { err, ok, type Result } from '$lib/types';
|
import { err, ok, type Result } from '$lib/types';
|
||||||
|
import type { ClientDetails } from '$lib/types/clients';
|
||||||
|
|
||||||
|
export async function findClients(userId: string) {
|
||||||
|
return db.query.wgClients.findMany({
|
||||||
|
columns: {
|
||||||
|
id: true,
|
||||||
|
name: true,
|
||||||
|
publicKey: true,
|
||||||
|
privateKey: true,
|
||||||
|
preSharedKey: true,
|
||||||
|
},
|
||||||
|
with: {
|
||||||
|
ipAllocation: true,
|
||||||
|
},
|
||||||
|
where: eq(wgClients.userId, userId),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function findClient(userId: string, clientId: number) {
|
||||||
|
return db.query.wgClients.findFirst({
|
||||||
|
columns: {
|
||||||
|
id: true,
|
||||||
|
name: true,
|
||||||
|
publicKey: true,
|
||||||
|
privateKey: true,
|
||||||
|
preSharedKey: true,
|
||||||
|
},
|
||||||
|
with: {
|
||||||
|
ipAllocation: true,
|
||||||
|
},
|
||||||
|
where: and(eq(wgClients.userId, userId), eq(wgClients.id, clientId)),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function mapClientToDetails(
|
||||||
|
client: Awaited<ReturnType<typeof findClients>>[0],
|
||||||
|
): ClientDetails {
|
||||||
|
const ips = getIpsFromIndex(client.ipAllocation.id);
|
||||||
|
return {
|
||||||
|
id: client.id,
|
||||||
|
name: client.name,
|
||||||
|
publicKey: client.publicKey,
|
||||||
|
privateKey: client.privateKey,
|
||||||
|
preSharedKey: client.preSharedKey,
|
||||||
|
ips,
|
||||||
|
vpnPublicKey: serverPublicKey,
|
||||||
|
vpnEndpoint: VPN_ENDPOINT,
|
||||||
|
vpnDns: VPN_DNS,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export async function createClient(params: {
|
export async function createClient(params: {
|
||||||
name: string;
|
name: string;
|
||||||
@ -22,7 +74,8 @@ export async function createClient(params: {
|
|||||||
.select({ clientCount: count() })
|
.select({ clientCount: count() })
|
||||||
.from(wgClients)
|
.from(wgClients)
|
||||||
.where(eq(wgClients.userId, params.user.id));
|
.where(eq(wgClients.userId, params.user.id));
|
||||||
if (clientCount >= parseInt(MAX_CLIENTS_PER_USER)) return err([400, 'Maximum number of clients reached'] as [400, string]);
|
if (clientCount >= parseInt(MAX_CLIENTS_PER_USER))
|
||||||
|
return err([400, 'Maximum number of clients reached'] as [400, string]);
|
||||||
|
|
||||||
// this is going to be quite long
|
// this is going to be quite long
|
||||||
// 1. fetch params for new client from opnsense api
|
// 1. fetch params for new client from opnsense api
|
||||||
@ -31,7 +84,7 @@ export async function createClient(params: {
|
|||||||
// 2.3. update the allocation with the client id
|
// 2.3. update the allocation with the client id
|
||||||
// 3. create the client in opnsense
|
// 3. create the client in opnsense
|
||||||
// 4. reconfigure opnsense to enable the new client
|
// 4. reconfigure opnsense to enable the new client
|
||||||
const error= await db.transaction(async (tx) => {
|
const error = await db.transaction(async (tx) => {
|
||||||
const [keys, availableAllocation, lastAllocation] = await Promise.all([
|
const [keys, availableAllocation, lastAllocation] = await Promise.all([
|
||||||
// fetch params for new client from opnsense api
|
// fetch params for new client from opnsense api
|
||||||
getKeys(),
|
getKeys(),
|
||||||
@ -132,11 +185,9 @@ export function getIpsFromIndex(ipIndex: number) {
|
|||||||
const v6Allowed = Address6.fromBigInt(v6StartingAddr.bigInt() + v6Offset);
|
const v6Allowed = Address6.fromBigInt(v6StartingAddr.bigInt() + v6Offset);
|
||||||
const v6AllowedShort = v6Allowed.parsedAddress.join(':');
|
const v6AllowedShort = v6Allowed.parsedAddress.join(':');
|
||||||
|
|
||||||
return [
|
return [v4Allowed.address + '/32', v6AllowedShort + '/' + IPV6_CLIENT_PREFIX_SIZE];
|
||||||
v4Allowed.address + '/32',
|
|
||||||
v6AllowedShort + '/' + IPV6_CLIENT_PREFIX_SIZE,
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function opnsenseCreateClient(params: {
|
async function opnsenseCreateClient(params: {
|
||||||
username: string;
|
username: string;
|
||||||
pubkey: string;
|
pubkey: string;
|
||||||
|
@ -10,11 +10,12 @@ assert(env.OPNSENSE_API_SECRET, 'OPNSENSE_API_SECRET is not set');
|
|||||||
assert(env.OPNSENSE_WG_IFNAME, 'OPNSENSE_WG_IFNAME is not set');
|
assert(env.OPNSENSE_WG_IFNAME, 'OPNSENSE_WG_IFNAME is not set');
|
||||||
|
|
||||||
export const opnsenseUrl = env.OPNSENSE_API_URL;
|
export const opnsenseUrl = env.OPNSENSE_API_URL;
|
||||||
export const opnsenseAuth = "Basic " + encodeBasicCredentials(env.OPNSENSE_API_KEY, env.OPNSENSE_API_SECRET);
|
export const opnsenseAuth =
|
||||||
|
'Basic ' + encodeBasicCredentials(env.OPNSENSE_API_KEY, env.OPNSENSE_API_SECRET);
|
||||||
export const opnsenseIfname = env.OPNSENSE_WG_IFNAME;
|
export const opnsenseIfname = env.OPNSENSE_WG_IFNAME;
|
||||||
|
|
||||||
// unset secret for security
|
// unset secret for security
|
||||||
if (!dev) env.OPNSENSE_API_SECRET = "";
|
if (!dev) env.OPNSENSE_API_SECRET = '';
|
||||||
|
|
||||||
// this might be pretty bad if the server is down and in a bunch of other cases
|
// this might be pretty bad if the server is down and in a bunch of other cases
|
||||||
// TODO: write a retry loop later
|
// TODO: write a retry loop later
|
||||||
@ -23,11 +24,26 @@ const resServers = await fetch(`${opnsenseUrl}/api/wireguard/client/list_servers
|
|||||||
headers: {
|
headers: {
|
||||||
Authorization: opnsenseAuth,
|
Authorization: opnsenseAuth,
|
||||||
Accept: 'application/json',
|
Accept: 'application/json',
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
assert(resServers.ok, 'Failed to fetch OPNsense WireGuard servers');
|
assert(resServers.ok, 'Failed to fetch OPNsense WireGuard servers');
|
||||||
const servers = await resServers.json() as OpnsenseWgServers;
|
const servers = (await resServers.json()) as OpnsenseWgServers;
|
||||||
assert.equal(servers.status, 'ok', 'Failed to fetch OPNsense WireGuard servers');
|
assert.equal(servers.status, 'ok', 'Failed to fetch OPNsense WireGuard servers');
|
||||||
export const serverUuid = servers.rows.find(server => server.name === opnsenseIfname)?.uuid;
|
export const serverUuid = servers.rows.find((server) => server.name === opnsenseIfname)?.uuid;
|
||||||
assert(serverUuid, 'Failed to find server UUID for OPNsense WireGuard server');
|
assert(serverUuid, 'Failed to find server UUID for OPNsense WireGuard server');
|
||||||
console.log('OPNsense WireGuard server UUID:', serverUuid);
|
console.log('OPNsense WireGuard server UUID:', serverUuid);
|
||||||
|
|
||||||
|
const resServerInfo = await fetch(
|
||||||
|
`${opnsenseUrl}/api/wireguard/client/get_server_info/${serverUuid}`,
|
||||||
|
{
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
Authorization: opnsenseAuth,
|
||||||
|
Accept: 'application/json',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
assert(resServerInfo.ok, 'Failed to fetch OPNsense WireGuard server info');
|
||||||
|
const serverInfo = await resServerInfo.json();
|
||||||
|
assert.equal(serverInfo.status, 'ok', 'Failed to fetch OPNsense WireGuard server info');
|
||||||
|
export const serverPublicKey = serverInfo['pubkey'];
|
||||||
|
11
src/lib/types/clients.ts
Normal file
11
src/lib/types/clients.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
export type ClientDetails = {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
publicKey: string;
|
||||||
|
privateKey: string | null;
|
||||||
|
preSharedKey: string | null;
|
||||||
|
ips: string[];
|
||||||
|
vpnPublicKey: string;
|
||||||
|
vpnEndpoint: string;
|
||||||
|
vpnDns: string;
|
||||||
|
};
|
@ -1,5 +1,5 @@
|
|||||||
class Ok<T> {
|
class Ok<T> {
|
||||||
readonly _tag = "ok";
|
readonly _tag = 'ok';
|
||||||
value: T;
|
value: T;
|
||||||
|
|
||||||
constructor(value: T) {
|
constructor(value: T) {
|
||||||
@ -8,7 +8,7 @@ class Ok<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class Err<E> {
|
class Err<E> {
|
||||||
readonly _tag = "err";
|
readonly _tag = 'err';
|
||||||
error: E;
|
error: E;
|
||||||
|
|
||||||
constructor(error: E) {
|
constructor(error: E) {
|
@ -7,8 +7,8 @@
|
|||||||
const { user } = data;
|
const { user } = data;
|
||||||
|
|
||||||
function getNavClass(path: string) {
|
function getNavClass(path: string) {
|
||||||
return cn("hover:text-foreground/80 transition-colors",
|
return cn('hover:text-foreground/80 transition-colors',
|
||||||
$page.url.pathname === path ? "text-foreground" : "text-foreground/60");
|
$page.url.pathname.startsWith(path) ? 'text-foreground' : 'text-foreground/60');
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
20
src/routes/api/clients/[id]/+server.ts
Normal file
20
src/routes/api/clients/[id]/+server.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { error } from '@sveltejs/kit';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
import { findClient, mapClientToDetails } from '$lib/server/clients';
|
||||||
|
|
||||||
|
export const GET: RequestHandler = async (event) => {
|
||||||
|
if (!event.locals.user) {
|
||||||
|
return error(401, 'Unauthorized');
|
||||||
|
}
|
||||||
|
|
||||||
|
const { id } = event.params;
|
||||||
|
const clientId = parseInt(id);
|
||||||
|
if (isNaN(clientId)) {
|
||||||
|
return error(400, 'Invalid client ID');
|
||||||
|
}
|
||||||
|
const client = await findClient(event.locals.user.id, clientId);
|
||||||
|
if (!client) {
|
||||||
|
return error(404, 'Client not found');
|
||||||
|
}
|
||||||
|
return new Response(JSON.stringify(mapClientToDetails(client)));
|
||||||
|
};
|
@ -22,8 +22,12 @@
|
|||||||
</Table.Header>
|
</Table.Header>
|
||||||
<Table.Body>
|
<Table.Body>
|
||||||
{#each data.clients as client}
|
{#each data.clients as client}
|
||||||
<Table.Row class="border-y-2 border-background">
|
<Table.Row class="border-y-2 border-background hover:bg-muted-foreground">
|
||||||
<Table.Cell>{client.name}</Table.Cell>
|
<a href={`/clients/${client.id}`} class="contents">
|
||||||
|
<Table.Cell>
|
||||||
|
{client.name}
|
||||||
|
</Table.Cell>
|
||||||
|
</a>
|
||||||
<Table.Cell class="truncate max-w-[10ch]">{client.publicKey}</Table.Cell>
|
<Table.Cell class="truncate max-w-[10ch]">{client.publicKey}</Table.Cell>
|
||||||
<Table.Cell class="truncate max-w-[10ch]">{client.privateKey}</Table.Cell>
|
<Table.Cell class="truncate max-w-[10ch]">{client.privateKey}</Table.Cell>
|
||||||
<Table.Cell class="truncate max-w-[10ch]">{client.preSharedKey}</Table.Cell>
|
<Table.Cell class="truncate max-w-[10ch]">{client.preSharedKey}</Table.Cell>
|
||||||
|
41
src/routes/clients/[id]/+page.svelte
Normal file
41
src/routes/clients/[id]/+page.svelte
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import type { PageData } from './$types';
|
||||||
|
import { LucideClipboardCopy } from 'lucide-svelte';
|
||||||
|
|
||||||
|
const { data }: { data: PageData } = $props();
|
||||||
|
|
||||||
|
let tooltipText = $state('Copy to clipboard');
|
||||||
|
|
||||||
|
function copyToClipboard() {
|
||||||
|
navigator.clipboard.writeText(data.config).then(() => {
|
||||||
|
tooltipText = 'Copied';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function onMouseLeave() {
|
||||||
|
tooltipText = 'Copy to Clipboard';
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svelte:head>
|
||||||
|
<title></title>
|
||||||
|
</svelte:head>
|
||||||
|
|
||||||
|
<h1>Client: {data.client.name}</h1>
|
||||||
|
|
||||||
|
<div class="flex relative bg-accent p-2 rounded-xl overflow-x-scroll">
|
||||||
|
<pre><code>{data.config}</code></pre>
|
||||||
|
|
||||||
|
<!--Copy button for the configuration-->
|
||||||
|
<div class="absolute flex right-2 items-center group">
|
||||||
|
<span class="hidden group-hover:block bg-background text-xs rounded py-1 px-2">
|
||||||
|
{tooltipText}
|
||||||
|
</span>
|
||||||
|
<button class="flex items-center justify-center w-10 h-10 bg-background rounded-xl ml-2"
|
||||||
|
onclick={copyToClipboard}
|
||||||
|
onmouseleave="{onMouseLeave}"
|
||||||
|
>
|
||||||
|
<LucideClipboardCopy />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
11
src/routes/clients/[id]/+page.ts
Normal file
11
src/routes/clients/[id]/+page.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import type { PageLoad } from './$types';
|
||||||
|
import type { ClientDetails } from '$lib/types/clients';
|
||||||
|
import { clientDetailsToConfig } from '$lib/clients';
|
||||||
|
|
||||||
|
export const load: PageLoad = async ({ fetch, params }) => {
|
||||||
|
const res = await fetch(`/api/clients/${params.id}`);
|
||||||
|
const client = (await res.json()) as ClientDetails;
|
||||||
|
const config = clientDetailsToConfig(client);
|
||||||
|
|
||||||
|
return { client, config };
|
||||||
|
};
|
Loading…
x
Reference in New Issue
Block a user