Verified Commit b0ff311a authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 40925: Implemented the Security Level component

Bug 42481: Modularize SecurityLevel.
parent 601bf763
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@

/* global AppConstants, Services, openPreferences, XPCOMUtils */

ChromeUtils.defineModuleGetter(
  this,
  "SecurityLevelPrefs",
  "resource://gre/modules/SecurityLevel.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
  SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs",
});

/*
  Security Level Button Code
+1 −6
Original line number Diff line number Diff line
@@ -12,14 +12,9 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
  SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs",
});

ChromeUtils.defineModuleGetter(
  lazy,
  "SecurityLevelPrefs",
  "resource://gre/modules/SecurityLevel.jsm"
);

const BinaryInputStream = Components.Constructor(
  "@mozilla.org/binaryinputstream;1",
  "nsIBinaryInputStream",
+7 −13
Original line number Diff line number Diff line
"use strict";

var EXPORTED_SYMBOLS = ["SecurityLevel", "SecurityLevelPrefs"];

const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
import { ConsoleAPI } from "resource://gre/modules/Console.sys.mjs";

const lazy = {};

ChromeUtils.defineModuleGetter(
  lazy,
  "ExtensionParent",
  "resource://gre/modules/ExtensionParent.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
});

const logger = new ConsoleAPI({
  maxLogLevel: "info",
@@ -263,6 +256,7 @@ var initializeNoScriptControl = () => {
// bind NoScript settings to the browser.security_level.security_slider
// (see noscript-control.js).
/* eslint-disable */
// prettier-ignore
const kSecuritySettings = {
  // Preference name :                                          [0, 1-high 2-m    3-m    4-low]
  "javascript.options.ion" :                                    [,  false, false, false, true ],
@@ -427,7 +421,7 @@ function migratePreferences() {
}

// This class is used to initialize the security level stuff at the startup
class SecurityLevel {
export class SecurityLevel {
  QueryInterface = ChromeUtils.generateQI(["nsIObserver"]);

  init() {
@@ -448,7 +442,7 @@ class SecurityLevel {

  Getters and Setters for relevant torbutton prefs
*/
const SecurityLevelPrefs = {
export const SecurityLevelPrefs = {
  SecurityLevels: Object.freeze({
    safest: 1,
    safer: 2,
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Classes = [
        "contract_ids": [
            "@torproject.org/security-level;1",
        ],
        "jsm": "resource://gre/modules/SecurityLevel.jsm",
        "esModule": "resource://gre/modules/SecurityLevel.sys.mjs",
        "constructor": "SecurityLevel",
    }
]
+1 −1
Original line number Diff line number Diff line
EXTRA_JS_MODULES += [
    "SecurityLevel.jsm",
    "SecurityLevel.sys.mjs",
]

XPCOM_MANIFESTS += [