Change SSH WIP

server/private/routers/ssh/signSshKey.ts

@@ -21,7 +21,7 @@ import {
     roles,
     roundTripMessageTracker,
     siteResources,
-    sites,
+    siteNetworks,
     userOrgs
 } from "@server/db";
 import { isLicensedOrSubscribed } from "#private/lib/isLicencedOrSubscribed";
@@ -62,11 +62,11 @@ const bodySchema = z
 
 export type SignSshKeyResponse = {
     certificate: string;
-    messageId: number;
+    messageIds: number[];
     sshUsername: string;
     sshHost: string;
     resourceId: number;
-    siteId: number;
+    siteIds: number[];
     keyId: string;
     validPrincipals: string[];
     validAfter: string;
@@ -250,10 +250,7 @@ export async function signSshKey(
                 .update(userOrgs)
                 .set({ pamUsername: usernameToUse })
                 .where(
-                    and(
+                    and(eq(userOrgs.orgId, orgId), eq(userOrgs.userId, userId))
-                        eq(userOrgs.orgId, orgId),
-                        eq(userOrgs.userId, userId)
-                    )
                 );
         } else {
             usernameToUse = userOrg.pamUsername;
@@ -374,21 +371,12 @@ export async function signSshKey(
         const homedir = roleRow?.sshCreateHomeDir ?? null;
         const sudoMode = roleRow?.sshSudoMode ?? "none";
 
-        // get the site
+        const sites = await db
-        const [newt] = await db
+            .select({ siteId: siteNetworks.siteId })
-            .select()
+            .from(siteNetworks)
-            .from(newts)
+            .where(eq(siteNetworks.networkId, resource.networkId!));
-            .where(eq(newts.siteId, resource.siteId))
-            .limit(1);
 
-        if (!newt) {
+        const siteIds = sites.map((site) => site.siteId);
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Site associated with resource not found"
-                )
-            );
-        }
 
         // Sign the public key
         const now = BigInt(Math.floor(Date.now() / 1000));
@@ -402,43 +390,64 @@ export async function signSshKey(
             validBefore: now + validFor
         });
 
-        const [message] = await db
+        const messageIds: number[] = [];
-            .insert(roundTripMessageTracker)
+        for (const siteId of siteIds) {
-            .values({
+            // get the site
-                wsClientId: newt.newtId,
+            const [newt] = await db
-                messageType: `newt/pam/connection`,
+                .select()
-                sentAt: Math.floor(Date.now() / 1000)
+                .from(newts)
-            })
+                .where(eq(newts.siteId, siteId))
-            .returning();
+                .limit(1);
 
-        if (!message) {
+            if (!newt) {
-            return next(
+                return next(
-                createHttpError(
+                    createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
+                        HttpCode.INTERNAL_SERVER_ERROR,
-                    "Failed to create message tracker entry"
+                        "Site associated with resource not found"
-                )
+                    )
-            );
+                );
-        }
-
-        await sendToClient(newt.newtId, {
-            type: `newt/pam/connection`,
-            data: {
-                messageId: message.messageId,
-                orgId: orgId,
-                agentPort: resource.authDaemonPort ?? 22123,
-                externalAuthDaemon: resource.authDaemonMode === "remote",
-                agentHost: resource.destination,
-                caCert: caKeys.publicKeyOpenSSH,
-                username: usernameToUse,
-                niceId: resource.niceId,
-                metadata: {
-                    sudoMode: sudoMode,
-                    sudoCommands: parsedSudoCommands,
-                    homedir: homedir,
-                    groups: parsedGroups
-                }
             }
-        });
+
+            const [message] = await db
+                .insert(roundTripMessageTracker)
+                .values({
+                    wsClientId: newt.newtId,
+                    messageType: `newt/pam/connection`,
+                    sentAt: Math.floor(Date.now() / 1000)
+                })
+                .returning();
+
+            if (!message) {
+                return next(
+                    createHttpError(
+                        HttpCode.INTERNAL_SERVER_ERROR,
+                        "Failed to create message tracker entry"
+                    )
+                );
+            }
+
+            messageIds.push(message.messageId);
+
+            await sendToClient(newt.newtId, {
+                type: `newt/pam/connection`,
+                data: {
+                    messageId: message.messageId,
+                    orgId: orgId,
+                    agentPort: resource.authDaemonPort ?? 22123,
+                    externalAuthDaemon: resource.authDaemonMode === "remote",
+                    agentHost: resource.destination,
+                    caCert: caKeys.publicKeyOpenSSH,
+                    username: usernameToUse,
+                    niceId: resource.niceId,
+                    metadata: {
+                        sudoMode: sudoMode,
+                        sudoCommands: parsedSudoCommands,
+                        homedir: homedir,
+                        groups: parsedGroups
+                    }
+                }
+            });
+        }
 
         const expiresIn = Number(validFor); // seconds
 
@@ -459,18 +468,20 @@ export async function signSshKey(
             metadata: JSON.stringify({
                 resourceId: resource.siteResourceId,
                 resource: resource.name,
-                siteId: resource.siteId,
+                siteIds: siteIds
             })
         });
 
+        // TODO: WE NEED TO MAKE SURE THE MESSAGEIDS ARE BACKWARD COMPATABILE AND THE SITEIDS TOO AND UPDATE THE CLI TO HANDLE THE MESSAGE IDS
+
         return response<SignSshKeyResponse>(res, {
             data: {
                 certificate: cert.certificate,
-                messageId: message.messageId,
+                messageIds: messageIds,
                 sshUsername: usernameToUse,
                 sshHost: sshHost,
                 resourceId: resource.siteResourceId,
-                siteId: resource.siteId,
+                siteIds: siteIds,
                 keyId: cert.keyId,
                 validPrincipals: cert.validPrincipals,
                 validAfter: cert.validAfter.toISOString(),