andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-12 15:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improve Traefik middleware configuration handling and validation

Browse Source
This commit is contained in:
Mauricio Siu
2025-10-05 12:04:21 -06:00
parent 1804a7c301
commit fc3fceb858
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/traefik/middleware.ts
+27 -7
View File
@@ -76,7 +76,7 @@ export const loadMiddlewares = <T>() => {
throw new Error(`File not found: ${configPath}`); throw new Error(`File not found: ${configPath}`);
} }
const yamlStr = readFileSync(configPath, "utf8"); const yamlStr = readFileSync(configPath, "utf8");
const config = (parse(yamlStr) ?? {}) as T; const config = parse(yamlStr) as T;
return config; return config;
}; };
@@ -94,7 +94,7 @@ export const loadRemoteMiddlewares = async (serverId: string) => {
console.error(`Error: ${stderr}`); console.error(`Error: ${stderr}`);
throw new Error(`File not found: ${configPath}`); throw new Error(`File not found: ${configPath}`);
} }
const config = (parse(stdout) ?? {}) as FileConfig; const config = parse(stdout) as FileConfig;
return config; return config;
} catch (_) { } catch (_) {
throw new Error(`File not found: ${configPath}`); throw new Error(`File not found: ${configPath}`);
@@ -139,17 +139,19 @@ export const createPathMiddlewares = async (
} }
} }
if (!config.http) { if (!config) {
config = { http: { middlewares: {} } };
} else if (!config.http) {
config.http = { middlewares: {} }; config.http = { middlewares: {} };
} }
if (!config.http.middlewares) { if (!config.http?.middlewares) {
config.http.middlewares = {}; config.http!.middlewares = {};
} }
// Add internal path prefix middleware // Add internal path prefix middleware
if (internalPath && internalPath !== "/" && internalPath !== path) { if (internalPath && internalPath !== "/" && internalPath !== path) {
const middlewareName = `addprefix-${appName}-${uniqueConfigKey}`; const middlewareName = `addprefix-${appName}-${uniqueConfigKey}`;
config.http.middlewares[middlewareName] = { config.http!.middlewares[middlewareName] = {
addPrefix: { addPrefix: {
prefix: internalPath, prefix: internalPath,
}, },
@@ -159,7 +161,7 @@ export const createPathMiddlewares = async (
// Strip external path middleware if needed // Strip external path middleware if needed
if (stripPath && path && path !== "/") { if (stripPath && path && path !== "/") {
const middlewareName = `stripprefix-${appName}-${uniqueConfigKey}`; const middlewareName = `stripprefix-${appName}-${uniqueConfigKey}`;
config.http.middlewares[middlewareName] = { config.http!.middlewares[middlewareName] = {
stripPrefix: { stripPrefix: {
prefixes: [path], prefixes: [path],
}, },
@@ -203,6 +205,24 @@ export const removePathMiddlewares = async (
delete config.http.middlewares[stripPrefixMiddleware]; delete config.http.middlewares[stripPrefixMiddleware];
} }
if (config?.http?.middlewares) {
// traefik will fail to start if the file contains middlewares entry but no middlewares are defined
const hasNoMiddlewares = Object.keys(config.http.middlewares).length === 0;
if (hasNoMiddlewares) {
// if there aren't any middlewares, remove the whole section
delete config.http.middlewares;
}
}
// // If http section is empty, remove it completely
if (config?.http && Object.keys(config?.http).length === 0) {
delete config.http;
}
if (config && Object.keys(config || {}).length === 0) {
config = {};
}
if (app.serverId) { if (app.serverId) {
await writeTraefikConfigRemote(config, "middlewares", app.serverId); await writeTraefikConfigRemote(config, "middlewares", app.serverId);
} else { } else {