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

Seperate ip and cidr

Browse source
This commit is contained in:
Owen 2025-02-10 21:06:37 -05:00
parent 5b44ffa2fb
commit 3c99fbb1ef
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
6 changed files with 51 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/db/schema.ts
View file

@ -378,7 +378,7 @@ export const resourceRules = sqliteTable("resourceRules", {
.notNull()
.references(() => resources.resourceId, { onDelete: "cascade" }),
action: text("action").notNull(), // ACCEPT, DROP
match: text("match").notNull(), // CIDR, PATH
match: text("match").notNull(), // CIDR, PATH, IP
value: text("value").notNull()
});

7
server/routers/badger/verifySession.ts
View file

@ -494,6 +494,10 @@ async function checkRules(
rule.match == "CIDR" &&
isIpInCidr(clientIp, rule.value) &&
rule.action === "DROP") ||
(clientIp &&
rule.match == "IP" &&
clientIp == rule.value &&
rule.action === "DROP") ||
(path &&
rule.match == "PATH" &&
urlGlobToRegex(rule.value).test(path) &&
@ -516,6 +520,9 @@ async function checkRules(
(clientIp &&
rule.match == "CIDR" &&
isIpInCidr(clientIp, rule.value)) ||
(clientIp &&
rule.match == "IP" &&
clientIp == rule.value) ||
(path &&
rule.match == "PATH" &&
urlGlobToRegex(rule.value).test(path))

2
server/routers/resource/createResourceRule.ts
View file

@ -12,7 +12,7 @@ import { fromError } from "zod-validation-error";
const createResourceRuleSchema = z
.object({
action: z.enum(["ACCEPT", "DROP"]),
match: z.enum(["CIDR", "PATH"]),
match: z.enum(["CIDR", "IP", "PATH"]),
value: z.string().min(1)
})
.strict();

2
server/routers/resource/updateResourceRule.ts
View file

@ -27,7 +27,7 @@ const updateResourceRuleParamsSchema = z
const updateResourceRuleSchema = z
.object({
action: z.enum(["ACCEPT", "DROP"]).optional(),
match: z.enum(["CIDR", "PATH"]).optional(),
match: z.enum(["CIDR", "IP", "PATH"]).optional(),
value: z.string().min(1).optional()
})
.strict()