Fix #1764, use URIFixup to clean URLs. This cleans only the URL attac…

…hed to the shot itself.

addon/lib/fix-url.js

@@ -0,0 +1,19 @@
+const { Cc, Ci } = require("chrome");
+const newURI = Cc["@mozilla.org/network/io-service;1"]
+  .getService(Ci.nsIIOService)
+  .newURI;
+const uriFixup = Cc["@mozilla.org/docshell/urifixup;1"]
+               .createInstance(Ci.nsIURIFixup);
+
+module.exports = function (url) {
+  let uri = newURI(url, null, null);
+  try {
+    let cleaned = uriFixup.createExposableURI(uri);
+    return cleaned.spec;
+  } catch (e) {
+    e.extra = {originalURL: url};
+    require("./errors").unhandled(e);
+    console.warn("Could not convert URL:", url);
+    return url;
+  }
+};

addon/lib/shooter.js

@@ -23,6 +23,7 @@ const { randomString } = require("./randomstring");
 const { setTimeout, clearTimeout } = require("sdk/timers");
 const shotstore = require("./shotstore");
 const getCookies = require("./get-cookies");
+const fixUrl = require("./fix-url");
 
 let shouldShowTour = false; // eslint-disable-line no-unused-vars
 
@@ -94,7 +95,7 @@ const ShotContext = Class({
     this.annotateForPage = annotateForPage === undefined ? annotateForPage : defaultAnnotateForPage;
     this.id = ++ShotContext._idGen;
     this.tab = tabs.activeTab;
-    this.tabUrl = this.tab.url;
+    this.tabUrl = fixUrl(this.tab.url);
     let deviceIdInfo = getDeviceIdInfo();
     if (! deviceIdInfo) {
       throw new Error("Could not get device authentication information");