From 2cfd7e867beaa01ba02390ed781c8d9fbb4a0b8e Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Tue, 4 Aug 2026 15:45:44 -0400
Subject: [PATCH] delete the client peers from the exit nodes properly

---
 server/lib/deleteOrg.ts                        | 3 +++
 server/routers/olm/handleOlmRegisterMessage.ts | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/lib/deleteOrg.ts b/server/lib/deleteOrg.ts
index 20c8a3e23..43921e41b 100644
--- a/server/lib/deleteOrg.ts
+++ b/server/lib/deleteOrg.ts
@@ -93,6 +93,9 @@ export async function deleteOrgById(
             await trx.delete(sites).where(eq(sites.siteId, site.siteId));
         }
         for (const client of orgClients) {
+            if (client.exitNodeId && client.pubKey) {
+                await deletePeer(client.exitNodeId, client.pubKey);
+            }
             const [olm] = await trx
                 .select()
                 .from(olms)
diff --git a/server/routers/olm/handleOlmRegisterMessage.ts b/server/routers/olm/handleOlmRegisterMessage.ts
index c0cee86d9..5cd38dabe 100644
--- a/server/routers/olm/handleOlmRegisterMessage.ts
+++ b/server/routers/olm/handleOlmRegisterMessage.ts
@@ -28,7 +28,7 @@ import {
     verifyExitNodeOrgAccess
 } from "#dynamic/lib/exitNodes";
 import { getUniqueSubnetForExitNode } from "@server/lib/exitNodes";
-import { addPeer } from "../gerbil/peers";
+import { addPeer, deletePeer } from "../gerbil/peers";
 
 const HOLEPUNCH_STALE_CHAIN_THRESHOLD = 18;
 const HOLEPUNCH_STALE_CHAIN_TTL_SECONDS = 1800;
@@ -394,6 +394,12 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             );
     }
 
+    if (client.pubKey && client.pubKey !== publicKey && client.exitNodeId) {
+        // test the old client to see if its different then remove
+        logger.info("Public key mismatch. Deleting old peer...");
+        await deletePeer(client.exitNodeId, client.pubKey);
+    }
+
     if (clientSubnet && exitNodeId) {
         try {
             // add the peer to the exit node so it can connect