Allow picking ips when creating stuff

server/db/schema.ts

@@ -44,8 +44,8 @@ export const sites = sqliteTable("sites", {
     type: text("type").notNull(), // "newt" or "wireguard"
     online: integer("online", { mode: "boolean" }).notNull().default(false),
 
-    // exit node stuff that is how to connect to the site when it has a gerbil
+    // exit node stuff that is how to connect to the site when it has a wg server
-    address: text("address"), // this is the address of the wireguard interface in gerbil
+    address: text("address"), // this is the address of the wireguard interface in newt
     endpoint: text("endpoint"), // this is how to reach gerbil externally - gets put into the wireguard config
     publicKey: text("pubicKey"),
     lastHolePunch: integer("lastHolePunch"),

server/routers/client/createClient.ts

@@ -80,7 +80,7 @@ export async function createClient(
             );
         }
 
-        if (subnet && !isValidIP(subnet)) {
+        if (!isValidIP(subnet)) {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
@@ -103,7 +103,7 @@ export async function createClient(
             );
         }
 
-        if (subnet && !isIpInCidr(subnet, org.subnet)) {
+        if (!isIpInCidr(subnet, org.subnet)) {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
@@ -114,6 +114,22 @@ export async function createClient(
 
         const updatedSubnet = `${subnet}/${org.subnet.split("/")[1]}`; // we want the block size of the whole org
 
+        // make sure the subnet is unique
+        const subnetExists = await db
+            .select()
+            .from(clients)
+            .where(eq(clients.subnet, updatedSubnet))
+            .limit(1);
+
+        if (subnetExists.length > 0) {
+            return next(
+                createHttpError(
+                    HttpCode.CONFLICT,
+                    `Subnet ${subnet} already exists`
+                )
+            );
+        }
+
         await db.transaction(async (trx) => {
             // TODO: more intelligent way to pick the exit node
 

server/routers/client/pickClientDefaults.ts

@@ -5,7 +5,6 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { generateId } from "@server/auth/sessions/app";
 import { getNextAvailableClientSubnet } from "@server/lib/ip";
-import config from "@server/lib/config";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
 
@@ -43,6 +42,14 @@ export async function pickClientDefaults(
         const secret = generateId(48);
 
         const newSubnet = await getNextAvailableClientSubnet(orgId);
+        if (!newSubnet) {
+            return next(
+                createHttpError(
+                    HttpCode.INTERNAL_SERVER_ERROR,
+                    "No available subnet found"
+                )
+            );
+        }
 
         const subnet = newSubnet.split("/")[0];
 

server/routers/newt/handleGetConfigMessage.ts

@@ -64,45 +64,15 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
         return;
     }
 
-    let site: Site | undefined;
+    // update the endpoint and the public key
-    if (!existingSite.address) {
+    const [site] = await db
-        // This is a new site configuration
+        .update(sites)
-        let address = await getNextAvailableClientSubnet(existingSite.orgId);
+        .set({
-        if (!address) {
+            publicKey,
-            logger.error("handleGetConfigMessage: No available address");
+            listenPort: port
-            return;
+        })
-        }
+        .where(eq(sites.siteId, siteId))
-
+        .returning();
-        // TODO: WE NEED TO PULL THE CIDR FROM THE DB SUBNET ON THE ORG INSTEAD BECAUSE IT CAN BE DIFFERENT
-        // TODO: SOMEHOW WE NEED TO ALLOW THEM TO PUT IN THEIR OWN ADDRESS
-        address = `${address.split("/")[0]}/${config.getRawConfig().orgs.block_size}`; // we want the block size of the whole org
-
-        // Update the site with new WireGuard info
-        const [updateRes] = await db
-            .update(sites)
-            .set({
-                publicKey,
-                address,
-                listenPort: port
-            })
-            .where(eq(sites.siteId, siteId))
-            .returning();
-
-        site = updateRes;
-        logger.info(`Updated site ${siteId} with new WG Newt info`);
-    } else {
-        // update the endpoint and the public key
-        const [siteRes] = await db
-            .update(sites)
-            .set({
-                publicKey,
-                listenPort: port
-            })
-            .where(eq(sites.siteId, siteId))
-            .returning();
-
-        site = siteRes;
-    }
 
     if (!site) {
         logger.error("handleGetConfigMessage: Failed to update site");
@@ -139,7 +109,9 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
                 const peerData = {
                     publicKey: client.clients.pubKey!,
                     allowedIps: [client.clients.subnet!],
-                    endpoint: client.clientSites.isRelayed ? "" : client.clients.endpoint! // if its relayed it should be localhost
+                    endpoint: client.clientSites.isRelayed
+                        ? ""
+                        : client.clients.endpoint! // if its relayed it should be localhost
                 };
 
                 // Add or update this peer on the olm if it is connected

server/routers/org/createOrg.ts

@@ -71,7 +71,7 @@ export async function createOrg(
 
         const { orgId, name, subnet } = parsedBody.data;
 
-        if (subnet && !isValidCIDR(subnet)) {
+        if (!isValidCIDR(subnet)) {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
@@ -80,6 +80,22 @@ export async function createOrg(
             );
         }
 
+        // make sure the subnet is unique
+        const subnetExists = await db
+            .select()
+            .from(orgs)
+            .where(eq(orgs.subnet, subnet))
+            .limit(1);
+
+        if (subnetExists.length > 0) {
+            return next(
+                createHttpError(
+                    HttpCode.CONFLICT,
+                    `Subnet ${subnet} already exists`
+                )
+            );
+        }
+
         // make sure the orgId is unique
         const orgExists = await db
             .select()

server/routers/site/createSite.ts

@@ -1,7 +1,14 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { roles, userSites, sites, roleSites, Site } from "@server/db/schema";
+import {
+    roles,
+    userSites,
+    sites,
+    roleSites,
+    Site,
+    orgs
+} from "@server/db/schema";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -13,6 +20,8 @@ import { fromError } from "zod-validation-error";
 import { newts } from "@server/db/schema";
 import moment from "moment";
 import { hashPassword } from "@server/auth/password";
+import { isValidIP } from "@server/lib/validators";
+import { isIpInCidr } from "@server/lib/ip";
 
 const createSiteParamsSchema = z
     .object({
@@ -34,6 +43,7 @@ const createSiteSchema = z
         subnet: z.string().optional(),
         newtId: z.string().optional(),
         secret: z.string().optional(),
+        address: z.string().optional(),
         type: z.enum(["newt", "wireguard", "local"])
     })
     .strict();
@@ -58,8 +68,16 @@ export async function createSite(
             );
         }
 
-        const { name, type, exitNodeId, pubKey, subnet, newtId, secret } =
+        const {
-            parsedBody.data;
+            name,
+            type,
+            exitNodeId,
+            pubKey,
+            subnet,
+            newtId,
+            secret,
+            address
+        } = parsedBody.data;
 
         const parsedParams = createSiteParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -79,6 +97,53 @@ export async function createSite(
             );
         }
 
+        const [org] = await db.select().from(orgs).where(eq(orgs.orgId, orgId));
+
+        if (!org) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `Organization with ID ${orgId} not found`
+                )
+            );
+        }
+
+        if (address) {
+            if (!isValidIP(address)) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Invalid subnet format. Please provide a valid CIDR notation."
+                    )
+                );
+            }
+
+            if (!isIpInCidr(address, org.subnet)) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "IP is not in the CIDR range of the subnet."
+                    )
+                );
+            }
+
+            // make sure the subnet is unique
+            const addressExists = await db
+                .select()
+                .from(sites)
+                .where(eq(sites.address, address))
+                .limit(1);
+
+            if (addressExists.length > 0) {
+                return next(
+                    createHttpError(
+                        HttpCode.CONFLICT,
+                        `Subnet ${subnet} already exists`
+                    )
+                );
+            }
+        }
+
         const niceId = await getUniqueSiteName(orgId);
 
         await db.transaction(async (trx) => {
@@ -102,6 +167,7 @@ export async function createSite(
                         exitNodeId,
                         name,
                         niceId,
+                        address: address || null,
                         subnet,
                         type,
                         ...(pubKey && type == "wireguard" && { pubKey })
@@ -116,6 +182,7 @@ export async function createSite(
                         orgId,
                         name,
                         niceId,
+                        address: address || null,
                         type,
                         subnet: "0.0.0.0/0"
                     })

server/routers/site/pickSiteDefaults.ts

@@ -6,9 +6,11 @@ import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
 import logger from "@server/logger";
-import { findNextAvailableCidr } from "@server/lib/ip";
+import { findNextAvailableCidr, getNextAvailableClientSubnet } from "@server/lib/ip";
 import { generateId } from "@server/auth/sessions/app";
 import config from "@server/lib/config";
+import { z } from "zod";
+import { fromError } from "zod-validation-error";
 
 export type PickSiteDefaultsResponse = {
     exitNodeId: number;
@@ -20,14 +22,32 @@ export type PickSiteDefaultsResponse = {
     subnet: string;
     newtId: string;
     newtSecret: string;
+    clientAddress: string;
 };
 
+const pickSiteDefaultsSchema = z
+    .object({
+        orgId: z.string()
+    })
+    .strict();
+
 export async function pickSiteDefaults(
     req: Request,
     res: Response,
     next: NextFunction
 ): Promise<any> {
     try {
+        const parsedParams = pickSiteDefaultsSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+
+        const { orgId } = parsedParams.data;
         // TODO: more intelligent way to pick the exit node
 
         // make sure there is an exit node by counting the exit nodes table
@@ -73,6 +93,18 @@ export async function pickSiteDefaults(
             );
         }
 
+        const newClientAddress = await getNextAvailableClientSubnet(orgId);
+        if (!newClientAddress) {
+            return next(
+                createHttpError(
+                    HttpCode.INTERNAL_SERVER_ERROR,
+                    "No available subnet found"
+                )
+            );
+        }
+
+        const clientAddress = newClientAddress.split("/")[0];
+
         const newtId = generateId(15);
         const secret = generateId(48);
 
@@ -86,6 +118,7 @@ export async function pickSiteDefaults(
                 endpoint: exitNode.endpoint,
                 // subnet: `${newSubnet.split("/")[0]}/${config.getRawConfig().gerbil.block_size}`, // we want the block size of the whole subnet
                 subnet: newSubnet,
+                clientAddress: clientAddress,
                 newtId,
                 newtSecret: secret
             },

src/app/[orgId]/settings/clients/CreateClientsForm.tsx

@@ -264,7 +264,7 @@ export default function CreateClientForm({
                         name="subnet"
                         render={({ field }) => (
                             <FormItem>
-                                <FormLabel>Subnet</FormLabel>
+                                <FormLabel>Address</FormLabel>
                                 <FormControl>
                                     <Input
                                         autoComplete="off"
@@ -273,7 +273,7 @@ export default function CreateClientForm({
                                     />
                                 </FormControl>
                                 <FormDescription>
-                                    The subnet that this client will use for connectivity.
+                                    The address that this client will use for connectivity.
                                 </FormDescription>
                                 <FormMessage />
                             </FormItem>

src/app/[orgId]/settings/sites/create/page.tsx

@@ -69,7 +69,8 @@ const createSiteFormSchema = z
                 message: "Name must not be longer than 30 characters."
             }),
         method: z.string(),
-        copied: z.boolean()
+        copied: z.boolean(),
+        clientAddress: z.string().optional()
     })
     .refine(
         (data) => {
@@ -130,7 +131,7 @@ export default function Page() {
     const [newtId, setNewtId] = useState("");
     const [newtSecret, setNewtSecret] = useState("");
     const [newtEndpoint, setNewtEndpoint] = useState("");
-
+    const [clientAddress, setClientAddress] = useState("");
     const [publicKey, setPublicKey] = useState("");
     const [privateKey, setPrivateKey] = useState("");
     const [wgConfig, setWgConfig] = useState("");
@@ -315,7 +316,8 @@ PersistentKeepalive = 5`;
         defaultValues: {
             name: "",
             copied: false,
-            method: "newt"
+            method: "newt",
+            clientAddress: ""
         }
     });
 
@@ -324,7 +326,7 @@ PersistentKeepalive = 5`;
 
         let payload: CreateSiteBody = {
             name: data.name,
-            type: data.method as any,
+            type: data.method as any
         };
 
         if (data.method == "wireguard") {
@@ -361,7 +363,8 @@ PersistentKeepalive = 5`;
                 subnet: siteDefaults.subnet,
                 exitNodeId: siteDefaults.exitNodeId,
                 secret: siteDefaults.newtSecret,
-                newtId: siteDefaults.newtId
+                newtId: siteDefaults.newtId,
+                address: clientAddress
             };
         }
 
@@ -431,10 +434,12 @@ PersistentKeepalive = 5`;
                         const newtId = data.newtId;
                         const newtSecret = data.newtSecret;
                         const newtEndpoint = data.endpoint;
+                        const clientAddress = data.clientAddress;
 
                         setNewtId(newtId);
                         setNewtSecret(newtSecret);
                         setNewtEndpoint(newtEndpoint);
+                        setClientAddress(clientAddress);
 
                         hydrateCommands(
                             newtId,
@@ -617,18 +622,6 @@ PersistentKeepalive = 5`;
                                             </InfoSection>
                                         </InfoSections>
 
-                                        <Alert variant="default" className="">
-                                            <InfoIcon className="h-4 w-4" />
-                                            <AlertTitle className="font-semibold">
-                                                Save Your Credentials
-                                            </AlertTitle>
-                                            <AlertDescription>
-                                                You will only be able to see
-                                                this once. Make sure to copy it
-                                                to a secure place.
-                                            </AlertDescription>
-                                        </Alert>
-
                                         <Form {...form}>
                                             <form
                                                 className="space-y-4"
@@ -669,97 +662,49 @@ PersistentKeepalive = 5`;
                                                         </FormItem>
                                                     )}
                                                 />
+                                                <FormField
+                                                    control={form.control}
+                                                    name="clientAddress"
+                                                    render={({ field }) => (
+                                                        <FormItem>
+                                                            <FormLabel>
+                                                                Client Address
+                                                            </FormLabel>
+                                                            <FormControl>
+                                                                <Input
+                                                                    autoComplete="off"
+                                                                    value={
+                                                                        clientAddress
+                                                                    }
+                                                                    onChange={(
+                                                                        e
+                                                                    ) => {
+                                                                        setClientAddress(
+                                                                            e
+                                                                                .target
+                                                                                .value
+                                                                        );
+                                                                        field.onChange(
+                                                                            e
+                                                                                .target
+                                                                                .value
+                                                                        );
+                                                                    }}
+                                                                />
+                                                            </FormControl>
+                                                            <FormMessage />
+                                                            <FormDescription>
+                                                                Specify the IP
+                                                                address of the
+                                                                host.
+                                                            </FormDescription>
+                                                        </FormItem>
+                                                    )}
+                                                />
                                             </form>
                                         </Form>
                                     </SettingsSectionBody>
                                 </SettingsSection>
-
-                                <SettingsSection>
-                                    <SettingsSectionHeader>
-                                        <SettingsSectionTitle>
-                                            Install Newt
-                                        </SettingsSectionTitle>
-                                        <SettingsSectionDescription>
-                                            Get Newt running on your system
-                                        </SettingsSectionDescription>
-                                    </SettingsSectionHeader>
-                                    <SettingsSectionBody>
-                                        <div>
-                                            <p className="font-bold mb-3">
-                                                Operating System
-                                            </p>
-                                            <div className="grid grid-cols-2 md:grid-cols-5 gap-2">
-                                                {[
-                                                    "linux",
-                                                    "docker",
-                                                    "mac",
-                                                    "windows",
-                                                    "freebsd"
-                                                ].map((os) => (
-                                                    <Button
-                                                        key={os}
-                                                        variant={
-                                                            platform === os
-                                                                ? "squareOutlinePrimary"
-                                                                : "squareOutline"
-                                                        }
-                                                        className={`flex-1 min-w-[120px] ${platform === os ? "bg-primary/10" : ""}`}
-                                                        onClick={() => {
-                                                            setPlatform(os);
-                                                        }}
-                                                    >
-                                                        {getPlatformIcon(os)}
-                                                        {getPlatformName(os)}
-                                                    </Button>
-                                                ))}
-                                            </div>
-                                        </div>
-
-                                        <div>
-                                            <p className="font-bold mb-3">
-                                                {platform === "docker"
-                                                    ? "Method"
-                                                    : "Architecture"}
-                                            </p>
-                                            <div className="grid grid-cols-2 md:grid-cols-5 gap-2">
-                                                {getArchitectures().map(
-                                                    (arch) => (
-                                                        <Button
-                                                            key={arch}
-                                                            variant={
-                                                                architecture ===
-                                                                arch
-                                                                    ? "squareOutlinePrimary"
-                                                                    : "squareOutline"
-                                                            }
-                                                            className={`flex-1 min-w-[120px] ${architecture === arch ? "bg-primary/10" : ""}`}
-                                                            onClick={() =>
-                                                                setArchitecture(
-                                                                    arch
-                                                                )
-                                                            }
-                                                        >
-                                                            {arch}
-                                                        </Button>
-                                                    )
-                                                )}
-                                            </div>
-                                            <div className="pt-4">
-                                                <p className="font-bold mb-3">
-                                                    Commands
-                                                </p>
-                                                <div className="mt-2">
-                                                    <CopyTextBox
-                                                        text={getCommand().join(
-                                                            "\n"
-                                                        )}
-                                                        outline={true}
-                                                    />
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </SettingsSectionBody>
-                                </SettingsSection>
                             </>
                         )}