Newt working

server/routers/newt/createNewt.ts

@@ -13,6 +13,7 @@ import {
     generateSessionToken,
 } from "@server/auth";
 import { createNewtSession } from "@server/auth/newt";
+import { fromError } from "zod-validation-error";
 
 export const createNewtBodySchema = z.object({});
 
@@ -24,6 +25,13 @@ export type CreateNewtResponse = {
     secret: string;
 };
 
+const createNewtSchema = z
+    .object({
+        newtId: z.string(),
+        secret: z.string()
+    })
+    .strict();
+
 export async function createNewt(
     req: Request,
     res: Response,
@@ -31,8 +39,25 @@ export async function createNewt(
 ): Promise<any> {
     try {
 
+        const parsedBody = createNewtSchema.safeParse(req.body);
+        if (!parsedBody.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedBody.error).toString()
+                )
+            );
+        }
+
+        const { newtId, secret } = parsedBody.data;
+
+        if (!req.userOrgRoleId) {
+            return next(
+                createHttpError(HttpCode.FORBIDDEN, "User does not have a role")
+            );
+        }
+
         // generate a newtId and secret
-        const secret = generateId(48);
         const secretHash = await hash(secret, {
             memoryCost: 19456,
             timeCost: 2,
@@ -40,8 +65,6 @@ export async function createNewt(
             parallelism: 1,
         });
 
-        const newtId = generateId(15);
-
         await db.insert(newts).values({
             newtId: newtId,
             secretHash,

server/routers/newt/handleRegisterMessage.ts

@@ -4,8 +4,6 @@ import { exitNodes, resources, sites, targets } from "@server/db/schema";
 import { eq, inArray } from "drizzle-orm";
 import { addPeer, deletePeer } from "../gerbil/peers";
 import logger from "@server/logger";
-import { findNextAvailableCidr } from "@server/utils/ip";
-import { exit } from "process";
 
 export const handleRegisterMessage: MessageHandler = async (context) => {
     const { message, newt, sendToClient } = context;
@@ -28,13 +26,18 @@ export const handleRegisterMessage: MessageHandler = async (context) => {
         return;
     }
 
-    // const [site] = await db
-    //     .select()
-    //     .from(sites)
-    //     .where(eq(sites.siteId, siteId))
-    //     .limit(1);
-
     const [site] = await db
+        .select()
+        .from(sites)
+        .where(eq(sites.siteId, siteId))
+        .limit(1);
+
+    if (!site || !site.exitNodeId) {
+        logger.warn("Site not found or does not have exit node");
+        return;
+    }
+
+    const [updatedSite] = await db
     .update(sites)
         .set({
             pubKey: publicKey
@@ -43,11 +46,6 @@ export const handleRegisterMessage: MessageHandler = async (context) => {
         .returning();
 
 
-    if (!site || !site.exitNodeId) {
-        logger.warn("Site not found or does not have exit node");
-        return;
-    }
-
     const [exitNode] = await db
         .select()
         .from(exitNodes)
@@ -100,10 +98,10 @@ export const handleRegisterMessage: MessageHandler = async (context) => {
         message: {
             type: "newt/wg/connect",
             data: {
-                endpoint: exitNode.endpoint,
+                endpoint: `${exitNode.endpoint}:${exitNode.listenPort}`,
                 publicKey: exitNode.publicKey,
-                serverIP: exitNode.address,
-                tunnelIP: site.subnet,
+                serverIP: exitNode.address.split("/")[0],
+                tunnelIP: site.subnet.split("/")[0],
                 targets: {
                     udp: udpTargets,
                     tcp: tcpTargets,