Bug 1858148 - Remove Cu.importGlobalProperties from sjs files as it is no longer needed. r=mossop,webdriver-reviewers,necko-reviewers,search-reviewers,devtools-reviewers,anti-tracking-reviewers,sessionstore-reviewers,pbz,dao,daleharvey,valentin

Differential Revision: https://phabricator.services.mozilla.com/D190759
This commit is contained in:
Mark Banner 2023-11-04 09:29:27 +00:00
parent 71f79e3173
commit a033642737
72 changed files with 4 additions and 100 deletions

View File

@ -11,7 +11,6 @@
* ?p=http%3A%2F%2Fexample.org%2Fbrowser%2Fbrowser%2Fbase%2Fcontent%2Ftest%2Fgeneral%2Frefresh_meta.sjs&d=200
*/
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let page = query.get("p");

View File

@ -4,7 +4,6 @@
* Arguments: ?scheme=http://&policy=origin&rel=noreferrer
*/
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let scheme = query.get("scheme");

View File

@ -4,7 +4,6 @@
* Arguments: ?scheme=http://&policy=origin&rel=noreferrer
*/
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let scheme = query.get("scheme");

View File

@ -3,8 +3,6 @@ const HTTPS_ORIGIN = "https://example.com";
const URI_PATH =
"/browser/browser/components/contextualidentity/test/browser/saveLink.sjs";
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(aRequest, aResponse) {
var params = new URLSearchParams(aRequest.queryString);

View File

@ -8,8 +8,6 @@ const VIDEO_PATH = `${URI_PATH}file_thirdPartyChild.video.ogv`;
const IMAGE_PATH = `${URI_PATH}file_favicon.png`;
const FRAME_PATH = `${SECOND_ORIGIN}${URI_PATH}file_saveAs.sjs?image=1`;
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(aRequest, aResponse) {
var params = new URLSearchParams(aRequest.queryString);
aResponse.setStatusLine(aRequest.httpVersion, 200);

View File

@ -56,7 +56,6 @@ const WORKER = `
`;
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
if (query.get("crossOriginIsolated") === "true") {

View File

@ -1,7 +1,5 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const HTML_DATA = `
<!DOCTYPE HTML>
<html>

View File

@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
Cu.importGlobalProperties(["TextEncoder"]);
let gTimer;
function handleRequest(req, resp) {

View File

@ -1,5 +1,4 @@
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let { NetUtil } = ChromeUtils.importESModule(
"resource://gre/modules/NetUtil.sys.mjs"
);

View File

@ -3,8 +3,6 @@
"use strict";
Cu.importGlobalProperties(["TextEncoder"]);
function gzipCompressString(string, obs) {
const scs = Cc["@mozilla.org/streamConverters;1"].getService(
Ci.nsIStreamConverterService

View File

@ -4,7 +4,6 @@ function handleRequest(request, response) {
response.setHeader("Content-Type", "html", false);
// Check the params and set the cross-origin-opener policy headers if needed
Cu.importGlobalProperties(["URLSearchParams"]);
const query = new URLSearchParams(request.queryString);
if (query.get("crossOriginIsolated") === "true") {
response.setHeader("Cross-Origin-Opener-Policy", "same-origin", false);

View File

@ -4,7 +4,6 @@
"use strict";
async function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
const query = new URLSearchParams(request.queryString);
const requestUserAgent = request.getHeader("user-agent");

View File

@ -1,7 +1,5 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
const params = new URLSearchParams(request.queryString);

View File

@ -4,7 +4,6 @@ function handleRequest(request, response) {
response.setHeader("Content-Type", "html", false);
// Check the params and set the cross-origin-opener policy headers if needed
Cu.importGlobalProperties(["URLSearchParams"]);
const query = new URLSearchParams(request.queryString);
if (query.get("crossOriginIsolated") === "true") {
response.setHeader("Cross-Origin-Opener-Policy", "same-origin", false);

View File

@ -3,8 +3,6 @@
"use strict";
Cu.importGlobalProperties(["TextEncoder"]);
// Simple server which can handle several response types and states.
// Trimmed down from devtools/client/netmonitor/test/sjs_content-type-test-server.sjs
// Additional features can be ported if needed.

View File

@ -33,7 +33,6 @@ function now() {
async function handleRequest(request, response) {
log("Get query parameters");
Cu.importGlobalProperties(["URLSearchParams"]);
let params = new URLSearchParams(request.queryString);
let start = now();

View File

@ -1,5 +1,3 @@
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
if (request.queryString == "reset") {
setState("index", "0");

View File

@ -1,5 +1,3 @@
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
response.write(
`<!DOCTYPE html>

View File

@ -1,7 +1,5 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
async function handleRequest(request, response) {
if (request.method !== "POST") {
throw new Error("Expected a post request");

View File

@ -8,8 +8,6 @@ const BinaryInputStream = Components.Constructor(
"setInputStream"
);
Cu.importGlobalProperties(["URLSearchParams"]);
function readStream(inputStream) {
let available = 0;
let result = [];

View File

@ -1,6 +1,6 @@
// Test server for bug 1268962
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const HTTPStatus = new Map([
[100, "Continue"],
[101, "Switching Protocol"],

View File

@ -36,7 +36,6 @@ function createContent(refresh) {
}
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let action = query.get("action");

View File

@ -5,7 +5,6 @@
* bug 1174913, bug 1175736, bug 1184781
*/
Cu.importGlobalProperties(["URLSearchParams"]);
const SJS = "referrer_testserver.sjs?";
const SJS_PATH = "/tests/dom/base/test/";
const BASE_ORIGIN = "example.com";

View File

@ -2,8 +2,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
let params = new URLSearchParams(request.queryString);
let test = params.get("set_test");

View File

@ -2,7 +2,6 @@
let { NetUtil } = ChromeUtils.importESModule(
"resource://gre/modules/NetUtil.sys.mjs"
);
Cu.importGlobalProperties(["URLSearchParams"]);
function loadHTMLFromFile(path) {
// Load the HTML to return in the response from file.

View File

@ -20,7 +20,7 @@
*/
//global handleRequest
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const HTTPStatus = new Map([
[100, "Continue"],
[101, "Switching Protocol"],

View File

@ -5,8 +5,6 @@ const BinaryInputStream = CC(
"setInputStream"
);
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(aRequest, aResponse) {
var params = new URLSearchParams(aRequest.queryString);

View File

@ -2,7 +2,6 @@
// https://bugzilla.mozilla.org/show_bug.cgi?id=1263286
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const PRE_BASE = `
<!DOCTYPE HTML>

View File

@ -2,7 +2,6 @@
// https://bugzilla.mozilla.org/show_bug.cgi?id=1073952
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const SCRIPT = `
<script>

View File

@ -2,7 +2,6 @@
// https://bugzilla.mozilla.org/show_bug.cgi?id=1529068
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const TEST_NAVIGATION_HEAD = `
<!DOCTYPE HTML>

View File

@ -26,7 +26,6 @@ function handleRequest(request, response) {
response.setHeader("Cache-Control", "no-cache", false);
response.setHeader("Content-Type", "text/html", false);
Cu.importGlobalProperties(["URLSearchParams"]);
const query = new URLSearchParams(request.queryString);
if (query.get("csp")) {

View File

@ -4,7 +4,6 @@
*/
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let scheme = query.get("scheme");

View File

@ -3,7 +3,6 @@
const { NetUtil } = ChromeUtils.importESModule(
"resource://gre/modules/NetUtil.sys.mjs"
);
Cu.importGlobalProperties(["URLSearchParams"]);
function loadHTMLFromFile(path) {
// Load the HTML to return in the response from file.

View File

@ -2,7 +2,6 @@
// https://bugzilla.mozilla.org/show_bug.cgi?id=1271173
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const TEST_NAVIGATIONAL_UPGRADE = `
<!DOCTYPE html>

View File

@ -1,5 +1,3 @@
Cu.importGlobalProperties(["URLSearchParams"]);
const SJS = "http://mochi.test:8888/tests/dom/security/test/csp/worker.sjs";
function createFetchWorker(url) {

View File

@ -2,7 +2,6 @@
// Bug 1288361 - Block scripts with wrong MIME type
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const WORKER = `
onmessage = function(event) {

View File

@ -30,7 +30,6 @@ function getSniffableContent(type) {
}
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
// avoid confusing cache behaviors (XXXX no sure what this means?)

View File

@ -1,5 +1,4 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
const SCRIPT = "var foo = 24;";
const CSS = "body { background-color: green; }";

View File

@ -37,7 +37,7 @@ function readQuery(testCase) {
function handleRequest(request, response) {
response.setHeader("Cache-Control", "no-cache", false);
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
// Downgrade to test http/https -> HTTP referrer policy
if (query.has("sendMe2") && request.scheme === "https") {

View File

@ -7,7 +7,6 @@ function handleRequest(request, response) {
// Eg, http://localhost:8888/authenticate.sjs?user=foo&realm=bar
// The extra ? allows the user/pass/realm checks to succeed if the name is
// at the beginning of the query string.
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let expected_user = query.get("user");

View File

@ -1,5 +1,3 @@
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
let params = new URLSearchParams(request.queryString);
let referrerPolicyHeader = params.get("header") || "";

View File

@ -5,7 +5,6 @@
* bug 1174913, bug 1175736, bug 1184781
*/
Cu.importGlobalProperties(["URLSearchParams"]);
const SJS = "referrer_testserver.sjs?";
const SJS_PATH = "/tests/dom/security/test/referrer-policy/";
const BASE_ORIGIN = "example.com";

View File

@ -115,7 +115,6 @@ function handleStreamRequest(request, response) {
intervalId = setInterval(tick, TICK_INTERVAL);
}
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
dump(
"server-stream-download.js: processing request for " +

View File

@ -80,7 +80,6 @@ function handleCountRequest(request, response) {
response.write(JSON.stringify({ count }));
}
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
dump(
"server_multie10s_update.sjs: processing request for " +

View File

@ -51,7 +51,6 @@ const RESPONSE = `
`;
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
// If the request has been marked to be isolated with COOP+COEP, set the appropriate headers.

View File

@ -1,5 +1,3 @@
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
const searchParams = new URLSearchParams(request.queryString);

View File

@ -1,7 +1,6 @@
"use strict";
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
response.setHeader("Content-Type", "application/javascript");

View File

@ -1,4 +1,3 @@
Cu.importGlobalProperties(["URLSearchParams"]);
const SJS = "referrer_test_server.sjs?";
const SHARED_KEY = SJS;

View File

@ -12,7 +12,6 @@ function handleRequest(request, response) {
setSharedState("earlyHintCount", JSON.stringify(count));
let content = "";
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let asset = qs.get("as");

View File

@ -1,7 +1,6 @@
"use strict";
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let asset = qs.get("as");
let hinted = qs.get("hinted") === "1";

View File

@ -1,7 +1,6 @@
"use strict";
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let asset = qs.get("as");
let hinted = qs.get("hinted") !== "0";

View File

@ -1,7 +1,5 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
response.setStatusLine(
request.httpVersion,

View File

@ -1,8 +1,6 @@
"use strict";
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
// write to raw socket
response.seizePower();

View File

@ -20,7 +20,6 @@ async function handleRequest(request, response) {
response.setHeader("Cache-Control", "max-age=604800", false);
let content = "";
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let asset = qs.get("as");

View File

@ -1,7 +1,6 @@
"use strict";
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let href = qs.get("href");
let crossOrigin = qs.get("crossOrigin");

View File

@ -5,7 +5,6 @@
// - location: sets destination of 301 response
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let link = qs.get("link");
let location = qs.get("location");

View File

@ -1,7 +1,6 @@
"use strict";
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let qs = new URLSearchParams(request.queryString);
let asset = qs.get("as");
var action = qs.get("action");

View File

@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
const queryString = new URLSearchParams(request.queryString);

View File

@ -7,7 +7,6 @@
const { NetUtil } = ChromeUtils.importESModule(
"resource://gre/modules/NetUtil.sys.mjs"
);
Cu.importGlobalProperties(["URLSearchParams"]);
function loadHTMLFromFile(path) {
// Load the HTML to return in the response from file.

View File

@ -1,7 +1,6 @@
function handleRequest(request, response) {
response.setHeader("Cache-Control", "no-cache", false);
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
let setState = query.get("setState");

View File

@ -4,8 +4,6 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
let query = new URLSearchParams(request.queryString);
let token = query.get("token");

View File

@ -4,8 +4,6 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
let query = new URLSearchParams(request.queryString);
let token = query.get("token");

View File

@ -1,5 +1,4 @@
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
response.setStatusLine(request.httpVersion, 200, "OK");

View File

@ -8,8 +8,6 @@ let { NetUtil } = ChromeUtils.importESModule(
"resource://gre/modules/NetUtil.sys.mjs"
);
Cu.importGlobalProperties(["TextEncoder"]);
/**
* Provide search suggestions in the OpenSearch JSON format.
*/

View File

@ -9,8 +9,6 @@ const BinaryInputStream = Components.Constructor(
"setInputStream"
);
Cu.importGlobalProperties(["TextDecoder"]);
function getPostBody(stream) {
let binaryStream = new BinaryInputStream(stream);
let count = binaryStream.available();

View File

@ -6,8 +6,6 @@ const REDIRECT =
"mochi.test:8888/chrome/toolkit/components/url-classifier/tests/mochitest/" +
SJS;
Cu.importGlobalProperties(["URLSearchParams"]);
function createBlockedIframePage() {
return `<!DOCTYPE HTML>
<html>

View File

@ -9,7 +9,6 @@ const BinaryInputStream = CC(
);
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let params = new URLSearchParams(request.queryString);
var action = params.get("action");

View File

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
Cu.importGlobalProperties(["URLSearchParams"]);
const stateTotalRequests = "total-request";
const stateCallback = "callback-response";
const stateTrackersWithCookie = "trackers-with-cookie";

View File

@ -5,8 +5,6 @@ let { NetUtil } = ChromeUtils.importESModule(
"resource://gre/modules/NetUtil.sys.mjs"
);
Cu.importGlobalProperties(["IOUtils", "PathUtils"]);
const RELATIVE_PATH = "browser/toolkit/mozapps/extensions/test/xpinstall";
const NOTIFICATION_TOPIC = "slowinstall-complete";

View File

@ -1,6 +1,6 @@
function handleRequest(request, response) {
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
let content = "";
let params = new URLSearchParams(request.queryString);
let extension = params.get("extension");

View File

@ -2,8 +2,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
function handleRequest(request, response) {
Cu.importGlobalProperties(["URLSearchParams"]);
let query = new URLSearchParams(request.queryString);
// Set CSP sandbox attributes if caller requests any.

View File

@ -3,8 +3,6 @@
"use strict";
Cu.importGlobalProperties(["URLSearchParams"]);
function handleRequest(request, response) {
let params = new URLSearchParams(request.queryString);
let uri = params.get("uri");