add sqlite migration

server/middlewares/verifyOrgAccess.ts

@@ -5,7 +5,6 @@ import { and, eq } from "drizzle-orm";
 import createHttpError from "http-errors";
 import HttpCode from "@server/types/HttpCode";
 import { checkOrgAccessPolicy } from "#dynamic/lib/checkOrgAccessPolicy";
-import logger from "@server/logger";
 
 export async function verifyOrgAccess(
     req: Request,
@@ -27,8 +26,6 @@ export async function verifyOrgAccess(
         );
     }
 
-    logger.debug(`Verifying access for user ${userId} to organization ${orgId}`);
-
     try {
         if (!req.userOrg) {
             const userOrgRes = await db
@@ -71,9 +68,6 @@ export async function verifyOrgAccess(
         req.userOrgRoleId = req.userOrg.roleId;
         req.userOrgId = orgId;
 
-        logger.debug(
-            `User ${userId} has access to organization ${orgId} with role ${req.userOrg.roleId}`
-        );
         return next();
     } catch (e) {
         return next(

server/setup/migrationsSqlite.ts

@@ -32,6 +32,7 @@ import m27 from "./scriptsSqlite/1.10.2";
 import m28 from "./scriptsSqlite/1.11.0";
 import m29 from "./scriptsSqlite/1.11.1";
 import m30 from "./scriptsSqlite/1.12.0";
+import m31 from "./scriptsSqlite/1.13.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -62,7 +63,8 @@ const migrations = [
     { version: "1.10.2", run: m27 },
     { version: "1.11.0", run: m28 },
     { version: "1.11.1", run: m29 },
-    { version: "1.12.0", run: m30 }
+    { version: "1.12.0", run: m30 },
+    { version: "1.13.0", run: m31 }
     // Add new migrations here as they are created
 ] as const;
 

server/setup/scriptsSqlite/1.13.0.ts

@@ -0,0 +1,360 @@
+import { __DIRNAME, APP_PATH } from "@server/lib/consts";
+import Database from "better-sqlite3";
+import { readFileSync } from "fs";
+import path, { join } from "path";
+
+const version = "1.13.0";
+
+const dev = process.env.ENVIRONMENT !== "prod";
+let file;
+if (!dev) {
+    file = join(__DIRNAME, "names.json");
+} else {
+    file = join("server/db/names.json");
+}
+export const names = JSON.parse(readFileSync(file, "utf-8"));
+
+export function generateName(): string {
+    const name = (
+        names.descriptors[
+            Math.floor(Math.random() * names.descriptors.length)
+        ] +
+        "-" +
+        names.animals[Math.floor(Math.random() * names.animals.length)]
+    )
+        .toLowerCase()
+        .replace(/\s/g, "-");
+
+    // clean out any non-alphanumeric characters except for dashes
+    return name.replace(/[^a-z0-9-]/g, "");
+}
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    const location = path.join(APP_PATH, "db", "db.sqlite");
+    const db = new Database(location);
+
+    try {
+        db.pragma("foreign_keys = OFF");
+
+        db.transaction(() => {
+            db.prepare(
+                `ALTER TABLE 'clientSites' RENAME TO 'clientSitesAssociationsCache';`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'clients' RENAME COLUMN 'id' TO 'clientId';`
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE 'clientSiteResources' (
+            'clientId' integer NOT NULL,
+            'siteResourceId' integer NOT NULL,
+            FOREIGN KEY ('clientId') REFERENCES 'clients'('clientId') ON UPDATE no action ON DELETE cascade,
+            FOREIGN KEY ('siteResourceId') REFERENCES 'siteResources'('siteResourceId') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE 'clientSiteResourcesAssociationsCache' (
+            'clientId' integer NOT NULL,
+            'siteResourceId' integer NOT NULL
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE 'deviceWebAuthCodes' (
+            'codeId' integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+            'code' text NOT NULL,
+            'ip' text,
+            'city' text,
+            'deviceName' text,
+            'applicationName' text NOT NULL,
+            'expiresAt' integer NOT NULL,
+            'createdAt' integer NOT NULL,
+            'verified' integer DEFAULT false NOT NULL,
+            'userId' text,
+            FOREIGN KEY ('userId') REFERENCES 'user'('id') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `CREATE UNIQUE INDEX 'deviceWebAuthCodes_code_unique' ON 'deviceWebAuthCodes' ('code');`
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE 'roleSiteResources' (
+            'roleId' integer NOT NULL,
+            'siteResourceId' integer NOT NULL,
+            FOREIGN KEY ('roleId') REFERENCES 'roles'('roleId') ON UPDATE no action ON DELETE cascade,
+            FOREIGN KEY ('siteResourceId') REFERENCES 'siteResources'('siteResourceId') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE 'userSiteResources' (
+            'userId' text NOT NULL,
+            'siteResourceId' integer NOT NULL,
+            FOREIGN KEY ('userId') REFERENCES 'user'('id') ON UPDATE no action ON DELETE cascade,
+            FOREIGN KEY ('siteResourceId') REFERENCES 'siteResources'('siteResourceId') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE '__new_clientSitesAssociationsCache' (
+            'clientId' integer NOT NULL,
+            'siteId' integer NOT NULL,
+            'isRelayed' integer DEFAULT false NOT NULL,
+            'endpoint' text,
+            'publicKey' text
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `INSERT INTO '__new_clientSitesAssociationsCache'("clientId", "siteId", "isRelayed", "endpoint", "publicKey") SELECT "clientId", "siteId", "isRelayed", "endpoint", NULL FROM 'clientSitesAssociationsCache';`
+            ).run();
+
+            db.prepare(`DROP TABLE 'clientSitesAssociationsCache';`).run();
+
+            db.prepare(
+                `ALTER TABLE '__new_clientSitesAssociationsCache' RENAME TO 'clientSitesAssociationsCache';`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'clients' ADD 'userId' text REFERENCES 'user'('id');`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'clients' ADD COLUMN 'niceId' TEXT NOT NULL DEFAULT 'PLACEHOLDER';`
+            ).run();
+
+            db.prepare(`ALTER TABLE 'clients' ADD 'olmId' text;`).run();
+
+            db.prepare(
+                `
+        CREATE TABLE '__new_siteResources' (
+            'siteResourceId' integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+            'siteId' integer NOT NULL,
+            'orgId' text NOT NULL,
+            'niceId' text NOT NULL,
+            'name' text NOT NULL,
+            'mode' text NOT NULL,
+            'protocol' text,
+            'proxyPort' integer,
+            'destinationPort' integer,
+            'destination' text NOT NULL,
+            'enabled' integer DEFAULT true NOT NULL,
+            'alias' text,
+            'aliasAddress' text,
+            FOREIGN KEY ('siteId') REFERENCES 'sites'('siteId') ON UPDATE no action ON DELETE cascade,
+            FOREIGN KEY ('orgId') REFERENCES 'orgs'('orgId') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `INSERT INTO '__new_siteResources'("siteResourceId", "siteId", "orgId", "niceId", "name", "mode", "protocol", "proxyPort", "destinationPort", "destination", "enabled", "alias", "aliasAddress") SELECT "siteResourceId", "siteId", "orgId", "niceId", "name", 'host', "protocol", "proxyPort", "destinationPort", "destinationIp", "enabled", NULL, NULL FROM 'siteResources';`
+            ).run();
+
+            db.prepare(`DROP TABLE 'siteResources';`).run();
+
+            db.prepare(
+                `ALTER TABLE '__new_siteResources' RENAME TO 'siteResources';`
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE '__new_olms' (
+            'id' text PRIMARY KEY NOT NULL,
+            'secretHash' text NOT NULL,
+            'dateCreated' text NOT NULL,
+            'version' text,
+            'agent' text,
+            'name' text,
+            'clientId' integer,
+            'userId' text,
+            FOREIGN KEY ('clientId') REFERENCES 'clients'('clientId') ON UPDATE no action ON DELETE set null,
+            FOREIGN KEY ('userId') REFERENCES 'user'('id') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `INSERT INTO '__new_olms'("id", "secretHash", "dateCreated", "version", "agent", "name", "clientId", "userId") SELECT "id", "secretHash", "dateCreated", "version", NULL, NULL, "clientId", NULL FROM 'olms';`
+            ).run();
+
+            db.prepare(`DROP TABLE 'olms';`).run();
+
+            db.prepare(`ALTER TABLE '__new_olms' RENAME TO 'olms';`).run();
+
+            db.prepare(
+                `
+        CREATE TABLE '__new_roleClients' (
+            'roleId' integer NOT NULL,
+            'clientId' integer NOT NULL,
+            FOREIGN KEY ('roleId') REFERENCES 'roles'('roleId') ON UPDATE no action ON DELETE cascade,
+            FOREIGN KEY ('clientId') REFERENCES 'clients'('clientId') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `INSERT INTO '__new_roleClients'("roleId", "clientId") SELECT "roleId", "clientId" FROM 'roleClients';`
+            ).run();
+
+            db.prepare(`DROP TABLE 'roleClients';`).run();
+
+            db.prepare(
+                `ALTER TABLE '__new_roleClients' RENAME TO 'roleClients';`
+            ).run();
+
+            db.prepare(
+                `
+        CREATE TABLE '__new_userClients' (
+            'userId' text NOT NULL,
+            'clientId' integer NOT NULL,
+            FOREIGN KEY ('userId') REFERENCES 'user'('id') ON UPDATE no action ON DELETE cascade,
+            FOREIGN KEY ('clientId') REFERENCES 'clients'('clientId') ON UPDATE no action ON DELETE cascade
+        );
+        `
+            ).run();
+
+            db.prepare(
+                `INSERT INTO '__new_userClients'("userId", "clientId") SELECT "userId", "clientId" FROM 'userClients';`
+            ).run();
+
+            db.prepare(`DROP TABLE 'userClients';`).run();
+
+            db.prepare(
+                `ALTER TABLE '__new_userClients' RENAME TO 'userClients';`
+            ).run();
+
+            db.prepare(`ALTER TABLE 'orgs' ADD 'utilitySubnet' text;`).run();
+
+            db.prepare(
+                `ALTER TABLE 'session' ADD 'deviceAuthUsed' integer DEFAULT false NOT NULL;`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'targetHealthCheck' ADD 'hcTlsServerName' text;`
+            ).run();
+
+            db.prepare(
+                `ALTER TABLE 'sites' DROP COLUMN 'remoteSubnets';`
+            ).run();
+
+            // Associate all clients with each site resource
+            const clients = db
+                .prepare(`SELECT clientId FROM 'clients'`)
+                .all() as {
+                clientId: number;
+            }[];
+            const siteResources = db
+                .prepare(`SELECT siteResourceId FROM 'siteResources'`)
+                .all() as {
+                siteResourceId: number;
+            }[];
+
+            const insertClientSiteResource = db.prepare(
+                `INSERT INTO 'clientSiteResources' ('clientId', 'siteResourceId') VALUES (?, ?)`
+            );
+
+            for (const client of clients) {
+                for (const siteResource of siteResources) {
+                    insertClientSiteResource.run(
+                        client.clientId,
+                        siteResource.siteResourceId
+                    );
+                }
+            }
+
+            // Associate existing site resources with their org's admin role
+            const siteResourcesWithOrg = db
+                .prepare(
+                    `SELECT siteResourceId, orgId FROM 'siteResources'`
+                )
+                .all() as {
+                siteResourceId: number;
+                orgId: string;
+            }[];
+
+            const getAdminRole = db.prepare(
+                `SELECT roleId FROM 'roles' WHERE orgId = ? AND isAdmin = 1 LIMIT 1`
+            );
+
+            const checkExistingAssociation = db.prepare(
+                `SELECT 1 FROM 'roleSiteResources' WHERE roleId = ? AND siteResourceId = ? LIMIT 1`
+            );
+
+            const insertRoleSiteResource = db.prepare(
+                `INSERT INTO 'roleSiteResources' ('roleId', 'siteResourceId') VALUES (?, ?)`
+            );
+
+            for (const siteResource of siteResourcesWithOrg) {
+                const adminRole = getAdminRole.get(siteResource.orgId) as
+                    | { roleId: number }
+                    | undefined;
+
+                if (adminRole) {
+                    const existing = checkExistingAssociation.get(
+                        adminRole.roleId,
+                        siteResource.siteResourceId
+                    );
+
+                    if (!existing) {
+                        insertRoleSiteResource.run(
+                            adminRole.roleId,
+                            siteResource.siteResourceId
+                        );
+                    }
+                }
+            }
+
+            // Populate niceId for clients
+            const usedNiceIds: string[] = [];
+
+            for (const clientId of clients) {
+                // Generate a unique name and ensure it's unique
+                let niceId = "";
+                let loops = 0;
+                while (true) {
+                    if (loops > 100) {
+                        throw new Error("Could not generate a unique name");
+                    }
+
+                    niceId = generateName();
+                    if (!usedNiceIds.includes(niceId)) {
+                        usedNiceIds.push(niceId);
+                        break;
+                    }
+                    loops++;
+                }
+                db.prepare(
+                    `UPDATE clients SET niceId = ? WHERE clientId = ?`
+                ).run(niceId, clientId.clientId);
+            }
+        })();
+
+        db.pragma("foreign_keys = ON");
+
+        console.log(`Migrated database`);
+    } catch (e) {
+        console.log("Failed to migrate db:", e);
+        throw e;
+    }
+
+    console.log(`${version} migration complete`);
+}