mirror
/
wg-easy
mirror of https://github.com/wg-easy/wg-easy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix issues, better naming

pull/1354/head
Bernd Storath 2 years ago
parent
4f97bebcaa
commit
176bbdf4b8
13 changed files with 136 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      src/app/components/Client/Address.vue
  2. 60
      src/app/components/Client/Address4.vue
  3. 2
      src/app/components/Client/Client.vue
  4. 10
      src/app/utils/api.ts
  5. 7
      src/server/api/wireguard/client/[clientId]/address4.put.ts
  6. 66
      src/server/utils/WireGuard.ts
  7. 8
      src/server/utils/types.ts
  8. 13
      src/services/database/lowdb.ts
  9. 22
      src/services/database/migrations/1.ts
  10. 4
      src/services/database/repositories/client.ts
  11. 2
      src/services/database/repositories/database.ts
  12. 6
      src/services/database/repositories/system.ts
  13. 6
      src/services/database/repositories/user.ts

60
src/app/components/Client/Address.vue
View File

@ -1,60 +0,0 @@
<template>
<span class="group">
<!-- Show -->
<input
v-show="clientEditAddressId === client.id"
ref="clientAddressInput"
v-model="clientEditAddress"
class="rounded border-2 dark:bg-neutral-700 border-gray-100 dark:border-neutral-600 focus:border-gray-200 dark:focus:border-neutral-500 outline-none w-20 text-black dark:text-neutral-300 dark:placeholder:text-neutral-500"
@keyup.enter="
updateClientAddress(client, clientEditAddress);
clientEditAddress = null;
clientEditAddressId = null;
"
@keyup.escape="
clientEditAddress = null;
clientEditAddressId = null;
"
/>
<span v-show="clientEditAddressId !== client.id" class="inline-block">{{
client.address
}}</span>
<!-- Edit -->
<span
v-show="clientEditAddressId !== client.id"
class="cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity"
@click="
clientEditAddress = client.address;
clientEditAddressId = client.id;
nextTick(() => clientAddressInput?.select());
"
>
<IconsEdit
class="h-4 w-4 inline align-middle opacity-25 hover:opacity-100"
/>
</span>
</span>
</template>
<script setup lang="ts">
defineProps<{
client: LocalClient;
}>();
const clientsStore = useClientsStore();
const clientAddressInput = ref<HTMLInputElement | null>(null);
const clientEditAddress = ref<null | string>(null);
const clientEditAddressId = ref<null | string>(null);
function updateClientAddress(client: WGClient, address: string | null) {
if (address === null) {
return;
}
api
.updateClientAddress({ clientId: client.id, address })
.catch((err) => alert(err.message || err.toString()))
.finally(() => clientsStore.refresh().catch(console.error));
}
</script>

60
src/app/components/Client/Address4.vue
View File

@ -0,0 +1,60 @@
<template>
<span class="group">
<!-- Show -->
<input
v-show="clientEditAddress4Id === client.id"
ref="clientAddress4Input"
v-model="clientEditAddress4"
class="rounded border-2 dark:bg-neutral-700 border-gray-100 dark:border-neutral-600 focus:border-gray-200 dark:focus:border-neutral-500 outline-none w-20 text-black dark:text-neutral-300 dark:placeholder:text-neutral-500"
@keyup.enter="
updateClientAddress4(client, clientEditAddress4);
clientEditAddress4 = null;
clientEditAddress4Id = null;
"
@keyup.escape="
clientEditAddress4 = null;
clientEditAddress4Id = null;
"
/>
<span v-show="clientEditAddress4Id !== client.id" class="inline-block">{{
client.address4
}}</span>
<!-- Edit -->
<span
v-show="clientEditAddress4Id !== client.id"
class="cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity"
@click="
clientEditAddress4 = client.address4;
clientEditAddress4Id = client.id;
nextTick(() => clientAddress4Input?.select());
"
>
<IconsEdit
class="h-4 w-4 inline align-middle opacity-25 hover:opacity-100"
/>
</span>
</span>
</template>
<script setup lang="ts">
defineProps<{
client: LocalClient;
}>();
const clientsStore = useClientsStore();
const clientAddress4Input = ref<HTMLInputElement | null>(null);
const clientEditAddress4 = ref<null | string>(null);
const clientEditAddress4Id = ref<null | string>(null);
function updateClientAddress4(client: WGClient, address4: string | null) {
if (address4 === null) {
return;
}
api
.updateClientAddress4({ clientId: client.id, address4 })
.catch((err) => alert(err.message || err.toString()))
.finally(() => clientsStore.refresh().catch(console.error));
}
</script>

2
src/app/components/Client/Client.vue
View File

@ -12,7 +12,7 @@
<div <div
class="block md:inline-block pb-1 md:pb-0 text-gray-500 dark:text-neutral-400 text-xs" class="block md:inline-block pb-1 md:pb-0 text-gray-500 dark:text-neutral-400 text-xs"
> >
<ClientAddress :client="client" /> <ClientAddress4 :client="client" />
<ClientInlineTransfer <ClientInlineTransfer
v-if="!globalStore.features.trafficStats.enabled" v-if="!globalStore.features.trafficStats.enabled"
:client="client" :client="client"

10
src/app/utils/api.ts
View File

@ -95,16 +95,16 @@ class API {
}); });
} }
async updateClientAddress({ async updateClientAddress4({
clientId, clientId,
address, address4,
}: { }: {
clientId: string; clientId: string;
address: string; address4: string;
}) { }) {
return $fetch(`/api/wireguard/client/${clientId}/address`, { return $fetch(`/api/wireguard/client/${clientId}/address4`, {
method: 'put', method: 'put',
body: { address }, body: { address4 },
}); });
} }

7
src/server/api/wireguard/client/[clientId]/address.put.ts → src/server/api/wireguard/client/[clientId]/address4.put.ts
View File

@ -3,7 +3,10 @@ export default defineEventHandler(async (event) => {
event, event,
validateZod(clientIdType) validateZod(clientIdType)
); );
const { address } = await readValidatedBody(event, validateZod(addressType)); const { address4 } = await readValidatedBody(
await WireGuard.updateClientAddress({ clientId, address }); event,
validateZod(address4Type)
);
await WireGuard.updateClientAddress({ clientId, address4 });
return { success: true }; return { success: true };
}); });

66
src/server/utils/WireGuard.ts
View File

@ -21,8 +21,8 @@ class WireGuard {
async #saveWireguardConfig() { async #saveWireguardConfig() {
const system = await Database.getSystem(); const system = await Database.getSystem();
const clients = await Database.getClients(); const clients = await Database.getClients();
const cidrBlock = parseCidr(system.userConfig.addressRange).prefix; const cidr4Block = parseCidr(system.userConfig.address4Range).prefix;
const cidr6Block = parseCidr(system.userConfig.addressRange6).prefix; const cidr6Block = parseCidr(system.userConfig.address6Range).prefix;
let result = ` let result = `
# Note: Do not edit this file directly. # Note: Do not edit this file directly.
# Your changes will be overwritten! # Your changes will be overwritten!
@ -30,7 +30,7 @@ class WireGuard {
# Server # Server
[Interface] [Interface]
PrivateKey = ${system.interface.privateKey} PrivateKey = ${system.interface.privateKey}
Address = ${system.interface.address}/${cidrBlock}, ${system.interface.address6}/${cidr6Block} Address = ${system.interface.address4}/${cidr4Block}, ${system.interface.address6}/${cidr6Block}
ListenPort = ${system.wgPort} ListenPort = ${system.wgPort}
PreUp = ${system.iptables.PreUp} PreUp = ${system.iptables.PreUp}
PostUp = ${system.iptables.PostUp} PostUp = ${system.iptables.PostUp}
@ -47,7 +47,7 @@ PostDown = ${system.iptables.PostDown}
[Peer] [Peer]
PublicKey = ${client.publicKey} PublicKey = ${client.publicKey}
PresharedKey = ${client.preSharedKey} PresharedKey = ${client.preSharedKey}
AllowedIPs = ${client.address}/32, ${client.address6}/128`; AllowedIPs = ${client.address4}/32, ${client.address6}/128`;
} }
DEBUG('Config saving...'); DEBUG('Config saving...');
@ -69,7 +69,7 @@ AllowedIPs = ${client.address}/32, ${client.address6}/128`;
id: clientId, id: clientId,
name: client.name, name: client.name,
enabled: client.enabled, enabled: client.enabled,
address: client.address, address4: client.address4,
address6: client.address6, address6: client.address6,
publicKey: client.publicKey, publicKey: client.publicKey,
createdAt: new Date(client.createdAt), createdAt: new Date(client.createdAt),
@ -136,11 +136,13 @@ AllowedIPs = ${client.address}/32, ${client.address6}/128`;
async getClientConfiguration({ clientId }: { clientId: string }) { async getClientConfiguration({ clientId }: { clientId: string }) {
const system = await Database.getSystem(); const system = await Database.getSystem();
const client = await this.getClient({ clientId }); const client = await this.getClient({ clientId });
const cidr4Block = parseCidr(system.userConfig.address4Range).prefix;
const cidr6Block = parseCidr(system.userConfig.address6Range).prefix;
return ` return `
[Interface] [Interface]
PrivateKey = ${client.privateKey} PrivateKey = ${client.privateKey}
Address = ${client.address} Address = ${client.address4}/${cidr4Block}, ${client.address6}/${cidr6Block}
DNS = ${system.userConfig.defaultDns.join(', ')} DNS = ${system.userConfig.defaultDns.join(', ')}
MTU = ${system.userConfig.mtu} MTU = ${system.userConfig.mtu}
@ -167,10 +169,6 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
name: string; name: string;
expireDate: string | null; expireDate: string | null;
}) { }) {
if (!name) {
throw new Error('Missing: Name');
}
const system = await Database.getSystem(); const system = await Database.getSystem();
const clients = await Database.getClients(); const clients = await Database.getClients();
@ -181,27 +179,31 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
const preSharedKey = await exec('wg genpsk'); const preSharedKey = await exec('wg genpsk');
// Calculate next IP // Calculate next IP
const cidr = parseCidr(system.userConfig.addressRange); const cidr4 = parseCidr(system.userConfig.address4Range);
let address; let address4;
for (let i = cidr.start + 2n; i <= cidr.end - 1n; i++) { for (let i = cidr4.start + 2n; i <= cidr4.end - 1n; i++) {
const currentIp = stringifyIp({ number: i, version: 4 }); const currentIp4 = stringifyIp({ number: i, version: 4 });
const client = Object.values(clients).find((client) => { const client = Object.values(clients).find((client) => {
return client.address === currentIp; return client.address4 === currentIp4;
}); });
if (!client) { if (!client) {
address = currentIp; address4 = currentIp4;
break; break;
} }
} }
if (!address) { if (!address4) {
throw new Error('Maximum number of clients reached.'); throw createError({
statusCode: 409,
statusMessage: 'Maximum number of clients reached.',
data: { cause: 'IPv4 Address Pool exhausted' },
});
} }
const cidr6 = parseCidr(system.userConfig.addressRange6); const cidr6 = parseCidr(system.userConfig.address6Range);
let address6; let address6;
for (let i = cidr6.start + 2n; i <= cidr.end - 1n; i++) { for (let i = cidr6.start + 2n; i <= cidr6.end - 1n; i++) {
const currentIp6 = stringifyIp({ number: i, version: 6 }); const currentIp6 = stringifyIp({ number: i, version: 6 });
const client = Object.values(clients).find((client) => { const client = Object.values(clients).find((client) => {
return client.address6 === currentIp6; return client.address6 === currentIp6;
@ -214,7 +216,11 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
} }
if (!address6) { if (!address6) {
throw new Error('Maximum number of clients reached.'); throw createError({
statusCode: 409,
statusMessage: 'Maximum number of clients reached.',
data: { cause: 'IPv6 Address Pool exhausted' },
});
} }
// Create Client // Create Client
@ -223,7 +229,7 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
const client: NewClient = { const client: NewClient = {
id, id,
name, name,
address, address4,
address6, address6,
privateKey, privateKey,
publicKey, publicKey,
@ -298,19 +304,19 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
async updateClientAddress({ async updateClientAddress({
clientId, clientId,
address, address4,
}: { }: {
clientId: string; clientId: string;
address: string; address4: string;
}) { }) {
if (!isIPv4(address)) { if (!isIPv4(address4)) {
throw createError({ throw createError({
statusCode: 400, statusCode: 400,
statusMessage: `Invalid Address: ${address}`, statusMessage: `Invalid Address: ${address4}`,
}); });
} }
await Database.updateClientAddress(clientId, address); await Database.updateClientAddress4(clientId, address4);
await this.saveConfig(); await this.saveConfig();
} }
@ -450,9 +456,9 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
if (client.endpoint !== null) { if (client.endpoint !== null) {
wireguardConnectedPeersCount++; wireguardConnectedPeersCount++;
} }
wireguardSentBytes += `wireguard_sent_bytes{interface="wg0",enabled="${client.enabled}",address="${client.address}",name="${client.name}"} ${Number(client.transferTx)}\n`; wireguardSentBytes += `wireguard_sent_bytes{interface="wg0",enabled="${client.enabled}",address4="${client.address4}",address6="${client.address6}",name="${client.name}"} ${Number(client.transferTx)}\n`;
wireguardReceivedBytes += `wireguard_received_bytes{interface="wg0",enabled="${client.enabled}",address="${client.address}",name="${client.name}"} ${Number(client.transferRx)}\n`; wireguardReceivedBytes += `wireguard_received_bytes{interface="wg0",enabled="${client.enabled}",address4="${client.address4}",address6="${client.address6}",name="${client.name}"} ${Number(client.transferRx)}\n`;
wireguardLatestHandshakeSeconds += `wireguard_latest_handshake_seconds{interface="wg0",enabled="${client.enabled}",address="${client.address}",name="${client.name}"} ${client.latestHandshakeAt ? (new Date().getTime() - new Date(client.latestHandshakeAt).getTime()) / 1000 : 0}\n`; wireguardLatestHandshakeSeconds += `wireguard_latest_handshake_seconds{interface="wg0",enabled="${client.enabled}",address4="${client.address4}",address6="${client.address6}",name="${client.name}"} ${client.latestHandshakeAt ? (new Date().getTime() - new Date(client.latestHandshakeAt).getTime()) / 1000 : 0}\n`;
} }
let returnText = '# HELP wg-easy and wireguard metrics\n'; let returnText = '# HELP wg-easy and wireguard metrics\n';

8
src/server/utils/types.ts
View File

@ -13,8 +13,8 @@ const id = z
.uuid('Client ID must be a valid UUID') .uuid('Client ID must be a valid UUID')
.pipe(safeStringRefine); .pipe(safeStringRefine);
const address = z const address4 = z
.string({ message: 'Address must be a valid string' }) .string({ message: 'IPv4 Address must be a valid string' })
.pipe(safeStringRefine); .pipe(safeStringRefine);
const name = z const name = z
@ -54,9 +54,9 @@ export const clientIdType = z.object(
{ message: "This shouldn't happen" } { message: "This shouldn't happen" }
); );
export const addressType = z.object( export const address4Type = z.object(
{ {
address: address, address4: address4,
}, },
{ message: 'Body must be a valid object' } { message: 'Body must be a valid object' }
); );

13
src/services/database/lowdb.ts
View File

@ -102,6 +102,7 @@ export default class LowDB extends DatabaseProvider {
id: crypto.randomUUID(), id: crypto.randomUUID(),
password: hashPassword(password), password: hashPassword(password),
username, username,
name: 'Administrator',
role: isUserEmpty ? 'ADMIN' : 'CLIENT', role: isUserEmpty ? 'ADMIN' : 'CLIENT',
enabled: true, enabled: true,
createdAt: now, createdAt: now,
@ -175,17 +176,17 @@ export default class LowDB extends DatabaseProvider {
}); });
} }
async updateClientAddress(id: string, address: string) { async updateClientAddress4(id: string, address4: string) {
DEBUG('Update Client Address'); DEBUG('Update Client Address4');
await this.#db.update((data) => { await this.#db.update((data) => {
if (data.clients[id]) { if (data.clients[id]) {
data.clients[id].address = address; data.clients[id].address4 = address4;
} }
}); });
} }
async updateClientExpirationDate(id: string, expirationDate: string | null) { async updateClientExpirationDate(id: string, expirationDate: string | null) {
DEBUG('Update Client Address'); DEBUG('Update Client Expiration Date');
await this.#db.update((data) => { await this.#db.update((data) => {
if (data.clients[id]) { if (data.clients[id]) {
data.clients[id].expiresAt = expirationDate; data.clients[id].expiresAt = expirationDate;
@ -194,7 +195,7 @@ export default class LowDB extends DatabaseProvider {
} }
async deleteOneTimeLink(id: string) { async deleteOneTimeLink(id: string) {
DEBUG('Update Client Address'); DEBUG('Delete Client One Time Link');
await this.#db.update((data) => { await this.#db.update((data) => {
if (data.clients[id]) { if (data.clients[id]) {
data.clients[id].oneTimeLink = null; data.clients[id].oneTimeLink = null;
@ -203,7 +204,7 @@ export default class LowDB extends DatabaseProvider {
} }
async createOneTimeLink(id: string, oneTimeLink: OneTimeLink) { async createOneTimeLink(id: string, oneTimeLink: OneTimeLink) {
DEBUG('Update Client Address'); DEBUG('Create Client One Time Link');
await this.#db.update((data) => { await this.#db.update((data) => {
if (data.clients[id]) { if (data.clients[id]) {
data.clients[id].oneTimeLink = oneTimeLink; data.clients[id].oneTimeLink = oneTimeLink;

22
src/services/database/migrations/1.ts
View File

@ -9,17 +9,17 @@ export async function run1(db: Low<Database>) {
const publicKey = await exec(`echo ${privateKey} | wg pubkey`, { const publicKey = await exec(`echo ${privateKey} | wg pubkey`, {
log: 'echo ***hidden*** | wg pubkey', log: 'echo ***hidden*** | wg pubkey',
}); });
const addressRange = '10.8.0.0/24'; const address4Range = '10.8.0.0/24';
const addressRange6 = 'fdcc:ad94:bacf:61a4::cafe:0/112'; const address6Range = 'fdcc:ad94:bacf:61a4::cafe:0/112';
const cidr = parseCidr(addressRange); const cidr4 = parseCidr(address4Range);
const cidr6 = parseCidr(addressRange6); const cidr6 = parseCidr(address6Range);
const database: Database = { const database: Database = {
migrations: [], migrations: [],
system: { system: {
interface: { interface: {
privateKey: privateKey, privateKey: privateKey,
publicKey: publicKey, publicKey: publicKey,
address: stringifyIp({ number: cidr.start + 1n, version: 4 }), address4: stringifyIp({ number: cidr4.start + 1n, version: 4 }),
address6: stringifyIp({ number: cidr6.start + 1n, version: 6 }), address6: stringifyIp({ number: cidr6.start + 1n, version: 6 }),
}, },
sessionTimeout: 3600, // 1 hour sessionTimeout: 3600, // 1 hour
@ -27,8 +27,8 @@ export async function run1(db: Low<Database>) {
userConfig: { userConfig: {
mtu: 1420, mtu: 1420,
persistentKeepalive: 0, persistentKeepalive: 0,
addressRange: addressRange, address4Range: address4Range,
addressRange6: addressRange6, address6Range: address6Range,
defaultDns: ['1.1.1.1', '2606:4700:4700::1111'], defaultDns: ['1.1.1.1', '2606:4700:4700::1111'],
allowedIps: ['0.0.0.0/0', '::/0'], allowedIps: ['0.0.0.0/0', '::/0'],
}, },
@ -73,11 +73,11 @@ export async function run1(db: Low<Database>) {
// TODO: use variables inside up/down script // TODO: use variables inside up/down script
// TODO: properly check if ipv6 support // TODO: properly check if ipv6 support
database.system.iptables.PostUp = ` database.system.iptables.PostUp = `
iptables -t nat -A POSTROUTING -s ${database.system.userConfig.addressRange} -o ${database.system.wgDevice} -j MASQUERADE; iptables -t nat -A POSTROUTING -s ${database.system.userConfig.address4Range} -o ${database.system.wgDevice} -j MASQUERADE;
iptables -A INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT; iptables -A INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT;
iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -i wg0 -j ACCEPT;
iptables -A FORWARD -o wg0 -j ACCEPT; iptables -A FORWARD -o wg0 -j ACCEPT;
ip6tables -t nat -A POSTROUTING -s ${database.system.userConfig.addressRange6} -o ${database.system.wgDevice} -j MASQUERADE; ip6tables -t nat -A POSTROUTING -s ${database.system.userConfig.address6Range} -o ${database.system.wgDevice} -j MASQUERADE;
ip6tables -A INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT; ip6tables -A INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT;
ip6tables -A FORWARD -i wg0 -j ACCEPT; ip6tables -A FORWARD -i wg0 -j ACCEPT;
ip6tables -A FORWARD -o wg0 -j ACCEPT; ip6tables -A FORWARD -o wg0 -j ACCEPT;
@ -86,11 +86,11 @@ ip6tables -A FORWARD -o wg0 -j ACCEPT;
.join(' '); .join(' ');
database.system.iptables.PostDown = ` database.system.iptables.PostDown = `
iptables -t nat -D POSTROUTING -s ${database.system.userConfig.addressRange} -o ${database.system.wgDevice} -j MASQUERADE; iptables -t nat -D POSTROUTING -s ${database.system.userConfig.address4Range} -o ${database.system.wgDevice} -j MASQUERADE;
iptables -D INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT; iptables -D INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT;
iptables -D FORWARD -i wg0 -j ACCEPT; iptables -D FORWARD -i wg0 -j ACCEPT;
iptables -D FORWARD -o wg0 -j ACCEPT; iptables -D FORWARD -o wg0 -j ACCEPT;
ip6tables -t nat -D POSTROUTING -s ${database.system.userConfig.addressRange6} -o ${database.system.wgDevice} -j MASQUERADE; ip6tables -t nat -D POSTROUTING -s ${database.system.userConfig.address6Range} -o ${database.system.wgDevice} -j MASQUERADE;
ip6tables -D INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT; ip6tables -D INPUT -p udp -m udp --dport ${database.system.wgPort} -j ACCEPT;
ip6tables -D FORWARD -i wg0 -j ACCEPT; ip6tables -D FORWARD -i wg0 -j ACCEPT;
ip6tables -D FORWARD -o wg0 -j ACCEPT; ip6tables -D FORWARD -o wg0 -j ACCEPT;

4
src/services/database/repositories/client.ts
View File

@ -7,7 +7,7 @@ export type OneTimeLink = {
export type Client = { export type Client = {
id: string; id: string;
name: string; name: string;
address: string; address4: string;
address6: string; address6: string;
privateKey: string; privateKey: string;
publicKey: string; publicKey: string;
@ -38,7 +38,7 @@ export interface ClientRepository {
deleteClient(id: string): Promise<void>; deleteClient(id: string): Promise<void>;
toggleClient(id: string, enable: boolean): Promise<void>; toggleClient(id: string, enable: boolean): Promise<void>;
updateClientName(id: string, name: string): Promise<void>; updateClientName(id: string, name: string): Promise<void>;
updateClientAddress(id: string, address: string): Promise<void>; updateClientAddress4(id: string, address4: string): Promise<void>;
updateClientExpirationDate( updateClientExpirationDate(
id: string, id: string,
expirationDate: string | null expirationDate: string | null

2
src/services/database/repositories/database.ts
View File

@ -59,7 +59,7 @@ export abstract class DatabaseProvider
abstract deleteClient(id: string): Promise<void>; abstract deleteClient(id: string): Promise<void>;
abstract toggleClient(id: string, enable: boolean): Promise<void>; abstract toggleClient(id: string, enable: boolean): Promise<void>;
abstract updateClientName(id: string, name: string): Promise<void>; abstract updateClientName(id: string, name: string): Promise<void>;
abstract updateClientAddress(id: string, address: string): Promise<void>; abstract updateClientAddress4(id: string, address4: string): Promise<void>;
abstract updateClientExpirationDate( abstract updateClientExpirationDate(
id: string, id: string,
expirationDate: string | null expirationDate: string | null

6
src/services/database/repositories/system.ts
View File

@ -12,15 +12,15 @@ export type IpTables = {
export type WGInterface = { export type WGInterface = {
privateKey: string; privateKey: string;
publicKey: string; publicKey: string;
address: string; address4: string;
address6: string; address6: string;
}; };
export type WGConfig = { export type WGConfig = {
mtu: number; mtu: number;
persistentKeepalive: number; persistentKeepalive: number;
addressRange: string; address4Range: string;
addressRange6: string; address6Range: string;
defaultDns: string[]; defaultDns: string[];
allowedIps: string[]; allowedIps: string[];
}; };

6
src/services/database/repositories/user.ts
View File

@ -16,11 +16,7 @@ export type User = {
role: ROLE; role: ROLE;
username: string; username: string;
password: string; password: string;
name?: string; name: string;
address?: string;
privateKey?: string;
publicKey?: string;
preSharedKey?: string;
/** ISO String */ /** ISO String */
createdAt: string; createdAt: string;
/** ISO String */ /** ISO String */

Write Preview
Loading…
Cancel
Save