config/docker-wireguard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add PreUp, PostUp, PreDown, PostDown for client (#1714)

Browse Source 
* Fix create client popup background is not white

* Fix no Add button when client Allowed Ips or Server Allowed Ips is empty

* Add preUp preDown postUp postDown for client

* Add description of hooks for client config

* Move hooks's label text into 'hooks' in en.json

---------

Co-authored-by: yanghuanglin <yanghuanglin@qq.com>
Co-authored-by: Bernd Storath <999999bst@gmail.com>
This commit is contained in:
杨黄林
2025-03-07 15:17:33 +08:00
committed by GitHub
parent 93db67bab6
commit fcb5049dab
14 changed files with 171 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/database/migrations/0000_short_skin.sql
View File

@@ -4,6 +4,10 @@ CREATE TABLE `clients_table` (
`name` text NOT NULL,
`ipv4_address` text NOT NULL,
`ipv6_address` text NOT NULL,
`pre_up` text DEFAULT '' NOT NULL,
`post_up` text DEFAULT '' NOT NULL,
`pre_down` text DEFAULT '' NOT NULL,
`post_down` text DEFAULT '' NOT NULL,
`private_key` text NOT NULL,
`public_key` text NOT NULL,
`pre_shared_key` text NOT NULL,

34
src/server/database/migrations/meta/0000_snapshot.json
View File

@@ -1,7 +1,7 @@
{
"version": "6",
"dialect": "sqlite",
"id": "b1dde023-d141-4eab-9226-89a832b2ed2b",
"id": "2cabecf8-93d5-4d32-81b7-2e4369c1cb29",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"clients_table": {
@@ -42,6 +42,38 @@
"notNull": true,
"autoincrement": false
},
"pre_up": {
"name": "pre_up",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"post_up": {
"name": "post_up",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"pre_down": {
"name": "pre_down",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"post_down": {
"name": "post_down",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"private_key": {
"name": "private_key",
"type": "text",

36
src/server/database/migrations/meta/0001_snapshot.json
View File

@@ -1,6 +1,6 @@
{
"id": "720d420c-361f-4427-a45b-db0ca613934d",
"prevId": "b1dde023-d141-4eab-9226-89a832b2ed2b",
"id": "9476c20a-509b-4cd7-b58b-a042600bafb1",
"prevId": "2cabecf8-93d5-4d32-81b7-2e4369c1cb29",
"version": "6",
"dialect": "sqlite",
"tables": {
@@ -42,6 +42,38 @@
"notNull": true,
"autoincrement": false
},
"pre_up": {
"name": "pre_up",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"post_up": {
"name": "post_up",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"pre_down": {
"name": "pre_down",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"post_down": {
"name": "post_down",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "''"
},
"private_key": {
"name": "private_key",
"type": "text",

4
src/server/database/migrations/meta/_journal.json
View File

@@ -5,14 +5,14 @@
{
"idx": 0,
"version": "6",
"when": 1739266828300,
"when": 1741331552405,
"tag": "0000_short_skin",
"breakpoints": true
},
{
"idx": 1,
"version": "6",
"when": 1739266837347,
"when": 1741331579259,
"tag": "0001_classy_the_stranger",
"breakpoints": true
}

4
src/server/database/repositories/client/schema.ts
View File

@@ -14,6 +14,10 @@ export const client = sqliteTable('clients_table', {
name: text().notNull(),
ipv4Address: text('ipv4_address').notNull().unique(),
ipv6Address: text('ipv6_address').notNull().unique(),
preUp: text('pre_up').default('').notNull(),
postUp: text('post_up').default('').notNull(),
preDown: text('pre_down').default('').notNull(),
postDown: text('post_down').default('').notNull(),
privateKey: text('private_key').notNull(),
publicKey: text('public_key').notNull(),
preSharedKey: text('pre_shared_key').notNull(),

4
src/server/database/repositories/client/types.ts
View File

@@ -57,6 +57,10 @@ export const ClientUpdateSchema = schemaForType<UpdateClientType>()(
expiresAt: expiresAt,
ipv4Address: address4,
ipv6Address: address6,
preUp: HookSchema,
postUp: HookSchema,
preDown: HookSchema,
postDown: HookSchema,
allowedIps: AllowedIpsSchema,
serverAllowedIps: serverAllowedIps,
mtu: MtuSchema,

10
src/server/database/repositories/hooks/types.ts
View File

@@ -6,13 +6,11 @@ export type HooksType = InferSelectModel<typeof hooks>;
export type HooksUpdateType = Omit<HooksType, 'id' | 'createdAt' | 'updatedAt'>;
const hook = z.string({ message: t('zod.hook') }).pipe(safeStringRefine);
export const HooksUpdateSchema = schemaForType<HooksUpdateType>()(
z.object({
preUp: hook,
postUp: hook,
preDown: hook,
postDown: hook,
preUp: HookSchema,
postUp: HookSchema,
preDown: HookSchema,
postDown: HookSchema,
})
);

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

@@ -52,6 +52,10 @@ export const FileSchema = z.object({
file: z.string({ message: t('zod.file') }),
});
export const HookSchema = z
.string({ message: t('zod.hook') })
.pipe(safeStringRefine);
export const schemaForType =
<T>() =>
// eslint-disable-next-line @typescript-eslint/no-explicit-any

9
src/server/utils/wgHelper.ts
View File

@@ -49,12 +49,19 @@ PostDown = ${iptablesTemplate(hooks.postDown, wgInterface)}`;
const cidr4Block = parseCidr(wgInterface.ipv4Cidr).prefix;
const cidr6Block = parseCidr(wgInterface.ipv6Cidr).prefix;
const hookLines = [
client.preUp ? `PreUp = ${client.preUp}` : null,
client.postUp ? `PostUp = ${client.postUp}` : null,
client.preDown ? `PreDown = ${client.preDown}` : null,
client.postDown ? `PostDown = ${client.postDown}` : null,
].filter((v) => v !== null);
return `[Interface]
PrivateKey = ${client.privateKey}
Address = ${client.ipv4Address}/${cidr4Block}, ${client.ipv6Address}/${cidr6Block}
DNS = ${client.dns.join(', ')}
MTU = ${client.mtu}
${hookLines.length ? `${hookLines.join('\n')}\n` : ''}
[Peer]
PublicKey = ${wgInterface.publicKey}
PresharedKey = ${client.preSharedKey}