mirror of
https://github.com/fosrl/pangolin.git
synced 2025-07-20 18:54:52 +02:00
commit c276d2193da5dbe7af5197bdf7e2bcce6f87b0cf Author: Owen Schwartz <owen@txv.io> Date: Tue Jan 28 22:06:04 2025 -0500 Okay actually now commit 9afdc0aadc3f4fb4e811930bacff70a9e17eab9f Author: Owen Schwartz <owen@txv.io> Date: Tue Jan 28 21:58:44 2025 -0500 Migrations working finally commit a7336b3b2466fe74d650b9c253ecadbe1eff749d Merge: e7c7203fdb1ab4
Author: Owen Schwartz <owen@txv.io> Date: Mon Jan 27 22:19:15 2025 -0500 Merge branch 'dev' into tcp-udp-traffic commit e7c7203330b1b08e570048b10ef314b55068e466 Author: Owen Schwartz <owen@txv.io> Date: Mon Jan 27 22:18:09 2025 -0500 Working on migration commit a4704dfd44b10647257c7c7054c0dae806d315bb Author: Owen Schwartz <owen@txv.io> Date: Mon Jan 27 21:40:52 2025 -0500 Add flag to allow raw resources commit d74f7a57ed11e2a6bf1a7e0c28c29fb07eb573a0 Merge: 6817788 d791b9b Author: Owen Schwartz <owen@txv.io> Date: Mon Jan 27 21:28:50 2025 -0500 Merge branch 'tcp-udp-traffic' of https://github.com/fosrl/pangolin into tcp-udp-traffic commit 68177882781b54ef30b62cca7dee8bbed7c5a2fa Author: Owen Schwartz <owen@txv.io> Date: Mon Jan 27 21:28:32 2025 -0500 Get everything working commit d791b9b47f9f6ca050d6edfd1d674438f8562d99 Author: Milo Schwartz <mschwartz10612@gmail.com> Date: Mon Jan 27 17:46:19 2025 -0500 fix orgId check in verifyAdmin commit 6ac30afd7a449a126190d311bd98d7f1048f73a4 Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 23:19:33 2025 -0500 Trying to figure out traefik... commit 9886b42272882f8bb6baff2efdbe26cee7cac2b6 Merge: 786e67e 85e9129 Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 21:53:32 2025 -0500 Merge branch 'tcp-udp-traffic' of https://github.com/fosrl/pangolin into tcp-udp-traffic commit 786e67eadd6df1ee8df24e77aed20c1f1fc9ca67 Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 21:51:37 2025 -0500 Bug fixing commit 85e9129ae313b2e4a460a8bc53a0af9f9fbbafb2 Author: Milo Schwartz <mschwartz10612@gmail.com> Date: Sun Jan 26 18:35:24 2025 -0500 rethrow errors in migration and remove permanent redirect commit bd82699505fc7510c27f72cd80ea0ce815d8c5ef Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 17:49:12 2025 -0500 Fix merge issue commit 933dbf3a02b1f19fd1f627410b2407fdf05cd9bf Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 17:46:13 2025 -0500 Add sql to update resources and targets commit f19437bad847c8dbf57fddd2c48cd17bab20ddb0 Merge: 58980eb9f1f291
Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 17:19:51 2025 -0500 Merge branch 'dev' into tcp-udp-traffic commit 58980ebb64d1040b4d224c76beb38c2254f3c5d9 Merge: 1de682ad284d36
Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 17:10:09 2025 -0500 Merge branch 'dev' into tcp-udp-traffic commit 1de682a9f6039f40e05c8901c7381a94b0d018ed Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 17:08:29 2025 -0500 Working on migrations commit dc853d2bc02b11997be5c3c7ea789402716fb4c2 Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 16:56:49 2025 -0500 Finish config of resource pages commit 37c681c08d7ab73d2cad41e7ef1dbe3a8852e1f2 Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 16:07:25 2025 -0500 Finish up table commit 461c6650bbea0d7439cc042971ec13fdb52a7431 Author: Owen Schwartz <owen@txv.io> Date: Sun Jan 26 15:54:46 2025 -0500 Working toward having dual resource types commit f0894663627375e16ce6994370cb30b298efc2dc Author: Owen Schwartz <owen@txv.io> Date: Sat Jan 25 22:31:25 2025 -0500 Add qutoes commit edc535b79b94c2e65b290cd90a69fe17d27245e9 Author: Owen Schwartz <owen@txv.io> Date: Sat Jan 25 22:28:45 2025 -0500 Add readTimeout to allow long file uploads commit 194892fa14b505bd7c2b31873dc13d4b8996c0e1 Author: Owen Schwartz <owen@txv.io> Date: Sat Jan 25 20:37:34 2025 -0500 Rework traefik config generation commit ad3f896b5333e4706d610c3198f29dcd67610365 Author: Owen Schwartz <owen@txv.io> Date: Sat Jan 25 13:01:47 2025 -0500 Add proxy port to api commit ca6013b2ffda0924a696ec3141825a54a4e5297d Author: Owen Schwartz <owen@txv.io> Date: Sat Jan 25 12:58:01 2025 -0500 Add migration commit 2258d76cb3a49d3db7f05f76d8b8a9f1c248b5e4 Author: Owen Schwartz <owen@txv.io> Date: Sat Jan 25 12:55:02 2025 -0500 Add new proxy port
235 lines
7.8 KiB
TypeScript
235 lines
7.8 KiB
TypeScript
import db from "@server/db";
|
|
import {
|
|
emailVerificationCodes,
|
|
passwordResetTokens,
|
|
resourceOtp,
|
|
resources,
|
|
resourceWhitelist,
|
|
targets,
|
|
userInvites,
|
|
users
|
|
} from "@server/db/schema";
|
|
import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
|
|
import { eq, sql } from "drizzle-orm";
|
|
import fs from "fs";
|
|
import yaml from "js-yaml";
|
|
import path from "path";
|
|
import { z } from "zod";
|
|
import { fromZodError } from "zod-validation-error";
|
|
|
|
export default async function migration() {
|
|
console.log("Running setup script 1.0.0-beta.9...");
|
|
|
|
try {
|
|
await db.transaction(async (trx) => {
|
|
trx.run(sql`UPDATE ${users} SET email = LOWER(email);`);
|
|
trx.run(
|
|
sql`UPDATE ${emailVerificationCodes} SET email = LOWER(email);`
|
|
);
|
|
trx.run(
|
|
sql`UPDATE ${passwordResetTokens} SET email = LOWER(email);`
|
|
);
|
|
trx.run(sql`UPDATE ${userInvites} SET email = LOWER(email);`);
|
|
trx.run(sql`UPDATE ${resourceWhitelist} SET email = LOWER(email);`);
|
|
trx.run(sql`UPDATE ${resourceOtp} SET email = LOWER(email);`);
|
|
});
|
|
} catch (error) {
|
|
console.log(
|
|
"We were unable to make all emails lower case in the database. You can safely ignore this error."
|
|
);
|
|
console.error(error);
|
|
}
|
|
|
|
try {
|
|
await db.transaction(async (trx) => {
|
|
|
|
const resourcesAll = await trx.select({
|
|
resourceId: resources.resourceId,
|
|
fullDomain: resources.fullDomain,
|
|
subdomain: resources.subdomain
|
|
}).from(resources);
|
|
|
|
trx.run(`DROP INDEX resources_fullDomain_unique;`)
|
|
trx.run(`ALTER TABLE resources
|
|
DROP COLUMN fullDomain;
|
|
`)
|
|
trx.run(`ALTER TABLE resources
|
|
DROP COLUMN subdomain;
|
|
`)
|
|
trx.run(sql`ALTER TABLE resources
|
|
ADD COLUMN fullDomain TEXT;
|
|
`)
|
|
trx.run(sql`ALTER TABLE resources
|
|
ADD COLUMN subdomain TEXT;
|
|
`)
|
|
trx.run(sql`ALTER TABLE resources
|
|
ADD COLUMN http INTEGER DEFAULT true NOT NULL;
|
|
`)
|
|
trx.run(sql`ALTER TABLE resources
|
|
ADD COLUMN protocol TEXT DEFAULT 'tcp' NOT NULL;
|
|
`)
|
|
trx.run(sql`ALTER TABLE resources
|
|
ADD COLUMN proxyPort INTEGER;
|
|
`)
|
|
|
|
// write the new fullDomain and subdomain values back to the database
|
|
for (const resource of resourcesAll) {
|
|
await trx.update(resources).set({
|
|
fullDomain: resource.fullDomain,
|
|
subdomain: resource.subdomain
|
|
}).where(eq(resources.resourceId, resource.resourceId));
|
|
}
|
|
|
|
const targetsAll = await trx.select({
|
|
targetId: targets.targetId,
|
|
method: targets.method
|
|
}).from(targets);
|
|
|
|
trx.run(`ALTER TABLE targets
|
|
DROP COLUMN method;
|
|
`)
|
|
trx.run(`ALTER TABLE targets
|
|
DROP COLUMN protocol;
|
|
`)
|
|
trx.run(sql`ALTER TABLE targets
|
|
ADD COLUMN method TEXT;
|
|
`)
|
|
|
|
// write the new method and protocol values back to the database
|
|
for (const target of targetsAll) {
|
|
await trx.update(targets).set({
|
|
method: target.method
|
|
}).where(eq(targets.targetId, target.targetId));
|
|
}
|
|
|
|
});
|
|
} catch (error) {
|
|
console.log(
|
|
"We were unable to make the changes to the targets and resources tables."
|
|
);
|
|
throw error;
|
|
}
|
|
|
|
try {
|
|
// Determine which config file exists
|
|
const filePaths = [configFilePath1, configFilePath2];
|
|
let filePath = "";
|
|
for (const path of filePaths) {
|
|
if (fs.existsSync(path)) {
|
|
filePath = path;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!filePath) {
|
|
throw new Error(
|
|
`No config file found (expected config.yml or config.yaml).`
|
|
);
|
|
}
|
|
|
|
// Read and parse the YAML file
|
|
let rawConfig: any;
|
|
const fileContents = fs.readFileSync(filePath, "utf8");
|
|
rawConfig = yaml.load(fileContents);
|
|
|
|
rawConfig.server.resource_session_request_param = "p_session_request";
|
|
rawConfig.server.session_cookie_name = "p_session_token"; // rename to prevent conflicts
|
|
delete rawConfig.server.resource_session_cookie_name;
|
|
|
|
// Write the updated YAML back to the file
|
|
const updatedYaml = yaml.dump(rawConfig);
|
|
fs.writeFileSync(filePath, updatedYaml, "utf8");
|
|
} catch (e) {
|
|
console.log(
|
|
`Failed to add resource_session_request_param to config. Please add it manually. https://docs.fossorial.io/Pangolin/Configuration/config`
|
|
);
|
|
throw e;
|
|
}
|
|
|
|
try {
|
|
const traefikPath = path.join(
|
|
APP_PATH,
|
|
"traefik",
|
|
"traefik_config.yml"
|
|
);
|
|
|
|
// Define schema for traefik config validation
|
|
const schema = z.object({
|
|
entryPoints: z
|
|
.object({
|
|
websecure: z
|
|
.object({
|
|
address: z.string(),
|
|
transport: z
|
|
.object({
|
|
respondingTimeouts: z.object({
|
|
readTimeout: z.string()
|
|
})
|
|
})
|
|
.optional()
|
|
})
|
|
.optional()
|
|
})
|
|
.optional(),
|
|
experimental: z.object({
|
|
plugins: z.object({
|
|
badger: z.object({
|
|
moduleName: z.string(),
|
|
version: z.string()
|
|
})
|
|
})
|
|
})
|
|
});
|
|
|
|
const traefikFileContents = fs.readFileSync(traefikPath, "utf8");
|
|
const traefikConfig = yaml.load(traefikFileContents) as any;
|
|
|
|
const parsedConfig = schema.safeParse(traefikConfig);
|
|
|
|
if (!parsedConfig.success) {
|
|
throw new Error(fromZodError(parsedConfig.error).toString());
|
|
}
|
|
|
|
// Ensure websecure entrypoint exists
|
|
if (traefikConfig.entryPoints?.websecure) {
|
|
// Add transport configuration
|
|
traefikConfig.entryPoints.websecure.transport = {
|
|
respondingTimeouts: {
|
|
readTimeout: "30m"
|
|
}
|
|
};
|
|
}
|
|
|
|
traefikConfig.experimental.plugins.badger.version = "v1.0.0-beta.3";
|
|
|
|
const updatedTraefikYaml = yaml.dump(traefikConfig);
|
|
fs.writeFileSync(traefikPath, updatedTraefikYaml, "utf8");
|
|
|
|
console.log(
|
|
"Updated the version of Badger in your Traefik configuration to v1.0.0-beta.3 and added readTimeout to websecure entrypoint in your Traefik configuration.."
|
|
);
|
|
} catch (e) {
|
|
console.log(
|
|
"We were unable to update the version of Badger in your Traefik configuration. Please update it manually to at least v1.0.0-beta.3. https://github.com/fosrl/badger"
|
|
);
|
|
throw e;
|
|
}
|
|
|
|
try {
|
|
await db.transaction(async (trx) => {
|
|
trx.run(
|
|
sql`ALTER TABLE 'resourceSessions' ADD 'isRequestToken' integer;`
|
|
);
|
|
trx.run(
|
|
sql`ALTER TABLE 'resourceSessions' ADD 'userSessionId' text REFERENCES session(id);`
|
|
);
|
|
});
|
|
} catch (e) {
|
|
console.log(
|
|
"We were unable to add columns to the resourceSessions table."
|
|
);
|
|
throw e;
|
|
}
|
|
|
|
console.log("Done.");
|
|
}
|