Backed out 4 changesets (bug 1770727) for causing mochitest failures …

…in test_bug1180105/test_access_control. CLOSED TREE Backed out changeset 6323b526b0ac (bug 1770727) Backed out changeset fc7ea80aa2ff (bug 1770727) Backed out changeset 2a358ba86652 (bug 1770727) Backed out changeset 464d1af6523b (bug 1770727)
dothq · May 24, 2022 · 05e3775 · 05e3775
1 parent c0e20dd
commit 05e3775
Show file tree

Hide file tree

Showing 55 changed files with 174 additions and 132 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -92,6 +92,23 @@ module.exports = {
         browser: false,
       },
     },
+    {
+      files: "*.sjs",
+      rules: {
+        complexity: "warn",
+        "no-empty": "warn",
+        "no-shadow": "warn",
+        "no-redeclare": "warn",
+        "no-fallthrough": "warn",
+        "no-control-regex": "warn",
+        "no-throw-literal": "warn",
+        "no-useless-concat": "warn",
+        "consistent-return": "warn",
+        "mozilla/use-services": "warn",
+        "mozilla/use-includes-instead-of-indexOf": "warn",
+        "mozilla/no-compare-against-boolean-literals": "warn",
+      },
+    },
     {
       files: [
         "*.html",

diff --git a/browser/base/content/test/siteIdentity/test_mcb_redirect.sjs b/browser/base/content/test/siteIdentity/test_mcb_redirect.sjs
@@ -2,20 +2,19 @@ function handleRequest(request, response) {
   var page =
     "<!DOCTYPE html><html><body>bug 418354 and bug 1082837</body></html>";
 
-  let redirect;
   if (request.queryString === "script") {
-    redirect =
+    var redirect =
       "http://example.com/browser/browser/base/content/test/siteIdentity/test_mcb_redirect.js";
     response.setHeader("Cache-Control", "no-cache", false);
   } else if (request.queryString === "image_http") {
-    redirect = "http://example.com/tests/image/test/mochitest/blue.png";
+    var redirect = "http://example.com/tests/image/test/mochitest/blue.png";
     response.setHeader("Cache-Control", "max-age=3600", false);
   } else if (request.queryString === "image_redirect_http_sjs") {
-    redirect =
+    var redirect =
       "http://example.com/browser/browser/base/content/test/siteIdentity/test_mcb_redirect.sjs?image_redirect_https";
     response.setHeader("Cache-Control", "max-age=3600", false);
   } else if (request.queryString === "image_redirect_https") {
-    redirect = "https://example.com/tests/image/test/mochitest/blue.png";
+    var redirect = "https://example.com/tests/image/test/mochitest/blue.png";
     response.setHeader("Cache-Control", "max-age=3600", false);
   }
 

diff --git a/browser/components/translation/test/bing.sjs b/browser/components/translation/test/bing.sjs
@@ -114,7 +114,9 @@ function parseXml(body) {
 }
 
 function getInputStream(path) {
-  let file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  let file = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
   for (let part of path.split("/")) {
     file.append(part);
   }

diff --git a/browser/components/translation/test/yandex.sjs b/browser/components/translation/test/yandex.sjs
@@ -122,7 +122,9 @@ function getRequestBody(req) {
 }
 
 function getInputStream(path) {
-  let file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  let file = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
   for (let part of path.split("/")) {
     file.append(part);
   }

diff --git a/docshell/test/navigation/file_fragment_handling_during_load_frame2.sjs b/docshell/test/navigation/file_fragment_handling_during_load_frame2.sjs
@@ -7,7 +7,6 @@ function handleRequest(request, response) {
   response.setHeader("Cache-Control", "no-cache", false);
   // Wait a bit.
   var s = Date.now();
-  // eslint-disable-next-line no-empty
   while (Date.now() - s < 1000) {}
 
   response.write(`<!DOCTYPE HTML>

diff --git a/dom/base/test/referrer_testserver.sjs b/dom/base/test/referrer_testserver.sjs
@@ -436,7 +436,6 @@ function buildLinkString(
   return `<link ${relString} ${href} ${policy} ${asString} id="test_link" onload='${onChildComplete}' onerror='${onChildComplete}'>`;
 }
 
-// eslint-disable-next-line complexity
 function handleRequest(request, response) {
   var params = new URLSearchParams(request.queryString);
   var action = params.get("ACTION");

diff --git a/dom/manifest/test/file_testserver.sjs b/dom/manifest/test/file_testserver.sjs
@@ -6,7 +6,9 @@ function loadHTMLFromFile(path) {
   // Load the HTML to return in the response from file.
   // Since it's relative to the cwd of the test runner, we start there and
   // append to get to the actual path of the file.
-  const testHTMLFile = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  const testHTMLFile = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
 
   const testHTMLFileStream = Cc[
     "@mozilla.org/network/file-input-stream;1"

diff --git a/dom/media/test/allowed.sjs b/dom/media/test/allowed.sjs
@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key == "") {
+    if (p.indexOf("=") < 0 && key == "") {
       return p;
     }
   }
@@ -31,7 +31,9 @@ var types = {
 function handleRequest(request, response) {
   var resource = parseQuery(request, "");
 
-  var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  var file = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
   var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
     Ci.nsIFileInputStream
   );

diff --git a/dom/media/test/cancellable_request.sjs b/dom/media/test/cancellable_request.sjs
@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key == "") {
+    if (p.indexOf("=") < 0 && key == "") {
       return p;
     }
   }

diff --git a/dom/media/test/contentType.sjs b/dom/media/test/contentType.sjs
@@ -10,7 +10,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key == "") {
+    if (p.indexOf("=") < 0 && key == "") {
       return p;
     }
   }
@@ -22,7 +22,9 @@ function handleRequest(request, response) {
     // Get the filename to send back.
     var filename = parseQuery(request, "file");
 
-    var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+    var file = Cc["@mozilla.org/file/directory_service;1"]
+      .getService(Ci.nsIProperties)
+      .get("CurWorkD", Ci.nsIFile);
     var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
       Ci.nsIFileInputStream
     );
@@ -43,8 +45,8 @@ function handleRequest(request, response) {
     if (request.hasHeader("Range")) {
       var range = request.getHeader("Range");
       var parts = range.replace(/bytes=/, "").split("-");
-      partialstart = parts[0];
-      partialend = parts[1];
+      var partialstart = parts[0];
+      var partialend = parts[1];
       if (!partialend.length) {
         partialend = file.fileSize - 1;
       }
@@ -58,9 +60,9 @@ function handleRequest(request, response) {
     bis.setInputStream(fis);
 
     var sendContentType = parseQuery(request, "nomime");
-    if (!sendContentType) {
+    if (sendContentType == false) {
       var contentType = parseQuery(request, "type");
-      if (!contentType) {
+      if (contentType == false) {
         // This should not happen.
         dump("No type specified without having 'nomime' in parameters.");
         return;

diff --git a/dom/media/test/dash_detect_stream_switch.sjs b/dom/media/test/dash_detect_stream_switch.sjs
@@ -27,7 +27,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") === 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key === "") {
+    if (p.indexOf("=") < 0 && key === "") {
       return p;
     }
   }
@@ -48,29 +48,25 @@ function handleRequest(request, response) {
         range == "bytes=25514-32767") ||
       (name == "dash-webm-video-428x240.webm" && range == "bytes=228-35852")
     ) {
-      throw new Error(
-        "Should not request " + name + " with byte-range " + range
-      );
+      throw "Should not request " + name + " with byte-range " + range;
     } else {
       var rangeSplit = range.split("=");
       if (rangeSplit.length != 2) {
-        throw new Error(
-          "DASH-SJS: ERROR: invalid number of tokens (" +
-            rangeSplit.length +
-            ") delimited by '=' in 'Range' header."
-        );
+        throw "DASH-SJS: ERROR: invalid number of tokens (" +
+          rangeSplit.length +
+          ") delimited by '=' in 'Range' header.";
       }
       var offsets = rangeSplit[1].split("-");
       if (offsets.length != 2) {
-        throw new Error(
-          "DASH-SJS: ERROR: invalid number of tokens (" +
-            offsets.length +
-            ") delimited by '-' in 'Range' header."
-        );
+        throw "DASH-SJS: ERROR: invalid number of tokens (" +
+          offsets.length +
+          ") delimited by '-' in 'Range' header.";
       }
       var startOffset = parseInt(offsets[0]);
       var endOffset = parseInt(offsets[1]);
-      var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+      var file = Cc["@mozilla.org/file/directory_service;1"]
+        .getService(Ci.nsIProperties)
+        .get("CurWorkD", Ci.nsIFile);
       var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
         Ci.nsIFileInputStream
       );
@@ -87,13 +83,11 @@ function handleRequest(request, response) {
       fis.init(file, -1, -1, false);
       // Exception: start offset should be within file bounds.
       if (startOffset > file.fileSize) {
-        throw new Error(
-          "Starting offset [" +
-            startOffset +
-            "] is after end of file [" +
-            file.fileSize +
-            "]."
-        );
+        throw "Starting offset [" +
+          startOffset +
+          "] is after end of file [" +
+          file.fileSize +
+          "].";
       }
       // End offset may be too large in the MPD. Real world HTTP servers just
       // return what data they can; do the same here - reduce the end offset.

diff --git a/dom/media/test/dynamic_resource.sjs b/dom/media/test/dynamic_resource.sjs
@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key == "") {
+    if (p.indexOf("=") < 0 && key == "") {
       return p;
     }
   }
@@ -25,7 +25,9 @@ function handleRequest(request, response) {
   var resource = getState(key) == "2" ? resource2 : resource1;
   setState(key, "2");
 
-  var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  var file = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
   var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
     Ci.nsIFileInputStream
   );

diff --git a/dom/media/test/midflight-redirect.sjs b/dom/media/test/midflight-redirect.sjs
@@ -7,7 +7,6 @@ function parseQuery(query, key) {
       return p.substring(key.length + 1);
     }
   }
-  return false;
 }
 
 // Return the first few bytes in a short byte range response. When Firefox
@@ -20,7 +19,9 @@ function handleRequest(request, response) {
   var redirected = parseQuery(query, "redirected") || false;
   var useCors = parseQuery(query, "cors") || false;
 
-  var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  var file = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
   var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
     Ci.nsIFileInputStream
   );

diff --git a/dom/media/test/redirect.sjs b/dom/media/test/redirect.sjs
@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key == "") {
+    if (p.indexOf("=") < 0 && key == "") {
       return p;
     }
   }

diff --git a/dom/media/test/referer.sjs b/dom/media/test/referer.sjs
@@ -8,7 +8,7 @@ function parseQuery(request, key) {
     if (p.indexOf(key + "=") == 0) {
       return p.substring(key.length + 1);
     }
-    if (!p.includes("=") && key == "") {
+    if (p.indexOf("=") < 0 && key == "") {
       return p;
     }
   }
@@ -24,7 +24,9 @@ function handleRequest(request, response) {
   ) {
     var name = parseQuery(request, "name");
     var type = parseQuery(request, "type");
-    var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+    var file = Cc["@mozilla.org/file/directory_service;1"]
+      .getService(Ci.nsIProperties)
+      .get("CurWorkD", Ci.nsIFile);
     var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
       Ci.nsIFileInputStream
     );

diff --git a/dom/media/test/seekLies.sjs b/dom/media/test/seekLies.sjs
@@ -1,5 +1,7 @@
 function handleRequest(request, response) {
-  var file = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  var file = Cc["@mozilla.org/file/directory_service;1"]
+    .getService(Ci.nsIProperties)
+    .get("CurWorkD", Ci.nsIFile);
   var fis = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
     Ci.nsIFileInputStream
   );

diff --git a/dom/security/test/cors/file_CrossSiteXHR_server.sjs b/dom/security/test/cors/file_CrossSiteXHR_server.sjs
@@ -7,7 +7,6 @@ const BinaryInputStream = CC(
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
 
-// eslint-disable-next-line complexity
 function handleRequest(request, response) {
   var query = {};
   request.queryString.split("&").forEach(function(val) {

diff --git a/dom/security/test/https-first/file_upgrade_insecure_server.sjs b/dom/security/test/https-first/file_upgrade_insecure_server.sjs
@@ -55,7 +55,7 @@ function handleRequest(request, response) {
   }
 
   // just in case error handling for unexpected queries
-  if (!expectedQueries.includes(queryString)) {
+  if (expectedQueries.indexOf(queryString) == -1) {
     response.write("unexpected-response");
     return;
   }

diff --git a/dom/security/test/https-only/file_upgrade_insecure_server.sjs b/dom/security/test/https-only/file_upgrade_insecure_server.sjs
@@ -54,7 +54,7 @@ function handleRequest(request, response) {
   }
 
   // just in case error handling for unexpected queries
-  if (!expectedQueries.includes(queryString)) {
+  if (expectedQueries.indexOf(queryString) == -1) {
     response.write("unexpected-response");
     return;
   }