calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-07-24 06:14:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3462

Browse Source
This commit is contained in:
Owen
2026-07-20 09:04:43 -04:00
parent 2bc6b28978
commit 26713b53f6
2 changed files with 24 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/routers/resource/createResourceRule.ts
+11 -38
View File
@@ -9,16 +9,14 @@ import createHttpError from "http-errors";
import logger from "@server/logger";
import { fromError } from "zod-validation-error";
import {
isValidCIDR,
isValidIP,
isValidUrlGlobPattern
RESOURCE_RULE_MATCH_TYPES,
getResourceRuleValueValidationError
} from "@server/lib/validators";
import { OpenAPITags, registry } from "@server/openApi";
import { isValidRegionId } from "@server/db/regions";
const createResourceRuleSchema = z.strictObject({
action: z.enum(["ACCEPT", "DROP", "PASS"]),
match: z.enum(["CIDR", "IP", "PATH", "COUNTRY", "ASN", "REGION"]),
match: z.enum(RESOURCE_RULE_MATCH_TYPES),
value: z.string().min(1),
priority: z.int(),
enabled: z.boolean().optional()
@@ -151,39 +149,14 @@ export async function createResourceRule(
);
}
if (match === "CIDR") {
if (!isValidCIDR(value)) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
"Invalid CIDR provided"
)
);
}
} else if (match === "IP") {
if (!isValidIP(value)) {
return next(
createHttpError(HttpCode.BAD_REQUEST, "Invalid IP provided")
);
}
} else if (match === "PATH") {
if (!isValidUrlGlobPattern(value)) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
"Invalid URL glob pattern provided"
)
);
}
} else if (match === "REGION") {
if (!isValidRegionId(value)) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
"Invalid region ID provided"
)
);
}
const valueValidationError = getResourceRuleValueValidationError(
match,
value
);
if (valueValidationError) {
return next(
createHttpError(HttpCode.BAD_REQUEST, valueValidationError)
);
}
// Create the new resource rule