calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-05 17:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Seperate ip and cidr

Browse Source
This commit is contained in:
Owen
2025-02-10 21:06:37 -05:00
parent 5b44ffa2fb
commit 3c99fbb1ef
6 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/app/[orgId]/settings/resources/[resourceId]/rules/page.tsx
View File

@@ -101,7 +101,7 @@ export default function ResourceRules(props: {
resolver: zodResolver(addRuleSchema),
defaultValues: {
action: "ACCEPT",
match: "CIDR",
match: "IP",
value: ""
}
});
@@ -167,6 +167,15 @@ export default function ResourceRules(props: {
setLoading(false);
return;
}
if (data.match === "IP" && !isValidIP(data.value)) {
toast({
variant: "destructive",
title: "Invalid IP",
description: "Please enter a valid IP address"
});
setLoading(false);
return;
}
const newRule: LocalRule = {
...data,
@@ -255,6 +264,15 @@ export default function ResourceRules(props: {
setLoading(false);
return;
}
if (rule.match === "IP" && !isValidIP(rule.value)) {
toast({
variant: "destructive",
title: "Invalid IP",
description: "Please enter a valid IP address"
});
setLoading(false);
return;
}
if (rule.new) {
const res = await api.put(`/resource/${params.resourceId}/rule`, data);
@@ -336,7 +354,7 @@ export default function ResourceRules(props: {
cell: ({ row }) => (
<Select
defaultValue={row.original.match}
onValueChange={(value: "CIDR" | "PATH") =>
onValueChange={(value: "CIDR" | "IP" | "PATH") =>
updateRule(row.original.ruleId, { match: value })
}
>
@@ -344,7 +362,8 @@ export default function ResourceRules(props: {
{row.original.match}
</SelectTrigger>
<SelectContent>
<SelectItem value="CIDR">CIDR</SelectItem>
<SelectItem value="IP">IP</SelectItem>
<SelectItem value="CIDR">IP Range</SelectItem>
<SelectItem value="PATH">PATH</SelectItem>
</SelectContent>
</Select>
@@ -527,8 +546,11 @@ export default function ResourceRules(props: {
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="IP">
IP
</SelectItem>
<SelectItem value="CIDR">
CIDR
IP Range
</SelectItem>
{resource.http && (
<SelectItem value="PATH">
@@ -657,6 +679,21 @@ function isValidCIDR(cidr: string): boolean {
});
}
function isValidIP(ip: string): boolean {
const ipPattern = /^([0-9]{1,3}\.){3}[0-9]{1,3}$/;
if (!ipPattern.test(ip)) {
return false;
}
const octets = ip.split(".");
return octets.every((octet) => {
const num = parseInt(octet, 10);
return num >= 0 && num <= 255;
});
}
function isValidUrlGlobPattern(pattern: string): boolean {
// Remove leading slash if present
pattern = pattern.startsWith("/") ? pattern.slice(1) : pattern;