mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-30 07:35:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow configuration of client and org subnets

Browse source
This commit is contained in:
Owen 2025-04-16 22:00:24 -04:00
parent 569635f3ed
commit db0328fa71
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
10 changed files with 218 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/routers/client/createClient.ts
View file

@ -19,8 +19,7 @@ import { eq, and } from "drizzle-orm";
import { fromError } from "zod-validation-error";
import moment from "moment";
import { hashPassword } from "@server/auth/password";
import { getNextAvailableClientSubnet } from "@server/lib/ip";
import config from "@server/lib/config";
import { isValidCIDR } from "@server/lib/validators";
const createClientParamsSchema = z
.object({
@ -34,6 +33,7 @@ const createClientSchema = z
siteIds: z.array(z.number().int().positive()),
olmId: z.string(),
secret: z.string(),
subnet: z.string(),
type: z.enum(["olm"])
})
.strict();
@ -58,7 +58,7 @@ export async function createClient(
);
}
const { name, type, siteIds, olmId, secret } = parsedBody.data;
const { name, type, siteIds, olmId, secret, subnet } = parsedBody.data;
const parsedParams = createClientParamsSchema.safeParse(req.params);
if (!parsedParams.success) {
@ -78,9 +78,14 @@ export async function createClient(
);
}
const newSubnet = await getNextAvailableClientSubnet(orgId);
const subnet = `${newSubnet.split("/")[0]}/${config.getRawConfig().orgs.block_size}`; // we want the block size of the whole org
if (subnet && !isValidCIDR(subnet)) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
"Invalid subnet format. Please provide a valid CIDR notation."
)
);
}
await db.transaction(async (trx) => {
// TODO: more intelligent way to pick the exit node