Update schema to include keys

server/db/schema.ts

@@ -3,61 +3,63 @@ import { InferSelectModel } from "drizzle-orm";
 
 // Orgs table
 export const orgs = sqliteTable("orgs", {
-  orgId: integer("orgId").primaryKey({ autoIncrement: true }),
+    orgId: integer("orgId").primaryKey({ autoIncrement: true }),
-  name: text("name").notNull(),
+    name: text("name").notNull(),
-  domain: text("domain").notNull(),
+    domain: text("domain").notNull(),
 });
 
 // Users table
 export const users = sqliteTable("users", {
-  userId: integer("userId").primaryKey({ autoIncrement: true }),
+    userId: integer("userId").primaryKey({ autoIncrement: true }),
-  orgId: integer("orgId").references(() => orgs.orgId),
+    orgId: integer("orgId").references(() => orgs.orgId),
-  name: text("name").notNull(),
+    name: text("name").notNull(),
-  email: text("email").notNull(),
+    email: text("email").notNull(),
-  groups: text("groups"),
+    groups: text("groups"),
 });
 
 // Sites table
 export const sites = sqliteTable("sites", {
-  siteId: integer("siteId").primaryKey({ autoIncrement: true }),
+    siteId: integer("siteId").primaryKey({ autoIncrement: true }),
-  orgId: integer("orgId").references(() => orgs.orgId),
+    orgId: integer("orgId").references(() => orgs.orgId),
-  exitNode: integer("exitNode").references(() => exitNodes.exitNodeId),
+    exitNode: integer("exitNode").references(() => exitNodes.exitNodeId),
-  name: text("name").notNull(),
+    name: text("name").notNull(),
-  subdomain: text("subdomain"),
+    subdomain: text("subdomain"),
-  pubKey: text("pubKey"),
+    pubKey: text("pubKey"),
-  subnet: text("subnet"),
+    subnet: text("subnet"),
 });
 
 // Resources table
 export const resources = sqliteTable("resources", {
-  resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
+    resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
-  siteId: integer("siteId").references(() => sites.siteId),
+    siteId: integer("siteId").references(() => sites.siteId),
-  name: text("name").notNull(),
+    name: text("name").notNull(),
-  subdomain: text("subdomain"),
+    subdomain: text("subdomain"),
 });
 
 // Exit Nodes table
 export const exitNodes = sqliteTable("exitNodes", {
-  exitNodeId: integer("exitNodeId").primaryKey({ autoIncrement: true }),
+    exitNodeId: integer("exitNodeId").primaryKey({ autoIncrement: true }),
-  name: text("name").notNull(),
+    name: text("name").notNull(),
-  address: text("address").notNull(),
+    address: text("address").notNull(),
+    privateKey: text("privateKey"),
+    listenPort: integer("listenPort"),
 });
 
 // Routes table
 export const routes = sqliteTable("routes", {
-  routeId: integer("routeId").primaryKey({ autoIncrement: true }),
+    routeId: integer("routeId").primaryKey({ autoIncrement: true }),
-  exitNodeId: integer("exitNodeId").references(() => exitNodes.exitNodeId),
+    exitNodeId: integer("exitNodeId").references(() => exitNodes.exitNodeId),
-  subnet: text("subnet").notNull(),
+    subnet: text("subnet").notNull(),
 });
 
 // Targets table
 export const targets = sqliteTable("targets", {
-  targetId: integer("targetId").primaryKey({ autoIncrement: true }),
+    targetId: integer("targetId").primaryKey({ autoIncrement: true }),
-  resourceId: integer("resourceId").references(() => resources.resourceId),
+    resourceId: integer("resourceId").references(() => resources.resourceId),
-  ip: text("ip").notNull(),
+    ip: text("ip").notNull(),
-  method: text("method"),
+    method: text("method"),
-  port: integer("port"),
+    port: integer("port"),
-  protocol: text("protocol"),
+    protocol: text("protocol"),
 });
 
 // Define the model types for type inference

server/migrations/0000_unique_killraven.sql

@@ -1,7 +1,9 @@
 CREATE TABLE `exitNodes` (
 	`exitNodeId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
 	`name` text NOT NULL,
-	`address` text NOT NULL
+	`address` text NOT NULL,
+	`privateKey` text,
+	`listenPort` integer
 );
 --> statement-breakpoint
 CREATE TABLE `orgs` (

server/migrations/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "9b039f4c-6867-4b08-8aa9-bc184c37b910",
+  "id": "369f669c-f220-4706-9a5c-8a66ab5653b2",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "exitNodes": {
@@ -27,6 +27,20 @@
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
+        },
+        "privateKey": {
+          "name": "privateKey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "listenPort": {
+          "name": "listenPort",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
         }
       },
       "indexes": {},

server/migrations/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1727544220529,
+      "when": 1727551266674,
-      "tag": "0000_short_ulik",
+      "tag": "0000_unique_killraven",
       "breakpoints": true
     }
   ]

server/routers/badger/getConfig.ts

@@ -1,20 +1,53 @@
 import { Request, Response, NextFunction } from 'express';
-import { DrizzleError } from 'drizzle-orm';
+import { DrizzleError, eq } from 'drizzle-orm';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
 import { sites, Site } from '../../db/schema';
 import db from '../../db';
 
 export const getConfig = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
   try {
-    const exitNodeId = req.query.exitNodeId as string;
+    const exitNodeId = parseInt(req.query.exitNodeId as string);
 
     if (!db) {
       throw new Error('Database is not attached to the request');
     }
 
-    const results: Site[] = db.select().from(sites).all();
 
-    res.json(results);
+    const exitNode = await db.query.exitNodes.findFirst({
+        where: {
+            exitNodeId: eq(exitNodeId)
+        },
+        with: {
+          routes: true,
+          sites: {
+            with: {
+              resources: {
+                with: {
+                  targets: true
+                }
+              }
+            }
+          }
+        }
+      });
+    
+      if (!exitNode) {
+        throw new Error('Exit node not found');
+      }
+    
+      const config = {
+        privateKey,
+        listenPort,
+        ipAddress: exitNode.address,
+        peers: exitNode.sites.map((site, index) => ({
+          publicKey: site.pubKey,
+          allowedIps: site.resources.flatMap(resource => 
+            resource.targets.map(target => target.ip)
+          )
+        }))
+      };
+
+    res.json(config);
   } catch (error) {
     console.error('Error querying database:', error);
     if (error instanceof DrizzleError) {
@@ -23,4 +56,11 @@ export const getConfig = async (req: Request, res: Response, next: NextFunction)
       next(error);
     }
   }
-};
+};
+
+function calculateSubnet(index: number): string {
+    const baseIp = 10 << 24;
+    const subnetSize = 16;
+    return `${(baseIp | (index * subnetSize)).toString()}/28`;
+  }
+