Bug 1942030 - nsStandarURL.setHost("") throws for URLTYPE_STANDARD r=necko-reviewers,kershaw

Differential Revision: https://phabricator.services.mozilla.com/D234487

netwerk/base/nsStandardURL.cpp

@@ -1903,9 +1903,9 @@ nsresult nsStandardURL::SetHost(const nsACString& input) {
     NS_WARNING("cannot set host on no-auth url");
     return NS_ERROR_UNEXPECTED;
   }
-  if (flat.IsEmpty()) {
-    // Setting an empty hostname is not allowed for
-    // URLTYPE_STANDARD and URLTYPE_AUTHORITY.
+
+  if (mURLType == URLTYPE_AUTHORITY && flat.IsEmpty()) {
+    // Setting an empty hostname is not allowed for URLTYPE_AUTHORITY.
     return NS_ERROR_UNEXPECTED;
   }
 
@@ -1946,7 +1946,8 @@ nsresult nsStandardURL::SetHost(const nsACString& input) {
   // NormalizeIDN always copies if the call was successful
   len = hostBuf.Length();
 
-  if (!len) {
+  if (!len && (mURLType == URLTYPE_AUTHORITY || mPort != -1 ||
+               Userpass(true).Length() > 0)) {
     return NS_ERROR_MALFORMED_URI;
   }
 

netwerk/test/unit/test_URIs.js

@@ -1149,5 +1149,16 @@ add_task(async function test_bug1939493() {
   // Clearing the host should fail, as there are still user, port, pass in play.
   Assert.throws(() => {
     uri = uri.mutate().setHost("").finalize();
-  }, /NS_ERROR_UNEXPECTED/);
+  }, /NS_ERROR_MALFORMED_URI/);
+
+  uri = uri
+    .mutate()
+    .setUserPass("")
+    .setUsername("")
+    .setPassword("")
+    .setPort(-1)
+    .setHost("")
+    .finalize();
+
+  Assert.equal(uri.spec, "resource:///components/");
 });

netwerk/test/unit/test_standardurl.js

@@ -1110,13 +1110,33 @@ add_task(async function test_emptyHostWithURLType() {
     "Empty host is not allowed for URLTYPE_AUTHORITY"
   );
 
-  url = makeURL("http://foo.com/bar/", Ci.nsIStandardURL.URLTYPE_STANDARD);
+  url = makeURL("http://user@foo.com/bar/", Ci.nsIStandardURL.URLTYPE_STANDARD);
   Assert.throws(
     () => url.mutate().setHost("").finalize().spec,
-    /NS_ERROR_UNEXPECTED/,
-    "Empty host is not allowed for URLTYPE_STANDARD"
+    /NS_ERROR_MALFORMED_URI/,
+    "Setting an empty host should throw if there is a username present"
   );
 
+  url = makeURL(
+    "http://:password@foo.com/bar/",
+    Ci.nsIStandardURL.URLTYPE_STANDARD
+  );
+  Assert.throws(
+    () => url.mutate().setHost("").finalize().spec,
+    /NS_ERROR_MALFORMED_URI/,
+    "Setting an empty host should throw if there is a password present"
+  );
+
+  url = makeURL("http://foo.com:123/bar/", Ci.nsIStandardURL.URLTYPE_STANDARD);
+  Assert.throws(
+    () => url.mutate().setHost("").finalize().spec,
+    /NS_ERROR_MALFORMED_URI/,
+    "Setting an empty host should throw if there is a port present"
+  );
+
+  url = makeURL("http://foo.com/bar/", Ci.nsIStandardURL.URLTYPE_STANDARD);
+  Assert.equal(url.mutate().setHost("").finalize().spec, "http:///bar/");
+
   url = makeURL("http://foo.com/bar/", Ci.nsIStandardURL.URLTYPE_NO_AUTHORITY);
   equal(
     url.spec,