Add alias config

server/routers/siteResource/createSiteResource.ts

@@ -18,6 +18,7 @@ import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
 import { getUniqueSiteResourceName } from "@server/db/names";
 import { rebuildClientAssociations } from "@server/lib/rebuildClientAssociations";
+import { getNextAvailableAliasAddress } from "@server/lib/ip";
 
 const createSiteResourceParamsSchema = z.strictObject({
     siteId: z.string().transform(Number).pipe(z.int().positive()),
@@ -193,6 +194,10 @@ export async function createSiteResource(
         // }
 
         const niceId = await getUniqueSiteResourceName(orgId);
+        let aliasAddress: string | null = null;
+        if (mode == "host") { // we can only have an alias on a host
+            aliasAddress = await getNextAvailableAliasAddress(orgId);
+        }
 
         let newSiteResource: SiteResource | undefined;
         await db.transaction(async (trx) => {
@@ -210,7 +215,8 @@ export async function createSiteResource(
                     // destinationPort: mode === "port" ? destinationPort : null,
                     destination,
                     enabled,
-                    alias: alias || null
+                    alias,
+                    aliasAddress
                 })
                 .returning();
 

server/routers/siteResource/updateSiteResource.ts

@@ -17,11 +17,9 @@ import { eq, and, ne } from "drizzle-orm";
 import { fromError } from "zod-validation-error";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
+import { updatePeerData, updateTargets } from "@server/routers/client/targets";
 import {
-    updateRemoteSubnets,
-    updateTargets
-} from "@server/routers/client/targets";
-import {
+    generateAliasConfig,
     generateRemoteSubnets,
     generateSubnetProxyTargets
 } from "@server/lib/ip";
@@ -266,7 +264,7 @@ export async function updateSiteResource(
                 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
                     olmJobs.push(
-                        updateRemoteSubnets(
+                        updatePeerData(
                             client.clientId,
                             updatedSiteResource.siteId,
                             {
@@ -276,6 +274,14 @@ export async function updateSiteResource(
                                 newRemoteSubnets: generateRemoteSubnets([
                                     updatedSiteResource
                                 ])
+                            },
+                            {
+                                oldAliases: generateAliasConfig([
+                                    existingSiteResource
+                                ]),
+                                newAliases: generateAliasConfig([
+                                    updatedSiteResource
+                                ])
                             }
                         )
                     );