Updated gerbil key handeling

server/db/ensureActions.ts

@@ -20,9 +20,10 @@ export async function ensureActions() {
 
     // Add new actions
     for (const actionId of actionsToAdd) {
+        logger.debug(`Adding action: ${actionId}`);
         await db.insert(actions).values({ actionId }).execute();
         // Add new actions to the Default role
-        if (defaultRoles.length === 0) {
+        if (defaultRoles.length != 0) {
             await db.insert(roleActions)
                 .values(defaultRoles.map(role => ({ roleId: role.roleId!, actionId, orgId: role.orgId! })))
                 .execute();
@@ -31,6 +32,7 @@ export async function ensureActions() {
 
     // Remove deprecated actions
     if (actionsToRemove.length > 0) {
+        logger.debug(`Removing actions: ${actionsToRemove.join(', ')}`);
         await db.delete(actions).where(inArray(actions.actionId, actionsToRemove)).execute();
         await db.delete(roleActions).where(inArray(roleActions.actionId, actionsToRemove)).execute();
     }

server/db/names.ts

@@ -6,7 +6,13 @@ import { eq, and } from "drizzle-orm";
 import { __DIRNAME } from "@server/config";
 
 // Load the names from the names.json file
-const file = join(__DIRNAME, "names.json");
+const dev = process.env.ENVIRONMENT !== "prod";
+let file;
+if (!dev) {
+    file = join(__DIRNAME, "names.json");
+} else {
+    file = join(__DIRNAME, "/db/names.json");
+}
 export const names = JSON.parse(readFileSync(file, "utf-8"));
 
 export async function getUniqueSiteName(orgId: string): Promise<string> {

server/routers/gerbil/getConfig.ts

@@ -27,7 +27,7 @@ export type GetConfigResponse = {
 export async function getConfig(req: Request, res: Response, next: NextFunction): Promise<any> {
     try {
         // Validate request parameters
-        const parsedParams = getConfigSchema.safeParse(req.query);
+        const parsedParams = getConfigSchema.safeParse(req.body);
         if (!parsedParams.success) {
             return next(
                 createHttpError(
@@ -44,9 +44,9 @@ export async function getConfig(req: Request, res: Response, next: NextFunction)
         }
 
         // Fetch exit node
-        let exitNode = await db.select().from(exitNodes).where(eq(exitNodes.publicKey, publicKey));
+        let exitNodeQuery = await db.select().from(exitNodes).where(eq(exitNodes.publicKey, publicKey));
-
+        let exitNode;
-        if (!exitNode) {
+        if (exitNodeQuery.length === 0) {
             const address = await getNextAvailableSubnet();
             const listenPort = await getNextAvailablePort();
             const subEndpoint = await getUniqueExitNodeEndpointName();
@@ -61,6 +61,8 @@ export async function getConfig(req: Request, res: Response, next: NextFunction)
             }).returning().execute();
 
             logger.info(`Created new exit node ${exitNode[0].name} with address ${exitNode[0].address} and port ${exitNode[0].listenPort}`);
+        } else {
+            exitNode = exitNodeQuery;
         }
 
         if (!exitNode) {
@@ -98,16 +100,11 @@ export async function getConfig(req: Request, res: Response, next: NextFunction)
             peers,
         };
 
-        return response(res, {
+        logger.debug("Sending config: ", configResponse);
-            data: configResponse,
-            success: true,
-            error: false,
-            message: "Configuration retrieved successfully",
-            status: HttpCode.OK,
-        });
 
+        return res.status(HttpCode.OK).send(configResponse);
     } catch (error) {
-        logger.error('Error from getConfig:', error);
+        logger.error(error);
         return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }
@@ -119,10 +116,13 @@ async function getNextAvailableSubnet(): Promise<string> {
     }).from(exitNodes);
 
     const addresses = existingAddresses.map(a => a.address);
-    const subnet = findNextAvailableCidr(addresses, config.gerbil.block_size, config.gerbil.subnet_group);
+    let subnet = findNextAvailableCidr(addresses, config.gerbil.block_size, config.gerbil.subnet_group);
     if (!subnet) {
         throw new Error('No available subnets remaining in space');
     }
+
+    // replace the last octet with 1
+    subnet = subnet.split('.').slice(0, 3).join('.') + '.1';
     return subnet;
 }
 

server/routers/internal.ts

@@ -17,7 +17,7 @@ internalRouter.get("/traefik-config", traefik.traefikConfigProvider);
 const gerbilRouter = Router();
 internalRouter.use("/gerbil", gerbilRouter);
 
-gerbilRouter.get("/get-config", gerbil.getConfig);
+gerbilRouter.post("/get-config", gerbil.getConfig);
 gerbilRouter.post("/receive-bandwidth", gerbil.receiveBandwidth);
 
 // Badger routes

server/routers/resource/createResource.ts

@@ -75,7 +75,7 @@ export async function createResource(req: Request, res: Response, next: NextFunc
         }
 
         // Generate a unique resourceId
-        const fullDomain = `${subdomain}.${org[0].orgId}.${org[0].domain}`;
+        const fullDomain = `${subdomain}.${org[0].domain}`;
 
         // Create new resource in the database
         const newResource = await db.insert(resources).values({