Make constructor throw on invalid ports.

src/URI.js

@@ -243,7 +243,7 @@
   // allowed hostname characters according to RFC 3986
   // ALPHA DIGIT "-" "." "_" "~" "!" "$" "&" "'" "(" ")" "*" "+" "," ";" "=" %encoded
   // I've never seen a (non-IDN) hostname other than: ALPHA DIGIT . -
-  URI.invalid_hostname_characters = /[^a-zA-Z0-9\.-]/;
+  URI.invalid_hostname_characters = /[^a-zA-Z0-9\.\-:]/;
   // map DOM Elements to their URI attribute
   URI.domAttributes = {
     'a': 'href',
@@ -524,6 +524,8 @@
     // what's left must be the path
     parts.path = string;
 
+    URI.basicValidation(parts);
+
     // and we're done
     return parts;
   };
@@ -575,6 +577,14 @@
       string = '/' + string;
     }
 
+    if (parts.hostname) {
+      URI.ensureValidHostname(parts.hostname);
+    }
+
+    if (parts.port) {
+      URI.ensureValidPort(parts.port);
+    }
+
     return string.substring(pos) || '/';
   };
   URI.parseAuthority = function(string, parts) {
@@ -1024,11 +1034,41 @@
       if (!punycode) {
         throw new TypeError('Hostname "' + v + '" contains characters other than [A-Z0-9.-] and Punycode.js is not available');
       }
-
       if (punycode.toASCII(v).match(URI.invalid_hostname_characters)) {
-        throw new TypeError('Hostname "' + v + '" contains characters other than [A-Z0-9.-]');
+        throw new TypeError('Hostname "' + v + '" contains characters other than [A-Z0-9.:-]');
+      }
+    }
+  };
+
+  URI.ensureValidPort = function(v) {
+    var valid = false;
+
+    if (!v || !v.length) {
+      // no custom port specified
+      valid = true;
+    } else {
+      var port = Number(v);
+
+      // verify type and range
+      if (Number.isInteger(port) && (port > 0) && (port < 65536)
+      ) {
+        valid = true;
       }
     }
+
+    if (!valid) {
+      throw new TypeError('Port "' + v + '" is not a valid port');
+    }
+  };
+
+  URI.basicValidation = function(parts) {
+    var hasProtocol = !!parts.protocol; // not null and not empty an empty string
+    var isHttpOrHttps = hasProtocol && (parts.protocol.indexOf('http') !== -1);
+    var hasHostname = !!parts.hostname; // not null and not an empty string
+
+    if (isHttpOrHttps && !hasHostname) {
+      throw new TypeError('Hostname cannot be empty, if protocol is http(s)');
+    }
   };
 
   // noConflict
@@ -1288,9 +1328,7 @@
           v = v.substring(1);
         }
 
-        if (v.match(/[^0-9]/)) {
-          throw new TypeError('Port "' + v + '" contains characters other than [0-9]');
-        }
+        URI.ensureValidPort(v);
       }
     }
     return _port.call(this, v, build);
@@ -1426,6 +1464,10 @@
         v += '.';
       }
 
+      if (v.indexOf(':') !== -1) {
+        throw new TypeError('Domains cannot contain colons');
+      }
+
       if (v) {
         URI.ensureValidHostname(v);
       }
@@ -1466,6 +1508,10 @@
         throw new TypeError('cannot set domain empty');
       }
 
+      if (v.indexOf(':') !== -1) {
+        throw new TypeError('Domains cannot contain colons');
+      }
+
       URI.ensureValidHostname(v);
 
       if (!this._parts.hostname || this.is('IP')) {

test/test.js

@@ -124,6 +124,26 @@
     ok(u instanceof URI, 'instanceof URI');
     ok(u._parts.hostname !== undefined, 'host undefined');
   });
+  test('function URI(string) with invalid port "port" throws', function () {
+    raises(function () {
+      new URI('http://example.org:port');
+    }, TypeError, "throws TypeError");
+  });
+  test('function URI(string) with invalid port "0" throws', function () {
+    raises(function () {
+      new URI('http://example.org:0');
+    }, TypeError, "throws TypeError");
+  });
+  test('function URI(string) with invalid port "65536" throws', function () {
+    raises(function () {
+      new URI('http://example.org:65536');
+    }, TypeError, "throws TypeError");
+  });
+  test('function URI(string) with protocol and without hostname should throw', function () {
+    raises(function () {
+      new URI('http://');
+    }, TypeError, "throws TypeError");
+  });
   test('new URI(string, string)', function() {
     // see http://dvcs.w3.org/hg/url/raw-file/tip/Overview.html#constructor
     var u = new URI('../foobar.html', 'http://example.org/hello/world.html');
@@ -1338,11 +1358,6 @@
         url: 'file:///C:/skyclan/snipkit',
         base: 'http://example.com/foo/bar',
         result: 'file:///C:/skyclan/snipkit'
-      }, {
-        name: 'absolute passthru - generic empty-hostname - urljoin (#328)',
-        url: 'http:///foo',
-        base: 'http://example.com/foo/bar',
-        result: 'http:///foo'
       }, {
         name: 'file paths - urljoin',
         url: 'anotherFile',