Merge branch 'dev' into private-site-ha

messages/en-US.json

@@ -1817,11 +1817,6 @@
     "editInternalResourceDialogModePort": "Port",
     "editInternalResourceDialogModeHost": "Host",
     "editInternalResourceDialogModeCidr": "CIDR",
-    "editInternalResourceDialogModeHttp": "HTTP",
-    "editInternalResourceDialogModeHttps": "HTTPS",
-    "editInternalResourceDialogScheme": "Scheme",
-    "editInternalResourceDialogEnableSsl": "Enable SSL",
-    "editInternalResourceDialogEnableSslDescription": "Enable SSL/TLS encryption for secure HTTPS connections to the destination.",
     "editInternalResourceDialogDestination": "Destination",
     "editInternalResourceDialogDestinationHostDescription": "The IP address or hostname of the resource on the site's network.",
     "editInternalResourceDialogDestinationIPDescription": "The IP or hostname address of the resource on the site's network.",
@@ -1865,19 +1860,11 @@
     "createInternalResourceDialogModePort": "Port",
     "createInternalResourceDialogModeHost": "Host",
     "createInternalResourceDialogModeCidr": "CIDR",
-    "createInternalResourceDialogModeHttp": "HTTP",
-    "createInternalResourceDialogModeHttps": "HTTPS",
-    "scheme": "Scheme",
-    "createInternalResourceDialogScheme": "Scheme",
-    "createInternalResourceDialogEnableSsl": "Enable SSL",
-    "createInternalResourceDialogEnableSslDescription": "Enable SSL/TLS encryption for secure HTTPS connections to the destination.",
     "createInternalResourceDialogDestination": "Destination",
     "createInternalResourceDialogDestinationHostDescription": "The IP address or hostname of the resource on the site's network.",
     "createInternalResourceDialogDestinationCidrDescription": "The CIDR range of the resource on the site's network.",
     "createInternalResourceDialogAlias": "Alias",
     "createInternalResourceDialogAliasDescription": "An optional internal DNS alias for this resource.",
-    "internalResourceDownstreamSchemeRequired": "Scheme is required for HTTP resources",
-    "internalResourceHttpPortRequired": "Destination port is required for HTTP resources",
     "siteConfiguration": "Configuration",
     "siteAcceptClientConnections": "Accept Client Connections",
     "siteAcceptClientConnectionsDescription": "Allow user devices and clients to access resources on this site. This can be changed later.",
@@ -2129,7 +2116,6 @@
     "domainPickerFreeProvidedDomain": "Free Provided Domain",
     "domainPickerVerified": "Verified",
     "domainPickerUnverified": "Unverified",
-    "domainPickerManual": "Manual",
     "domainPickerInvalidSubdomainStructure": "This subdomain contains invalid characters or structure. It will be sanitized automatically when you save.",
     "domainPickerError": "Error",
     "domainPickerErrorLoadDomains": "Failed to load organization domains",
@@ -2673,12 +2659,8 @@
     "editInternalResourceDialogAddUsers": "Add Users",
     "editInternalResourceDialogAddClients": "Add Clients",
     "editInternalResourceDialogDestinationLabel": "Destination",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it, then complete the settings that apply to your setup.",
+    "editInternalResourceDialogDestinationDescription": "Specify the destination address for the internal resource. This can be a hostname, IP address, or CIDR range depending on the selected mode. Optionally set an internal DNS alias for easier identification.",
     "editInternalResourceDialogPortRestrictionsDescription": "Restrict access to specific TCP/UDP ports or allow/block all ports.",
-    "createInternalResourceDialogHttpConfiguration": "HTTP configuration",
-    "createInternalResourceDialogHttpConfigurationDescription": "Choose the domain clients will use to reach this resource over HTTP or HTTPS.",
-    "editInternalResourceDialogHttpConfiguration": "HTTP configuration",
-    "editInternalResourceDialogHttpConfigurationDescription": "Choose the domain clients will use to reach this resource over HTTP or HTTPS.",
     "editInternalResourceDialogTcp": "TCP",
     "editInternalResourceDialogUdp": "UDP",
     "editInternalResourceDialogIcmp": "ICMP",
@@ -2717,8 +2699,6 @@
     "maintenancePageMessagePlaceholder": "We'll be back soon! Our site is currently undergoing scheduled maintenance.",
     "maintenancePageMessageDescription": "Detailed message explaining the maintenance",
     "maintenancePageTimeTitle": "Estimated Completion Time (Optional)",
-    "privateMaintenanceScreenTitle": "Private Placeholder Screen",
-    "privateMaintenanceScreenMessage": "This domain is being used on a private resource. Please connect using the Pangolin client to access this resource.",
     "maintenanceTime": "e.g., 2 hours, Nov 1 at 5:00 PM",
     "maintenanceEstimatedTimeDescription": "When you expect maintenance to be completed",
     "editDomain": "Edit Domain",

server/db/pg/schema/schema.ts

@@ -57,9 +57,7 @@ export const orgs = pgTable("orgs", {
     settingsLogRetentionDaysAction: integer("settingsLogRetentionDaysAction") // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
         .notNull()
         .default(0),
-    settingsLogRetentionDaysConnection: integer(
+    settingsLogRetentionDaysConnection: integer("settingsLogRetentionDaysConnection") // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
-        "settingsLogRetentionDaysConnection"
-    ) // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
         .notNull()
         .default(0),
     sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
@@ -103,9 +101,7 @@ export const sites = pgTable("sites", {
     lastHolePunch: bigint("lastHolePunch", { mode: "number" }),
     listenPort: integer("listenPort"),
     dockerSocketEnabled: boolean("dockerSocketEnabled").notNull().default(true),
-    status: varchar("status")
+    status: varchar("status").$type<"pending" | "approved">().default("approved")
-        .$type<"pending" | "approved">()
-        .default("approved")
 });
 
 export const resources = pgTable("resources", {
@@ -226,17 +222,22 @@ export const exitNodes = pgTable("exitNodes", {
 export const siteResources = pgTable("siteResources", {
     // this is for the clients
     siteResourceId: serial("siteResourceId").primaryKey(),
-    siteId: integer("siteId")
-        .notNull()
-        .references(() => sites.siteId, { onDelete: "cascade" }),
     orgId: varchar("orgId")
         .notNull()
         .references(() => orgs.orgId, { onDelete: "cascade" }),
+    networkId: integer("networkId").references(() => networks.networkId, {
+        onDelete: "set null"
+    }),
+    defaultNetworkId: integer("defaultNetworkId").references(
+        () => networks.networkId,
+        {
+            onDelete: "restrict"
+        }
+    ),
     niceId: varchar("niceId").notNull(),
     name: varchar("name").notNull(),
-    ssl: boolean("ssl").notNull().default(false),
+    mode: varchar("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
-    mode: varchar("mode").$type<"host" | "cidr" | "http">().notNull(), // "host" | "cidr" | "http"
+    protocol: varchar("protocol"), // only for port mode
-    scheme: varchar("scheme").$type<"http" | "https">(), // only for when we are doing https or http mode
     proxyPort: integer("proxyPort"), // only for port mode
     destinationPort: integer("destinationPort"), // only for port mode
     destination: varchar("destination").notNull(), // ip, cidr, hostname; validate against the mode
@@ -252,6 +253,32 @@ export const siteResources = pgTable("siteResources", {
         .default("site")
 });
 
+export const networks = pgTable("networks", {
+    networkId: serial("networkId").primaryKey(),
+    niceId: text("niceId"),
+    name: text("name"),
+    scope: varchar("scope")
+        .$type<"global" | "resource">()
+        .notNull()
+        .default("global"),
+    orgId: varchar("orgId")
+        .references(() => orgs.orgId, {
+            onDelete: "cascade"
+        })
+        .notNull()
+});
+
+export const siteNetworks = pgTable("siteNetworks", {
+    siteId: integer("siteId")
+        .notNull()
+        .references(() => sites.siteId, {
+            onDelete: "cascade"
+        }),
+    networkId: integer("networkId")
+        .notNull()
+        .references(() => networks.networkId, { onDelete: "cascade" })
+});
+
 export const clientSiteResources = pgTable("clientSiteResources", {
     clientId: integer("clientId")
         .notNull()
@@ -1111,3 +1138,4 @@ export type RequestAuditLog = InferSelectModel<typeof requestAuditLog>;
 export type RoundTripMessageTracker = InferSelectModel<
     typeof roundTripMessageTracker
 >;
+export type Network = InferSelectModel<typeof networks>;

server/db/sqlite/schema/schema.ts

@@ -54,9 +54,7 @@ export const orgs = sqliteTable("orgs", {
     settingsLogRetentionDaysAction: integer("settingsLogRetentionDaysAction") // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
         .notNull()
         .default(0),
-    settingsLogRetentionDaysConnection: integer(
+    settingsLogRetentionDaysConnection: integer("settingsLogRetentionDaysConnection") // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
-        "settingsLogRetentionDaysConnection"
-    ) // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
         .notNull()
         .default(0),
     sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
@@ -94,6 +92,9 @@ export const sites = sqliteTable("sites", {
     exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
         onDelete: "set null"
     }),
+    networkId: integer("networkId").references(() => networks.networkId, {
+        onDelete: "set null"
+    }),
     name: text("name").notNull(),
     pubKey: text("pubKey"),
     subnet: text("subnet"),
@@ -252,17 +253,20 @@ export const siteResources = sqliteTable("siteResources", {
     siteResourceId: integer("siteResourceId").primaryKey({
         autoIncrement: true
     }),
-    siteId: integer("siteId")
-        .notNull()
-        .references(() => sites.siteId, { onDelete: "cascade" }),
     orgId: text("orgId")
         .notNull()
         .references(() => orgs.orgId, { onDelete: "cascade" }),
+    networkId: integer("networkId").references(() => networks.networkId, {
+        onDelete: "set null"
+    }),
+    defaultNetworkId: integer("defaultNetworkId").references(
+        () => networks.networkId,
+        { onDelete: "restrict" }
+    ),
     niceId: text("niceId").notNull(),
     name: text("name").notNull(),
-    ssl: integer("ssl", { mode: "boolean" }).notNull().default(false),
+    mode: text("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
-    mode: text("mode").$type<"host" | "cidr" | "http">().notNull(), // "host" | "cidr" | "http"
+    protocol: text("protocol"), // only for port mode
-    scheme: text("scheme").$type<"http" | "https">(), // only for when we are doing https or http mode
     proxyPort: integer("proxyPort"), // only for port mode
     destinationPort: integer("destinationPort"), // only for port mode
     destination: text("destination").notNull(), // ip, cidr, hostname
@@ -280,6 +284,30 @@ export const siteResources = sqliteTable("siteResources", {
         .default("site")
 });
 
+export const networks = sqliteTable("networks", {
+    networkId: integer("networkId").primaryKey({ autoIncrement: true }),
+    niceId: text("niceId"),
+    name: text("name"),
+    scope: text("scope")
+        .$type<"global" | "resource">()
+        .notNull()
+        .default("global"),
+    orgId: text("orgId")
+        .notNull()
+        .references(() => orgs.orgId, { onDelete: "cascade" })
+});
+
+export const siteNetworks = sqliteTable("siteNetworks", {
+    siteId: integer("siteId")
+        .notNull()
+        .references(() => sites.siteId, {
+            onDelete: "cascade"
+        }),
+    networkId: integer("networkId")
+        .notNull()
+        .references(() => networks.networkId, { onDelete: "cascade" })
+});
+
 export const clientSiteResources = sqliteTable("clientSiteResources", {
     clientId: integer("clientId")
         .notNull()
@@ -1198,6 +1226,7 @@ export type ApiKey = InferSelectModel<typeof apiKeys>;
 export type ApiKeyAction = InferSelectModel<typeof apiKeyActions>;
 export type ApiKeyOrg = InferSelectModel<typeof apiKeyOrg>;
 export type SiteResource = InferSelectModel<typeof siteResources>;
+export type Network = InferSelectModel<typeof networks>;
 export type OrgDomains = InferSelectModel<typeof orgDomains>;
 export type SetupToken = InferSelectModel<typeof setupTokens>;
 export type HostMeta = InferSelectModel<typeof hostMeta>;

server/index.ts

@@ -22,7 +22,6 @@ import { TraefikConfigManager } from "@server/lib/traefik/TraefikConfigManager";
 import { initCleanup } from "#dynamic/cleanup";
 import license from "#dynamic/license/license";
 import { initLogCleanupInterval } from "@server/lib/cleanupLogs";
-import { initAcmeCertSync } from "#dynamic/lib/acmeCertSync";
 import { fetchServerIp } from "@server/lib/serverIpService";
 
 async function startServers() {
@@ -40,7 +39,6 @@ async function startServers() {
     initTelemetryClient();
 
     initLogCleanupInterval();
-    initAcmeCertSync();
 
     // Start all servers
     const apiServer = createApiServer();

server/lib/acmeCertSync.ts

@@ -1,3 +0,0 @@
-export function initAcmeCertSync(): void {
-    // stub
-}

server/lib/blueprints/applyBlueprint.ts

@@ -121,8 +121,8 @@ export async function applyBlueprint({
             for (const result of clientResourcesResults) {
                 if (
                     result.oldSiteResource &&
-                    result.oldSiteResource.siteId !=
+                    JSON.stringify(result.newSites?.sort()) !==
-                        result.newSiteResource.siteId
+                        JSON.stringify(result.oldSites?.sort())
                 ) {
                     // query existing associations
                     const existingRoleIds = await trx
@@ -222,13 +222,15 @@ export async function applyBlueprint({
                         trx
                     );
                 } else {
-                    const [newSite] = await trx
+                    let good = true;
+                    for (const newSite of result.newSites) {
+                        const [site] = await trx
                             .select()
                             .from(sites)
                             .innerJoin(newts, eq(sites.siteId, newts.siteId))
                             .where(
                                 and(
-                                eq(sites.siteId, result.newSiteResource.siteId),
+                                    eq(sites.siteId, newSite.siteId),
                                     eq(sites.orgId, orgId),
                                     eq(sites.type, "newt"),
                                     isNotNull(sites.pubKey)
@@ -236,24 +238,30 @@ export async function applyBlueprint({
                             )
                             .limit(1);
 
-                    if (!newSite) {
+                        if (!site) {
                             logger.debug(
-                            `No newt site found for client resource ${result.newSiteResource.siteResourceId}, skipping target update`
+                                `No newt sites found for client resource ${result.newSiteResource.siteResourceId}, skipping target update`
                             );
-                        continue;
+                            good = false;
+                            break;
                         }
 
                         logger.debug(
-                        `Updating client resource ${result.newSiteResource.siteResourceId} on site ${newSite.sites.siteId}`
+                            `Updating client resource ${result.newSiteResource.siteResourceId} on site ${newSite.siteId}`
                         );
+                    }
+
+                    if (!good) {
+                        continue;
+                    }
 
                     await handleMessagingForUpdatedSiteResource(
                         result.oldSiteResource,
                         result.newSiteResource,
-                        {
+                        result.newSites.map((site) => ({
-                            siteId: newSite.sites.siteId,
+                            siteId: site.siteId,
-                            orgId: newSite.sites.orgId
+                            orgId: result.newSiteResource.orgId
-                        },
+                        })),
                         trx
                     );
                 }

server/lib/blueprints/clientResources.ts

@@ -3,12 +3,15 @@ import {
     clientSiteResources,
     roles,
     roleSiteResources,
+    Site,
     SiteResource,
+    siteNetworks,
     siteResources,
     Transaction,
     userOrgs,
     users,
-    userSiteResources
+    userSiteResources,
+    networks
 } from "@server/db";
 import { sites } from "@server/db";
 import { eq, and, ne, inArray, or } from "drizzle-orm";
@@ -16,23 +19,11 @@ import { Config } from "./types";
 import logger from "@server/logger";
 import { getNextAvailableAliasAddress } from "../ip";
 
-function siteResourceModeForDb(mode: "host" | "cidr" | "http" | "https"): {
-    mode: "host" | "cidr" | "http";
-    ssl: boolean;
-    scheme: "http" | "https" | null;
-} {
-    if (mode === "https") {
-        return { mode: "http", ssl: true, scheme: "https" };
-    }
-    if (mode === "http") {
-        return { mode: "http", ssl: false, scheme: "http" };
-    }
-    return { mode, ssl: false, scheme: null };
-}
-
 export type ClientResourcesResults = {
     newSiteResource: SiteResource;
     oldSiteResource?: SiteResource;
+    newSites: { siteId: number }[];
+    oldSites: { siteId: number }[];
 }[];
 
 export async function updateClientResources(
@@ -57,12 +48,21 @@ export async function updateClientResources(
             )
             .limit(1);
 
+        const existingSiteIds = existingResource?.networkId
+            ? await trx
+                  .select({ siteId: sites.siteId })
+                  .from(siteNetworks)
+                  .where(eq(siteNetworks.networkId, existingResource.networkId))
+            : [];
+
+        let allSites: { siteId: number }[] = [];
+        if (resourceData.site) {
+            let siteSingle;
             const resourceSiteId = resourceData.site;
-        let site;
 
             if (resourceSiteId) {
                 // Look up site by niceId
-            [site] = await trx
+                [siteSingle] = await trx
                     .select({ siteId: sites.siteId })
                     .from(sites)
                     .where(
@@ -74,34 +74,54 @@ export async function updateClientResources(
                     .limit(1);
             } else if (siteId) {
                 // Use the provided siteId directly, but verify it belongs to the org
-            [site] = await trx
+                [siteSingle] = await trx
                     .select({ siteId: sites.siteId })
                     .from(sites)
-                .where(and(eq(sites.siteId, siteId), eq(sites.orgId, orgId)))
+                    .where(
+                        and(eq(sites.siteId, siteId), eq(sites.orgId, orgId))
+                    )
                     .limit(1);
             } else {
                 throw new Error(`Target site is required`);
             }
 
-        if (!site) {
+            if (!siteSingle) {
                 throw new Error(
                     `Site not found: ${resourceSiteId} in org ${orgId}`
                 );
             }
+            allSites.push(siteSingle);
+        }
+
+        if (resourceData.sites) {
+            for (const siteNiceId of resourceData.sites) {
+                const [site] = await trx
+                    .select({ siteId: sites.siteId })
+                    .from(sites)
+                    .where(
+                        and(
+                            eq(sites.niceId, siteNiceId),
+                            eq(sites.orgId, orgId)
+                        )
+                    )
+                    .limit(1);
+                if (!site) {
+                    throw new Error(
+                        `Site not found: ${siteId} in org ${orgId}`
+                    );
+                }
+                allSites.push(site);
+            }
+        }
 
         if (existingResource) {
-            const mappedMode = siteResourceModeForDb(resourceData.mode);
             // Update existing resource
             const [updatedResource] = await trx
                 .update(siteResources)
                 .set({
                     name: resourceData.name || resourceNiceId,
-                    siteId: site.siteId,
+                    mode: resourceData.mode,
-                    mode: mappedMode.mode,
-                    ssl: mappedMode.ssl,
-                    scheme: mappedMode.scheme,
                     destination: resourceData.destination,
-                    destinationPort: resourceData["destination-port"],
                     enabled: true, // hardcoded for now
                     // enabled: resourceData.enabled ?? true,
                     alias: resourceData.alias || null,
@@ -120,6 +140,21 @@ export async function updateClientResources(
             const siteResourceId = existingResource.siteResourceId;
             const orgId = existingResource.orgId;
 
+            if (updatedResource.networkId) {
+                await trx
+                    .delete(siteNetworks)
+                    .where(
+                        eq(siteNetworks.networkId, updatedResource.networkId)
+                    );
+
+                for (const site of allSites) {
+                    await trx.insert(siteNetworks).values({
+                        siteId: site.siteId,
+                        networkId: updatedResource.networkId
+                    });
+                }
+            }
+
             await trx
                 .delete(clientSiteResources)
                 .where(eq(clientSiteResources.siteResourceId, siteResourceId));
@@ -222,28 +257,36 @@ export async function updateClientResources(
 
             results.push({
                 newSiteResource: updatedResource,
-                oldSiteResource: existingResource
+                oldSiteResource: existingResource,
+                newSites: allSites,
+                oldSites: existingSiteIds
             });
         } else {
-            const mappedMode = siteResourceModeForDb(resourceData.mode);
             let aliasAddress: string | null = null;
-            if (mappedMode.mode === "host" || mappedMode.mode === "http") {
+            if (resourceData.mode == "host") {
+                // we can only have an alias on a host
                 aliasAddress = await getNextAvailableAliasAddress(orgId);
             }
 
+            const [network] = await trx
+                .insert(networks)
+                .values({
+                    scope: "resource",
+                    orgId: orgId
+                })
+                .returning();
+
             // Create new resource
             const [newResource] = await trx
                 .insert(siteResources)
                 .values({
                     orgId: orgId,
-                    siteId: site.siteId,
                     niceId: resourceNiceId,
+                    networkId: network.networkId,
+                    defaultNetworkId: network.networkId,
                     name: resourceData.name || resourceNiceId,
-                    mode: mappedMode.mode,
+                    mode: resourceData.mode,
-                    ssl: mappedMode.ssl,
-                    scheme: mappedMode.scheme,
                     destination: resourceData.destination,
-                    destinationPort: resourceData["destination-port"],
                     enabled: true, // hardcoded for now
                     // enabled: resourceData.enabled ?? true,
                     alias: resourceData.alias || null,
@@ -256,6 +299,13 @@ export async function updateClientResources(
 
             const siteResourceId = newResource.siteResourceId;
 
+            for (const site of allSites) {
+                await trx.insert(siteNetworks).values({
+                    siteId: site.siteId,
+                    networkId: network.networkId
+                });
+            }
+
             const [adminRole] = await trx
                 .select()
                 .from(roles)
@@ -345,7 +395,11 @@ export async function updateClientResources(
                 `Created new client resource ${newResource.name} (${newResource.siteResourceId}) for org ${orgId}`
             );
 
-            results.push({ newSiteResource: newResource });
+            results.push({
+                newSiteResource: newResource,
+                newSites: allSites,
+                oldSites: existingSiteIds
+            });
         }
     }
 

server/lib/blueprints/types.ts

@@ -325,11 +325,12 @@ export function isTargetsOnlyResource(resource: any): boolean {
 export const ClientResourceSchema = z
     .object({
         name: z.string().min(1).max(255),
-        mode: z.enum(["host", "cidr", "http", "https"]),
+        mode: z.enum(["host", "cidr"]),
-        site: z.string(),
+        site: z.string(), // DEPRECATED IN FAVOR OF sites
+        sites: z.array(z.string()).optional().default([]),
         // protocol: z.enum(["tcp", "udp"]).optional(),
         // proxyPort: z.int().positive().optional(),
-        "destination-port": z.int().positive().optional(),
+        // destinationPort: z.int().positive().optional(),
         destination: z.string().min(1),
         // enabled: z.boolean().default(true),
         "tcp-ports": portRangeStringSchema.optional().default("*"),

server/lib/ip.ts

@@ -5,7 +5,6 @@ import config from "@server/lib/config";
 import z from "zod";
 import logger from "@server/logger";
 import semver from "semver";
-import { getValidCertificatesForDomains } from "#private/lib/certificates";
 
 interface IPRange {
     start: bigint;
@@ -583,26 +582,16 @@ export type SubnetProxyTargetV2 = {
         protocol: "tcp" | "udp";
     }[];
     resourceId?: number;
-    protocol?: "http" | "https"; // if set, this target only applies to the specified protocol
-    httpTargets?: HTTPTarget[];
-    tlsCert?: string;
-    tlsKey?: string;
 };
 
-export type HTTPTarget = {
+export function generateSubnetProxyTargetV2(
-    destAddr: string; // must be an IP or hostname
-    destPort: number;
-    scheme: "http" | "https";
-};
-
-export async function generateSubnetProxyTargetV2(
     siteResource: SiteResource,
     clients: {
         clientId: number;
         pubKey: string | null;
         subnet: string | null;
     }[]
-): Promise<SubnetProxyTargetV2 | undefined> {
+): SubnetProxyTargetV2 | undefined {
     if (clients.length === 0) {
         logger.debug(
             `No clients have access to site resource ${siteResource.siteResourceId}, skipping target generation.`
@@ -630,7 +619,7 @@ export async function generateSubnetProxyTargetV2(
                 destPrefix: destination,
                 portRange,
                 disableIcmp,
-                resourceId: siteResource.siteResourceId
+                resourceId: siteResource.siteResourceId,
             };
         }
 
@@ -642,7 +631,7 @@ export async function generateSubnetProxyTargetV2(
                 rewriteTo: destination,
                 portRange,
                 disableIcmp,
-                resourceId: siteResource.siteResourceId
+                resourceId: siteResource.siteResourceId,
             };
         }
     } else if (siteResource.mode == "cidr") {
@@ -651,69 +640,7 @@ export async function generateSubnetProxyTargetV2(
             destPrefix: siteResource.destination,
             portRange,
             disableIcmp,
-            resourceId: siteResource.siteResourceId
-        };
-    } else if (siteResource.mode == "http") {
-        let destination = siteResource.destination;
-        // check if this is a valid ip
-        const ipSchema = z.union([z.ipv4(), z.ipv6()]);
-        if (ipSchema.safeParse(destination).success) {
-            destination = `${destination}/32`;
-        }
-
-        if (
-            !siteResource.alias ||
-            !siteResource.aliasAddress ||
-            !siteResource.destinationPort ||
-            !siteResource.scheme
-        ) {
-            logger.debug(
-                `Site resource ${siteResource.siteResourceId} is in HTTP mode but is missing alias or alias address or destinationPort or scheme, skipping alias target generation.`
-            );
-            return;
-        }
-        const publicProtocol = siteResource.ssl ? "https" : "http";
-        // also push a match for the alias address
-        let tlsCert: string | undefined;
-        let tlsKey: string | undefined;
-
-        if (siteResource.ssl && siteResource.alias) {
-            try {
-                const certs = await getValidCertificatesForDomains(
-                    new Set([siteResource.alias]),
-                    true
-                );
-                if (certs.length > 0 && certs[0].certFile && certs[0].keyFile) {
-                    tlsCert = certs[0].certFile;
-                    tlsKey = certs[0].keyFile;
-                } else {
-                    logger.warn(
-                        `No valid certificate found for SSL site resource ${siteResource.siteResourceId} with domain ${siteResource.alias}`
-                    );
-                }
-            } catch (err) {
-                logger.error(
-                    `Failed to retrieve certificate for site resource ${siteResource.siteResourceId} domain ${siteResource.alias}: ${err}`
-                );
-            }
-        }
-
-        target = {
-            sourcePrefixes: [],
-            destPrefix: `${siteResource.aliasAddress}/32`,
-            rewriteTo: destination,
-            portRange,
-            disableIcmp,
             resourceId: siteResource.siteResourceId,
-            protocol: siteResource.ssl ? "https" : "http",
-            httpTargets: [
-                {
-                    destAddr: siteResource.destination,
-                    destPort: siteResource.destinationPort,
-                    scheme: siteResource.scheme
-                }
-            ],
-            ...(tlsCert && tlsKey ? { tlsCert, tlsKey } : {})
         };
     }
 
@@ -743,15 +670,16 @@ export async function generateSubnetProxyTargetV2(
     return target;
 }
 
+
 /**
  * Converts a SubnetProxyTargetV2 to an array of SubnetProxyTarget (v1)
  * by expanding each source prefix into its own target entry.
  * @param targetV2 - The v2 target to convert
  * @returns Array of v1 SubnetProxyTarget objects
  */
-export function convertSubnetProxyTargetsV2ToV1(
+ export function convertSubnetProxyTargetsV2ToV1(
      targetsV2: SubnetProxyTargetV2[]
-): SubnetProxyTarget[] {
+ ): SubnetProxyTarget[] {
      return targetsV2.flatMap((targetV2) =>
          targetV2.sourcePrefixes.map((sourcePrefix) => ({
              sourcePrefix,
@@ -767,7 +695,8 @@ export function convertSubnetProxyTargetsV2ToV1(
              })
          }))
      );
-}
+ }
+
 
 // Custom schema for validating port range strings
 // Format: "80,443,8000-9000" or "*" for all ports, or empty string

server/lib/rebuildClientAssociations.ts

@@ -11,11 +11,11 @@ import {
     roleSiteResources,
     Site,
     SiteResource,
+    siteNetworks,
     siteResources,
     sites,
     Transaction,
     userOrgRoles,
-    userOrgs,
     userSiteResources
 } from "@server/db";
 import { and, eq, inArray, ne } from "drizzle-orm";
@@ -48,15 +48,23 @@ export async function getClientSiteResourceAccess(
     siteResource: SiteResource,
     trx: Transaction | typeof db = db
 ) {
-    // get the site
+    // get all sites associated with this siteResource via its network
-    const [site] = await trx
+    const sitesList = siteResource.networkId
+        ? await trx
               .select()
               .from(sites)
-        .where(eq(sites.siteId, siteResource.siteId))
+              .innerJoin(
-        .limit(1);
+                  siteNetworks,
+                  eq(siteNetworks.siteId, sites.siteId)
+              )
+              .where(eq(siteNetworks.networkId, siteResource.networkId))
+              .then((rows) => rows.map((row) => row.sites))
+        : [];
 
-    if (!site) {
+    if (sitesList.length === 0) {
-        throw new Error(`Site with ID ${siteResource.siteId} not found`);
+        logger.warn(
+            `No sites found for siteResource ${siteResource.siteResourceId} with networkId ${siteResource.networkId}`
+        );
     }
 
     const roleIds = await trx
@@ -137,7 +145,7 @@ export async function getClientSiteResourceAccess(
     const mergedAllClientIds = mergedAllClients.map((c) => c.clientId);
 
     return {
-        site,
+        sitesList,
         mergedAllClients,
         mergedAllClientIds
     };
@@ -153,17 +161,18 @@ export async function rebuildClientAssociationsFromSiteResource(
         subnet: string | null;
     }[];
 }> {
-    const siteId = siteResource.siteId;
+    const { sitesList, mergedAllClients, mergedAllClientIds } =
-
-    const { site, mergedAllClients, mergedAllClientIds } =
         await getClientSiteResourceAccess(siteResource, trx);
 
     /////////// process the client-siteResource associations ///////////
 
-    // get all of the clients associated with other resources on this site
+    // get all of the clients associated with other resources in the same network,
-    const allUpdatedClientsFromOtherResourcesOnThisSite = await trx
+    // joined through siteNetworks so we know which siteId each client belongs to
+    const allUpdatedClientsFromOtherResourcesOnThisSite = siteResource.networkId
+        ? await trx
               .select({
-            clientId: clientSiteResourcesAssociationsCache.clientId
+                  clientId: clientSiteResourcesAssociationsCache.clientId,
+                  siteId: siteNetworks.siteId
               })
               .from(clientSiteResourcesAssociationsCache)
               .innerJoin(
@@ -173,20 +182,30 @@ export async function rebuildClientAssociationsFromSiteResource(
                       siteResources.siteResourceId
                   )
               )
+              .innerJoin(
+                  siteNetworks,
+                  eq(siteNetworks.networkId, siteResources.networkId)
+              )
               .where(
                   and(
-                eq(siteResources.siteId, siteId),
+                      eq(siteResources.networkId, siteResource.networkId),
-                ne(siteResources.siteResourceId, siteResource.siteResourceId)
+                      ne(
+                          siteResources.siteResourceId,
+                          siteResource.siteResourceId
                       )
-        );
+                  )
+              )
+        : [];
 
-    const allClientIdsFromOtherResourcesOnThisSite = Array.from(
+    // Build a per-site map so the loop below can check by siteId rather than
-        new Set(
+    // across the entire network.
-            allUpdatedClientsFromOtherResourcesOnThisSite.map(
+    const clientsFromOtherResourcesBySite = new Map<number, Set<number>>();
-                (row) => row.clientId
+    for (const row of allUpdatedClientsFromOtherResourcesOnThisSite) {
-            )
+        if (!clientsFromOtherResourcesBySite.has(row.siteId)) {
-        )
+            clientsFromOtherResourcesBySite.set(row.siteId, new Set());
-    );
+        }
+        clientsFromOtherResourcesBySite.get(row.siteId)!.add(row.clientId);
+    }
 
     const existingClientSiteResources = await trx
         .select({
@@ -260,31 +279,39 @@ export async function rebuildClientAssociationsFromSiteResource(
 
     /////////// process the client-site associations ///////////
 
+    for (const site of sitesList) {
+        const siteId = site.siteId;
+
         const existingClientSites = await trx
             .select({
                 clientId: clientSitesAssociationsCache.clientId
             })
             .from(clientSitesAssociationsCache)
-        .where(eq(clientSitesAssociationsCache.siteId, siteResource.siteId));
+            .where(eq(clientSitesAssociationsCache.siteId, siteId));
 
         const existingClientSiteIds = existingClientSites.map(
             (row) => row.clientId
         );
 
         // Get full client details for existing clients (needed for sending delete messages)
-    const existingClients = await trx
+        const existingClients =
+            existingClientSiteIds.length > 0
+                ? await trx
                       .select({
                           clientId: clients.clientId,
                           pubKey: clients.pubKey,
                           subnet: clients.subnet
                       })
                       .from(clients)
-        .where(inArray(clients.clientId, existingClientSiteIds));
+                      .where(inArray(clients.clientId, existingClientSiteIds))
+                : [];
+
+        const otherResourceClientIds = clientsFromOtherResourcesBySite.get(siteId) ?? new Set<number>();
 
         const clientSitesToAdd = mergedAllClientIds.filter(
             (clientId) =>
                 !existingClientSiteIds.includes(clientId) &&
-            !allClientIdsFromOtherResourcesOnThisSite.includes(clientId) // dont remove if there is still another connection for another site resource
+                !otherResourceClientIds.has(clientId) // dont add if already connected via another site resource
         );
 
         const clientSitesToInsert = clientSitesToAdd.map((clientId) => ({
@@ -303,7 +330,7 @@ export async function rebuildClientAssociationsFromSiteResource(
         const clientSitesToRemove = existingClientSiteIds.filter(
             (clientId) =>
                 !mergedAllClientIds.includes(clientId) &&
-            !allClientIdsFromOtherResourcesOnThisSite.includes(clientId) // dont remove if there is still another connection for another site resource
+                !otherResourceClientIds.has(clientId) // dont remove if there is still another connection for another site resource
         );
 
         if (clientSitesToRemove.length > 0) {
@@ -320,8 +347,6 @@ export async function rebuildClientAssociationsFromSiteResource(
                 );
         }
 
-    /////////// send the messages ///////////
-
         // Now handle the messages to add/remove peers on both the newt and olm sides
         await handleMessagesForSiteClients(
             site,
@@ -332,10 +357,12 @@ export async function rebuildClientAssociationsFromSiteResource(
             clientSitesToRemove,
             trx
         );
+    }
 
     // Handle subnet proxy target updates for the resource associations
     await handleSubnetProxyTargetUpdates(
         siteResource,
+        sitesList,
         mergedAllClients,
         existingResourceClients,
         clientSiteResourcesToAdd,
@@ -624,6 +651,7 @@ export async function updateClientSiteDestinations(
 
 async function handleSubnetProxyTargetUpdates(
     siteResource: SiteResource,
+    sitesList: Site[],
     allClients: {
         clientId: number;
         pubKey: string | null;
@@ -638,22 +666,26 @@ async function handleSubnetProxyTargetUpdates(
     clientSiteResourcesToRemove: number[],
     trx: Transaction | typeof db = db
 ): Promise<void> {
+    const proxyJobs: Promise<any>[] = [];
+    const olmJobs: Promise<any>[] = [];
+
+    for (const siteData of sitesList) {
+        const siteId = siteData.siteId;
+
         // Get the newt for this site
         const [newt] = await trx
             .select()
             .from(newts)
-        .where(eq(newts.siteId, siteResource.siteId))
+            .where(eq(newts.siteId, siteId))
             .limit(1);
 
         if (!newt) {
             logger.warn(
-            `Newt not found for site ${siteResource.siteId}, skipping subnet proxy target updates`
+                `Newt not found for site ${siteId}, skipping subnet proxy target updates`
             );
-        return;
+            continue;
         }
 
-    const proxyJobs = [];
-    const olmJobs = [];
         // Generate targets for added associations
         if (clientSiteResourcesToAdd.length > 0) {
             const addedClients = allClients.filter((client) =>
@@ -661,7 +693,7 @@ async function handleSubnetProxyTargetUpdates(
             );
 
             if (addedClients.length > 0) {
-            const targetToAdd = await generateSubnetProxyTargetV2(
+                const targetToAdd = generateSubnetProxyTargetV2(
                     siteResource,
                     addedClients
                 );
@@ -680,7 +712,7 @@ async function handleSubnetProxyTargetUpdates(
                     olmJobs.push(
                         addPeerData(
                             client.clientId,
-                        siteResource.siteId,
+                            siteId,
                             generateRemoteSubnets([siteResource]),
                             generateAliasConfig([siteResource])
                         )
@@ -698,7 +730,7 @@ async function handleSubnetProxyTargetUpdates(
             );
 
             if (removedClients.length > 0) {
-            const targetToRemove = await generateSubnetProxyTargetV2(
+                const targetToRemove = generateSubnetProxyTargetV2(
                     siteResource,
                     removedClients
                 );
@@ -714,7 +746,11 @@ async function handleSubnetProxyTargetUpdates(
                 }
 
                 for (const client of removedClients) {
-                // Check if this client still has access to another resource on this site with the same destination
+                    // Check if this client still has access to another resource
+                    // on this specific site with the same destination. We scope
+                    // by siteId (via siteNetworks) rather than networkId because
+                    // removePeerData operates per-site — a resource on a different
+                    // site sharing the same network should not block removal here.
                     const destinationStillInUse = await trx
                         .select()
                         .from(siteResources)
@@ -725,13 +761,17 @@ async function handleSubnetProxyTargetUpdates(
                                 siteResources.siteResourceId
                             )
                         )
+                        .innerJoin(
+                            siteNetworks,
+                            eq(siteNetworks.networkId, siteResources.networkId)
+                        )
                         .where(
                             and(
                                 eq(
                                     clientSiteResourcesAssociationsCache.clientId,
                                     client.clientId
                                 ),
-                            eq(siteResources.siteId, siteResource.siteId),
+                                eq(siteNetworks.siteId, siteId),
                                 eq(
                                     siteResources.destination,
                                     siteResource.destination
@@ -752,7 +792,7 @@ async function handleSubnetProxyTargetUpdates(
                     olmJobs.push(
                         removePeerData(
                             client.clientId,
-                        siteResource.siteId,
+                            siteId,
                             remoteSubnetsToRemove,
                             generateAliasConfig([siteResource])
                         )
@@ -760,6 +800,7 @@ async function handleSubnetProxyTargetUpdates(
                 }
             }
         }
+    }
 
     await Promise.all(proxyJobs);
 }
@@ -863,10 +904,25 @@ export async function rebuildClientAssociationsFromClient(
                   )
             : [];
 
-    // Group by siteId for site-level associations
+    // Group by siteId for site-level associations — look up via siteNetworks since
-    const newSiteIds = Array.from(
+    // siteResources no longer carries a direct siteId column.
-        new Set(newSiteResources.map((sr) => sr.siteId))
+    const networkIds = Array.from(
+        new Set(
+            newSiteResources
+                .map((sr) => sr.networkId)
+                .filter((id): id is number => id !== null)
+        )
     );
+    const newSiteIds =
+        networkIds.length > 0
+            ? await trx
+                  .select({ siteId: siteNetworks.siteId })
+                  .from(siteNetworks)
+                  .where(inArray(siteNetworks.networkId, networkIds))
+                  .then((rows) =>
+                      Array.from(new Set(rows.map((r) => r.siteId)))
+                  )
+            : [];
 
     /////////// Process client-siteResource associations ///////////
 
@@ -1139,13 +1195,45 @@ async function handleMessagesForClientResources(
             resourcesToAdd.includes(r.siteResourceId)
         );
 
+        // Build (resource, siteId) pairs by looking up siteNetworks for each resource's networkId
+        const addedNetworkIds = Array.from(
+            new Set(
+                addedResources
+                    .map((r) => r.networkId)
+                    .filter((id): id is number => id !== null)
+            )
+        );
+        const addedSiteNetworkRows =
+            addedNetworkIds.length > 0
+                ? await trx
+                      .select({
+                          networkId: siteNetworks.networkId,
+                          siteId: siteNetworks.siteId
+                      })
+                      .from(siteNetworks)
+                      .where(inArray(siteNetworks.networkId, addedNetworkIds))
+                : [];
+        const addedNetworkToSites = new Map<number, number[]>();
+        for (const row of addedSiteNetworkRows) {
+            if (!addedNetworkToSites.has(row.networkId)) {
+                addedNetworkToSites.set(row.networkId, []);
+            }
+            addedNetworkToSites.get(row.networkId)!.push(row.siteId);
+        }
+
         // Group by site for proxy updates
         const addedBySite = new Map<number, SiteResource[]>();
         for (const resource of addedResources) {
-            if (!addedBySite.has(resource.siteId)) {
+            const siteIds =
-                addedBySite.set(resource.siteId, []);
+                resource.networkId != null
+                    ? (addedNetworkToSites.get(resource.networkId) ?? [])
+                    : [];
+            for (const siteId of siteIds) {
+                if (!addedBySite.has(siteId)) {
+                    addedBySite.set(siteId, []);
+                }
+                addedBySite.get(siteId)!.push(resource);
             }
-            addedBySite.get(resource.siteId)!.push(resource);
         }
 
         // Add subnet proxy targets for each site
@@ -1164,7 +1252,7 @@ async function handleMessagesForClientResources(
             }
 
             for (const resource of resources) {
-                const target = await generateSubnetProxyTargetV2(resource, [
+                const target = generateSubnetProxyTargetV2(resource, [
                     {
                         clientId: client.clientId,
                         pubKey: client.pubKey,
@@ -1187,7 +1275,7 @@ async function handleMessagesForClientResources(
                     olmJobs.push(
                         addPeerData(
                             client.clientId,
-                            resource.siteId,
+                            siteId,
                             generateRemoteSubnets([resource]),
                             generateAliasConfig([resource])
                         )
@@ -1199,7 +1287,7 @@ async function handleMessagesForClientResources(
                         error.message.includes("not found")
                     ) {
                         logger.debug(
-                            `Olm data not found for client ${client.clientId} and site ${resource.siteId}, skipping removal`
+                            `Olm data not found for client ${client.clientId} and site ${siteId}, skipping addition`
                         );
                     } else {
                         throw error;
@@ -1216,13 +1304,45 @@ async function handleMessagesForClientResources(
             .from(siteResources)
             .where(inArray(siteResources.siteResourceId, resourcesToRemove));
 
+        // Build (resource, siteId) pairs via siteNetworks
+        const removedNetworkIds = Array.from(
+            new Set(
+                removedResources
+                    .map((r) => r.networkId)
+                    .filter((id): id is number => id !== null)
+            )
+        );
+        const removedSiteNetworkRows =
+            removedNetworkIds.length > 0
+                ? await trx
+                      .select({
+                          networkId: siteNetworks.networkId,
+                          siteId: siteNetworks.siteId
+                      })
+                      .from(siteNetworks)
+                      .where(inArray(siteNetworks.networkId, removedNetworkIds))
+                : [];
+        const removedNetworkToSites = new Map<number, number[]>();
+        for (const row of removedSiteNetworkRows) {
+            if (!removedNetworkToSites.has(row.networkId)) {
+                removedNetworkToSites.set(row.networkId, []);
+            }
+            removedNetworkToSites.get(row.networkId)!.push(row.siteId);
+        }
+
         // Group by site for proxy updates
         const removedBySite = new Map<number, SiteResource[]>();
         for (const resource of removedResources) {
-            if (!removedBySite.has(resource.siteId)) {
+            const siteIds =
-                removedBySite.set(resource.siteId, []);
+                resource.networkId != null
+                    ? (removedNetworkToSites.get(resource.networkId) ?? [])
+                    : [];
+            for (const siteId of siteIds) {
+                if (!removedBySite.has(siteId)) {
+                    removedBySite.set(siteId, []);
+                }
+                removedBySite.get(siteId)!.push(resource);
             }
-            removedBySite.get(resource.siteId)!.push(resource);
         }
 
         // Remove subnet proxy targets for each site
@@ -1241,7 +1361,7 @@ async function handleMessagesForClientResources(
             }
 
             for (const resource of resources) {
-                const target = await generateSubnetProxyTargetV2(resource, [
+                const target = generateSubnetProxyTargetV2(resource, [
                     {
                         clientId: client.clientId,
                         pubKey: client.pubKey,
@@ -1260,7 +1380,11 @@ async function handleMessagesForClientResources(
                 }
 
                 try {
-                    // Check if this client still has access to another resource on this site with the same destination
+                    // Check if this client still has access to another resource
+                    // on this specific site with the same destination. We scope
+                    // by siteId (via siteNetworks) rather than networkId because
+                    // removePeerData operates per-site — a resource on a different
+                    // site sharing the same network should not block removal here.
                     const destinationStillInUse = await trx
                         .select()
                         .from(siteResources)
@@ -1271,13 +1395,17 @@ async function handleMessagesForClientResources(
                                 siteResources.siteResourceId
                             )
                         )
+                        .innerJoin(
+                            siteNetworks,
+                            eq(siteNetworks.networkId, siteResources.networkId)
+                        )
                         .where(
                             and(
                                 eq(
                                     clientSiteResourcesAssociationsCache.clientId,
                                     client.clientId
                                 ),
-                                eq(siteResources.siteId, resource.siteId),
+                                eq(siteNetworks.siteId, siteId),
                                 eq(
                                     siteResources.destination,
                                     resource.destination
@@ -1299,7 +1427,7 @@ async function handleMessagesForClientResources(
                     olmJobs.push(
                         removePeerData(
                             client.clientId,
-                            resource.siteId,
+                            siteId,
                             remoteSubnetsToRemove,
                             generateAliasConfig([resource])
                         )
@@ -1311,7 +1439,7 @@ async function handleMessagesForClientResources(
                         error.message.includes("not found")
                     ) {
                         logger.debug(
-                            `Olm data not found for client ${client.clientId} and site ${resource.siteId}, skipping removal`
+                            `Olm data not found for client ${client.clientId} and site ${siteId}, skipping removal`
                         );
                     } else {
                         throw error;

server/private/lib/acmeCertSync.ts

@@ -1,277 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import fs from "fs";
-import crypto from "crypto";
-import { certificates, domains, db } from "@server/db";
-import { and, eq } from "drizzle-orm";
-import { encryptData, decryptData } from "@server/lib/encryption";
-import logger from "@server/logger";
-import config from "#private/lib/config";
-
-interface AcmeCert {
-    domain: { main: string; sans?: string[] };
-    certificate: string;
-    key: string;
-    Store: string;
-}
-
-interface AcmeJson {
-    [resolver: string]: {
-        Certificates: AcmeCert[];
-    };
-}
-
-function getEncryptionKey(): Buffer {
-    const keyHex = config.getRawPrivateConfig().server.encryption_key;
-    if (!keyHex) {
-        throw new Error("acmeCertSync: encryption key is not configured");
-    }
-    return Buffer.from(keyHex, "hex");
-}
-
-async function findDomainId(certDomain: string): Promise<string | null> {
-    // Strip wildcard prefix before lookup (*.example.com -> example.com)
-    const lookupDomain = certDomain.startsWith("*.")
-        ? certDomain.slice(2)
-        : certDomain;
-
-    // 1. Exact baseDomain match (any domain type)
-    const exactMatch = await db
-        .select({ domainId: domains.domainId })
-        .from(domains)
-        .where(eq(domains.baseDomain, lookupDomain))
-        .limit(1);
-
-    if (exactMatch.length > 0) {
-        return exactMatch[0].domainId;
-    }
-
-    // 2. Walk up the domain hierarchy looking for a wildcard-type domain whose
-    //    baseDomain is a suffix of the cert domain. e.g. cert "sub.example.com"
-    //    matches a wildcard domain with baseDomain "example.com".
-    const parts = lookupDomain.split(".");
-    for (let i = 1; i < parts.length; i++) {
-        const candidate = parts.slice(i).join(".");
-        if (!candidate) continue;
-
-        const wildcardMatch = await db
-            .select({ domainId: domains.domainId })
-            .from(domains)
-            .where(
-                and(
-                    eq(domains.baseDomain, candidate),
-                    eq(domains.type, "wildcard")
-                )
-            )
-            .limit(1);
-
-        if (wildcardMatch.length > 0) {
-            return wildcardMatch[0].domainId;
-        }
-    }
-
-    return null;
-}
-
-function extractFirstCert(pemBundle: string): string | null {
-    const match = pemBundle.match(
-        /-----BEGIN CERTIFICATE-----[\s\S]+?-----END CERTIFICATE-----/
-    );
-    return match ? match[0] : null;
-}
-
-async function syncAcmeCerts(
-    acmeJsonPath: string,
-    resolver: string
-): Promise<void> {
-    let raw: string;
-    try {
-        raw = fs.readFileSync(acmeJsonPath, "utf8");
-    } catch (err) {
-        logger.debug(
-            `acmeCertSync: could not read ${acmeJsonPath}: ${err}`
-        );
-        return;
-    }
-
-    let acmeJson: AcmeJson;
-    try {
-        acmeJson = JSON.parse(raw);
-    } catch (err) {
-        logger.debug(`acmeCertSync: could not parse acme.json: ${err}`);
-        return;
-    }
-
-    const resolverData = acmeJson[resolver];
-    if (!resolverData || !Array.isArray(resolverData.Certificates)) {
-        logger.debug(
-            `acmeCertSync: no certificates found for resolver "${resolver}"`
-        );
-        return;
-    }
-
-    const encryptionKey = getEncryptionKey();
-
-    for (const cert of resolverData.Certificates) {
-        const domain = cert.domain?.main;
-
-        if (!domain) {
-            logger.debug(
-                `acmeCertSync: skipping cert with missing domain`
-            );
-            continue;
-        }
-
-        if (!cert.certificate || !cert.key) {
-            logger.debug(
-                `acmeCertSync: skipping cert for ${domain} - empty certificate or key field`
-            );
-            continue;
-        }
-
-        const certPem = Buffer.from(cert.certificate, "base64").toString(
-            "utf8"
-        );
-        const keyPem = Buffer.from(cert.key, "base64").toString("utf8");
-
-        if (!certPem.trim() || !keyPem.trim()) {
-            logger.debug(
-                `acmeCertSync: skipping cert for ${domain} - blank PEM after base64 decode`
-            );
-            continue;
-        }
-
-        // Check if cert already exists in DB
-        const existing = await db
-            .select()
-            .from(certificates)
-            .where(eq(certificates.domain, domain))
-            .limit(1);
-
-        if (existing.length > 0 && existing[0].certFile) {
-            try {
-                const storedCertPem = decryptData(
-                    existing[0].certFile,
-                    encryptionKey
-                );
-                if (storedCertPem === certPem) {
-                    logger.debug(
-                        `acmeCertSync: cert for ${domain} is unchanged, skipping`
-                    );
-                    continue;
-                }
-            } catch (err) {
-                // Decryption failure means we should proceed with the update
-                logger.debug(
-                    `acmeCertSync: could not decrypt stored cert for ${domain}, will update: ${err}`
-                );
-            }
-        }
-
-        // Parse cert expiry from the first cert in the PEM bundle
-        let expiresAt: number | null = null;
-        const firstCertPem = extractFirstCert(certPem);
-        if (firstCertPem) {
-            try {
-                const x509 = new crypto.X509Certificate(firstCertPem);
-                expiresAt = Math.floor(
-                    new Date(x509.validTo).getTime() / 1000
-                );
-            } catch (err) {
-                logger.debug(
-                    `acmeCertSync: could not parse cert expiry for ${domain}: ${err}`
-                );
-            }
-        }
-
-        const wildcard = domain.startsWith("*.");
-        const encryptedCert = encryptData(certPem, encryptionKey);
-        const encryptedKey = encryptData(keyPem, encryptionKey);
-        const now = Math.floor(Date.now() / 1000);
-
-        const domainId = await findDomainId(domain);
-        if (domainId) {
-            logger.debug(
-                `acmeCertSync: resolved domainId "${domainId}" for cert domain "${domain}"`
-            );
-        } else {
-            logger.debug(
-                `acmeCertSync: no matching domain record found for cert domain "${domain}"`
-            );
-        }
-
-        if (existing.length > 0) {
-            await db
-                .update(certificates)
-                .set({
-                    certFile: encryptedCert,
-                    keyFile: encryptedKey,
-                    status: "valid",
-                    expiresAt,
-                    updatedAt: now,
-                    wildcard,
-                    ...(domainId !== null && { domainId })
-                })
-                .where(eq(certificates.domain, domain));
-
-            logger.info(
-                `acmeCertSync: updated certificate for ${domain} (expires ${expiresAt ? new Date(expiresAt * 1000).toISOString() : "unknown"})`
-            );
-        } else {
-            await db.insert(certificates).values({
-                domain,
-                domainId,
-                certFile: encryptedCert,
-                keyFile: encryptedKey,
-                status: "valid",
-                expiresAt,
-                createdAt: now,
-                updatedAt: now,
-                wildcard
-            });
-
-            logger.info(
-                `acmeCertSync: inserted new certificate for ${domain} (expires ${expiresAt ? new Date(expiresAt * 1000).toISOString() : "unknown"})`
-            );
-        }
-    }
-}
-
-export function initAcmeCertSync(): void {
-    const privateConfig = config.getRawPrivateConfig();
-
-    if (!privateConfig.flags?.enable_acme_cert_sync) {
-        return;
-    }
-
-    const acmeJsonPath =
-        privateConfig.acme?.acme_json_path ?? "config/letsencrypt/acme.json";
-    const resolver = privateConfig.acme?.resolver ?? "letsencrypt";
-    const intervalMs = privateConfig.acme?.sync_interval_ms ?? 5000;
-
-    logger.info(
-        `acmeCertSync: starting ACME cert sync from "${acmeJsonPath}" using resolver "${resolver}" every ${intervalMs}ms`
-    );
-
-    // Run immediately on init, then on the configured interval
-    syncAcmeCerts(acmeJsonPath, resolver).catch((err) => {
-        logger.error(`acmeCertSync: error during initial sync: ${err}`);
-    });
-
-    setInterval(() => {
-        syncAcmeCerts(acmeJsonPath, resolver).catch((err) => {
-            logger.error(`acmeCertSync: error during sync: ${err}`);
-        });
-    }, intervalMs);
-}

server/private/lib/readConfigFile.ts

@@ -95,21 +95,10 @@ export const privateConfigSchema = z.object({
         .object({
             enable_redis: z.boolean().optional().default(false),
             use_pangolin_dns: z.boolean().optional().default(false),
-            use_org_only_idp: z.boolean().optional(),
+            use_org_only_idp: z.boolean().optional()
-            enable_acme_cert_sync: z.boolean().optional().default(false)
         })
         .optional()
         .prefault({}),
-    acme: z
-        .object({
-            acme_json_path: z
-                .string()
-                .optional()
-                .default("config/letsencrypt/acme.json"),
-            resolver: z.string().optional().default("letsencrypt"),
-            sync_interval_ms: z.number().optional().default(5000)
-        })
-        .optional(),
     branding: z
         .object({
             app_name: z.string().optional(),

server/private/lib/traefik/getTraefikConfig.ts

@@ -33,7 +33,7 @@ import {
 } from "drizzle-orm";
 import logger from "@server/logger";
 import config from "@server/lib/config";
-import { orgs, resources, sites, siteResources, Target, targets } from "@server/db";
+import { orgs, resources, sites, Target, targets } from "@server/db";
 import {
     sanitize,
     encodePath,
@@ -267,34 +267,6 @@ export async function getTraefikConfig(
         });
     });
 
-    // Query siteResources in HTTP mode with SSL enabled and aliases — cert generation / HTTPS edge
-    const siteResourcesWithAliases = await db
-        .select({
-            siteResourceId: siteResources.siteResourceId,
-            alias: siteResources.alias,
-            mode: siteResources.mode
-        })
-        .from(siteResources)
-        .innerJoin(sites, eq(sites.siteId, siteResources.siteId))
-        .where(
-            and(
-                eq(siteResources.enabled, true),
-                isNotNull(siteResources.alias),
-                eq(siteResources.mode, "http"),
-                eq(siteResources.ssl, true),
-                or(
-                    eq(sites.exitNodeId, exitNodeId),
-                    and(
-                        isNull(sites.exitNodeId),
-                        sql`(${siteTypes.includes("local") ? 1 : 0} = 1)`,
-                        eq(sites.type, "local"),
-                        sql`(${build != "saas" ? 1 : 0} = 1)`
-                    )
-                ),
-                inArray(sites.type, siteTypes)
-            )
-        );
-
     let validCerts: CertificateResult[] = [];
     if (privateConfig.getRawPrivateConfig().flags.use_pangolin_dns) {
         // create a list of all domains to get certs for
@@ -304,12 +276,6 @@ export async function getTraefikConfig(
                 domains.add(resource.fullDomain);
             }
         }
-        // Include siteResource aliases so pangolin-dns also fetches certs for them
-        for (const sr of siteResourcesWithAliases) {
-            if (sr.alias) {
-                domains.add(sr.alias);
-            }
-        }
         // get the valid certs for these domains
         validCerts = await getValidCertificatesForDomains(domains, true); // we are caching here because this is called often
         // logger.debug(`Valid certs for domains: ${JSON.stringify(validCerts)}`);
@@ -901,128 +867,6 @@ export async function getTraefikConfig(
         }
     }
 
-    // Add Traefik routes for siteResource aliases (HTTP mode + SSL) so that
-    // Traefik generates TLS certificates for those domains even when no
-    // matching resource exists yet.
-    if (siteResourcesWithAliases.length > 0) {
-        // Build a set of domains already covered by normal resources
-        const existingFullDomains = new Set<string>();
-        for (const resource of resourcesMap.values()) {
-            if (resource.fullDomain) {
-                existingFullDomains.add(resource.fullDomain);
-            }
-        }
-
-        for (const sr of siteResourcesWithAliases) {
-            if (!sr.alias) continue;
-
-            // Skip if this alias is already handled by a resource router
-            if (existingFullDomains.has(sr.alias)) continue;
-
-            const alias = sr.alias;
-            const srKey = `site-resource-cert-${sr.siteResourceId}`;
-            const siteResourceServiceName = `${srKey}-service`;
-            const siteResourceRouterName = `${srKey}-router`;
-            const siteResourceRewriteMiddlewareName = `${srKey}-rewrite`;
-
-            const maintenancePort = config.getRawConfig().server.next_port;
-            const maintenanceHost =
-                config.getRawConfig().server.internal_hostname;
-
-            if (!config_output.http.routers) {
-                config_output.http.routers = {};
-            }
-            if (!config_output.http.services) {
-                config_output.http.services = {};
-            }
-            if (!config_output.http.middlewares) {
-                config_output.http.middlewares = {};
-            }
-
-            // Service pointing at the internal maintenance/Next.js page
-            config_output.http.services[siteResourceServiceName] = {
-                loadBalancer: {
-                    servers: [
-                        {
-                            url: `http://${maintenanceHost}:${maintenancePort}`
-                        }
-                    ],
-                    passHostHeader: true
-                }
-            };
-
-            // Middleware that rewrites any path to /maintenance-screen
-            config_output.http.middlewares[
-                siteResourceRewriteMiddlewareName
-            ] = {
-                replacePathRegex: {
-                    regex: "^/(.*)",
-                    replacement: "/private-maintenance-screen"
-                }
-            };
-
-            // HTTP -> HTTPS redirect so the ACME challenge can be served
-            config_output.http.routers[
-                `${siteResourceRouterName}-redirect`
-            ] = {
-                entryPoints: [
-                    config.getRawConfig().traefik.http_entrypoint
-                ],
-                middlewares: [redirectHttpsMiddlewareName],
-                service: siteResourceServiceName,
-                rule: `Host(\`${alias}\`)`,
-                priority: 100
-            };
-
-            // Determine TLS / cert-resolver configuration
-            let tls: any = {};
-            if (
-                !privateConfig.getRawPrivateConfig().flags.use_pangolin_dns
-            ) {
-                const domainParts = alias.split(".");
-                const wildCard =
-                    domainParts.length <= 2
-                        ? `*.${domainParts.join(".")}`
-                        : `*.${domainParts.slice(1).join(".")}`;
-
-                const globalDefaultResolver =
-                    config.getRawConfig().traefik.cert_resolver;
-                const globalDefaultPreferWildcard =
-                    config.getRawConfig().traefik.prefer_wildcard_cert;
-
-                tls = {
-                    certResolver: globalDefaultResolver,
-                    ...(globalDefaultPreferWildcard
-                        ? { domains: [{ main: wildCard }] }
-                        : {})
-                };
-            } else {
-                // pangolin-dns: only add route if we already have a valid cert
-                const matchingCert = validCerts.find(
-                    (cert) => cert.queriedDomain === alias
-                );
-                if (!matchingCert) {
-                    logger.debug(
-                        `No matching certificate found for siteResource alias: ${alias}`
-                    );
-                    continue;
-                }
-            }
-
-            // HTTPS router — presence of this entry triggers cert generation
-            config_output.http.routers[siteResourceRouterName] = {
-                entryPoints: [
-                    config.getRawConfig().traefik.https_entrypoint
-                ],
-                service: siteResourceServiceName,
-                middlewares: [siteResourceRewriteMiddlewareName],
-                rule: `Host(\`${alias}\`)`,
-                priority: 100,
-                tls
-            };
-        }
-    }
-
     if (generateLoginPageRouters) {
         const exitNodeLoginPages = await db
             .select({

server/private/routers/ssh/signSshKey.ts

@@ -21,7 +21,7 @@ import {
     roles,
     roundTripMessageTracker,
     siteResources,
-    sites,
+    siteNetworks,
     userOrgs
 } from "@server/db";
 import { logAccessAudit } from "#private/lib/logAccessAudit";
@@ -63,10 +63,12 @@ const bodySchema = z
 
 export type SignSshKeyResponse = {
     certificate: string;
+    messageIds: number[];
     messageId: number;
     sshUsername: string;
     sshHost: string;
     resourceId: number;
+    siteIds: number[];
     siteId: number;
     keyId: string;
     validPrincipals: string[];
@@ -260,10 +262,7 @@ export async function signSshKey(
                 .update(userOrgs)
                 .set({ pamUsername: usernameToUse })
                 .where(
-                    and(
+                    and(eq(userOrgs.orgId, orgId), eq(userOrgs.userId, userId))
-                        eq(userOrgs.orgId, orgId),
-                        eq(userOrgs.userId, userId)
-                    )
                 );
         } else {
             usernameToUse = userOrg.pamUsername;
@@ -395,21 +394,12 @@ export async function signSshKey(
             homedir = roleRows[0].sshCreateHomeDir ?? null;
         }
 
-        // get the site
+        const sites = await db
-        const [newt] = await db
+            .select({ siteId: siteNetworks.siteId })
-            .select()
+            .from(siteNetworks)
-            .from(newts)
+            .where(eq(siteNetworks.networkId, resource.networkId!));
-            .where(eq(newts.siteId, resource.siteId))
-            .limit(1);
 
-        if (!newt) {
+        const siteIds = sites.map((site) => site.siteId);
-            return next(
-                createHttpError(
-                    HttpCode.INTERNAL_SERVER_ERROR,
-                    "Site associated with resource not found"
-                )
-            );
-        }
 
         // Sign the public key
         const now = BigInt(Math.floor(Date.now() / 1000));
@@ -423,6 +413,24 @@ export async function signSshKey(
             validBefore: now + validFor
         });
 
+        const messageIds: number[] = [];
+        for (const siteId of siteIds) {
+            // get the site
+            const [newt] = await db
+                .select()
+                .from(newts)
+                .where(eq(newts.siteId, siteId))
+                .limit(1);
+
+            if (!newt) {
+                return next(
+                    createHttpError(
+                        HttpCode.INTERNAL_SERVER_ERROR,
+                        "Site associated with resource not found"
+                    )
+                );
+            }
+
             const [message] = await db
                 .insert(roundTripMessageTracker)
                 .values({
@@ -441,6 +449,8 @@ export async function signSshKey(
                 );
             }
 
+            messageIds.push(message.messageId);
+
             await sendToClient(newt.newtId, {
                 type: `newt/pam/connection`,
                 data: {
@@ -460,6 +470,7 @@ export async function signSshKey(
                     }
                 }
             });
+        }
 
         const expiresIn = Number(validFor); // seconds
 
@@ -480,7 +491,7 @@ export async function signSshKey(
             metadata: JSON.stringify({
                 resourceId: resource.siteResourceId,
                 resource: resource.name,
-                siteId: resource.siteId,
+                siteIds: siteIds
             })
         });
 
@@ -505,11 +516,13 @@ export async function signSshKey(
         return response<SignSshKeyResponse>(res, {
             data: {
                 certificate: cert.certificate,
-                messageId: message.messageId,
+                messageIds: messageIds,
+                messageId: messageIds[0], // just pick the first one for backward compatibility
                 sshUsername: usernameToUse,
                 sshHost: sshHost,
                 resourceId: resource.siteResourceId,
-                siteId: resource.siteId,
+                siteIds: siteIds,
+                siteId: siteIds[0], // just pick the first one for backward compatibility
                 keyId: cert.keyId,
                 validPrincipals: cert.validPrincipals,
                 validAfter: cert.validAfter.toISOString(),

server/routers/newt/buildConfiguration.ts

@@ -4,8 +4,10 @@ import {
     clientSitesAssociationsCache,
     db,
     ExitNode,
+    networks,
     resources,
     Site,
+    siteNetworks,
     siteResources,
     targetHealthCheck,
     targets
@@ -137,11 +139,14 @@ export async function buildClientConfigurationForNewtClient(
     // Filter out any null values from peers that didn't have an olm
     const validPeers = peers.filter((peer) => peer !== null);
 
-    // Get all enabled site resources for this site
+    // Get all enabled site resources for this site by joining through siteNetworks and networks
     const allSiteResources = await db
         .select()
         .from(siteResources)
-        .where(eq(siteResources.siteId, siteId));
+        .innerJoin(networks, eq(siteResources.networkId, networks.networkId))
+        .innerJoin(siteNetworks, eq(networks.networkId, siteNetworks.networkId))
+        .where(eq(siteNetworks.siteId, siteId))
+        .then((rows) => rows.map((r) => r.siteResources));
 
     const targetsToSend: SubnetProxyTargetV2[] = [];
 
@@ -168,7 +173,7 @@ export async function buildClientConfigurationForNewtClient(
                 )
             );
 
-        const resourceTarget = await generateSubnetProxyTargetV2(
+        const resourceTarget = generateSubnetProxyTargetV2(
             resource,
             resourceClients
         );

server/routers/olm/buildConfiguration.ts

@@ -4,6 +4,8 @@ import {
     clientSitesAssociationsCache,
     db,
     exitNodes,
+    networks,
+    siteNetworks,
     siteResources,
     sites
 } from "@server/db";
@@ -59,9 +61,17 @@ export async function buildSiteConfigurationForOlmClient(
                     clientSiteResourcesAssociationsCache.siteResourceId
                 )
             )
+            .innerJoin(
+                networks,
+                eq(siteResources.networkId, networks.networkId)
+            )
+            .innerJoin(
+                siteNetworks,
+                eq(networks.networkId, siteNetworks.networkId)
+            )
             .where(
                 and(
-                    eq(siteResources.siteId, site.siteId),
+                    eq(siteNetworks.siteId, site.siteId),
                     eq(
                         clientSiteResourcesAssociationsCache.clientId,
                         client.clientId
@@ -69,6 +79,7 @@ export async function buildSiteConfigurationForOlmClient(
                 )
             );
 
+
         if (jitMode) {
             // Add site configuration to the array
             siteConfigurations.push({

server/routers/olm/handleOlmServerInitAddPeerHandshake.ts

@@ -4,10 +4,12 @@ import {
     db,
     exitNodes,
     Site,
-    siteResources
+    siteNetworks,
+    siteResources,
+    sites
 } from "@server/db";
 import { MessageHandler } from "@server/routers/ws";
-import { clients, Olm, sites } from "@server/db";
+import { clients, Olm } from "@server/db";
 import { and, eq, or } from "drizzle-orm";
 import logger from "@server/logger";
 import { initPeerAddHandshake } from "./peers";
@@ -44,20 +46,31 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
 
     const { siteId, resourceId, chainId } = message.data;
 
-    let site: Site | null = null;
+    const sendCancel = async () => {
+        await sendToClient(
+            olm.olmId,
+            {
+                type: "olm/wg/peer/chain/cancel",
+                data: { chainId }
+            },
+            { incrementConfigVersion: false }
+        ).catch((error) => {
+            logger.warn(`Error sending message:`, error);
+        });
+    };
+
+    let sitesToProcess: Site[] = [];
+
     if (siteId) {
-        // get the site
         const [siteRes] = await db
             .select()
             .from(sites)
             .where(eq(sites.siteId, siteId))
             .limit(1);
         if (siteRes) {
-            site = siteRes;
+            sitesToProcess = [siteRes];
         }
-    }
+    } else if (resourceId) {
-
-    if (resourceId && !site) {
         const resources = await db
             .select()
             .from(siteResources)
@@ -72,27 +85,17 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             );
 
         if (!resources || resources.length === 0) {
-            logger.error(`handleOlmServerPeerAddMessage: Resource not found`);
+            logger.error(
-            // cancel the request from the olm side to not keep doing this
+                `handleOlmServerInitAddPeerHandshake: Resource not found`
-            await sendToClient(
+            );
-                olm.olmId,
+            await sendCancel();
-                {
-                    type: "olm/wg/peer/chain/cancel",
-                    data: {
-                        chainId
-                    }
-                },
-                { incrementConfigVersion: false }
-            ).catch((error) => {
-                logger.warn(`Error sending message:`, error);
-            });
             return;
         }
 
         if (resources.length > 1) {
             // error but this should not happen because the nice id cant contain a dot and the alias has to have a dot and both have to be unique within the org so there should never be multiple matches
             logger.error(
-                `handleOlmServerPeerAddMessage: Multiple resources found matching the criteria`
+                `handleOlmServerInitAddPeerHandshake: Multiple resources found matching the criteria`
             );
             return;
         }
@@ -117,47 +120,61 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
 
         if (currentResourceAssociationCaches.length === 0) {
             logger.error(
-                `handleOlmServerPeerAddMessage: Client ${client.clientId} does not have access to resource ${resource.siteResourceId}`
+                `handleOlmServerInitAddPeerHandshake: Client ${client.clientId} does not have access to resource ${resource.siteResourceId}`
             );
-            // cancel the request from the olm side to not keep doing this
+            await sendCancel();
-            await sendToClient(
-                olm.olmId,
-                {
-                    type: "olm/wg/peer/chain/cancel",
-                    data: {
-                        chainId
-                    }
-                },
-                { incrementConfigVersion: false }
-            ).catch((error) => {
-                logger.warn(`Error sending message:`, error);
-            });
             return;
         }
 
-        const siteIdFromResource = resource.siteId;
+        if (!resource.networkId) {
+            logger.error(
+                `handleOlmServerInitAddPeerHandshake: Resource ${resource.siteResourceId} has no network`
+            );
+            await sendCancel();
+            return;
+        }
 
-        // get the site
+        // Get all sites associated with this resource's network via siteNetworks
-        const [siteRes] = await db
+        const siteRows = await db
+            .select({ siteId: siteNetworks.siteId })
+            .from(siteNetworks)
+            .where(eq(siteNetworks.networkId, resource.networkId));
+
+        if (!siteRows || siteRows.length === 0) {
+            logger.error(
+                `handleOlmServerInitAddPeerHandshake: No sites found for resource ${resource.siteResourceId}`
+            );
+            await sendCancel();
+            return;
+        }
+
+        // Fetch full site objects for all network members
+        const foundSites = await Promise.all(
+            siteRows.map(async ({ siteId: sid }) => {
+                const [s] = await db
                     .select()
                     .from(sites)
-            .where(eq(sites.siteId, siteIdFromResource));
+                    .where(eq(sites.siteId, sid))
-        if (!siteRes) {
+                    .limit(1);
-            logger.error(
+                return s ?? null;
-                `handleOlmServerPeerAddMessage: Site with ID ${site} not found`
+            })
         );
+
+        sitesToProcess = foundSites.filter((s): s is Site => s !== null);
+    }
+
+    if (sitesToProcess.length === 0) {
+        logger.error(
+            `handleOlmServerInitAddPeerHandshake: No sites to process`
+        );
+        await sendCancel();
         return;
     }
 
-        site = siteRes;
+    let handshakeInitiated = false;
-    }
 
-    if (!site) {
+    for (const site of sitesToProcess) {
-        logger.error(`handleOlmServerPeerAddMessage: Site not found`);
+        // Check if the client can access this site using the cache
-        return;
-    }
-
-    // check if the client can access this site using the cache
         const currentSiteAssociationCaches = await db
             .select()
             .from(clientSitesAssociationsCache)
@@ -169,46 +186,19 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             );
 
         if (currentSiteAssociationCaches.length === 0) {
-        logger.error(
+            logger.warn(
-            `handleOlmServerPeerAddMessage: Client ${client.clientId} does not have access to site ${site.siteId}`
+                `handleOlmServerInitAddPeerHandshake: Client ${client.clientId} does not have access to site ${site.siteId}, skipping`
             );
-        // cancel the request from the olm side to not keep doing this
+            continue;
-        await sendToClient(
-            olm.olmId,
-            {
-                type: "olm/wg/peer/chain/cancel",
-                data: {
-                    chainId
-                }
-            },
-            { incrementConfigVersion: false }
-        ).catch((error) => {
-            logger.warn(`Error sending message:`, error);
-        });
-        return;
         }
 
         if (!site.exitNodeId) {
             logger.error(
-            `handleOlmServerPeerAddMessage: Site with ID ${site.siteId} has no exit node`
+                `handleOlmServerInitAddPeerHandshake: Site ${site.siteId} has no exit node, skipping`
             );
-        // cancel the request from the olm side to not keep doing this
+            continue;
-        await sendToClient(
-            olm.olmId,
-            {
-                type: "olm/wg/peer/chain/cancel",
-                data: {
-                    chainId
-                }
-            },
-            { incrementConfigVersion: false }
-        ).catch((error) => {
-            logger.warn(`Error sending message:`, error);
-        });
-        return;
         }
 
-    // get the exit node from the side
         const [exitNode] = await db
             .select()
             .from(exitNodes)
@@ -216,15 +206,13 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
 
         if (!exitNode) {
             logger.error(
-            `handleOlmServerPeerAddMessage: Site with ID ${site.siteId} has no exit node`
+                `handleOlmServerInitAddPeerHandshake: Exit node not found for site ${site.siteId}, skipping`
             );
-        return;
+            continue;
         }
 
-    // also trigger the peer add handshake in case the peer was not already added to the olm and we need to hole punch
+        // Trigger the peer add handshake — if the peer was already added this will be a no-op
-    // if it has already been added this will be a no-op
         await initPeerAddHandshake(
-        // this will kick off the add peer process for the client
             client.clientId,
             {
                 siteId: site.siteId,
@@ -237,5 +225,15 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             chainId
         );
 
+        handshakeInitiated = true;
+    }
+
+    if (!handshakeInitiated) {
+        logger.error(
+            `handleOlmServerInitAddPeerHandshake: No accessible sites with valid exit nodes found, cancelling chain`
+        );
+        await sendCancel();
+    }
+
     return;
 };

server/routers/olm/handleOlmServerPeerAddMessage.ts

@@ -1,43 +1,25 @@
 import {
-    Client,
     clientSiteResourcesAssociationsCache,
     db,
-    ExitNode,
+    networks,
-    Org,
+    siteNetworks,
-    orgs,
-    roleClients,
-    roles,
     siteResources,
-    Transaction,
-    userClients,
-    userOrgs,
-    users
 } from "@server/db";
 import { MessageHandler } from "@server/routers/ws";
 import {
     clients,
     clientSitesAssociationsCache,
-    exitNodes,
     Olm,
-    olms,
     sites
 } from "@server/db";
 import { and, eq, inArray, isNotNull, isNull } from "drizzle-orm";
-import { addPeer, deletePeer } from "../newt/peers";
 import logger from "@server/logger";
-import { listExitNodes } from "#dynamic/lib/exitNodes";
 import {
     generateAliasConfig,
-    getNextAvailableClientSubnet
 } from "@server/lib/ip";
 import { generateRemoteSubnets } from "@server/lib/ip";
-import { rebuildClientAssociationsFromClient } from "@server/lib/rebuildClientAssociations";
-import { checkOrgAccessPolicy } from "#dynamic/lib/checkOrgAccessPolicy";
-import { validateSessionToken } from "@server/auth/sessions/app";
-import config from "@server/lib/config";
 import {
     addPeer as newtAddPeer,
-    deletePeer as newtDeletePeer
 } from "@server/routers/newt/peers";
 
 export const handleOlmServerPeerAddMessage: MessageHandler = async (
@@ -153,14 +135,22 @@ export const handleOlmServerPeerAddMessage: MessageHandler = async (
                 clientSiteResourcesAssociationsCache.siteResourceId
             )
         )
-        .where(
+        .innerJoin(
+            networks,
+            eq(siteResources.networkId, networks.networkId)
+        )
+        .innerJoin(
+            siteNetworks,
             and(
-                eq(siteResources.siteId, site.siteId),
+                eq(networks.networkId, siteNetworks.networkId),
+                eq(siteNetworks.siteId, site.siteId)
+            )
+        )
+        .where(
             eq(
                 clientSiteResourcesAssociationsCache.clientId,
                 client.clientId
             )
-            )
         );
 
     // Return connect message with all site configurations

server/routers/resource/getUserResources.ts

@@ -144,7 +144,7 @@ export async function getUserResources(
             name: string;
             destination: string;
             mode: string;
-            scheme: string | null;
+            protocol: string | null;
             enabled: boolean;
             alias: string | null;
             aliasAddress: string | null;
@@ -156,7 +156,7 @@ export async function getUserResources(
                     name: siteResources.name,
                     destination: siteResources.destination,
                     mode: siteResources.mode,
-                    scheme: siteResources.scheme,
+                    protocol: siteResources.protocol,
                     enabled: siteResources.enabled,
                     alias: siteResources.alias,
                     aliasAddress: siteResources.aliasAddress
@@ -240,7 +240,7 @@ export async function getUserResources(
                 name: siteResource.name,
                 destination: siteResource.destination,
                 mode: siteResource.mode,
-                protocol: siteResource.scheme,
+                protocol: siteResource.protocol,
                 enabled: siteResource.enabled,
                 alias: siteResource.alias,
                 aliasAddress: siteResource.aliasAddress,
@@ -289,7 +289,7 @@ export type GetUserResourcesResponse = {
             enabled: boolean;
             alias: string | null;
             aliasAddress: string | null;
-            type: "site";
+            type: 'site';
         }>;
     };
 };

server/routers/site/deleteSite.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, Site, siteResources } from "@server/db";
+import { db, Site, siteNetworks, siteResources } from "@server/db";
 import { newts, newtSessions, sites } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
@@ -71,19 +71,24 @@ export async function deleteSite(
                     await deletePeer(site.exitNodeId!, site.pubKey);
                 }
             } else if (site.type == "newt") {
-                // delete all of the site resources on this site
+                const networks = await trx
-                const siteResourcesOnSite = trx
+                    .select({ networkId: siteNetworks.networkId })
-                    .delete(siteResources)
+                    .from(siteNetworks)
-                    .where(eq(siteResources.siteId, siteId))
+                    .where(eq(siteNetworks.siteId, siteId));
-                    .returning();
 
                 // loop through them
-                for (const removedSiteResource of await siteResourcesOnSite) {
+                for (const network of await networks) {
+                    const [siteResource] = await trx
+                        .select()
+                        .from(siteResources)
+                        .where(eq(siteResources.networkId, network.networkId));
+                    if (siteResource) {
                         await rebuildClientAssociationsFromSiteResource(
-                        removedSiteResource,
+                            siteResource,
                             trx
                         );
                     }
+                }
 
                 // get the newt on the site by querying the newt table for siteId
                 const [deletedNewt] = await trx

server/routers/siteResource/createSiteResource.ts

@@ -5,6 +5,8 @@ import {
     orgs,
     roles,
     roleSiteResources,
+    siteNetworks,
+    networks,
     SiteResource,
     siteResources,
     sites,
@@ -23,7 +25,7 @@ import response from "@server/lib/response";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import { and, eq } from "drizzle-orm";
+import { and, eq, inArray } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
 import { z } from "zod";
@@ -36,12 +38,11 @@ const createSiteResourceParamsSchema = z.strictObject({
 const createSiteResourceSchema = z
     .strictObject({
         name: z.string().min(1).max(255),
-        mode: z.enum(["host", "cidr", "http"]),
+        mode: z.enum(["host", "cidr", "port"]),
-        ssl: z.boolean().optional(), // only used for http mode
+        siteIds: z.array(z.int()),
-        siteId: z.int(),
+        // protocol: z.enum(["tcp", "udp"]).optional(),
-        scheme: z.enum(["http", "https"]).optional(),
         // proxyPort: z.int().positive().optional(),
-        destinationPort: z.int().positive().optional(),
+        // destinationPort: z.int().positive().optional(),
         destination: z.string().min(1),
         enabled: z.boolean().default(true),
         alias: z
@@ -63,11 +64,7 @@ const createSiteResourceSchema = z
     .strict()
     .refine(
         (data) => {
-            if (
+            if (data.mode === "host") {
-                data.mode === "host" ||
-                data.mode == "http"
-            ) {
-                if (data.mode == "host") {
                 // Check if it's a valid IP address using zod (v4 or v6)
                 const isValidIP = z
                     // .union([z.ipv4(), z.ipv6()])
@@ -77,7 +74,6 @@ const createSiteResourceSchema = z
                 if (isValidIP) {
                     return true;
                 }
-                }
 
                 // Check if it's a valid domain (hostname pattern, TLD not required)
                 const domainRegex =
@@ -111,21 +107,6 @@ const createSiteResourceSchema = z
         {
             message: "Destination must be a valid CIDR notation for cidr mode"
         }
-    )
-    .refine(
-        (data) => {
-            if (data.mode !== "http") return true;
-            return (
-                data.scheme !== undefined &&
-                data.destinationPort !== undefined &&
-                data.destinationPort >= 1 &&
-                data.destinationPort <= 65535
-            );
-        },
-        {
-            message:
-                "HTTP mode requires scheme (http or https) and a valid destination port"
-        }
     );
 
 export type CreateSiteResourceBody = z.infer<typeof createSiteResourceSchema>;
@@ -180,14 +161,13 @@ export async function createSiteResource(
         const { orgId } = parsedParams.data;
         const {
             name,
-            siteId,
+            siteIds,
             mode,
-            scheme,
+            // protocol,
             // proxyPort,
-            destinationPort,
+            // destinationPort,
             destination,
             enabled,
-            ssl,
             alias,
             userIds,
             roleIds,
@@ -200,14 +180,16 @@ export async function createSiteResource(
         } = parsedBody.data;
 
         // Verify the site exists and belongs to the org
-        const [site] = await db
+        const sitesToAssign = await db
             .select()
             .from(sites)
-            .where(and(eq(sites.siteId, siteId), eq(sites.orgId, orgId)))
+            .where(and(inArray(sites.siteId, siteIds), eq(sites.orgId, orgId)))
             .limit(1);
 
-        if (!site) {
+        if (sitesToAssign.length !== siteIds.length) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
+            return next(
+                createHttpError(HttpCode.NOT_FOUND, "Some site not found")
+            );
         }
 
         const [org] = await db
@@ -248,6 +230,30 @@ export async function createSiteResource(
             );
         }
 
+        // // check if resource with same protocol and proxy port already exists (only for port mode)
+        // if (mode === "port" && protocol && proxyPort) {
+        //     const [existingResource] = await db
+        //         .select()
+        //         .from(siteResources)
+        //         .where(
+        //             and(
+        //                 eq(siteResources.siteId, siteId),
+        //                 eq(siteResources.orgId, orgId),
+        //                 eq(siteResources.protocol, protocol),
+        //                 eq(siteResources.proxyPort, proxyPort)
+        //             )
+        //         )
+        //         .limit(1);
+        //     if (existingResource && existingResource.siteResourceId) {
+        //         return next(
+        //             createHttpError(
+        //                 HttpCode.CONFLICT,
+        //                 "A resource with the same protocol and proxy port already exists"
+        //             )
+        //         );
+        //     }
+        // }
+
         // make sure the alias is unique within the org if provided
         if (alias) {
             const [conflict] = await db
@@ -278,23 +284,38 @@ export async function createSiteResource(
 
         const niceId = await getUniqueSiteResourceName(orgId);
         let aliasAddress: string | null = null;
-        if (mode === "host" || mode === "http") {
+        if (mode == "host") {
+            // we can only have an alias on a host
             aliasAddress = await getNextAvailableAliasAddress(orgId);
         }
 
         let newSiteResource: SiteResource | undefined;
         await db.transaction(async (trx) => {
+            const [network] = await trx
+                .insert(networks)
+                .values({
+                    scope: "resource",
+                    orgId: orgId
+                })
+                .returning();
+
+            if (!network) {
+                return next(
+                    createHttpError(
+                        HttpCode.INTERNAL_SERVER_ERROR,
+                        `Failed to create network`
+                    )
+                );
+            }
+
             // Create the site resource
             const insertValues: typeof siteResources.$inferInsert = {
-                siteId,
                 niceId,
                 orgId,
                 name,
-                mode,
+                networkId: network.networkId,
-                ssl,
+                mode: mode as "host" | "cidr",
                 destination,
-                scheme,
-                destinationPort,
                 enabled,
                 alias,
                 aliasAddress,
@@ -317,6 +338,13 @@ export async function createSiteResource(
 
             //////////////////// update the associations ////////////////////
 
+            for (const siteId of siteIds) {
+                await trx.insert(siteNetworks).values({
+                    siteId: siteId,
+                    networkId: network.networkId
+                });
+            }
+
             const [adminRole] = await trx
                 .select()
                 .from(roles)
@@ -359,17 +387,22 @@ export async function createSiteResource(
                 );
             }
 
+            for (const siteToAssign of sitesToAssign) {
                 const [newt] = await trx
                     .select()
                     .from(newts)
-                .where(eq(newts.siteId, site.siteId))
+                    .where(eq(newts.siteId, siteToAssign.siteId))
                     .limit(1);
 
                 if (!newt) {
                     return next(
-                    createHttpError(HttpCode.NOT_FOUND, "Newt not found")
+                        createHttpError(
+                            HttpCode.NOT_FOUND,
+                            `Newt not found for site ${siteToAssign.siteId}`
+                        )
                     );
                 }
+            }
 
             await rebuildClientAssociationsFromSiteResource(
                 newSiteResource,
@@ -387,7 +420,7 @@ export async function createSiteResource(
         }
 
         logger.info(
-            `Created site resource ${newSiteResource.siteResourceId} for site ${siteId}`
+            `Created site resource ${newSiteResource.siteResourceId} for org ${orgId}`
         );
 
         return response(res, {

server/routers/siteResource/deleteSiteResource.ts

@@ -70,17 +70,18 @@ export async function deleteSiteResource(
                 .where(and(eq(siteResources.siteResourceId, siteResourceId)))
                 .returning();
 
-            const [newt] = await trx
+            // not sure why this is here...
-                .select()
+            // const [newt] = await trx
-                .from(newts)
+            //     .select()
-                .where(eq(newts.siteId, removedSiteResource.siteId))
+            //     .from(newts)
-                .limit(1);
+            //     .where(eq(newts.siteId, removedSiteResource.siteId))
+            //     .limit(1);
 
-            if (!newt) {
+            // if (!newt) {
-                return next(
+            //     return next(
-                    createHttpError(HttpCode.NOT_FOUND, "Newt not found")
+            //         createHttpError(HttpCode.NOT_FOUND, "Newt not found")
-                );
+            //     );
-            }
+            // }
 
             await rebuildClientAssociationsFromSiteResource(
                 removedSiteResource,

server/routers/siteResource/getSiteResource.ts

@@ -17,38 +17,34 @@ const getSiteResourceParamsSchema = z.strictObject({
         .transform((val) => (val ? Number(val) : undefined))
         .pipe(z.int().positive().optional())
         .optional(),
-    siteId: z.string().transform(Number).pipe(z.int().positive()),
     niceId: z.string().optional(),
     orgId: z.string()
 });
 
 async function query(
     siteResourceId?: number,
-    siteId?: number,
     niceId?: string,
     orgId?: string
 ) {
-    if (siteResourceId && siteId && orgId) {
+    if (siteResourceId && orgId) {
         const [siteResource] = await db
             .select()
             .from(siteResources)
             .where(
                 and(
                     eq(siteResources.siteResourceId, siteResourceId),
-                    eq(siteResources.siteId, siteId),
                     eq(siteResources.orgId, orgId)
                 )
             )
             .limit(1);
         return siteResource;
-    } else if (niceId && siteId && orgId) {
+    } else if (niceId && orgId) {
         const [siteResource] = await db
             .select()
             .from(siteResources)
             .where(
                 and(
                     eq(siteResources.niceId, niceId),
-                    eq(siteResources.siteId, siteId),
                     eq(siteResources.orgId, orgId)
                 )
             )
@@ -84,7 +80,6 @@ registry.registerPath({
     request: {
         params: z.object({
             niceId: z.string(),
-            siteId: z.number(),
             orgId: z.string()
         })
     },
@@ -107,10 +102,10 @@ export async function getSiteResource(
             );
         }
 
-        const { siteResourceId, siteId, niceId, orgId } = parsedParams.data;
+        const { siteResourceId, niceId, orgId } = parsedParams.data;
 
         // Get the site resource
-        const siteResource = await query(siteResourceId, siteId, niceId, orgId);
+        const siteResource = await query(siteResourceId, niceId, orgId);
 
         if (!siteResource) {
             return next(

server/routers/siteResource/listAllSiteResourcesByOrg.ts

@@ -1,4 +1,4 @@
-import { db, SiteResource, siteResources, sites } from "@server/db";
+import { db, SiteResource, siteNetworks, siteResources, sites } from "@server/db";
 import response from "@server/lib/response";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
@@ -41,12 +41,12 @@ const listAllSiteResourcesByOrgQuerySchema = z.object({
         }),
     query: z.string().optional(),
     mode: z
-        .enum(["host", "cidr", "http"])
+        .enum(["host", "cidr"])
         .optional()
         .catch(undefined)
         .openapi({
             type: "string",
-            enum: ["host", "cidr", "http"],
+            enum: ["host", "cidr"],
             description: "Filter site resources by mode"
         }),
     sort_by: z
@@ -73,9 +73,10 @@ const listAllSiteResourcesByOrgQuerySchema = z.object({
 
 export type ListAllSiteResourcesByOrgResponse = PaginatedResponse<{
     siteResources: (SiteResource & {
-        siteName: string;
+        siteIds: number[];
-        siteNiceId: string;
+        siteNames: string[];
-        siteAddress: string | null;
+        siteNiceIds: string[];
+        siteAddresses: (string | null)[];
     })[];
 }>;
 
@@ -83,13 +84,11 @@ function querySiteResourcesBase() {
     return db
         .select({
             siteResourceId: siteResources.siteResourceId,
-            siteId: siteResources.siteId,
             orgId: siteResources.orgId,
             niceId: siteResources.niceId,
             name: siteResources.name,
             mode: siteResources.mode,
-            ssl: siteResources.ssl,
+            protocol: siteResources.protocol,
-            scheme: siteResources.scheme,
             proxyPort: siteResources.proxyPort,
             destinationPort: siteResources.destinationPort,
             destination: siteResources.destination,
@@ -101,14 +100,20 @@ function querySiteResourcesBase() {
             disableIcmp: siteResources.disableIcmp,
             authDaemonMode: siteResources.authDaemonMode,
             authDaemonPort: siteResources.authDaemonPort,
-            siteName: sites.name,
+            networkId: siteResources.networkId,
-            siteNiceId: sites.niceId,
+            defaultNetworkId: siteResources.defaultNetworkId,
-            siteAddress: sites.address
+            siteNames: sql<string[]>`array_agg(${sites.name})`,
+            siteNiceIds: sql<string[]>`array_agg(${sites.niceId})`,
+            siteIds: sql<number[]>`array_agg(${sites.siteId})`,
+            siteAddresses: sql<(string | null)[]>`array_agg(${sites.address})`
         })
         .from(siteResources)
-        .innerJoin(sites, eq(siteResources.siteId, sites.siteId));
+        .innerJoin(siteNetworks, eq(siteResources.networkId, siteNetworks.networkId))
+        .innerJoin(sites, eq(siteNetworks.siteId, sites.siteId))
+        .groupBy(siteResources.siteResourceId);
 }
 
+
 registry.registerPath({
     method: "get",
     path: "/org/{orgId}/site-resources",
@@ -194,9 +199,7 @@ export async function listAllSiteResourcesByOrg(
         const baseQuery = querySiteResourcesBase().where(and(...conditions));
 
         const countQuery = db.$count(
-            querySiteResourcesBase()
+            querySiteResourcesBase().where(and(...conditions)).as("filtered_site_resources")
-                .where(and(...conditions))
-                .as("filtered_site_resources")
         );
 
         const [siteResourcesList, totalCount] = await Promise.all([

server/routers/siteResource/listSiteResources.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db } from "@server/db";
+import { db, networks, siteNetworks } from "@server/db";
 import { siteResources, sites, SiteResource } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -108,13 +108,21 @@ export async function listSiteResources(
             return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
         }
 
-        // Get site resources
+        // Get site resources by joining networks to siteResources via siteNetworks
         const siteResourcesList = await db
             .select()
-            .from(siteResources)
+            .from(siteNetworks)
+            .innerJoin(
+                networks,
+                eq(siteNetworks.networkId, networks.networkId)
+            )
+            .innerJoin(
+                siteResources,
+                eq(siteResources.networkId, networks.networkId)
+            )
             .where(
                 and(
-                    eq(siteResources.siteId, siteId),
+                    eq(siteNetworks.siteId, siteId),
                     eq(siteResources.orgId, orgId)
                 )
             )
@@ -128,6 +136,7 @@ export async function listSiteResources(
             .limit(limit)
             .offset(offset);
 
+
         return response(res, {
             data: { siteResources: siteResourcesList },
             success: true,

server/routers/siteResource/updateSiteResource.ts

@@ -7,12 +7,18 @@ import {
     orgs,
     roles,
     roleSiteResources,
+    siteNetworks,
     SiteResource,
     siteResources,
     sites,
+    networks,
     Transaction,
     userSiteResources
 } from "@server/db";
+import response from "@server/lib/response";
+import { eq, and, ne, inArray } from "drizzle-orm";
+import { OpenAPITags, registry } from "@server/openApi";
+import { updatePeerData, updateTargets } from "@server/routers/client/targets";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import {
     generateAliasConfig,
@@ -22,12 +28,8 @@ import {
     portRangeStringSchema
 } from "@server/lib/ip";
 import { rebuildClientAssociationsFromSiteResource } from "@server/lib/rebuildClientAssociations";
-import response from "@server/lib/response";
 import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
-import { updatePeerData, updateTargets } from "@server/routers/client/targets";
 import HttpCode from "@server/types/HttpCode";
-import { and, eq, ne } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
 import { z } from "zod";
@@ -40,7 +42,8 @@ const updateSiteResourceParamsSchema = z.strictObject({
 const updateSiteResourceSchema = z
     .strictObject({
         name: z.string().min(1).max(255).optional(),
-        siteId: z.int(),
+        siteIds: z.array(z.int()),
+        // niceId: z.string().min(1).max(255).regex(/^[a-zA-Z0-9-]+$/, "niceId can only contain letters, numbers, and dashes").optional(),
         niceId: z
             .string()
             .min(1)
@@ -51,11 +54,10 @@ const updateSiteResourceSchema = z
             )
             .optional(),
         // mode: z.enum(["host", "cidr", "port"]).optional(),
-        mode: z.enum(["host", "cidr", "http"]).optional(),
+        mode: z.enum(["host", "cidr"]).optional(),
-        ssl: z.boolean().optional(),
+        // protocol: z.enum(["tcp", "udp"]).nullish(),
-        scheme: z.enum(["http", "https"]).nullish(),
         // proxyPort: z.int().positive().nullish(),
-        destinationPort: z.int().positive().nullish(),
+        // destinationPort: z.int().positive().nullish(),
         destination: z.string().min(1).optional(),
         enabled: z.boolean().optional(),
         alias: z
@@ -77,12 +79,7 @@ const updateSiteResourceSchema = z
     .strict()
     .refine(
         (data) => {
-            if (
+            if (data.mode === "host" && data.destination) {
-                (data.mode === "host" ||
-                    data.mode == "http") &&
-                data.destination
-            ) {
-                if (data.mode == "host") {
                 const isValidIP = z
                     // .union([z.ipv4(), z.ipv6()])
                     .union([z.ipv4()]) // for now lets just do ipv4 until we verify ipv6 works everywhere
@@ -91,7 +88,6 @@ const updateSiteResourceSchema = z
                 if (isValidIP) {
                     return true;
                 }
-                }
 
                 // Check if it's a valid domain (hostname pattern, TLD not required)
                 const domainRegex =
@@ -125,23 +121,6 @@ const updateSiteResourceSchema = z
         {
             message: "Destination must be a valid CIDR notation for cidr mode"
         }
-    )
-    .refine(
-        (data) => {
-            if (data.mode !== "http") return true;
-            return (
-                data.scheme !== undefined &&
-                data.scheme !== null &&
-                data.destinationPort !== undefined &&
-                data.destinationPort !== null &&
-                data.destinationPort >= 1 &&
-                data.destinationPort <= 65535
-            );
-        },
-        {
-            message:
-                "HTTP mode requires scheme (http or https) and a valid destination port"
-        }
     );
 
 export type UpdateSiteResourceBody = z.infer<typeof updateSiteResourceSchema>;
@@ -196,14 +175,11 @@ export async function updateSiteResource(
         const { siteResourceId } = parsedParams.data;
         const {
             name,
-            siteId, // because it can change
+            siteIds, // because it can change
             niceId,
             mode,
-            scheme,
             destination,
-            destinationPort,
             alias,
-            ssl,
             enabled,
             userIds,
             roleIds,
@@ -215,16 +191,6 @@ export async function updateSiteResource(
             authDaemonMode
         } = parsedBody.data;
 
-        const [site] = await db
-            .select()
-            .from(sites)
-            .where(eq(sites.siteId, siteId))
-            .limit(1);
-
-        if (!site) {
-            return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
-        }
-
         // Check if site resource exists
         const [existingSiteResource] = await db
             .select()
@@ -264,6 +230,24 @@ export async function updateSiteResource(
             );
         }
 
+        // Verify the site exists and belongs to the org
+        const sitesToAssign = await db
+            .select()
+            .from(sites)
+            .where(
+                and(
+                    inArray(sites.siteId, siteIds),
+                    eq(sites.orgId, existingSiteResource.orgId)
+                )
+            )
+            .limit(1);
+
+        if (sitesToAssign.length !== siteIds.length) {
+            return next(
+                createHttpError(HttpCode.NOT_FOUND, "Some site not found")
+            );
+        }
+
         // Only check if destination is an IP address
         const isIp = z
             .union([z.ipv4(), z.ipv6()])
@@ -281,25 +265,24 @@ export async function updateSiteResource(
             );
         }
 
-        let existingSite = site;
+        let sitesChanged = false;
-        let siteChanged = false;
+        const existingSiteIds = existingSiteResource.networkId
-        if (existingSiteResource.siteId !== siteId) {
+            ? await db
-            siteChanged = true;
-            // get the existing site
-            [existingSite] = await db
                   .select()
-                .from(sites)
+                  .from(siteNetworks)
-                .where(eq(sites.siteId, existingSiteResource.siteId))
+                  .where(
-                .limit(1);
+                      eq(siteNetworks.networkId, existingSiteResource.networkId)
-
-            if (!existingSite) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        "Existing site not found"
                   )
-                );
+            : [];
-            }
+
+        const existingSiteIdSet = new Set(existingSiteIds.map((s) => s.siteId));
+        const newSiteIdSet = new Set(siteIds);
+
+        if (
+            existingSiteIdSet.size !== newSiteIdSet.size ||
+            ![...existingSiteIdSet].every((id) => newSiteIdSet.has(id))
+        ) {
+            sitesChanged = true;
         }
 
         // make sure the alias is unique within the org if provided
@@ -329,7 +312,7 @@ export async function updateSiteResource(
         let updatedSiteResource: SiteResource | undefined;
         await db.transaction(async (trx) => {
             // if the site is changed we need to delete and recreate the resource to avoid complications with the rebuild function otherwise we can just update in place
-            if (siteChanged) {
+            if (sitesChanged) {
                 // delete the existing site resource
                 await trx
                     .delete(siteResources)
@@ -370,13 +353,9 @@ export async function updateSiteResource(
                     .update(siteResources)
                     .set({
                         name,
-                        siteId,
                         niceId,
                         mode,
-                        scheme,
-                        ssl,
                         destination,
-                        destinationPort,
                         enabled,
                         alias: alias && alias.trim() ? alias : null,
                         tcpPortRangeString,
@@ -477,12 +456,8 @@ export async function updateSiteResource(
                     .update(siteResources)
                     .set({
                         name: name,
-                        siteId: siteId,
                         mode: mode,
-                        scheme,
-                        ssl,
                         destination: destination,
-                        destinationPort: destinationPort,
                         enabled: enabled,
                         alias: alias && alias.trim() ? alias : null,
                         tcpPortRangeString: tcpPortRangeString,
@@ -497,6 +472,23 @@ export async function updateSiteResource(
 
                 //////////////////// update the associations ////////////////////
 
+                // delete the site - site resources associations
+                await trx
+                    .delete(siteNetworks)
+                    .where(
+                        eq(
+                            siteNetworks.networkId,
+                            updatedSiteResource.networkId!
+                        )
+                    );
+
+                for (const siteId of siteIds) {
+                    await trx.insert(siteNetworks).values({
+                        siteId: siteId,
+                        networkId: updatedSiteResource.networkId!
+                    });
+                }
+
                 await trx
                     .delete(clientSiteResources)
                     .where(
@@ -566,14 +558,15 @@ export async function updateSiteResource(
                     );
                 }
 
-                logger.info(
+                logger.info(`Updated site resource ${siteResourceId}`);
-                    `Updated site resource ${siteResourceId} for site ${siteId}`
-                );
 
                 await handleMessagingForUpdatedSiteResource(
                     existingSiteResource,
                     updatedSiteResource,
-                    { siteId: site.siteId, orgId: site.orgId },
+                    siteIds.map((siteId) => ({
+                        siteId,
+                        orgId: existingSiteResource.orgId
+                    })),
                     trx
                 );
             }
@@ -600,7 +593,7 @@ export async function updateSiteResource(
 export async function handleMessagingForUpdatedSiteResource(
     existingSiteResource: SiteResource | undefined,
     updatedSiteResource: SiteResource,
-    site: { siteId: number; orgId: string },
+    sites: { siteId: number; orgId: string }[],
     trx: Transaction
 ) {
     logger.debug(
@@ -637,6 +630,7 @@ export async function handleMessagingForUpdatedSiteResource(
     // if the existingSiteResource is undefined (new resource) we don't need to do anything here, the rebuild above handled it all
 
     if (destinationChanged || aliasChanged || portRangesChanged) {
+        for (const site of sites) {
             const [newt] = await trx
                 .select()
                 .from(newts)
@@ -651,11 +645,11 @@ export async function handleMessagingForUpdatedSiteResource(
 
             // Only update targets on newt if destination changed
             if (destinationChanged || portRangesChanged) {
-            const oldTarget = await generateSubnetProxyTargetV2(
+                const oldTarget = generateSubnetProxyTargetV2(
                     existingSiteResource,
                     mergedAllClients
                 );
-            const newTarget = await generateSubnetProxyTargetV2(
+                const newTarget = generateSubnetProxyTargetV2(
                     updatedSiteResource,
                     mergedAllClients
                 );
@@ -684,13 +678,17 @@ export async function handleMessagingForUpdatedSiteResource(
                             siteResources.siteResourceId
                         )
                     )
+                    .innerJoin(
+                        siteNetworks,
+                        eq(siteNetworks.networkId, siteResources.networkId)
+                    )
                     .where(
                         and(
                             eq(
                                 clientSiteResourcesAssociationsCache.clientId,
                                 client.clientId
                             ),
-                        eq(siteResources.siteId, site.siteId),
+                            eq(siteNetworks.siteId, site.siteId),
                             eq(
                                 siteResources.destination,
                                 existingSiteResource.destination
@@ -709,10 +707,11 @@ export async function handleMessagingForUpdatedSiteResource(
                 olmJobs.push(
                     updatePeerData(
                         client.clientId,
-                    updatedSiteResource.siteId,
+                        site.siteId,
                         destinationChanged
                             ? {
-                              oldRemoteSubnets: !oldDestinationStillInUseByASite
+                                  oldRemoteSubnets:
+                                      !oldDestinationStillInUseByASite
                                           ? generateRemoteSubnets([
                                                 existingSiteResource
                                             ])
@@ -738,4 +737,5 @@ export async function handleMessagingForUpdatedSiteResource(
 
             await Promise.all(olmJobs);
         }
+    }
 }

src/app/[orgId]/settings/domains/[domainId]/page.tsx

@@ -10,6 +10,7 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { GetDNSRecordsResponse } from "@server/routers/domain";
 import DNSRecordsTable from "@app/components/DNSRecordTable";
 import DomainCertForm from "@app/components/DomainCertForm";
+import { build } from "@server/build";
 
 interface DomainSettingsPageProps {
     params: Promise<{ domainId: string; orgId: string }>;
@@ -65,12 +66,14 @@ export default async function DomainSettingsPage({
                 )}
             </div>
             <div className="space-y-6">
+                {build != "oss" && env.flags.usePangolinDns ? (
                     <DomainInfoCard
                         failed={domain.failed}
                         verified={domain.verified}
                         type={domain.type}
                         errorMessage={domain.errorMessage}
                     />
+                ) : null}
 
                 <DNSRecordsTable records={dnsRecords} type={domain.type} />
 

src/app/[orgId]/settings/resources/client/page.tsx

@@ -56,33 +56,21 @@ export default async function ClientResourcesPage(
 
     const internalResourceRows: InternalResourceRow[] = siteResources.map(
         (siteResource) => {
-            const rawMode = siteResource.mode as string | undefined;
-            const normalizedMode =
-                rawMode === "https"
-                    ? ("http" as const)
-                    : rawMode === "host" || rawMode === "cidr" || rawMode === "http"
-                      ? rawMode
-                      : ("host" as const);
             return {
                 id: siteResource.siteResourceId,
                 name: siteResource.name,
                 orgId: params.orgId,
-                siteName: siteResource.siteName,
+                siteNames: siteResource.siteNames,
-                siteAddress: siteResource.siteAddress || null,
+                siteAddresses: siteResource.siteAddresses || null,
-                mode: normalizedMode,
+                mode: siteResource.mode || ("port" as any),
-                scheme:
-                    siteResource.scheme ??
-                    (rawMode === "https" ? ("https" as const) : null),
-                ssl:
-                    siteResource.ssl === true || rawMode === "https",
                 // protocol: siteResource.protocol,
                 // proxyPort: siteResource.proxyPort,
-                siteId: siteResource.siteId,
+                siteIds: siteResource.siteIds,
                 destination: siteResource.destination,
-                httpHttpsPort: siteResource.destinationPort ?? null,
+                // destinationPort: siteResource.destinationPort,
                 alias: siteResource.alias || null,
                 aliasAddress: siteResource.aliasAddress || null,
-                siteNiceId: siteResource.siteNiceId,
+                siteNiceIds: siteResource.siteNiceIds,
                 niceId: siteResource.niceId,
                 tcpPortRangeString: siteResource.tcpPortRangeString || null,
                 udpPortRangeString: siteResource.udpPortRangeString || null,

src/app/private-maintenance-screen/page.tsx

@@ -1,32 +0,0 @@
-import { Metadata } from "next";
-import { getTranslations } from "next-intl/server";
-import {
-    Card,
-    CardContent,
-    CardHeader,
-    CardTitle
-} from "@app/components/ui/card";
-
-export const dynamic = "force-dynamic";
-
-export const metadata: Metadata = {
-    title: "Private Placeholder"
-};
-
-export default async function MaintenanceScreen() {
-    const t = await getTranslations();
-
-    let title = t("privateMaintenanceScreenTitle");
-    let message = t("privateMaintenanceScreenMessage");
-
-    return (
-        <div className="min-h-screen flex items-center justify-center p-4">
-            <Card className="w-full max-w-md">
-                <CardHeader>
-                    <CardTitle>{title}</CardTitle>
-                </CardHeader>
-                <CardContent className="space-y-4">{message}</CardContent>
-            </Card>
-        </div>
-    );
-}

src/components/ClientResourcesTable.tsx

@@ -21,6 +21,7 @@ import {
     ArrowUp10Icon,
     ArrowUpDown,
     ArrowUpRight,
+    ChevronDown,
     ChevronsUpDownIcon,
     MoreHorizontal
 } from "lucide-react";
@@ -43,18 +44,16 @@ export type InternalResourceRow = {
     id: number;
     name: string;
     orgId: string;
-    siteName: string;
+    siteNames: string[];
-    siteAddress: string | null;
+    siteAddresses: (string | null)[];
+    siteIds: number[];
+    siteNiceIds: string[];
     // mode: "host" | "cidr" | "port";
-    mode: "host" | "cidr" | "http";
+    mode: "host" | "cidr";
-    scheme: "http" | "https" | null;
-    ssl: boolean;
     // protocol: string | null;
     // proxyPort: number | null;
-    siteId: number;
-    siteNiceId: string;
     destination: string;
-    httpHttpsPort: number | null;
+    // destinationPort: number | null;
     alias: string | null;
     aliasAddress: string | null;
     niceId: string;
@@ -65,39 +64,6 @@ export type InternalResourceRow = {
     authDaemonPort?: number | null;
 };
 
-function resolveHttpHttpsDisplayPort(
-    mode: "http",
-    httpHttpsPort: number | null
-): number {
-    if (httpHttpsPort != null) {
-        return httpHttpsPort;
-    }
-    return 80;
-}
-
-function formatDestinationDisplay(row: InternalResourceRow): string {
-    const { mode, destination, httpHttpsPort, scheme } = row;
-    if (mode !== "http") {
-        return destination;
-    }
-    const port = resolveHttpHttpsDisplayPort(mode, httpHttpsPort);
-    const downstreamScheme = scheme ?? "http";
-    const hostPart =
-        destination.includes(":") && !destination.startsWith("[")
-            ? `[${destination}]`
-            : destination;
-    return `${downstreamScheme}://${hostPart}:${port}`;
-}
-
-function isSafeUrlForLink(href: string): boolean {
-    try {
-        void new URL(href);
-        return true;
-    } catch {
-        return false;
-    }
-}
-
 type ClientResourcesTableProps = {
     internalResources: InternalResourceRow[];
     orgId: string;
@@ -171,6 +137,60 @@ export default function ClientResourcesTable({
         }
     };
 
+    function SiteCell({ resourceRow }: { resourceRow: InternalResourceRow }) {
+        const { siteNames, siteNiceIds, orgId } = resourceRow;
+
+        if (!siteNames || siteNames.length === 0) {
+            return <span>-</span>;
+        }
+
+        if (siteNames.length === 1) {
+            return (
+                <Link
+                    href={`/${orgId}/settings/sites/${siteNiceIds[0]}`}
+                >
+                    <Button variant="outline">
+                        {siteNames[0]}
+                        <ArrowUpRight className="ml-2 h-4 w-4" />
+                    </Button>
+                </Link>
+            );
+        }
+
+        return (
+            <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                    <Button
+                        variant="outline"
+                        size="sm"
+                        className="flex items-center gap-2"
+                    >
+                        <span>
+                            {siteNames.length} {t("sites")}
+                        </span>
+                        <ChevronDown className="h-3 w-3" />
+                    </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start">
+                    {siteNames.map((siteName, idx) => (
+                        <DropdownMenuItem
+                            key={siteNiceIds[idx]}
+                            asChild
+                        >
+                            <Link
+                                href={`/${orgId}/settings/sites/${siteNiceIds[idx]}`}
+                                className="flex items-center gap-2 cursor-pointer"
+                            >
+                                {siteName}
+                                <ArrowUpRight className="h-3 w-3" />
+                            </Link>
+                        </DropdownMenuItem>
+                    ))}
+                </DropdownMenuContent>
+            </DropdownMenu>
+        );
+    }
+
     const internalColumns: ExtendedColumnDef<InternalResourceRow>[] = [
         {
             accessorKey: "name",
@@ -220,21 +240,11 @@ export default function ClientResourcesTable({
             }
         },
         {
-            accessorKey: "siteName",
+            accessorKey: "siteNames",
             friendlyName: t("site"),
             header: () => <span className="p-3">{t("site")}</span>,
             cell: ({ row }) => {
-                const resourceRow = row.original;
+                return <SiteCell resourceRow={row.original} />;
-                return (
-                    <Link
-                        href={`/${resourceRow.orgId}/settings/sites/${resourceRow.siteNiceId}`}
-                    >
-                        <Button variant="outline">
-                            {resourceRow.siteName}
-                            <ArrowUpRight className="ml-2 h-4 w-4" />
-                        </Button>
-                    </Link>
-                );
             }
         },
         {
@@ -250,10 +260,6 @@ export default function ClientResourcesTable({
                         {
                             value: "cidr",
                             label: t("editInternalResourceDialogModeCidr")
-                        },
-                        {
-                            value: "http",
-                            label: t("editInternalResourceDialogModeHttp")
                         }
                     ]}
                     selectedValue={searchParams.get("mode") ?? undefined}
@@ -266,14 +272,10 @@ export default function ClientResourcesTable({
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
-                const modeLabels: Record<
+                const modeLabels: Record<"host" | "cidr" | "port", string> = {
-                    "host" | "cidr" | "port" | "http",
-                    string
-                > = {
                     host: t("editInternalResourceDialogModeHost"),
                     cidr: t("editInternalResourceDialogModeCidr"),
-                    port: t("editInternalResourceDialogModePort"),
+                    port: t("editInternalResourceDialogModePort")
-                    http: t("editInternalResourceDialogModeHttp")
                 };
                 return <span>{modeLabels[resourceRow.mode]}</span>;
             }
@@ -286,12 +288,11 @@ export default function ClientResourcesTable({
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
-                const display = formatDestinationDisplay(resourceRow);
                 return (
                     <CopyToClipboard
-                        text={display}
+                        text={resourceRow.destination}
                         isLink={false}
-                        displayText={display}
+                        displayText={resourceRow.destination}
                     />
                 );
             }
@@ -304,27 +305,16 @@ export default function ClientResourcesTable({
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
-                if (resourceRow.mode === "host" && resourceRow.alias) {
+                return resourceRow.mode === "host" && resourceRow.alias ? (
-                    return (
                     <CopyToClipboard
                         text={resourceRow.alias}
                         isLink={false}
                         displayText={resourceRow.alias}
                     />
+                ) : (
+                    <span>-</span>
                 );
             }
-                if (resourceRow.mode === "http" && resourceRow.alias) {
-                    const url = `${resourceRow.ssl ? "https" : "http"}://${resourceRow.alias}`;
-                    return (
-                        <CopyToClipboard
-                            text={url}
-                            isLink={isSafeUrlForLink(url)}
-                            displayText={url}
-                        />
-                    );
-                }
-                return <span>-</span>;
-            }
         },
         {
             accessorKey: "aliasAddress",
@@ -454,7 +444,7 @@ export default function ClientResourcesTable({
                     onConfirm={async () =>
                         deleteInternalResource(
                             selectedInternalResource!.id,
-                            selectedInternalResource!.siteId
+                            selectedInternalResource!.siteIds[0]
                         )
                     }
                     string={selectedInternalResource.name}
@@ -488,7 +478,11 @@ export default function ClientResourcesTable({
                 <EditInternalResourceDialog
                     open={isEditDialogOpen}
                     setOpen={setIsEditDialogOpen}
-                    resource={editingResource}
+                    resource={{
+                        ...editingResource,
+                        siteName: editingResource.siteNames[0] ?? "",
+                        siteId: editingResource.siteIds[0]
+                    }}
                     orgId={orgId}
                     sites={sites}
                     onSuccess={() => {

src/components/CreateDomainForm.tsx

@@ -154,7 +154,7 @@ export default function CreateDomainForm({
 
     const punycodePreview = useMemo(() => {
         if (!baseDomain) return "";
-        const punycode = toPunycode(baseDomain);
+        const punycode = toPunycode(baseDomain.toLowerCase());
         return punycode !== baseDomain.toLowerCase() ? punycode : "";
     }, [baseDomain]);
 
@@ -239,6 +239,7 @@ export default function CreateDomainForm({
                             className="space-y-4"
                             id="create-domain-form"
                         >
+                            {build != "oss" && env.flags.usePangolinDns ? (
                                 <FormField
                                     control={form.control}
                                     name="type"
@@ -254,6 +255,8 @@ export default function CreateDomainForm({
                                         </FormItem>
                                     )}
                                 />
+                            ) : null}
+
                             <FormField
                                 control={form.control}
                                 name="baseDomain"

src/components/CreateInternalResourceDialog.tsx

@@ -50,10 +50,7 @@ export default function CreateInternalResourceDialog({
         setIsSubmitting(true);
         try {
             let data = { ...values };
-            if (
+            if (data.mode === "host" && isHostname(data.destination)) {
-                (data.mode === "host" || data.mode === "http") &&
-                isHostname(data.destination)
-            ) {
                 const currentAlias = data.alias?.trim() || "";
                 if (!currentAlias) {
                     let aliasValue = data.destination;
@@ -72,42 +69,21 @@ export default function CreateInternalResourceDialog({
                     mode: data.mode,
                     destination: data.destination,
                     enabled: true,
-                    ...(data.mode === "http" && {
+                    alias: data.alias && typeof data.alias === "string" && data.alias.trim() ? data.alias : undefined,
-                        scheme: data.scheme,
-                        ssl: data.ssl ?? false,
-                        destinationPort: data.httpHttpsPort ?? undefined
-                    }),
-                    alias:
-                        data.alias &&
-                        typeof data.alias === "string" &&
-                        data.alias.trim()
-                            ? data.alias
-                            : undefined,
                     tcpPortRangeString: data.tcpPortRangeString,
                     udpPortRangeString: data.udpPortRangeString,
                     disableIcmp: data.disableIcmp ?? false,
-                    ...(data.authDaemonMode != null && {
+                    ...(data.authDaemonMode != null && { authDaemonMode: data.authDaemonMode }),
-                        authDaemonMode: data.authDaemonMode
+                    ...(data.authDaemonMode === "remote" && data.authDaemonPort != null && { authDaemonPort: data.authDaemonPort }),
-                    }),
+                    roleIds: data.roles ? data.roles.map((r) => parseInt(r.id)) : [],
-                    ...(data.authDaemonMode === "remote" &&
-                        data.authDaemonPort != null && {
-                            authDaemonPort: data.authDaemonPort
-                        }),
-                    roleIds: data.roles
-                        ? data.roles.map((r) => parseInt(r.id))
-                        : [],
                     userIds: data.users ? data.users.map((u) => u.id) : [],
-                    clientIds: data.clients
+                    clientIds: data.clients ? data.clients.map((c) => parseInt(c.id)) : []
-                        ? data.clients.map((c) => parseInt(c.id))
-                        : []
                 }
             );
 
             toast({
                 title: t("createInternalResourceDialogSuccess"),
-                description: t(
+                description: t("createInternalResourceDialogInternalResourceCreatedSuccessfully"),
-                    "createInternalResourceDialogInternalResourceCreatedSuccessfully"
-                ),
                 variant: "default"
             });
             setOpen(false);
@@ -117,9 +93,7 @@ export default function CreateInternalResourceDialog({
                 title: t("createInternalResourceDialogError"),
                 description: formatAxiosError(
                     error,
-                    t(
+                    t("createInternalResourceDialogFailedToCreateInternalResource")
-                        "createInternalResourceDialogFailedToCreateInternalResource"
-                    )
                 ),
                 variant: "destructive"
             });
@@ -132,13 +106,9 @@ export default function CreateInternalResourceDialog({
         <Credenza open={open} onOpenChange={setOpen}>
             <CredenzaContent className="max-w-3xl">
                 <CredenzaHeader>
-                    <CredenzaTitle>
+                    <CredenzaTitle>{t("createInternalResourceDialogCreateClientResource")}</CredenzaTitle>
-                        {t("createInternalResourceDialogCreateClientResource")}
-                    </CredenzaTitle>
                     <CredenzaDescription>
-                        {t(
+                        {t("createInternalResourceDialogCreateClientResourceDescription")}
-                            "createInternalResourceDialogCreateClientResourceDescription"
-                        )}
                     </CredenzaDescription>
                 </CredenzaHeader>
                 <CredenzaBody>
@@ -153,11 +123,7 @@ export default function CreateInternalResourceDialog({
                 </CredenzaBody>
                 <CredenzaFooter>
                     <CredenzaClose asChild>
-                        <Button
+                        <Button variant="outline" onClick={() => setOpen(false)} disabled={isSubmitting}>
-                            variant="outline"
-                            onClick={() => setOpen(false)}
-                            disabled={isSubmitting}
-                        >
                             {t("createInternalResourceDialogCancel")}
                         </Button>
                     </CredenzaClose>

src/components/DomainPicker.tsx

@@ -163,18 +163,15 @@ export default function DomainPicker({
                         domainId: firstOrExistingDomain.domainId
                     };
 
-                    const base = firstOrExistingDomain.baseDomain;
-                    const sub =
-                        firstOrExistingDomain.type !== "cname"
-                            ? defaultSubdomain?.trim() || undefined
-                            : undefined;
-
                     onDomainChange?.({
                         domainId: firstOrExistingDomain.domainId,
                         type: "organization",
-                        subdomain: sub,
+                        subdomain:
-                        fullDomain: sub ? `${sub}.${base}` : base,
+                            firstOrExistingDomain.type !== "cname"
-                        baseDomain: base
+                                ? defaultSubdomain || undefined
+                                : undefined,
+                        fullDomain: firstOrExistingDomain.baseDomain,
+                        baseDomain: firstOrExistingDomain.baseDomain
                     });
                 }
             }
@@ -512,9 +509,7 @@ export default function DomainPicker({
                                         <span className="truncate">
                                             {selectedBaseDomain.domain}
                                         </span>
-                                        {selectedBaseDomain.verified &&
+                                        {selectedBaseDomain.verified && (
-                                            selectedBaseDomain.domainType !==
-                                                "wildcard" && (
                                             <CheckCircle2 className="h-3 w-3 text-green-500 shrink-0" />
                                         )}
                                     </div>
@@ -579,13 +574,6 @@ export default function DomainPicker({
                                                                     }
                                                                 </span>
                                                                 <span className="text-xs text-muted-foreground">
-                                                                    {orgDomain.type ===
-                                                                    "wildcard"
-                                                                        ? t(
-                                                                              "domainPickerManual"
-                                                                          )
-                                                                        : (
-                                                                              <>
                                                                     {orgDomain.type.toUpperCase()}{" "}
                                                                     •{" "}
                                                                     {orgDomain.verified
@@ -595,8 +583,6 @@ export default function DomainPicker({
                                                                         : t(
                                                                               "domainPickerUnverified"
                                                                           )}
-                                                                              </>
-                                                                          )}
                                                                 </span>
                                                             </div>
                                                             <Check

src/components/EditInternalResourceDialog.tsx

@@ -54,10 +54,7 @@ export default function EditInternalResourceDialog({
     async function handleSubmit(values: InternalResourceFormValues) {
         try {
             let data = { ...values };
-            if (
+            if (data.mode === "host" && isHostname(data.destination)) {
-                (data.mode === "host" || data.mode === "http") &&
-                isHostname(data.destination)
-            ) {
                 const currentAlias = data.alias?.trim() || "";
                 if (!currentAlias) {
                     let aliasValue = data.destination;
@@ -74,11 +71,6 @@ export default function EditInternalResourceDialog({
                 mode: data.mode,
                 niceId: data.niceId,
                 destination: data.destination,
-                ...(data.mode === "http" && {
-                    scheme: data.scheme,
-                    ssl: data.ssl ?? false,
-                    destinationPort: data.httpHttpsPort ?? null
-                }),
                 alias:
                     data.alias &&
                     typeof data.alias === "string" &&

src/components/InternalResourceForm.tsx

@@ -1,10 +1,6 @@
 "use client";
 
 import { HorizontalTabs } from "@app/components/HorizontalTabs";
-import {
-    OptionSelect,
-    type OptionSelectOption
-} from "@app/components/OptionSelect";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { StrategySelect } from "@app/components/StrategySelect";
 import { Tag, TagInput } from "@app/components/tags/tag-input";
@@ -49,8 +45,6 @@ import { z } from "zod";
 import { SitesSelector, type Selectedsite } from "./site-selector";
 import { CaretSortIcon } from "@radix-ui/react-icons";
 import { MachinesSelector } from "./machines-selector";
-import DomainPicker from "@app/components/DomainPicker";
-import { SwitchInput } from "@app/components/SwitchInput";
 
 // --- Helpers (shared) ---
 
@@ -126,14 +120,12 @@ export const cleanForFQDN = (name: string): string =>
 
 type Site = ListSitesResponse["sites"][0];
 
-export type InternalResourceMode = "host" | "cidr" | "http";
-
 export type InternalResourceData = {
     id: number;
     name: string;
     orgId: string;
     siteName: string;
-    mode: InternalResourceMode;
+    mode: "host" | "cidr";
     siteId: number;
     niceId: string;
     destination: string;
@@ -143,12 +135,6 @@ export type InternalResourceData = {
     disableIcmp?: boolean;
     authDaemonMode?: "site" | "remote" | null;
     authDaemonPort?: number | null;
-    httpHttpsPort?: number | null;
-    scheme?: "http" | "https" | null;
-    ssl?: boolean;
-    httpConfigSubdomain?: string | null;
-    httpConfigDomainId?: string | null;
-    httpConfigFullDomain?: string | null;
 };
 
 const tagSchema = z.object({ id: z.string(), text: z.string() });
@@ -156,7 +142,7 @@ const tagSchema = z.object({ id: z.string(), text: z.string() });
 export type InternalResourceFormValues = {
     name: string;
     siteId: number;
-    mode: InternalResourceMode;
+    mode: "host" | "cidr";
     destination: string;
     alias?: string | null;
     niceId?: string;
@@ -165,12 +151,6 @@ export type InternalResourceFormValues = {
     disableIcmp?: boolean;
     authDaemonMode?: "site" | "remote" | null;
     authDaemonPort?: number | null;
-    httpHttpsPort?: number | null;
-    scheme?: "http" | "https";
-    ssl?: boolean;
-    httpConfigSubdomain?: string | null;
-    httpConfigDomainId?: string | null;
-    httpConfigFullDomain?: string | null;
     roles?: z.infer<typeof tagSchema>[];
     users?: z.infer<typeof tagSchema>[];
     clients?: z.infer<typeof tagSchema>[];
@@ -231,22 +211,6 @@ export function InternalResourceForm({
         variant === "create"
             ? "createInternalResourceDialogModeCidr"
             : "editInternalResourceDialogModeCidr";
-    const modeHttpKey =
-        variant === "create"
-            ? "createInternalResourceDialogModeHttp"
-            : "editInternalResourceDialogModeHttp";
-    const schemeLabelKey =
-        variant === "create"
-            ? "createInternalResourceDialogScheme"
-            : "editInternalResourceDialogScheme";
-    const enableSslLabelKey =
-        variant === "create"
-            ? "createInternalResourceDialogEnableSsl"
-            : "editInternalResourceDialogEnableSsl";
-    const enableSslDescriptionKey =
-        variant === "create"
-            ? "createInternalResourceDialogEnableSslDescription"
-            : "editInternalResourceDialogEnableSslDescription";
     const destinationLabelKey =
         variant === "create"
             ? "createInternalResourceDialogDestination"
@@ -259,27 +223,14 @@ export function InternalResourceForm({
         variant === "create"
             ? "createInternalResourceDialogAlias"
             : "editInternalResourceDialogAlias";
-    const httpHttpsPortLabelKey =
-        variant === "create"
-            ? "createInternalResourceDialogModePort"
-            : "editInternalResourceDialogModePort";
-    const httpConfigurationTitleKey =
-        variant === "create"
-            ? "createInternalResourceDialogHttpConfiguration"
-            : "editInternalResourceDialogHttpConfiguration";
-    const httpConfigurationDescriptionKey =
-        variant === "create"
-            ? "createInternalResourceDialogHttpConfigurationDescription"
-            : "editInternalResourceDialogHttpConfigurationDescription";
 
-    const formSchema = z
+    const formSchema = z.object({
-        .object({
         name: z.string().min(1, t(nameRequiredKey)).max(255, t(nameMaxKey)),
         siteId: z
             .number()
             .int()
             .positive(siteRequiredKey ? t(siteRequiredKey) : undefined),
-            mode: z.enum(["host", "cidr", "http"]),
+        mode: z.enum(["host", "cidr"]),
         destination: z
             .string()
             .min(
@@ -289,18 +240,6 @@ export function InternalResourceForm({
                     : undefined
             ),
         alias: z.string().nullish(),
-            httpHttpsPort: z
-                .number()
-                .int()
-                .min(1)
-                .max(65535)
-                .optional()
-                .nullable(),
-            scheme: z.enum(["http", "https"]).optional(),
-            ssl: z.boolean().optional(),
-            httpConfigSubdomain: z.string().nullish(),
-            httpConfigDomainId: z.string().nullish(),
-            httpConfigFullDomain: z.string().nullish(),
         niceId: z
             .string()
             .min(1)
@@ -322,27 +261,6 @@ export function InternalResourceForm({
                 })
             )
             .optional()
-        })
-        .superRefine((data, ctx) => {
-            if (data.mode !== "http") return;
-            if (!data.scheme) {
-                ctx.addIssue({
-                    code: z.ZodIssueCode.custom,
-                    message: t("internalResourceDownstreamSchemeRequired"),
-                    path: ["scheme"]
-                });
-            }
-            if (
-                data.httpHttpsPort == null ||
-                !Number.isFinite(data.httpHttpsPort) ||
-                data.httpHttpsPort < 1
-            ) {
-                ctx.addIssue({
-                    code: z.ZodIssueCode.custom,
-                    message: t("internalResourceHttpPortRequired"),
-                    path: ["httpHttpsPort"]
-                });
-            }
     });
 
     type FormData = z.infer<typeof formSchema>;
@@ -476,12 +394,6 @@ export function InternalResourceForm({
                   disableIcmp: resource.disableIcmp ?? false,
                   authDaemonMode: resource.authDaemonMode ?? "site",
                   authDaemonPort: resource.authDaemonPort ?? null,
-                  httpHttpsPort: resource.httpHttpsPort ?? null,
-                  scheme: resource.scheme ?? "http",
-                  ssl: resource.ssl ?? false,
-                  httpConfigSubdomain: resource.httpConfigSubdomain ?? null,
-                  httpConfigDomainId: resource.httpConfigDomainId ?? null,
-                  httpConfigFullDomain: resource.httpConfigFullDomain ?? null,
                   niceId: resource.niceId,
                   roles: [],
                   users: [],
@@ -493,12 +405,6 @@ export function InternalResourceForm({
                   mode: "host",
                   destination: "",
                   alias: null,
-                  httpHttpsPort: null,
-                  scheme: "http",
-                  ssl: true,
-                  httpConfigSubdomain: null,
-                  httpConfigDomainId: null,
-                  httpConfigFullDomain: null,
                   tcpPortRangeString: "*",
                   udpPortRangeString: "*",
                   disableIcmp: false,
@@ -519,10 +425,6 @@ export function InternalResourceForm({
     });
 
     const mode = form.watch("mode");
-    const httpConfigSubdomain = form.watch("httpConfigSubdomain");
-    const httpConfigDomainId = form.watch("httpConfigDomainId");
-    const httpConfigFullDomain = form.watch("httpConfigFullDomain");
-    const isHttpMode = mode === "http";
     const authDaemonMode = form.watch("authDaemonMode") ?? "site";
     const hasInitialized = useRef(false);
     const previousResourceId = useRef<number | null>(null);
@@ -546,12 +448,6 @@ export function InternalResourceForm({
                 mode: "host",
                 destination: "",
                 alias: null,
-                httpHttpsPort: null,
-                scheme: "http",
-                ssl: true,
-                httpConfigSubdomain: null,
-                httpConfigDomainId: null,
-                httpConfigFullDomain: null,
                 tcpPortRangeString: "*",
                 udpPortRangeString: "*",
                 disableIcmp: false,
@@ -579,12 +475,6 @@ export function InternalResourceForm({
                     mode: resource.mode ?? "host",
                     destination: resource.destination ?? "",
                     alias: resource.alias ?? null,
-                    httpHttpsPort: resource.httpHttpsPort ?? null,
-                    scheme: resource.scheme ?? "http",
-                    ssl: resource.ssl ?? false,
-                    httpConfigSubdomain: resource.httpConfigSubdomain ?? null,
-                    httpConfigDomainId: resource.httpConfigDomainId ?? null,
-                    httpConfigFullDomain: resource.httpConfigFullDomain ?? null,
                     tcpPortRangeString: resource.tcpPortRangeString ?? "*",
                     udpPortRangeString: resource.udpPortRangeString ?? "*",
                     disableIcmp: resource.disableIcmp ?? false,
@@ -691,50 +581,12 @@ export function InternalResourceForm({
                             )}
                         />
                     )}
-                </div>
-
-                <HorizontalTabs
-                    clientSide
-                    items={[
-                        {
-                            title: t(
-                                "editInternalResourceDialogNetworkSettings"
-                            ),
-                            href: "#"
-                        },
-                        {
-                            title: t("editInternalResourceDialogAccessPolicy"),
-                            href: "#"
-                        },
-                        ...(disableEnterpriseFeatures || mode !== "host"
-                            ? []
-                            : [{ title: t("sshAccess"), href: "#" }])
-                    ]}
-                >
-                    <div className="space-y-4 mt-4 p-1">
-                        <div>
-                            <div className="mb-8">
-                                <label className="font-medium block">
-                                    {t(
-                                        "editInternalResourceDialogDestinationLabel"
-                                    )}
-                                </label>
-                                <div className="text-sm text-muted-foreground">
-                                    {t(
-                                        "editInternalResourceDialogDestinationDescription"
-                                    )}
-                                </div>
-                            </div>
-                            <div className="grid grid-cols-3 gap-4 items-start mb-4">
-                                <div className="min-w-0 col-span-1">
                     <FormField
                         control={form.control}
                         name="siteId"
                         render={({ field }) => (
                             <FormItem className="flex flex-col">
-                                                <FormLabel>
+                                <FormLabel>{t("site")}</FormLabel>
-                                                    {t("site")}
-                                                </FormLabel>
                                 <Popover>
                                     <PopoverTrigger asChild>
                                         <FormControl>
@@ -753,9 +605,7 @@ export function InternalResourceForm({
                                                               s.siteId ===
                                                               field.value
                                                       )?.name
-                                                                    : t(
+                                                    : t("selectSite")}
-                                                                          "selectSite"
-                                                                      )}
                                                 <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
                                             </Button>
                                         </FormControl>
@@ -763,21 +613,11 @@ export function InternalResourceForm({
                                     <PopoverContent className="w-full p-0">
                                         <SitesSelector
                                             orgId={orgId}
-                                                            selectedSite={
+                                            selectedSite={selectedSite}
-                                                                selectedSite
+                                            filterTypes={["newt"]}
-                                                            }
+                                            onSelectSite={(site) => {
-                                                            filterTypes={[
+                                                setSelectedSite(site);
-                                                                "newt"
+                                                field.onChange(site.siteId);
-                                                            ]}
-                                                            onSelectSite={(
-                                                                site
-                                                            ) => {
-                                                                setSelectedSite(
-                                                                    site
-                                                                );
-                                                                field.onChange(
-                                                                    site.siteId
-                                                                );
                                             }}
                                         />
                                     </PopoverContent>
@@ -787,84 +627,79 @@ export function InternalResourceForm({
                         )}
                     />
                 </div>
-                                <div className="min-w-0 col-span-2">
+
-                                    <FormField
+                <HorizontalTabs
-                                        control={form.control}
+                    clientSide
-                                        name="mode"
+                    items={[
-                                        render={({ field }) => {
-                                            const modeOptions: OptionSelectOption<InternalResourceMode>[] =
-                                                [
                         {
-                                                        value: "host",
+                            title: t(
-                                                        label: t(modeHostKey)
+                                "editInternalResourceDialogNetworkSettings"
+                            ),
+                            href: "#"
                         },
                         {
-                                                        value: "cidr",
+                            title: t("editInternalResourceDialogAccessPolicy"),
-                                                        label: t(modeCidrKey)
+                            href: "#"
                         },
-                                                    {
+                        ...(disableEnterpriseFeatures || mode === "cidr"
-                                                        value: "http",
+                            ? []
-                                                        label: t(modeHttpKey)
+                            : [{ title: t("sshAccess"), href: "#" }])
-                                                    }
+                    ]}
-                                                ];
+                >
-                                            return (
+                    <div className="space-y-4 mt-4 p-1">
-                                                <FormItem>
+                        <div>
-                                                    <FormLabel>
+                            <div className="mb-8">
-                                                        {t(modeLabelKey)}
+                                <label className="font-medium block">
-                                                    </FormLabel>
+                                    {t(
-                                                    <OptionSelect<InternalResourceMode>
+                                        "editInternalResourceDialogDestinationLabel"
-                                                        options={modeOptions}
+                                    )}
-                                                        value={field.value}
+                                </label>
-                                                        onChange={
+                                <div className="text-sm text-muted-foreground">
-                                                            field.onChange
+                                    {t(
-                                                        }
+                                        "editInternalResourceDialogDestinationDescription"
-                                                        cols={3}
+                                    )}
-                                                    />
-                                                    <FormMessage />
-                                                </FormItem>
-                                            );
-                                        }}
-                                    />
                                 </div>
                             </div>
                             <div
                                 className={cn(
                                     "grid gap-4 items-start",
-                                    mode === "cidr" && "grid-cols-1",
+                                    mode === "cidr"
-                                    mode === "http" && "grid-cols-3",
+                                        ? "grid-cols-4"
-                                    mode === "host" && "grid-cols-2"
+                                        : "grid-cols-12"
                                 )}
                             >
-                                {mode === "http" && (
+                                <div
-                                    <div className="min-w-0">
+                                    className={
+                                        mode === "cidr"
+                                            ? "col-span-1"
+                                            : "col-span-3"
+                                    }
+                                >
                                     <FormField
                                         control={form.control}
-                                            name="scheme"
+                                        name="mode"
                                         render={({ field }) => (
                                             <FormItem>
                                                 <FormLabel>
-                                                        {t(schemeLabelKey)}
+                                                    {t(modeLabelKey)}
                                                 </FormLabel>
                                                 <Select
                                                     onValueChange={
                                                         field.onChange
                                                     }
-                                                        value={
+                                                    value={field.value}
-                                                            field.value ??
-                                                            "http"
-                                                        }
                                                 >
                                                     <FormControl>
-                                                            <SelectTrigger className="w-full">
+                                                        <SelectTrigger>
                                                             <SelectValue />
                                                         </SelectTrigger>
                                                     </FormControl>
                                                     <SelectContent>
-                                                            <SelectItem value="http">
+                                                        <SelectItem value="host">
-                                                                http
+                                                            {t(modeHostKey)}
                                                         </SelectItem>
-                                                            <SelectItem value="https">
+                                                        <SelectItem value="cidr">
-                                                                https
+                                                            {t(modeCidrKey)}
                                                         </SelectItem>
                                                     </SelectContent>
                                                 </Select>
@@ -873,13 +708,12 @@ export function InternalResourceForm({
                                         )}
                                     />
                                 </div>
-                                )}
                                 <div
-                                    className={cn(
+                                    className={
-                                        mode === "cidr" && "col-span-1",
+                                        mode === "cidr"
-                                        (mode === "http" || mode === "host") &&
+                                            ? "col-span-3"
-                                            "min-w-0"
+                                            : "col-span-5"
-                                    )}
+                                    }
                                 >
                                     <FormField
                                         control={form.control}
@@ -890,18 +724,15 @@ export function InternalResourceForm({
                                                     {t(destinationLabelKey)}
                                                 </FormLabel>
                                                 <FormControl>
-                                                    <Input
+                                                    <Input {...field} />
-                                                        {...field}
-                                                        className="w-full"
-                                                    />
                                                 </FormControl>
                                                 <FormMessage />
                                             </FormItem>
                                         )}
                                     />
                                 </div>
-                                {mode === "host" && (
+                                {mode !== "cidr" && (
-                                    <div className="min-w-0">
+                                    <div className="col-span-4">
                                         <FormField
                                             control={form.control}
                                             name="alias"
@@ -913,7 +744,6 @@ export function InternalResourceForm({
                                                     <FormControl>
                                                         <Input
                                                             {...field}
-                                                            className="w-full"
                                                             value={
                                                                 field.value ??
                                                                 ""
@@ -926,144 +756,9 @@ export function InternalResourceForm({
                                         />
                                     </div>
                                 )}
-                                {mode === "http" && (
-                                    <div className="min-w-0">
-                                        <FormField
-                                            control={form.control}
-                                            name="httpHttpsPort"
-                                            render={({ field }) => (
-                                                <FormItem>
-                                                    <FormLabel>
-                                                        {t(
-                                                            httpHttpsPortLabelKey
-                                                        )}
-                                                    </FormLabel>
-                                                    <FormControl>
-                                                        <Input
-                                                            className="w-full"
-                                                            type="number"
-                                                            min={1}
-                                                            max={65535}
-                                                            value={
-                                                                field.value ??
-                                                                ""
-                                                            }
-                                                            onChange={(e) => {
-                                                                const raw =
-                                                                    e.target
-                                                                        .value;
-                                                                if (
-                                                                    raw === ""
-                                                                ) {
-                                                                    field.onChange(
-                                                                        null
-                                                                    );
-                                                                    return;
-                                                                }
-                                                                const n =
-                                                                    Number(raw);
-                                                                field.onChange(
-                                                                    Number.isFinite(
-                                                                        n
-                                                                    )
-                                                                        ? n
-                                                                        : null
-                                                                );
-                                                            }}
-                                                        />
-                                                    </FormControl>
-                                                    <FormMessage />
-                                                </FormItem>
-                                            )}
-                                        />
-                                    </div>
-                                )}
                             </div>
                         </div>
 
-                        {isHttpMode ? (
-                            <div className="space-y-4">
-                                <div className="my-8">
-                                    <label className="font-medium block">
-                                        {t(httpConfigurationTitleKey)}
-                                    </label>
-                                    <div className="text-sm text-muted-foreground">
-                                        {t(httpConfigurationDescriptionKey)}
-                                    </div>
-                                </div>
-                                <DomainPicker
-                                    key={
-                                        variant === "edit" && siteResourceId
-                                            ? `http-domain-${siteResourceId}`
-                                            : "http-domain-create"
-                                    }
-                                    orgId={orgId}
-                                    cols={2}
-                                    hideFreeDomain
-                                    defaultSubdomain={
-                                        httpConfigSubdomain ?? undefined
-                                    }
-                                    defaultDomainId={
-                                        httpConfigDomainId ?? undefined
-                                    }
-                                    defaultFullDomain={
-                                        httpConfigFullDomain ?? undefined
-                                    }
-                                    onDomainChange={(res) => {
-                                        if (res === null) {
-                                            form.setValue(
-                                                "httpConfigSubdomain",
-                                                null
-                                            );
-                                            form.setValue(
-                                                "httpConfigDomainId",
-                                                null
-                                            );
-                                            form.setValue(
-                                                "httpConfigFullDomain",
-                                                null
-                                            );
-                                            form.setValue("alias", null);
-                                            return;
-                                        }
-                                        form.setValue(
-                                            "httpConfigSubdomain",
-                                            res.subdomain ?? null
-                                        );
-                                        form.setValue(
-                                            "httpConfigDomainId",
-                                            res.domainId
-                                        );
-                                        form.setValue(
-                                            "httpConfigFullDomain",
-                                            res.fullDomain
-                                        );
-                                        form.setValue("alias", res.fullDomain);
-                                    }}
-                                />
-                                <FormField
-                                    control={form.control}
-                                    name="ssl"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormControl>
-                                                <SwitchInput
-                                                    id="internal-resource-ssl"
-                                                    label={t(enableSslLabelKey)}
-                                                    description={t(
-                                                        enableSslDescriptionKey
-                                                    )}
-                                                    checked={!!field.value}
-                                                    onCheckedChange={
-                                                        field.onChange
-                                                    }
-                                                />
-                                            </FormControl>
-                                        </FormItem>
-                                    )}
-                                />
-                            </div>
-                        ) : (
                         <div className="space-y-4">
                             <div className="my-8">
                                 <label className="font-medium block">
@@ -1111,11 +806,7 @@ export function InternalResourceForm({
                                                         value={tcpPortMode}
                                                         onValueChange={(
                                                             v: PortMode
-                                                            ) =>
+                                                        ) => setTcpPortMode(v)}
-                                                                setTcpPortMode(
-                                                                    v
-                                                                )
-                                                            }
                                                     >
                                                         <FormControl>
                                                             <SelectTrigger className="w-[110px]">
@@ -1124,19 +815,13 @@ export function InternalResourceForm({
                                                         </FormControl>
                                                         <SelectContent>
                                                             <SelectItem value="all">
-                                                                    {t(
+                                                                {t("allPorts")}
-                                                                        "allPorts"
-                                                                    )}
                                                             </SelectItem>
                                                             <SelectItem value="blocked">
-                                                                    {t(
+                                                                {t("blocked")}
-                                                                        "blocked"
-                                                                    )}
                                                             </SelectItem>
                                                             <SelectItem value="custom">
-                                                                    {t(
+                                                                {t("custom")}
-                                                                        "custom"
-                                                                    )}
                                                             </SelectItem>
                                                         </SelectContent>
                                                     </Select>
@@ -1148,12 +833,9 @@ export function InternalResourceForm({
                                                                 value={
                                                                     tcpCustomPorts
                                                                 }
-                                                                    onChange={(
+                                                                onChange={(e) =>
-                                                                        e
-                                                                    ) =>
                                                                     setTcpCustomPorts(
-                                                                            e
+                                                                        e.target
-                                                                                .target
                                                                             .value
                                                                     )
                                                                 }
@@ -1217,11 +899,7 @@ export function InternalResourceForm({
                                                         value={udpPortMode}
                                                         onValueChange={(
                                                             v: PortMode
-                                                            ) =>
+                                                        ) => setUdpPortMode(v)}
-                                                                setUdpPortMode(
-                                                                    v
-                                                                )
-                                                            }
                                                     >
                                                         <FormControl>
                                                             <SelectTrigger className="w-[110px]">
@@ -1230,19 +908,13 @@ export function InternalResourceForm({
                                                         </FormControl>
                                                         <SelectContent>
                                                             <SelectItem value="all">
-                                                                    {t(
+                                                                {t("allPorts")}
-                                                                        "allPorts"
-                                                                    )}
                                                             </SelectItem>
                                                             <SelectItem value="blocked">
-                                                                    {t(
+                                                                {t("blocked")}
-                                                                        "blocked"
-                                                                    )}
                                                             </SelectItem>
                                                             <SelectItem value="custom">
-                                                                    {t(
+                                                                {t("custom")}
-                                                                        "custom"
-                                                                    )}
                                                             </SelectItem>
                                                         </SelectContent>
                                                     </Select>
@@ -1254,12 +926,9 @@ export function InternalResourceForm({
                                                                 value={
                                                                     udpCustomPorts
                                                                 }
-                                                                    onChange={(
+                                                                onChange={(e) =>
-                                                                        e
-                                                                    ) =>
                                                                     setUdpCustomPorts(
-                                                                            e
+                                                                        e.target
-                                                                                .target
                                                                             .value
                                                                     )
                                                                 }
@@ -1303,9 +972,7 @@ export function InternalResourceForm({
                                     }
                                 >
                                     <FormLabel className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
-                                            {t(
+                                        {t("editInternalResourceDialogIcmp")}
-                                                "editInternalResourceDialogIcmp"
-                                            )}
                                     </FormLabel>
                                 </div>
                                 <div
@@ -1348,7 +1015,6 @@ export function InternalResourceForm({
                                 </div>
                             </div>
                         </div>
-                        )}
                     </div>
 
                     <div className="space-y-4 mt-4 p-1">
@@ -1547,8 +1213,8 @@ export function InternalResourceForm({
                         )}
                     </div>
 
-                    {/* SSH Access tab (host mode only) */}
+                    {/* SSH Access tab */}
-                    {!disableEnterpriseFeatures && mode === "host" && (
+                    {!disableEnterpriseFeatures && mode !== "cidr" && (
                         <div className="space-y-4 mt-4 p-1">
                             <PaidFeaturesAlert tiers={tierMatrix.sshPam} />
                             <div className="mb-8">

src/components/PendingSitesTable.tsx

@@ -333,7 +333,8 @@ export default function PendingSitesTable({
                         "jupiter",
                         "saturn",
                         "uranus",
-                        "neptune"
+                        "neptune",
+                        "pluto"
                     ].includes(originalRow.exitNodeName.toLowerCase());
 
                 if (isCloudNode) {

src/components/SitesTable.tsx

@@ -342,7 +342,8 @@ export default function SitesTable({
                         "jupiter",
                         "saturn",
                         "uranus",
-                        "neptune"
+                        "neptune",
+                        "pluto"
                     ].includes(originalRow.exitNodeName.toLowerCase());
 
                 if (isCloudNode) {