calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-08-01 18:20:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Get exit node every time

Browse Source
This commit is contained in:
Owen
2026-07-31 15:17:16 -04:00
parent 4d7a4c809d
commit df7bb2fb57
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/routers/olm/handleOlmRegisterMessage.ts
+14 -6
View File
@@ -1,4 +1,4 @@
import { db, ExitNode, orgs, primaryDb } from "@server/db";
import { db, ExitNode, exitNodes, orgs, primaryDb } from "@server/db";
import { MessageHandler } from "@server/routers/ws";
import {
clients,
@@ -311,15 +311,14 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
}
let clientSubnet = client.exitNodeSubnet;
let exitNode: ExitNode | null = null;
if (
exitNodeId &&
(client.exitNodeId !== exitNodeId || !client.exitNodeSubnet)
) {
const { exitNode: exitNodeResult, hasAccess } =
await verifyExitNodeOrgAccess(exitNodeId, client.orgId);
exitNode = exitNodeResult;
const { exitNode, hasAccess } = await verifyExitNodeOrgAccess(
exitNodeId,
client.orgId
);
if (!exitNode) {
logger.warn("[handleOlmRegisterMessage] Exit node not found", {
@@ -451,6 +450,15 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
return;
}
let exitNode: ExitNode | null = null;
if (exitNodeId) {
[exitNode] = await db
.select()
.from(exitNodes)
.where(eq(exitNodes.exitNodeId, exitNodeId))
.limit(1);
}
// NOTE: its important that the client here is the old client and the public key is the new key
await waitForClientRebuildIdle(olm.clientId);