This commit is contained in:
Owen Schwartz 2024-09-28 23:53:14 -04:00
commit 90c152adf5
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
9 changed files with 145 additions and 488 deletions

View file

@ -43,9 +43,10 @@ export const targets = sqliteTable("targets", {
targetId: integer("targetId").primaryKey({ autoIncrement: true }),
resourceId: text("resourceId").references(() => resources.resourceId, { onDelete: "cascade" }),
ip: text("ip").notNull(),
method: text("method"),
port: integer("port"),
method: text("method").notNull(),
port: integer("port").notNull(),
protocol: text("protocol"),
enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
});
// Exit Nodes table
@ -71,4 +72,4 @@ export type Site = InferSelectModel<typeof sites>;
export type Resource = InferSelectModel<typeof resources>;
export type ExitNode = InferSelectModel<typeof exitNodes>;
export type Route = InferSelectModel<typeof routes>;
export type Target = InferSelectModel<typeof targets>;
export type Target = InferSelectModel<typeof targets>;

View file

@ -1,61 +0,0 @@
CREATE TABLE `exitNodes` (
`exitNodeId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`name` text NOT NULL,
`address` text NOT NULL,
`privateKey` text,
`listenPort` integer
);
--> statement-breakpoint
CREATE TABLE `orgs` (
`orgId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`name` text NOT NULL,
`domain` text NOT NULL
);
--> statement-breakpoint
CREATE TABLE `resources` (
`resourceId` text(2048) PRIMARY KEY NOT NULL,
`siteId` integer,
`name` text NOT NULL,
`subdomain` text,
FOREIGN KEY (`siteId`) REFERENCES `sites`(`siteId`) ON UPDATE no action ON DELETE cascade
);
--> statement-breakpoint
CREATE TABLE `routes` (
`routeId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`exitNodeId` integer,
`subnet` text NOT NULL,
FOREIGN KEY (`exitNodeId`) REFERENCES `exitNodes`(`exitNodeId`) ON UPDATE no action ON DELETE cascade
);
--> statement-breakpoint
CREATE TABLE `sites` (
`siteId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`orgId` integer,
`exitNode` integer,
`name` text NOT NULL,
`subdomain` text,
`pubKey` text,
`subnet` text,
`bytesIn` integer,
`bytesOut` integer,
FOREIGN KEY (`orgId`) REFERENCES `orgs`(`orgId`) ON UPDATE no action ON DELETE cascade,
FOREIGN KEY (`exitNode`) REFERENCES `exitNodes`(`exitNodeId`) ON UPDATE no action ON DELETE set null
);
--> statement-breakpoint
CREATE TABLE `targets` (
`targetId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`resourceId` text,
`ip` text NOT NULL,
`method` text,
`port` integer,
`protocol` text,
FOREIGN KEY (`resourceId`) REFERENCES `resources`(`resourceId`) ON UPDATE no action ON DELETE cascade
);
--> statement-breakpoint
CREATE TABLE `users` (
`userId` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
`orgId` integer,
`name` text NOT NULL,
`email` text NOT NULL,
`groups` text,
FOREIGN KEY (`orgId`) REFERENCES `orgs`(`orgId`) ON UPDATE no action ON DELETE cascade
);

View file

@ -1,408 +0,0 @@
{
"version": "6",
"dialect": "sqlite",
"id": "8f8a2cda-fb58-438b-bc67-e5c34eda0580",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"exitNodes": {
"name": "exitNodes",
"columns": {
"exitNodeId": {
"name": "exitNodeId",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"address": {
"name": "address",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"privateKey": {
"name": "privateKey",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"listenPort": {
"name": "listenPort",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"orgs": {
"name": "orgs",
"columns": {
"orgId": {
"name": "orgId",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"domain": {
"name": "domain",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"resources": {
"name": "resources",
"columns": {
"resourceId": {
"name": "resourceId",
"type": "text(2048)",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"siteId": {
"name": "siteId",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"subdomain": {
"name": "subdomain",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {
"resources_siteId_sites_siteId_fk": {
"name": "resources_siteId_sites_siteId_fk",
"tableFrom": "resources",
"tableTo": "sites",
"columnsFrom": [
"siteId"
],
"columnsTo": [
"siteId"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"routes": {
"name": "routes",
"columns": {
"routeId": {
"name": "routeId",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"exitNodeId": {
"name": "exitNodeId",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"subnet": {
"name": "subnet",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {
"routes_exitNodeId_exitNodes_exitNodeId_fk": {
"name": "routes_exitNodeId_exitNodes_exitNodeId_fk",
"tableFrom": "routes",
"tableTo": "exitNodes",
"columnsFrom": [
"exitNodeId"
],
"columnsTo": [
"exitNodeId"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"sites": {
"name": "sites",
"columns": {
"siteId": {
"name": "siteId",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"orgId": {
"name": "orgId",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"exitNode": {
"name": "exitNode",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"subdomain": {
"name": "subdomain",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"pubKey": {
"name": "pubKey",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"subnet": {
"name": "subnet",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"bytesIn": {
"name": "bytesIn",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"bytesOut": {
"name": "bytesOut",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {
"sites_orgId_orgs_orgId_fk": {
"name": "sites_orgId_orgs_orgId_fk",
"tableFrom": "sites",
"tableTo": "orgs",
"columnsFrom": [
"orgId"
],
"columnsTo": [
"orgId"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"sites_exitNode_exitNodes_exitNodeId_fk": {
"name": "sites_exitNode_exitNodes_exitNodeId_fk",
"tableFrom": "sites",
"tableTo": "exitNodes",
"columnsFrom": [
"exitNode"
],
"columnsTo": [
"exitNodeId"
],
"onDelete": "set null",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"targets": {
"name": "targets",
"columns": {
"targetId": {
"name": "targetId",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"resourceId": {
"name": "resourceId",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"ip": {
"name": "ip",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"method": {
"name": "method",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"port": {
"name": "port",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"protocol": {
"name": "protocol",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {
"targets_resourceId_resources_resourceId_fk": {
"name": "targets_resourceId_resources_resourceId_fk",
"tableFrom": "targets",
"tableTo": "resources",
"columnsFrom": [
"resourceId"
],
"columnsTo": [
"resourceId"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"users": {
"name": "users",
"columns": {
"userId": {
"name": "userId",
"type": "integer",
"primaryKey": true,
"notNull": true,
"autoincrement": true
},
"orgId": {
"name": "orgId",
"type": "integer",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"groups": {
"name": "groups",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {
"users_orgId_orgs_orgId_fk": {
"name": "users_orgId_orgs_orgId_fk",
"tableFrom": "users",
"tableTo": "orgs",
"columnsFrom": [
"orgId"
],
"columnsTo": [
"orgId"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
}
},
"enums": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
},
"internal": {
"indexes": {}
}
}

View file

@ -1,13 +0,0 @@
{
"version": "7",
"dialect": "sqlite",
"entries": [
{
"idx": 0,
"version": "6",
"when": 1727577233301,
"tag": "0000_flimsy_shotgun",
"breakpoints": true
}
]
}

View file

@ -1,6 +1,7 @@
import { Router } from "express";
import badger from "./badger/badger";
import gerbil from "./gerbil/gerbil";
import { traefikConfigProvider } from "@server/traefik-config-provider";
const unauth = Router();
@ -11,4 +12,6 @@ unauth.get("/", (_, res) => {
unauth.use("/badger", badger);
unauth.use("/gerbil", gerbil);
unauth.get("/traefik-config-provider", traefikConfigProvider);
export default unauth;

View file

@ -0,0 +1,52 @@
export type DynamicTraefikConfig = {
http?: Http;
};
export type Http = {
routers?: Routers;
services?: Services;
middlewares?: Middlewares;
};
export type Routers = {
[key: string]: Router;
};
export type Router = {
entryPoints: string[];
middlewares: string[];
service: string;
rule: string;
};
export type Services = {
[key: string]: Service;
};
export type Service = {
loadBalancer: LoadBalancer;
};
export type LoadBalancer = {
servers: Server[];
};
export type Server = {
url: string;
};
export type Middlewares = {
[key: string]: MiddlewarePlugin;
};
export type MiddlewarePlugin = {
plugin: Plugin;
};
export type Plugin = {
[key: string]: MiddlewarePluginConfig;
};
export type MiddlewarePluginConfig = {
[key: string]: any;
};

View file

@ -0,0 +1,80 @@
import { Request, Response } from "express";
import db from "@server/db";
import * as schema from "@server/db/schema";
import { DynamicTraefikConfig } from "./configSchema";
import { and, like, eq } from "drizzle-orm";
import logger from "@server/logger";
export async function traefikConfigProvider(_: Request, res: Response) {
try {
const targets = await getAllTargets();
const traefikConfig = buildTraefikConfig(targets);
logger.debug("Built traefik config");
res.status(200).send(traefikConfig);
} catch (e) {
logger.error(`Failed to build traefik config: ${e}`);
res.status(500).send({ message: "Failed to build traefik config" });
}
}
export function buildTraefikConfig(
targets: schema.Target[],
): DynamicTraefikConfig {
const middlewareName = "gerbil";
if (!targets.length) {
return {};
}
const http: DynamicTraefikConfig["http"] = {
routers: {},
services: {},
// middlewares: {
// [middlewareName]: {
// plugin: {
// [middlewareName]: {
// // These are temporary values
// APIEndpoint:
// "http://host.docker.internal:3001/api/v1/gerbil",
// ValidToken: "abc123",
// },
// },
// },
// },
};
for (const target of targets) {
const routerName = `router-${target.targetId}`;
const serviceName = `service-${target.targetId}`;
http.routers![routerName] = {
entryPoints: [target.method],
middlewares: [],
service: serviceName,
rule: `Host(\`${target.resourceId}\`)`, // assuming resourceId is a valid full hostname
};
http.services![serviceName] = {
loadBalancer: {
servers: [
{ url: `${target.method}://${target.ip}:${target.port}` },
],
},
};
}
return { http } as DynamicTraefikConfig;
}
export async function getAllTargets(): Promise<schema.Target[]> {
const all = await db
.select()
.from(schema.targets)
.where(
and(
eq(schema.targets.enabled, true),
like(schema.targets.resourceId, "%.%"),
),
); // any resourceId with a dot is a valid hostname; otherwise it's a UUID placeholder
return all;
}