Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding an additional validation using regex for the URL #3916

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −2
Open

Adding an additional validation using regex for the URL #3916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
143a169
Adding another layer of validation for the URL with regex
andR3Scr1pTx86 Dec 18, 2024
fe4ddf0
updating url validations test suite
andR3Scr1pTx86 Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deno/lib/__tests__/string.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ test("url validations", () => {
expect(() => url.parse("asdf")).toThrow();
expect(() => url.parse("https:/")).toThrow();
expect(() => url.parse("[email protected]")).toThrow();
expect(() => url.parse("https://asdf.com,https://asdf")).toThrow();
});

test("url error overrides", () => {
Expand Down
6 changes: 5 additions & 1 deletion deno/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
// /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
const uuidRegex =
/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i;
const urlRegex = /^([a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*)(:\d+)?(\/[^\s,]*)?$/;
const nanoidRegex = /^[a-z0-9_-]{21}$/i;
const jwtRegex = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/;
const durationRegex =
Expand Down Expand Up @@ -918,7 +919,10 @@ export class ZodString extends ZodType<string, ZodStringDef, string> {
}
} else if (check.kind === "url") {
try {
new URL(input.data);
const parsed = new URL(input.data);
if (!urlRegex.test(parsed.host + parsed.pathname)) {
throw new Error();
}
} catch {
ctx = this._getOrReturnCtx(input, ctx);
addIssueToContext(ctx, {
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/string.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ test("url validations", () => {
expect(() => url.parse("asdf")).toThrow();
expect(() => url.parse("https:/")).toThrow();
expect(() => url.parse("[email protected]")).toThrow();
expect(() => url.parse("https://asdf.com,https://asdf")).toThrow();
});

test("url error overrides", () => {
Expand Down
6 changes: 5 additions & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
// /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
const uuidRegex =
/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i;
const urlRegex = /^([a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*)(:\d+)?(\/[^\s,]*)?$/;
const nanoidRegex = /^[a-z0-9_-]{21}$/i;
const jwtRegex = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$/;
const durationRegex =
Expand Down Expand Up @@ -918,7 +919,10 @@ export class ZodString extends ZodType<string, ZodStringDef, string> {
}
} else if (check.kind === "url") {
try {
new URL(input.data);
const parsed = new URL(input.data);
if (!urlRegex.test(parsed.host + parsed.pathname)) {
throw new Error();
}
} catch {
ctx = this._getOrReturnCtx(input, ctx);
addIssueToContext(ctx, {
Expand Down