awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed TLD requirement from SAN extension dns field

Browse Source
This commit is contained in:
Julius Mieliauskas
2025-07-31 23:51:07 +03:00
parent 2cbd66e804
commit de2c1c5560
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/certificate-authority/certificate-authority-validators.ts
+2 -2
View File
@@ -16,7 +16,7 @@ export const validateAltNameField = z
.refine( .refine(
(name) => { (name) => {
return ( return (
isFQDN(name, { allow_wildcard: true }) || isFQDN(name, { allow_wildcard: true, require_tld: false }) ||
z.string().url().safeParse(name).success || z.string().url().safeParse(name).success ||
z.string().email().safeParse(name).success || z.string().email().safeParse(name).success ||
isValidIp(name) isValidIp(name)
@@ -45,7 +45,7 @@ export const validateAltNamesField = z
// Split and validate each alt name // Split and validate each alt name
return data.split(", ").every((name) => { return data.split(", ").every((name) => {
return ( return (
isFQDN(name, { allow_wildcard: true }) || isFQDN(name, { allow_wildcard: true, require_tld: false }) ||
z.string().url().safeParse(name).success || z.string().url().safeParse(name).success ||
z.string().email().safeParse(name).success || z.string().email().safeParse(name).success ||
isValidIp(name) isValidIp(name)
backend/src/services/certificate-authority/internal/internal-certificate-authority-fns.ts
+8 -8
View File
@@ -160,6 +160,10 @@ export const InternalCertificateAuthorityFns = ({
return { type: "email", value: altName }; return { type: "email", value: altName };
} }
if (isFQDN(altName, { allow_wildcard: true, require_tld: false })) {
return { type: "dns", value: altName };
}
if (z.string().url().safeParse(altName).success) { if (z.string().url().safeParse(altName).success) {
return { type: "url", value: altName }; return { type: "url", value: altName };
} }
@@ -168,10 +172,6 @@ export const InternalCertificateAuthorityFns = ({
return { type: "ip", value: altName }; return { type: "ip", value: altName };
} }
if (isFQDN(altName, { allow_wildcard: true })) {
return { type: "dns", value: altName };
}
throw new BadRequestError({ message: `Invalid SAN entry: ${altName}` }); throw new BadRequestError({ message: `Invalid SAN entry: ${altName}` });
}); });
@@ -434,6 +434,10 @@ export const InternalCertificateAuthorityFns = ({
return { type: "email", value: altName }; return { type: "email", value: altName };
} }
if (isFQDN(altName, { allow_wildcard: true, require_tld: false })) {
return { type: "dns", value: altName };
}
if (z.string().url().safeParse(altName).success) { if (z.string().url().safeParse(altName).success) {
return { type: "url", value: altName }; return { type: "url", value: altName };
} }
@@ -442,10 +446,6 @@ export const InternalCertificateAuthorityFns = ({
return { type: "ip", value: altName }; return { type: "ip", value: altName };
} }
if (isFQDN(altName, { allow_wildcard: true })) {
return { type: "dns", value: altName };
}
throw new BadRequestError({ message: `Invalid SAN entry: ${altName}` }); throw new BadRequestError({ message: `Invalid SAN entry: ${altName}` });
}); });