Merge branch 'dev' into clients-user

2026-01-28 22:00:51 +00:00 · 2025-11-17 11:28:47 -05:00
parent 1261ad3a00 33331fd3c8
commit 97312343e4
251 changed files with 3872 additions and 1666 deletions
--- a/server/lib/ip.ts
+++ b/server/lib/ip.ts
@@ -308,7 +308,7 @@ export function generateRemoteSubnetsStr(allSiteResources: SiteResource[]) {
            if (sr.mode === "cidr") return true;
            if (sr.mode === "host") {
                // check if its a valid IP using zod
-                const ipSchema = z.string().ip();
+                const ipSchema = z.union([z.ipv4(), z.ipv6()]);
                const parseResult = ipSchema.safeParse(sr.destination);
                return parseResult.success;
            }