Skip to content

Commit

Permalink
Merge pull request #125 from fosrl/dev
Browse files Browse the repository at this point in the history 
Hotfix Various Bugs
  • Loading branch information
@miloschwartz
miloschwartz authored Jan 31, 2025
2 parents 5c507cc + a9477d7 commit 722b877
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 54 deletions.
2 changes: 1 addition & 1 deletion server/auth/passwordSchema.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const passwordSchema = z
.string()
.min(8, { message: "Password must be at least 8 characters long" })
.max(64, { message: "Password must be at most 64 characters long" })
.regex(/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).*$/, {
.regex(/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[,#?!@$%^&*-]).*$/, {
message: `Your password must meet the following conditions:
at least one uppercase English letter,
at least one lowercase English letter,
Expand Down
77 changes: 51 additions & 26 deletions server/routers/traefik/getTraefikConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,6 @@ export async function traefikConfigProvider(
continue;
}

if (
targets.filter(
(target: Target) => target.internalPort != null
).length == 0
) {
continue;
}

// add routers and services empty objects if they don't exist
if (!config_output.http.routers) {
config_output.http.routers = {};
Expand Down Expand Up @@ -156,15 +148,19 @@ export async function traefikConfigProvider(
: {})
};

const additionalMiddlewares = config.getRawConfig().traefik.additional_middlewares || [];
const additionalMiddlewares =
config.getRawConfig().traefik.additional_middlewares || [];

config_output.http.routers![routerName] = {
entryPoints: [
resource.ssl
? config.getRawConfig().traefik.https_entrypoint
: config.getRawConfig().traefik.http_entrypoint
],
middlewares: [badgerMiddlewareName, ...additionalMiddlewares],
middlewares: [
badgerMiddlewareName,
...additionalMiddlewares
],
service: serviceName,
rule: `Host(\`${fullDomain}\`)`,
...(resource.ssl ? { tls } : {})
Expand All @@ -184,9 +180,31 @@ export async function traefikConfigProvider(
config_output.http.services![serviceName] = {
loadBalancer: {
servers: targets
.filter(
(target: Target) => target.internalPort != null
)
.filter((target: Target) => {
if (!target.enabled) {
return false;
}
if (
site.type === "local" ||
site.type === "wireguard"
) {
if (
!target.ip ||
!target.port ||
!target.method
) {
return false;
}
} else if (site.type === "newt") {
if (
!target.internalPort ||
!target.method
) {
return false;
}
}
return true;
})
.map((target: Target) => {
if (
site.type === "local" ||
Expand All @@ -213,14 +231,6 @@ export async function traefikConfigProvider(
continue;
}

if (
targets.filter(
(target: Target) => target.internalPort != null
).length == 0
) {
continue;
}

if (!config_output[protocol]) {
config_output[protocol] = {
routers: {},
Expand All @@ -237,9 +247,24 @@ export async function traefikConfigProvider(
config_output[protocol].services[serviceName] = {
loadBalancer: {
servers: targets
.filter(
(target: Target) => target.internalPort != null
)
.filter((target: Target) => {
if (!target.enabled) {
return false;
}
if (
site.type === "local" ||
site.type === "wireguard"
) {
if (!target.ip || !target.port) {
return false;
}
} else if (site.type === "newt") {
if (!target.internalPort) {
return false;
}
}
return true;
})
.map((target: Target) => {
if (
site.type === "local" ||
Expand All @@ -261,9 +286,9 @@ export async function traefikConfigProvider(
}
return res.status(HttpCode.OK).json(config_output);
} catch (e) {
logger.error(`Failed to build traefik config: ${e}`);
logger.error(`Failed to build Traefik config: ${e}`);
return res.status(HttpCode.INTERNAL_SERVER_ERROR).json({
error: "Failed to build traefik config"
error: "Failed to build Traefik config"
});
}
}
54 changes: 32 additions & 22 deletions server/setup/migrations.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import db, { exists } from "@server/db";
import path from "path";
import semver from "semver";
import { versionMigrations } from "@server/db/schema";
import { desc } from "drizzle-orm";
import { __DIRNAME } from "@server/lib/consts";
import { loadAppVersion } from "@server/lib/loadAppVersion";
import { SqliteError } from "better-sqlite3";
import m1 from "./scripts/1.0.0-beta1";
import m2 from "./scripts/1.0.0-beta2";
import m3 from "./scripts/1.0.0-beta3";
Expand Down Expand Up @@ -53,38 +53,44 @@ export async function runMigrations() {
}

await db
.insert(versionMigrations)
.values({
version: appVersion,
executedAt: Date.now()
})
.execute();
.insert(versionMigrations)
.values({
version: appVersion,
executedAt: Date.now()
})
.execute();
}
} catch (e) {
console.error("Error running migrations:", e);
await new Promise((resolve) => setTimeout(resolve, 1000 * 60 * 60 * 24 * 1));
await new Promise((resolve) =>
setTimeout(resolve, 1000 * 60 * 60 * 24 * 1)
);
}
}

async function executeScripts() {
try {
// Get the last executed version from the database
const lastExecuted = await db
.select()
.from(versionMigrations)
.orderBy(desc(versionMigrations.version))
.limit(1);
const lastExecuted = await db.select().from(versionMigrations);

const startVersion = lastExecuted[0]?.version ?? "0.0.0";
// Filter and sort migrations
const pendingMigrations = lastExecuted
.map((m) => m)
.sort((a, b) => semver.compare(b.version, a.version));
const startVersion = pendingMigrations[0]?.version ?? "0.0.0";
console.log(`Starting migrations from version ${startVersion}`);

// Filter and sort migrations
const pendingMigrations = migrations
.filter((migration) => semver.gt(migration.version, startVersion))
.sort((a, b) => semver.compare(a.version, b.version));
const migrationsToRun = migrations.filter((migration) =>
semver.gt(migration.version, startVersion)
);

console.log(
"Migrations to run:",
migrationsToRun.map((m) => m.version).join(", ")
);

// Run migrations in order
for (const migration of pendingMigrations) {
for (const migration of migrationsToRun) {
console.log(`Running migration ${migration.version}`);

try {
Expand All @@ -102,12 +108,16 @@ async function executeScripts() {
console.log(
`Successfully completed migration ${migration.version}`
);
} catch (error) {
} catch (e) {
if (e instanceof SqliteError && e.code === "SQLITE_CONSTRAINT_UNIQUE") {
console.error("Migration has already run! Skipping...");
continue;
}
console.error(
`Failed to run migration ${migration.version}:`,
error
e
);
throw error; // Re-throw to stop migration process
throw e; // Re-throw to stop migration process
}
}

Expand Down
8 changes: 3 additions & 5 deletions src/app/[orgId]/settings/resources/CreateResourceForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ export default function CreateResourceForm({
}, [open]);

async function onSubmit(data: CreateResourceFormValues) {
console.log(data);

const res = await api
.put<AxiosResponse<Resource>>(
`/org/${orgId}/site/${data.siteId}/resource/`,
Expand Down Expand Up @@ -194,16 +192,16 @@ export default function CreateResourceForm({
setResourceId(id);

if (data.http) {
goToResource();
goToResource(id);
} else {
setShowSnippets(true);
}
}
}

function goToResource() {
function goToResource(id?: number) {
// navigate to the resource page
router.push(`/${orgId}/settings/resources/${resourceId}`);
router.push(`/${orgId}/settings/resources/${id || resourceId}`);
}

return (
Expand Down

0 comments on commit 722b877

Please sign in to comment.