pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-10-20 03:29:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent overlapping exit node address selections

Browse Source
This commit is contained in:
Owen
2026-10-15 10:10:41 -04:00
parent 2a4004044d
commit c5c19871eb
3 changed files with 89 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/routers/newt/handleNewtRegisterMessage.ts
+16 -10
View File
@@ -112,7 +112,8 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
return;
}
const newSubnet = await getUniqueSubnetForExitNode(exitNode);
const { value: newSubnet, release: releaseSubnetLock } =
await getUniqueSubnetForExitNode(exitNode);
if (!newSubnet) {
logger.error(
@@ -124,15 +125,20 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
siteSubnet = newSubnet;
await db
.update(sites)
.set({
pubKey: publicKey,
exitNodeId: exitNodeId,
exitNodeSubnet: newSubnet
})
.where(eq(sites.siteId, siteId))
.returning();
try {
await db
.update(sites)
.set({
pubKey: publicKey,
exitNodeId: exitNodeId,
exitNodeSubnet: newSubnet
})
.where(eq(sites.siteId, siteId))
.returning();
} finally {
// only release once the subnet is persisted so no other node can pick it
await releaseSubnetLock();
}
} else {
await db
.update(sites)
server/routers/olm/handleOlmRegisterMessage.ts
+22 -11
View File
@@ -314,6 +314,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
}
let clientSubnet = client.exitNodeSubnet;
let releaseSubnetLock: (() => Promise<void>) | null = null;
if (
exitNodeId &&
(client.exitNodeId !== exitNodeId || !client.exitNodeSubnet)
@@ -341,7 +342,8 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
// TODO: IF WE DO NOT HAVE AN INFERENCE RESOURCE DO WE NEED TO BE HOLDING A SUBNET ON THE CLIENT?
const newSubnet = await getUniqueSubnetForExitNode(exitNode);
const { value: newSubnet, release } =
await getUniqueSubnetForExitNode(exitNode);
if (!newSubnet) {
logger.error(
@@ -353,6 +355,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
}
clientSubnet = newSubnet;
releaseSubnetLock = release;
}
if (
@@ -365,16 +368,21 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
"[handleOlmRegisterMessage] Public key mismatch. Updating public key and clearing session info...",
{ orgId: client.orgId, clientId: client.clientId }
);
// Update the client's public key
await db
.update(clients)
.set({
pubKey: publicKey,
archived: false,
exitNodeId: exitNodeId, // this can be undefined if no exit node was selected, which is fine just means we cant talk to the node or connect to it
exitNodeSubnet: clientSubnet
})
.where(eq(clients.clientId, client.clientId));
try {
// Update the client's public key
await db
.update(clients)
.set({
pubKey: publicKey,
archived: false,
exitNodeId: exitNodeId, // this can be undefined if no exit node was selected, which is fine just means we cant talk to the node or connect to it
exitNodeSubnet: clientSubnet
})
.where(eq(clients.clientId, client.clientId));
} finally {
// only release once the subnet is persisted so no other node can pick it
await releaseSubnetLock?.();
}
// set isRelay to false for all of the client's sites to reset the connection metadata
await db
@@ -397,6 +405,9 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
);
}
// safety net in case a subnet was locked but the update above was skipped (release is idempotent)
await releaseSubnetLock?.();
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...");