pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-26 23:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Badger & traefik working now?

Browse Source
This commit is contained in:
Owen
2025-08-14 21:48:14 -07:00
parent f9184cf489
commit 825bff5d60
7 changed files with 126 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/routers/badger/verifySession.ts
View File

@@ -140,7 +140,7 @@ export async function verifyResourceSession(
const result = await getResourceByDomain(cleanHost);
if (!result) {
logger.debug("Resource not found", cleanHost);
logger.debug(`Resource not found ${cleanHost}`);
return notAllowed(res);
}
@@ -151,7 +151,7 @@ export async function verifyResourceSession(
const { resource, pincode, password } = resourceData;
if (!resource) {
logger.debug("Resource not found", cleanHost);
logger.debug(`Resource not found ${cleanHost}`);
return notAllowed(res);
}
@@ -191,7 +191,13 @@ export async function verifyResourceSession(
return allowed(res);
}
const redirectUrl = `${config.getRawConfig().app.dashboard_url}/auth/resource/${encodeURIComponent(
let endpoint: string;
if (config.isHybridMode()) {
endpoint = config.getRawConfig().hybrid?.redirect_endpoint || config.getRawConfig().hybrid?.endpoint || "";
} else {
endpoint = config.getRawConfig().app.dashboard_url;
}
const redirectUrl = `${endpoint}/auth/resource/${encodeURIComponent(
resource.resourceId
)}?redirect=${encodeURIComponent(originalRequestURL)}`;

2
server/routers/internal.ts
View File

@@ -87,7 +87,7 @@ badgerRouter.post("/verify-session", badger.verifyResourceSession);
if (config.isHybridMode()) {
badgerRouter.post("/exchange-session", (req, res, next) =>
proxyToRemote(req, res, next, "badger/exchange-session")
proxyToRemote(req, res, next, "hybrid/badger/exchange-session")
);
} else {
badgerRouter.post("/exchange-session", badger.exchangeSession);

2
server/routers/traefik/getTraefikConfig.ts
View File

@@ -51,7 +51,7 @@ export async function traefikConfigProvider(
plugin: {
[badgerMiddlewareName]: {
apiBaseUrl: new URL(
"/api/v0",
"/api/v1",
`http://${
config.getRawConfig().server.internal_hostname
}:${config.getRawConfig().server.internal_port}`