pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-01 08:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing various things

Browse Source
This commit is contained in:
Owen
2025-10-27 17:52:39 -07:00
parent 15d63ddffa
commit bd5cc790d6
14 changed files with 117 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/private/routers/hybrid.ts
View File

@@ -75,6 +75,7 @@ import { validateResourceSessionToken } from "@server/auth/sessions/resource";
import { checkExitNodeOrg, resolveExitNodes } from "#private/lib/exitNodes";
import { maxmindLookup } from "@server/db/maxmind";
import { verifyResourceAccessToken } from "@server/auth/verifyResourceAccessToken";
import semver from "semver";
// Zod schemas for request validation
const getResourceByDomainParamsSchema = z
@@ -1070,11 +1071,20 @@ hybridRouter.get(
);
}
const rules = await db
let rules = await db
.select()
.from(resourceRules)
.where(eq(resourceRules.resourceId, resourceId));
// backward compatibility: COUNTRY -> GEOIP
if ((remoteExitNode.version && semver.lt(remoteExitNode.version, "1.1.0")) || !remoteExitNode.version) {
for (const rule of rules) {
if (rule.match == "COUNTRY") {
rule.match = "GEOIP";
}
}
}
return response<(typeof resourceRules.$inferSelect)[]>(res, {
data: rules,
success: true,