improvements: update regex checks

This commit is contained in:
Scott Wilson
2025-04-22 17:57:59 -07:00
parent d61e6752d6
commit 7bd312a287
3 changed files with 5 additions and 1 deletions
@@ -1,3 +1,4 @@
import RE2 from "re2";
import { z } from "zod"; import { z } from "zod";
import { SecretRotations } from "@app/lib/api-docs"; import { SecretRotations } from "@app/lib/api-docs";
@@ -29,6 +30,7 @@ export const PasswordRequirementsSchema = z
}), }),
allowedSymbols: z allowedSymbols: z
.string() .string()
.regex(new RE2("[!@#$%^&*()_+\\-=\\[\\]{};':\"\\\\|,.<>\\/?~]"), "Invalid symbols")
.optional() .optional()
.describe(SecretRotations.PARAMETERS.GENERAL.PASSWORD_REQUIREMENTS.allowedSymbols) .describe(SecretRotations.PARAMETERS.GENERAL.PASSWORD_REQUIREMENTS.allowedSymbols)
}) })
@@ -1,3 +1,4 @@
import RE2 from "re2";
import { z } from "zod"; import { z } from "zod";
import { AppConnections } from "@app/lib/api-docs"; import { AppConnections } from "@app/lib/api-docs";
@@ -16,7 +17,7 @@ export const LdapConnectionSimpleBindCredentialsSchema = z.object({
.string() .string()
.trim() .trim()
.min(1, "URL required") .min(1, "URL required")
.refine((value) => value.startsWith("ldap://") || value.startsWith("ldaps://")) .regex(new RE2(/^ldaps?:\/\//))
.describe(AppConnections.CREDENTIALS.LDAP.url), .describe(AppConnections.CREDENTIALS.LDAP.url),
dn: z.string().trim().min(1, "Distinguished Name (DN) required").describe(AppConnections.CREDENTIALS.LDAP.dn), dn: z.string().trim().min(1, "Distinguished Name (DN) required").describe(AppConnections.CREDENTIALS.LDAP.dn),
password: z.string().trim().min(1, "Password required").describe(AppConnections.CREDENTIALS.LDAP.password), password: z.string().trim().min(1, "Password required").describe(AppConnections.CREDENTIALS.LDAP.password),
@@ -14,6 +14,7 @@ export const PasswordRequirementsSchema = z
}), }),
allowedSymbols: z allowedSymbols: z
.string() .string()
.regex(/[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?~]/, "Invalid symbols")
.optional() .optional()
.transform((value) => value || "-_.~!*") .transform((value) => value || "-_.~!*")
}) })