mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-28 21:58:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove olm/wg/relay message

Browse source
This commit is contained in:
Owen 2025-03-26 21:41:20 -04:00
parent dac49f7fdc
commit 15eb666394
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
3 changed files with 3 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/routers/messageHandlers.ts
View file

@ -1,5 +1,5 @@
import { handleNewtRegisterMessage, handleReceiveBandwidthMessage } from "./newt"; import { handleNewtRegisterMessage, handleReceiveBandwidthMessage } from "./newt";
import { handleOlmRegisterMessage, handleOlmRelayMessage } from "./olm"; import { handleOlmRegisterMessage } from "./olm";
import { handleGetConfigMessage } from "./newt/handleGetConfigMessage"; import { handleGetConfigMessage } from "./newt/handleGetConfigMessage";
import { MessageHandler } from "./ws"; import { MessageHandler } from "./ws";
@ -7,6 +7,5 @@ export const messageHandlers: Record<string, MessageHandler> = {
"newt/wg/register": handleNewtRegisterMessage, "newt/wg/register": handleNewtRegisterMessage,
"olm/wg/register": handleOlmRegisterMessage, "olm/wg/register": handleOlmRegisterMessage,
"newt/wg/get-config": handleGetConfigMessage, "newt/wg/get-config": handleGetConfigMessage,
"newt/receive-bandwidth": handleReceiveBandwidthMessage, "newt/receive-bandwidth": handleReceiveBandwidthMessage
"olm/wg/relay": handleOlmRelayMessage
}; };

81
server/routers/olm/handleOlmRelayMessage.ts
View file

@ -1,81 +0,0 @@
import db from "@server/db";
import { MessageHandler } from "../ws";
import { clients, Olm, olms, sites } from "@server/db/schema";
import { eq } from "drizzle-orm";
import { addPeer, deletePeer } from "../newt/peers";
import logger from "@server/logger";
export const handleOlmRelayMessage: MessageHandler = async (context) => {
const { message, client: c, sendToClient } = context;
const olm = c as Olm;
logger.info("Handling relay olm message!");
if (!olm) {
logger.warn("Olm not found");
return;
}
if (!olm.clientId) {
logger.warn("Olm has no site!"); // TODO: Maybe we create the site here?
return;
}
const clientId = olm.clientId;
const [client] = await db
.select()
.from(clients)
.where(eq(clients.clientId, clientId))
.limit(1);
if (!client || !client.siteId) {
logger.warn("Site not found or does not have exit node");
return;
}
const [site] = await db
.select()
.from(sites)
.where(eq(sites.siteId, client.siteId))
.limit(1);
if (!client) {
logger.warn("Site not found or does not have exit node");
return;
}
// make sure we hand endpoints for both the site and the client and the lastHolePunch is not too old
if (!client.pubKey) {
logger.warn("Site or client has no endpoint or listen port");
return;
}
if (!site.subnet) {
logger.warn("Site has no subnet");
return;
}
await deletePeer(site.siteId, client.pubKey);
// add the peer to the exit node
await addPeer(site.siteId, {
publicKey: client.pubKey,
allowedIps: [client.subnet],
endpoint: ""
});
return {
message: {
type: "olm/wg/connect",
data: {
endpoint: site.endpoint,
publicKey: site.publicKey,
serverIP: site.address!.split("/")[0],
tunnelIP: client.subnet
}
},
broadcast: false, // Send to all olms
excludeSender: false // Include sender in broadcast
};
};

3
server/routers/olm/index.ts
View file

@ -1,4 +1,3 @@
export * from "./handleOlmRegisterMessage"; export * from "./handleOlmRegisterMessage";
export * from "./getOlmToken"; export * from "./getOlmToken";
export * from "./createOlm"; export * from "./createOlm";
export * from "./handleOlmRelayMessage";