pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-03 09:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clients' of https://github.com/fosrl/pangolin_dg into clients

Browse Source
This commit is contained in:
miloschwartz
2025-02-21 16:58:39 -05:00
parent 098723b88d b21e758eb8
commit 204403da67
14 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/routers/client/createClient.ts
View File

@@ -37,10 +37,10 @@ const createClientSchema = z
.object({
name: z.string().min(1).max(255),
siteId: z.number().int().positive(),
pubKey: z.string(),
subnet: z.string(),
olmId: z.string(),
secret: z.string(),
pubKey: z.string().optional(),
subnet: z.string().optional(),
olmId: z.string().optional(),
secret: z.string().optional(),
type: z.enum(["olm"])
})
.strict();

8
server/routers/client/pickClientDefaults.ts
View File

@@ -101,12 +101,16 @@ export async function pickClientDefaults(
subnets.push(
address.replace(
/\/\d+$/,
`/${config.getRawConfig().wg_site.block_size}`
`/${config.getRawConfig().wg_site.site_block_size}`
)
);
logger.debug(`Subnets: ${subnets}`);
logger.debug(`Address: ${address}`);
logger.debug(`Block size: ${config.getRawConfig().wg_site.block_size}`);
logger.debug(`Site block size: ${config.getRawConfig().wg_site.site_block_size}`);
const newSubnet = findNextAvailableCidr(
subnets,
config.getRawConfig().wg_site.block_size,
config.getRawConfig().wg_site.site_block_size,
address
);
if (!newSubnet) {