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

allow any string as target

Browse source
This commit is contained in:
Milo Schwartz 2025-02-14 13:27:34 -05:00
parent 8dd30c88ab
commit 2ff6d1d117
No known key found for this signature in database
3 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

56
server/routers/target/updateTarget.ts
View file

@ -12,33 +12,33 @@ import { addPeer } from "../gerbil/peers";
import { addTargets } from "../newt/targets";
import { pickPort } from "./helpers";
// Regular expressions for validation
const DOMAIN_REGEX =
/^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
const IPV4_REGEX =
/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
const IPV6_REGEX = /^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$/i;
// Schema for domain names and IP addresses
const domainSchema = z
.string()
.min(1, "Domain cannot be empty")
.max(255, "Domain name too long")
.refine(
(value) => {
// Check if it's a valid IP address (v4 or v6)
if (IPV4_REGEX.test(value) || IPV6_REGEX.test(value)) {
return true;
}
// Check if it's a valid domain name
return DOMAIN_REGEX.test(value);
},
{
message: "Invalid domain name or IP address format",
path: ["domain"]
}
);
// // Regular expressions for validation
// const DOMAIN_REGEX =
// /^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
// const IPV4_REGEX =
// /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
// const IPV6_REGEX = /^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$/i;
//
// // Schema for domain names and IP addresses
// const domainSchema = z
// .string()
// .min(1, "Domain cannot be empty")
// .max(255, "Domain name too long")
// .refine(
// (value) => {
// // Check if it's a valid IP address (v4 or v6)
// if (IPV4_REGEX.test(value) || IPV6_REGEX.test(value)) {
// return true;
// }
//
// // Check if it's a valid domain name
// return DOMAIN_REGEX.test(value);
// },
// {
// message: "Invalid domain name or IP address format",
// path: ["domain"]
// }
// );
const updateTargetParamsSchema = z
.object({
@ -48,7 +48,7 @@ const updateTargetParamsSchema = z
const updateTargetBodySchema = z
.object({
ip: domainSchema.optional(),
ip: z.string().min(1).max(255),
method: z.string().min(1).max(10).optional().nullable(),
port: z.number().int().min(1).max(65535).optional(),
enabled: z.boolean().optional()