Allow for double hyphens in isURL, closes #294

validatorjs · Jun 13, 2014 · f860503 · f860503
1 parent 1f4c690
commit f860503
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test/validators.js b/test/validators.js
@@ -81,6 +81,7 @@ describe('Validators', function () {
               , 'http://foobar.com#baz=qux'
               , 'http://www.xn--froschgrn-x9a.net/'
               , 'http://xn--froschgrn-x9a.com/'
+              , 'http://foo--bar.com'
             ]
           , invalid: [
                 'xyz://foobar.com'
@@ -94,11 +95,12 @@ describe('Validators', function () {
               , 'rtmp://foobar.com'
               , 'http://www.xn--.com/'
               , 'http://xn--.com/'
-              , 'http://www.xn--foo--bar.com/'
-              , 'http://xn--foo--bar.com/'
               , 'http://www.foobar.com:0/'
               , 'http://www.foobar.com:70000/'
               , 'http://www.foobar.com:99999/'
+              , 'http://www.-foobar.com/'
+              , 'http://www.foobar-.com/'
+              , 'http://www.foo---bar.com/'
               , ''
               , 'http://foobar.com/' + new Array(2083).join('f')
             ]

diff --git a/validator.js b/validator.js
@@ -153,7 +153,7 @@
             return false;
         }
         options = merge(options, default_url_options);
-        var url = new RegExp('^(?!mailto:)(?:(?:' + options.protocols.join('|') + ')://)' + (options.require_protocol ? '' : '?') + '(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:www.)?xn--)?(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))' + (options.require_tld ? '' : '?') + ')|localhost)(?::(\\d{1,5}))?(?:(?:/|\\?|#)[^\\s]*)?$', 'i');
+        var url = new RegExp('^(?!mailto:)(?:(?:' + options.protocols.join('|') + ')://)' + (options.require_protocol ? '' : '?') + '(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:www.)?)?(?:(?:[a-z\\u00a1-\\uffff0-9]+-?-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))' + (options.require_tld ? '' : '?') + ')|localhost)(?::(\\d{1,5}))?(?:(?:/|\\?|#)[^\\s]*)?$', 'i');
         var match = str.match(url)
           , port = match ? match[1] : 0;
         return !!(match && (!port || (port > 0 && port <= 65535)));