mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-02 17:14:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow picking ips when creating stuff

Browse source
This commit is contained in:
Owen 2025-04-18 14:41:27 -04:00
parent d664aa204f
commit 581fdd67b1
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
9 changed files with 212 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

52
server/routers/newt/handleGetConfigMessage.ts
View file

@ -64,45 +64,15 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
return;
}
let site: Site | undefined;
if (!existingSite.address) {
// This is a new site configuration
let address = await getNextAvailableClientSubnet(existingSite.orgId);
if (!address) {
logger.error("handleGetConfigMessage: No available address");
return;
}
// TODO: WE NEED TO PULL THE CIDR FROM THE DB SUBNET ON THE ORG INSTEAD BECAUSE IT CAN BE DIFFERENT
// TODO: SOMEHOW WE NEED TO ALLOW THEM TO PUT IN THEIR OWN ADDRESS
address = `${address.split("/")[0]}/${config.getRawConfig().orgs.block_size}`; // we want the block size of the whole org
// Update the site with new WireGuard info
const [updateRes] = await db
.update(sites)
.set({
publicKey,
address,
listenPort: port
})
.where(eq(sites.siteId, siteId))
.returning();
site = updateRes;
logger.info(`Updated site ${siteId} with new WG Newt info`);
} else {
// update the endpoint and the public key
const [siteRes] = await db
.update(sites)
.set({
publicKey,
listenPort: port
})
.where(eq(sites.siteId, siteId))
.returning();
site = siteRes;
}
// update the endpoint and the public key
const [site] = await db
.update(sites)
.set({
publicKey,
listenPort: port
})
.where(eq(sites.siteId, siteId))
.returning();
if (!site) {
logger.error("handleGetConfigMessage: Failed to update site");
@ -139,7 +109,9 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
const peerData = {
publicKey: client.clients.pubKey!,
allowedIps: [client.clients.subnet!],
endpoint: client.clientSites.isRelayed ? "" : client.clients.endpoint! // if its relayed it should be localhost
endpoint: client.clientSites.isRelayed
? ""
: client.clients.endpoint! // if its relayed it should be localhost
};
// Add or update this peer on the olm if it is connected