Issue 2062 - Preserve trailing question mark when converting URL into string

lib/url.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 window.URL = (function()
 {
   let URL = window.URL || window.webkitURL;
-  let URLProperties = ["href", "protocol", "host", "hostname", "port", "pathname", "search"];
+  let URLProperties = ["href", "protocol", "host", "hostname", "pathname", "search"];

[kzar, 2015/03/02 15:04:13]

Do we not need to check the port for a URL anywhere else in the code?

[Sebastian Noack, 2015/03/02 15:10:37]

Not as far as I know. But feel free to double check. ;)

[Sebastian Noack, 2015/03/02 15:18:21]

contentPolicy.js is Firefox-specific code, also it doesn't use the URL class,
but nsURI.

 
   if (!URL || !URLProperties.every(prop => prop in new URL("about:blank")))
   {
     let doc = document.implementation.createHTMLDocument();
 
     let base = doc.createElement("base");
     doc.head.appendChild(base);
 
     let anchor = doc.createElement("a");
     doc.body.appendChild(anchor);
@@ skipping 46 matching lines @@
     let hostname = getDecodedHostname(frame.url);
     if (hostname)
       return hostname;
   }
 
   return "";
 }
 exports.extractHostFromFrame = extractHostFromFrame;
 
 /**
- * Converts a URL object into a string. For HTTP(S) URLs the hash and
- * auth crendetials are stripped, and the hostname gets IDN-decoded.
+ * Converts a URL object into a string. For HTTP(S) URLs
+ * the hostname gets IDN-decoded and the hash is stripped.
  *
  * @param {URL} [url]
  * @return {string}
  */
 function stringifyURL(url)
 {
   let protocol = url.protocol;
-  if (protocol != "http:" && protocol != "https:")
-    return url.href;
+  let href = url.href;
 
-  let host = getDecodedHostname(url);
-  if (url.port)
-    host += ":" + url.port;
-  return protocol + "//" + host + url.pathname + url.search;
+  if (protocol == "http:" || protocol == "https:")
+  {
+    let hostname = url.hostname;
+    if (hostname.indexOf("xn--") != -1)
+      href = href.replace(hostname, punycode.toUnicode(hostname));
+
+    let hash = href.indexOf("#");
+    if (hash != -1)
+      href = href.substr(0, hash);
+  }
+
+  return href;
 }
+
 exports.stringifyURL = stringifyURL;
 
 function isDomain(hostname)
 {
   // No hostname or IPv4 address, also considering hexadecimal octets.
   if (/^((0x[\da-f]+|\d+)(\.|$))*$/i.test(hostname))
     return false;
 
   // IPv6 address. Since there can't be colons in domains, we can
   // just check whether there are any colons to exclude IPv6 addresses.
@@ skipping 36 matching lines @@
 
   if (requestHost == documentHost)
     return false;
 
   if (!isDomain(requestHost) || !isDomain(documentHost))
     return true;
 
   return getBaseDomain(requestHost) != getBaseDomain(documentHost);
 }
 exports.isThirdParty = isThirdParty;