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

Add validation and fix thrown error from updatePeerData

Browse Source
This commit is contained in:
Owen
2025-11-30 17:49:55 -05:00
parent 096da391e5
commit 92125611e9
1 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
server/routers/siteResource/updateSiteResource.ts
View File

@@ -49,7 +49,44 @@ const updateSiteResourceSchema = z
roleIds: z.array(z.int()), roleIds: z.array(z.int()),
clientIds: z.array(z.int()) clientIds: z.array(z.int())
}) })
.strict(); .strict()
.refine(
(data) => {
if (data.mode === "host" && data.destination) {
// Check if it's a valid IP address using zod (v4 or v6)
const isValidIP = z
.union([z.ipv4(), z.ipv6()])
.safeParse(data.destination).success;
// Check if it's a valid domain (hostname pattern, TLD not required)
const domainRegex =
/^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
const isValidDomain = domainRegex.test(data.destination);
return isValidIP || isValidDomain;
}
return true;
},
{
message:
"Destination must be a valid IP address or domain name for host mode"
}
)
.refine(
(data) => {
if (data.mode === "cidr" && data.destination) {
// Check if it's a valid CIDR (v4 or v6)
const isValidCIDR = z
.union([z.cidrv4(), z.cidrv6()])
.safeParse(data.destination).success;
return isValidCIDR;
}
return true;
},
{
message: "Destination must be a valid CIDR notation for cidr mode"
}
);
export type UpdateSiteResourceBody = z.infer<typeof updateSiteResourceSchema>; export type UpdateSiteResourceBody = z.infer<typeof updateSiteResourceSchema>;
export type UpdateSiteResourceResponse = SiteResource; export type UpdateSiteResourceResponse = SiteResource;
@@ -224,10 +261,11 @@ export async function updateSiteResource(
); );
} }
const { mergedAllClients } = await rebuildClientAssociationsFromSiteResource( const { mergedAllClients } =
existingSiteResource, // we want to rebuild based on the existing resource then we will apply the change to the destination below await rebuildClientAssociationsFromSiteResource(
trx existingSiteResource, // we want to rebuild based on the existing resource then we will apply the change to the destination below
); trx
);
// after everything is rebuilt above we still need to update the targets and remote subnets if the destination changed // after everything is rebuilt above we still need to update the targets and remote subnets if the destination changed
if ( if (
@@ -263,28 +301,36 @@ export async function updateSiteResource(
let olmJobs: Promise<void>[] = []; let olmJobs: Promise<void>[] = [];
for (const client of mergedAllClients) { for (const client of mergedAllClients) {
// we also need to update the remote subnets on the olms for each client that has access to this site // we also need to update the remote subnets on the olms for each client that has access to this site
olmJobs.push( try {
updatePeerData( olmJobs.push(
client.clientId, updatePeerData(
updatedSiteResource.siteId, client.clientId,
{ updatedSiteResource.siteId,
oldRemoteSubnets: generateRemoteSubnets([ {
existingSiteResource oldRemoteSubnets: generateRemoteSubnets([
]), existingSiteResource
newRemoteSubnets: generateRemoteSubnets([ ]),
updatedSiteResource newRemoteSubnets: generateRemoteSubnets([
]) updatedSiteResource
}, ])
{ },
oldAliases: generateAliasConfig([ {
existingSiteResource oldAliases: generateAliasConfig([
]), existingSiteResource
newAliases: generateAliasConfig([ ]),
updatedSiteResource newAliases: generateAliasConfig([
]) updatedSiteResource
} ])
) }
); )
);
} catch (error) {
logger.warn(
// this is okay because sometimes the olm is not online to receive the update or associated with the client yet
`Error updating peer data for client ${client.clientId}:`,
error
);
}
} }
await Promise.all(olmJobs); await Promise.all(olmJobs);