Fixed a bug with isURL()

If the protocol was missing in a URL string and :// appeared in the
query string then the validator would incorrectly take anything up to
the :// as the protocol and would then fail.

This closes #518

CHANGELOG.md

@@ -1,3 +1,8 @@
+#### HEAD
+
+- Fixed a bug with `isURL()` when protocol was missing and :// appeared in the query
+  ([#518](https://github.com/chriso/validator.js/issues/518))
+
 #### 5.1.0
 
 - Added a `unescape()` HTML function

lib/isURL.js

@@ -49,6 +49,13 @@ function isURL(url, options) {
       port = void 0,
       port_str = void 0,
       split = void 0;
+
+  split = url.split('#');
+  url = split.shift();
+
+  split = url.split('?');
+  url = split.shift();
+
   split = url.split('://');
   if (split.length > 1) {
     protocol = split.shift();
@@ -61,11 +68,6 @@ function isURL(url, options) {
     split[0] = url.substr(2);
   }
   url = split.join('://');
-  split = url.split('#');
-  url = split.shift();
-
-  split = url.split('?');
-  url = split.shift();
 
   split = url.split('/');
   url = split.shift();

src/lib/isURL.js

@@ -24,6 +24,13 @@ export default function isURL(url, options) {
   }
   options = merge(options, default_url_options);
   let protocol, auth, host, hostname, port, port_str, split;
+
+  split = url.split('#');
+  url = split.shift();
+
+  split = url.split('?');
+  url = split.shift();
+
   split = url.split('://');
   if (split.length > 1) {
     protocol = split.shift();
@@ -36,11 +43,6 @@ export default function isURL(url, options) {
     split[0] = url.substr(2);
   }
   url = split.join('://');
-  split = url.split('#');
-  url = split.shift();
-
-  split = url.split('?');
-  url = split.shift();
 
   split = url.split('/');
   url = split.shift();

test/validators.js

@@ -184,6 +184,7 @@ describe('Validators', function () {
         'http://xn--j1aac5a4g.xn--j1amh',
         'http://xn------eddceddeftq7bvv7c4ke4c.xn--p1ai',
         'http://кулік.укр',
+        'test.com?ref=http://test2.com',
       ],
       invalid: [
         'xyz://foobar.com',

validator.js

@@ -317,6 +317,13 @@
             port = void 0,
             port_str = void 0,
             split = void 0;
+
+        split = url.split('#');
+        url = split.shift();
+
+        split = url.split('?');
+        url = split.shift();
+
         split = url.split('://');
         if (split.length > 1) {
           protocol = split.shift();
@@ -329,11 +336,6 @@
           split[0] = url.substr(2);
         }
         url = split.join('://');
-        split = url.split('#');
-        url = split.shift();
-
-        split = url.split('?');
-        url = split.shift();
 
         split = url.split('/');
         url = split.shift();