mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-23 12:15:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add exit node name and fix db import issues

Browse source
This commit is contained in:
miloschwartz 2025-06-15 17:49:27 -04:00
parent d46b9eaf87
commit b39708700d
No known key found for this signature in database
24 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/auth/sessions/olm.ts
View file

@ -2,8 +2,8 @@ import {
encodeHexLowerCase,
} from "@oslojs/encoding";
import { sha256 } from "@oslojs/crypto/sha2";
import { Olm, olms, olmSessions, OlmSession } from "@server/db/schemas";
import db from "@server/db";
import { Olm, olms, olmSessions, OlmSession } from "@server/db";
import { db } from "@server/db";
import { eq } from "drizzle-orm";
export const EXPIRES = 1000 * 60 * 60 * 24 * 30;

2
server/db/pg/migrate.ts
View file

@ -1,5 +1,5 @@
import { migrate } from "drizzle-orm/node-postgres/migrator";
import db from "./driver";
import { db } from "./driver";
import path from "path";
const migrationsFolder = path.join("server/migrations");

2
server/db/sqlite/migrate.ts
View file

@ -1,5 +1,5 @@
import { migrate } from "drizzle-orm/better-sqlite3/migrator";
import db from "./driver";
import { db } from "./driver";
import path from "path";
const migrationsFolder = path.join("server/migrations");

4
server/lib/ip.ts
View file

@ -1,5 +1,5 @@
import db from "@server/db";
import { clients, orgs, sites } from "@server/db/schemas";
import { db } from "@server/db";
import { clients, orgs, sites } from "@server/db";
import { and, eq, isNotNull } from "drizzle-orm";
import config from "@server/lib/config";

1
server/lib/readConfigFile.ts
View file

@ -161,6 +161,7 @@ export const configSchema = z
.default({}),
gerbil: z
.object({
exit_node_name: z.string().optional().default("default"),
start_port: portSchema
.optional()
.default(51820)

2
server/middlewares/verifyClientAccess.ts
View file

@ -1,6 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { db } from "@server/db";
import { userOrgs, clients, roleClients, userClients } from "@server/db/schemas";
import { userOrgs, clients, roleClients, userClients } from "@server/db";
import { and, eq } from "drizzle-orm";
import createHttpError from "http-errors";
import HttpCode from "@server/types/HttpCode";

2
server/routers/client/createClient.ts
View file

@ -12,7 +12,7 @@ import {
exitNodes,
orgs,
sites
} from "@server/db/schemas";
} from "@server/db";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";

2
server/routers/client/deleteClient.ts
View file

@ -1,7 +1,7 @@
import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { db } from "@server/db";
import { clients, clientSites } from "@server/db/schemas";
import { clients, clientSites } from "@server/db";
import { eq } from "drizzle-orm";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";

2
server/routers/client/getClient.ts
View file

@ -1,7 +1,7 @@
import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { db } from "@server/db";
import { clients, clientSites } from "@server/db/schemas";
import { clients, clientSites } from "@server/db";
import { eq, and } from "drizzle-orm";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";

2
server/routers/client/listClients.ts
View file

@ -6,7 +6,7 @@ import {
sites,
userClients,
clientSites
} from "@server/db/schemas";
} from "@server/db";
import logger from "@server/logger";
import HttpCode from "@server/types/HttpCode";
import response from "@server/lib/response";

2
server/routers/client/updateClient.ts
View file

@ -1,7 +1,7 @@
import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { db } from "@server/db";
import { clients, clientSites } from "@server/db/schemas";
import { clients, clientSites } from "@server/db";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";

2
server/routers/gerbil/getAllRelays.ts
View file

@ -1,6 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { clients, exitNodes, newts, olms, Site, sites, clientSites } from "@server/db/schemas";
import { clients, exitNodes, newts, olms, Site, sites, clientSites } from "@server/db";
import { db } from "@server/db";
import { eq } from "drizzle-orm";
import HttpCode from "@server/types/HttpCode";

4
server/routers/gerbil/getConfig.ts
View file

@ -53,7 +53,7 @@ export async function getConfig(
}
// Fetch exit node
let exitNodeQuery = await db
const exitNodeQuery = await db
.select()
.from(exitNodes)
.where(eq(exitNodes.publicKey, publicKey));
@ -77,7 +77,7 @@ export async function getConfig(
address,
listenPort,
reachableAt,
name: `Exit Node ${publicKey.slice(0, 8)}`
name: config.getRawConfig().gerbil.exit_node_name // defaults to "default"
})
.returning()
.execute();

2
server/routers/gerbil/updateHolePunch.ts
View file

@ -1,6 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { clients, newts, olms, Site, sites, clientSites } from "@server/db/schemas";
import { clients, newts, olms, Site, sites, clientSites } from "@server/db";
import { db } from "@server/db";
import { eq } from "drizzle-orm";
import HttpCode from "@server/types/HttpCode";

4
server/routers/newt/handleGetConfigMessage.ts
View file

@ -2,8 +2,8 @@ import { z } from "zod";
import { MessageHandler } from "../ws";
import logger from "@server/logger";
import { fromError } from "zod-validation-error";
import db from "@server/db";
import { clients, clientSites, Newt, sites } from "@server/db/schemas";
import { db } from "@server/db";
import { clients, clientSites, Newt, sites } from "@server/db";
import { eq } from "drizzle-orm";
import { updatePeer } from "../olm/peers";

4
server/routers/newt/handleReceiveBandwidthMessage.ts
View file

@ -1,6 +1,6 @@
import db from "@server/db";
import { db } from "@server/db";
import { MessageHandler } from "../ws";
import { clients, Newt } from "@server/db/schemas";
import { clients, Newt } from "@server/db";
import { eq } from "drizzle-orm";
import logger from "@server/logger";

4
server/routers/newt/peers.ts
View file

@ -1,5 +1,5 @@
import db from "@server/db";
import { newts, sites } from "@server/db/schemas";
import { db } from "@server/db";
import { newts, sites } from "@server/db";
import { eq } from "drizzle-orm";
import { sendToClient } from "../ws";
import logger from "@server/logger";

4
server/routers/olm/createOlm.ts
View file

@ -1,9 +1,9 @@
import { NextFunction, Request, Response } from "express";
import db from "@server/db";
import { db } from "@server/db";
import { hash } from "@node-rs/argon2";
import HttpCode from "@server/types/HttpCode";
import { z } from "zod";
import { newts } from "@server/db/schemas";
import { newts } from "@server/db";
import createHttpError from "http-errors";
import response from "@server/lib/response";
import { SqliteError } from "better-sqlite3";

4
server/routers/olm/getOlmToken.ts
View file

@ -1,6 +1,6 @@
import { generateSessionToken } from "@server/auth/sessions/app";
import db from "@server/db";
import { olms } from "@server/db/schemas";
import { db } from "@server/db";
import { olms } from "@server/db";
import HttpCode from "@server/types/HttpCode";
import response from "@server/lib/response";
import { eq } from "drizzle-orm";

4
server/routers/olm/handleOlmPingMessage.ts
View file

@ -1,6 +1,6 @@
import db from "@server/db";
import { db } from "@server/db";
import { MessageHandler } from "../ws";
import { clients, Olm } from "@server/db/schemas";
import { clients, Olm } from "@server/db";
import { eq, lt, isNull } from "drizzle-orm";
import logger from "@server/logger";

4
server/routers/olm/handleOlmRegisterMessage.ts
View file

@ -1,4 +1,4 @@
import db from "@server/db";
import { db } from "@server/db";
import { MessageHandler } from "../ws";
import {
clients,
@ -7,7 +7,7 @@ import {
Olm,
olms,
sites
} from "@server/db/schemas";
} from "@server/db";
import { eq, inArray } from "drizzle-orm";
import { addPeer, deletePeer } from "../newt/peers";
import logger from "@server/logger";

4
server/routers/olm/handleOlmRelayMessage.ts
View file

@ -1,6 +1,6 @@
import db from "@server/db";
import { db } from "@server/db";
import { MessageHandler } from "../ws";
import { clients, clientSites, Olm } from "@server/db/schemas";
import { clients, clientSites, Olm } from "@server/db";
import { eq } from "drizzle-orm";
import { updatePeer } from "../newt/peers";
import logger from "@server/logger";

4
server/routers/olm/peers.ts
View file

@ -1,5 +1,5 @@
import db from "@server/db";
import { clients, olms, newts, sites } from "@server/db/schemas";
import { db } from "@server/db";
import { clients, olms, newts, sites } from "@server/db";
import { eq } from "drizzle-orm";
import { sendToClient } from "../ws";
import logger from "@server/logger";

8
server/setup/copyInConfig.ts
View file

@ -105,14 +105,14 @@ export async function copyInConfig() {
}
});
// TODO: eventually each exit node could have a different endpoint
const exitNodeName = config.getRawConfig().gerbil.exit_node_name;
await db
.update(exitNodes)
.set({ endpoint })
.where(ne(exitNodes.endpoint, endpoint));
// TODO: eventually each exit node could have a different port
.where(eq(exitNodes.name, exitNodeName));
await db
.update(exitNodes)
.set({ listenPort })
.where(ne(exitNodes.listenPort, listenPort));
.where(eq(exitNodes.name, exitNodeName));
}