averello/jquery-validation-mirror
1
0
Fork 0
mirror of https://github.com/jquery-validation/jquery-validation.git synced 2025-12-14 20:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from GHSA-ffmh-x56j-9rc3

Browse Source 
(cherry picked from commit a3908cc082465000a3afa4bed47418b6e02c14ed)
This commit is contained in:
Kieran
2022-07-01 16:00:37 +01:00
committed by GitHub
parent 3d3c1fb880
commit 5bbd80d27f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/additional/url2.js
View File

@@ -1,4 +1,4 @@
// Same as url, but TLD is optional // Same as url, but TLD is optional
$.validator.addMethod( "url2", function( value, element ) { $.validator.addMethod( "url2", function( value, element ) {
return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.?)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value ); return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?)|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff])|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62}\.)))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value );
}, $.validator.messages.url ); }, $.validator.messages.url );

2
src/core.js
View File

@@ -1416,7 +1416,7 @@ $.extend( $.validator, {
// https://gist.github.com/dperini/729294 // https://gist.github.com/dperini/729294
// see also https://mathiasbynens.be/demo/url-regex // see also https://mathiasbynens.be/demo/url-regex
// modified to allow protocol-relative URLs // modified to allow protocol-relative URLs
return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value ); return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})+(?::(?:[^\]\[?\/<~#`!@$^&*()+=}|:";',>{ ]|%[0-9A-Fa-f]{2})*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value );
}, },
// https://jqueryvalidation.org/date-method/ // https://jqueryvalidation.org/date-method/

4
test/methods.js
View File

@@ -123,9 +123,9 @@ QUnit.test( "url2 (tld optional)", function( assert ) {
assert.ok( method( "http://www.føtex.dk/" ), "Valid url, danish unicode characters" ); assert.ok( method( "http://www.føtex.dk/" ), "Valid url, danish unicode characters" );
assert.ok( method( "http://bösendorfer.de/" ), "Valid url, german unicode characters" ); assert.ok( method( "http://bösendorfer.de/" ), "Valid url, german unicode characters" );
assert.ok( method( "http://142.42.1.1" ), "Valid IP Address" ); assert.ok( method( "http://142.42.1.1" ), "Valid IP Address" );
assert.ok( method( "http://bassistance" ), "Valid URL (optional TLD)" );
assert.ok( method( "http://bassistance." ), "Valid URL (optional TLD)" );
assert.ok( !method( "http://192.168.8." ), "Invalid IP Address" ); assert.ok( !method( "http://192.168.8." ), "Invalid IP Address" );
assert.ok( method( "http://bassistance" ), "Invalid url" );
assert.ok( method( "http://bassistance." ), "Invalid url" );
assert.ok( !method( "http://bassistance,de" ), "Invalid url" ); assert.ok( !method( "http://bassistance,de" ), "Invalid url" );
assert.ok( !method( "http://bassistance;de" ), "Invalid url" ); assert.ok( !method( "http://bassistance;de" ), "Invalid url" );
assert.ok( !method( "http://.bassistancede" ), "Invalid url" ); assert.ok( !method( "http://.bassistancede" ), "Invalid url" );