From 8544ecaa114e939fce86a9a1ddd4ee37abfcd2c1 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 23 Nov 2021 13:58:56 -0800 Subject: [PATCH 1/3] Be less restrictive when validating urls Use the same logic as the `UrlAttribute` which only checks the beginning of the string in a case insensitive way. Fixes #11 --- src/index.ts | 46 +++++----------------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/src/index.ts b/src/index.ts index 845a16a..9884a7e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -235,48 +235,12 @@ export class MvcValidationProviders { if (!value) { return true; } + + let lowerCaseValue = value.toLowerCase(); - // (c) Diego Perini, MIT Licensed - // https://gist.github.com/dperini/729294 - - var r = new RegExp( - "^" + - // protocol identifier - "(?:(?:https?|ftp)://)" + - // user:pass authentication - "(?:\\S+(?::\\S*)?@)?" + - "(?:" + - // IP address exclusion - // private & local networks - "(?!(?: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})" + - // IP address dotted notation octets - // excludes loopback network 0.0.0.0 - // excludes reserved space >= 224.0.0.0 - // excludes network & broacast addresses - // (first & last IP address of each class) - "(?:[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]))" + - "|" + - // host name - "(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)" + - // domain name - "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*" + - // TLD identifier - "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" + - // TLD may end with dot - "\\.?" + - ")" + - // port number - "(?::\\d{2,5})?" + - // resource path - "(?:[/?#]\\S*)?" + - "$", "i" - ); - - return r.test(value); + return lowerCaseValue.indexOf('http://') > -1 + || lowerCaseValue.indexOf('https://') > -1 + || lowerCaseValue.indexOf('ftp://') > -1; } /** From f3b40fab502310562619dc8dddc9670027b280e3 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 23 Nov 2021 14:09:05 -0800 Subject: [PATCH 2/3] Add clarifying comment --- src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ts b/src/index.ts index 9884a7e..43f0572 100644 --- a/src/index.ts +++ b/src/index.ts @@ -238,6 +238,7 @@ export class MvcValidationProviders { let lowerCaseValue = value.toLowerCase(); + // Match the logic in `UrlAttribute` return lowerCaseValue.indexOf('http://') > -1 || lowerCaseValue.indexOf('https://') > -1 || lowerCaseValue.indexOf('ftp://') > -1; From e9197fa0f2b880eda5b60be9c1bfade8628700fa Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Tue, 23 Nov 2021 16:37:00 -0800 Subject: [PATCH 3/3] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2850b27..44fe8f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-client-validation", - "version": "0.5.0", + "version": "0.5.1", "description": "Enables ASP.NET MVC client-side validation, without jQuery!", "main": "dist/aspnet-validation.js", "style": "dist/aspnet-validation.css",