Working on orchestration

server/routers/newt/handleGetConfigMessage.ts

@@ -7,16 +7,16 @@ import {
     ExitNode,
     exitNodes,
     siteResources,
-    clientSiteResourcesAssociationsCache,
+    clientSiteResourcesAssociationsCache
 } from "@server/db";
 import { clients, clientSitesAssociationsCache, Newt, sites } from "@server/db";
 import { eq, and, inArray } from "drizzle-orm";
 import { updatePeer } from "../olm/peers";
 import { sendToExitNode } from "#dynamic/lib/exitNodes";
 import {
-    generateRemoteSubnetsStr,
+    generateRemoteSubnets,
     generateSubnetProxyTargets,
-    SubnetProxyTarget,
+    SubnetProxyTarget
 } from "@server/lib/ip";
 
 const inputSchema = z.object({
@@ -137,7 +137,10 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
     const clientsRes = await db
         .select()
         .from(clients)
-        .innerJoin(clientSitesAssociationsCache, eq(clients.clientId, clientSitesAssociationsCache.clientId))
+        .innerJoin(
+            clientSitesAssociationsCache,
+            eq(clients.clientId, clientSitesAssociationsCache.clientId)
+        )
         .where(eq(clientSitesAssociationsCache.siteId, siteId));
 
     // Prepare peers data for the response
@@ -186,10 +189,25 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
                         return null;
                     }
 
-                    const allSiteResources = await db
+                    const allSiteResources = await db // only get the site resources that this client has access to
                         .select()
                         .from(siteResources)
-                        .where(eq(siteResources.siteId, site.siteId));
+                        .innerJoin(
+                            clientSiteResourcesAssociationsCache,
+                            eq(
+                                siteResources.siteResourceId,
+                                clientSiteResourcesAssociationsCache.siteResourceId
+                            )
+                        )
+                        .where(
+                            and(
+                                eq(siteResources.siteId, site.siteId),
+                                eq(
+                                    clientSiteResourcesAssociationsCache.clientId,
+                                    client.clients.clientId
+                                )
+                            )
+                        );
 
                     await updatePeer(client.clients.clientId, {
                         siteId: site.siteId,
@@ -197,8 +215,11 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
                         publicKey: site.publicKey,
                         serverIP: site.address,
                         serverPort: site.listenPort,
-                        remoteSubnets:
-                            generateRemoteSubnetsStr(allSiteResources)
+                        remoteSubnets: generateRemoteSubnets(
+                            allSiteResources.map(
+                                ({ siteResources }) => siteResources
+                            )
+                        )
                     });
                 } catch (error) {
                     logger.error(
@@ -238,7 +259,10 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
             .from(clients)
             .innerJoin(
                 clientSiteResourcesAssociationsCache,
-                eq(clients.clientId, clientSiteResourcesAssociationsCache.clientId)
+                eq(
+                    clients.clientId,
+                    clientSiteResourcesAssociationsCache.clientId
+                )
             )
             .where(
                 eq(
@@ -247,7 +271,10 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
                 )
             );
 
-        const resourceTargets = generateSubnetProxyTargets(resource, resourceClients);
+        const resourceTargets = generateSubnetProxyTargets(
+            resource,
+            resourceClients
+        );
         targetsToSend.push(...resourceTargets);
     }
 

server/routers/olm/handleOlmRegisterMessage.ts

@@ -1,5 +1,6 @@
 import {
     Client,
+    clientSiteResourcesAssociationsCache,
     db,
     ExitNode,
     orgs,
@@ -12,13 +13,20 @@ import {
     users
 } from "@server/db";
 import { MessageHandler } from "@server/routers/ws";
-import { clients, clientSitesAssociationsCache, exitNodes, Olm, olms, sites } from "@server/db";
+import {
+    clients,
+    clientSitesAssociationsCache,
+    exitNodes,
+    Olm,
+    olms,
+    sites
+} from "@server/db";
 import { and, eq, inArray, isNull } from "drizzle-orm";
 import { addPeer, deletePeer } from "../newt/peers";
 import logger from "@server/logger";
 import { listExitNodes } from "#dynamic/lib/exitNodes";
 import { getNextAvailableClientSubnet } from "@server/lib/ip";
-import { generateRemoteSubnetsStr } from "@server/lib/ip";
+import { generateRemoteSubnets } from "@server/lib/ip";
 
 export const handleOlmRegisterMessage: MessageHandler = async (context) => {
     logger.info("Handling register olm message!");
@@ -170,7 +178,10 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
     const sitesData = await db
         .select()
         .from(sites)
-        .innerJoin(clientSitesAssociationsCache, eq(sites.siteId, clientSitesAssociationsCache.siteId))
+        .innerJoin(
+            clientSitesAssociationsCache,
+            eq(sites.siteId, clientSitesAssociationsCache.siteId)
+        )
         .where(eq(clientSitesAssociationsCache.clientId, client.clientId));
 
     // Prepare an array to store site configurations
@@ -234,11 +245,6 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             )
             .limit(1);
 
-        const allSiteResources = await db
-            .select()
-            .from(siteResources)
-            .where(eq(siteResources.siteId, site.siteId));
-
         // Add the peer to the exit node for this site
         if (clientSite.endpoint) {
             logger.info(
@@ -269,6 +275,26 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             endpoint = `${exitNode.endpoint}:21820`;
         }
 
+        const allSiteResources = await db // only get the site resources that this client has access to
+            .select()
+            .from(siteResources)
+            .innerJoin(
+                clientSiteResourcesAssociationsCache,
+                eq(
+                    siteResources.siteResourceId,
+                    clientSiteResourcesAssociationsCache.siteResourceId
+                )
+            )
+            .where(
+                and(
+                    eq(siteResources.siteId, site.siteId),
+                    eq(
+                        clientSiteResourcesAssociationsCache.clientId,
+                        client.clientId
+                    )
+                )
+            );
+
         // Add site configuration to the array
         siteConfigurations.push({
             siteId: site.siteId,
@@ -276,7 +302,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             publicKey: site.publicKey,
             serverIP: site.address,
             serverPort: site.listenPort,
-            remoteSubnets: generateRemoteSubnetsStr(allSiteResources)
+            remoteSubnets: generateRemoteSubnets(allSiteResources.map(({ siteResources }) => siteResources))
         });
     }
 

server/routers/olm/peers.ts

@@ -12,7 +12,7 @@ export async function addPeer(
         endpoint: string;
         serverIP: string | null;
         serverPort: number | null;
-        remoteSubnets: string | null; // optional, comma-separated list of subnets that this site can access
+        remoteSubnets: string[] | null; // optional, comma-separated list of subnets that this site can access
     },
     olmId?: string
 ) {
@@ -80,7 +80,7 @@ export async function updatePeer(
         endpoint: string;
         serverIP: string | null;
         serverPort: number | null;
-        remoteSubnets?: string | null; // optional, comma-separated list of subnets that
+        remoteSubnets?: string[] | null; // optional, comma-separated list of subnets that
     },
     olmId?: string
 ) {

server/routers/siteResource/createSiteResource.ts

@@ -272,9 +272,6 @@ export async function createSiteResource(
                 );
             }
 
-            // const targets = await generateSubnetProxyTargets([newSiteResource], trx);
-            // await addTargets(newt.newtId, targets);
-
             await rebuildClientAssociations(newSiteResource, trx); // we need to call this because we added to the admin role
         });
 

server/routers/siteResource/deleteSiteResource.ts

@@ -106,10 +106,7 @@ export async function deleteSiteResource(
                 );
             }
 
-            // const targets = await generateSubnetProxyTargets([removedSiteResource], trx);
-            // await removeTargets(newt.newtId, targets);
-
-            await rebuildClientAssociations(existingSiteResource, trx);
+            await rebuildClientAssociations(removedSiteResource, trx);
         });
 
         logger.info(