mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-16 15:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Complex filter generating config; Resolves #124

Browse source
This commit is contained in:
Owen Schwartz 2025-01-31 15:06:25 -05:00
parent bb5573a8f4
commit a9477d7eb9
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
1 changed files with 51 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

77
server/routers/traefik/getTraefikConfig.ts
View file

@ -118,14 +118,6 @@ export async function traefikConfigProvider(
continue; continue;
} }
if (
targets.filter(
(target: Target) => target.internalPort != null
).length == 0
) {
continue;
}
// add routers and services empty objects if they don't exist // add routers and services empty objects if they don't exist
if (!config_output.http.routers) { if (!config_output.http.routers) {
config_output.http.routers = {}; config_output.http.routers = {};
@ -156,7 +148,8 @@ export async function traefikConfigProvider(
: {}) : {})
}; };
const additionalMiddlewares = config.getRawConfig().traefik.additional_middlewares || []; const additionalMiddlewares =
config.getRawConfig().traefik.additional_middlewares || [];
config_output.http.routers![routerName] = { config_output.http.routers![routerName] = {
entryPoints: [ entryPoints: [
@ -164,7 +157,10 @@ export async function traefikConfigProvider(
? config.getRawConfig().traefik.https_entrypoint ? config.getRawConfig().traefik.https_entrypoint
: config.getRawConfig().traefik.http_entrypoint : config.getRawConfig().traefik.http_entrypoint
], ],
middlewares: [badgerMiddlewareName, ...additionalMiddlewares], middlewares: [
badgerMiddlewareName,
...additionalMiddlewares
],
service: serviceName, service: serviceName,
rule: `Host(\`${fullDomain}\`)`, rule: `Host(\`${fullDomain}\`)`,
...(resource.ssl ? { tls } : {}) ...(resource.ssl ? { tls } : {})
@ -184,9 +180,31 @@ export async function traefikConfigProvider(
config_output.http.services![serviceName] = { config_output.http.services![serviceName] = {
loadBalancer: { loadBalancer: {
servers: targets servers: targets
.filter( .filter((target: Target) => {
(target: Target) => target.internalPort != null 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) => { .map((target: Target) => {
if ( if (
site.type === "local" || site.type === "local" ||
@ -213,14 +231,6 @@ export async function traefikConfigProvider(
continue; continue;
} }
if (
targets.filter(
(target: Target) => target.internalPort != null
).length == 0
) {
continue;
}
if (!config_output[protocol]) { if (!config_output[protocol]) {
config_output[protocol] = { config_output[protocol] = {
routers: {}, routers: {},
@ -237,9 +247,24 @@ export async function traefikConfigProvider(
config_output[protocol].services[serviceName] = { config_output[protocol].services[serviceName] = {
loadBalancer: { loadBalancer: {
servers: targets servers: targets
.filter( .filter((target: Target) => {
(target: Target) => target.internalPort != null 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) => { .map((target: Target) => {
if ( if (
site.type === "local" || site.type === "local" ||
@ -261,9 +286,9 @@ export async function traefikConfigProvider(
} }
return res.status(HttpCode.OK).json(config_output); return res.status(HttpCode.OK).json(config_output);
} catch (e) { } 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({ return res.status(HttpCode.INTERNAL_SERVER_ERROR).json({
error: "Failed to build traefik config" error: "Failed to build Traefik config"
}); });
} }
} }