Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions chromium/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"parserOptions": {
"ecmaVersion": 2017
},
"env": {
"browser": true,
"commonjs": true,
Expand Down
50 changes: 50 additions & 0 deletions chromium/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ storage.get({enableMixedRulesets: false}, function(item) {
all_rules.addFromXml(loadExtensionFile('rules/default.rulesets', 'xml'));
});

// Load in the legacy custom rulesets, if any
function load_legacy_custom_rulesets(legacy_custom_rulesets){
for(let legacy_custom_ruleset of legacy_custom_rulesets){
all_rules.addFromXml((new DOMParser()).parseFromString(legacy_custom_ruleset, 'text/xml'));
}
}
storage.get({legacy_custom_rulesets: []}, item => load_legacy_custom_rulesets(item.legacy_custom_rulesets));

var USER_RULE_KEY = 'userRules';
// Records which tabId's are active in the HTTPS Switch Planner (see
// devtools-panel.js).
Expand Down Expand Up @@ -660,5 +668,47 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){
updateState();
} else if (message.type == "remove_rule") {
removeRule(message.object);
} else if (message.type == "import_settings") {
// This is used when importing settings from the options ui
import_settings(message.object).then(() => {
sendResponse(true);
});
}
});

// Send a message to the embedded webextension bootstrap.js to get settings to import
chrome.runtime.sendMessage("import-legacy-data", import_settings);

/**
* Import extension settings (custom rulesets, ruleset toggles, globals) from an object
* @param settings the settings object
*/
async function import_settings(settings){
if(settings.changed){
// Load custom rulesets and add to storage
await new Promise(resolve => {
storage.set({"legacy_custom_rulesets": settings.custom_rulesets}, resolve);
});

// Load all the ruleset toggles into memory and store
let rule_toggle_promises = [];
for(let ruleset_name in settings.rule_toggle){
localStorage[ruleset_name] = settings.rule_toggle[ruleset_name];
}

all_rules = new RuleSets(localStorage);
all_rules.addFromXml(loadExtensionFile('rules/default.rulesets', 'xml'));
load_legacy_custom_rulesets(settings.custom_rulesets);

// Set/store globals
await new Promise(resolve => {
storage.set({'httpNowhere': settings.prefs.http_nowhere_enabled}, resolve);
});
await new Promise(resolve => {
storage.set({'showCounter': settings.prefs.show_counter}, resolve);
});
await new Promise(resolve => {
storage.set({'globalEnabled': settings.prefs.global_enabled}, resolve);
});
}
}
5 changes: 4 additions & 1 deletion chromium/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"incognito-cache-clearing.js"
]
},
"options_ui": {
"page": "options.html"
},
"browser_action": {
"default_icon": {
"38": "icons/icon-active-38.png"
Expand All @@ -32,7 +35,7 @@
},
"incognito": "spanning",
"manifest_version": 2,
"minimum_chrome_version": "52",
"minimum_chrome_version": "55",
"name": "__MSG_about_ext_name__",
"permissions": [
"webNavigation",
Expand Down
17 changes: 17 additions & 0 deletions chromium/options.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.section-header{
margin-bottom: 10px;
}

.section-header-span{
border-bottom: 1px solid #ccc;
font-size: 15px;
}

#import{
margin-bottom: 10px;
float: right;
}

#import-confirmed{
display: none;
}
22 changes: 22 additions & 0 deletions chromium/options.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link href="options.css" rel="stylesheet" type="text/css"/>
<script src="options.js"></script>
<script src="translation.js"></script>
<script src="send-message.js"></script>
</head>
<body>
<div id='import-confirmed' i18n="options_imported"></div>

<form>
<div class="section-header"><span class="section-header-span" i18n="options_importSettings"></span></div>
<section id="ImportSettings" class="options">
<input id="import-settings" type="file" accept="application/json" value="importSettings" />
</section>
<button type="submit" id="import" i18n="options_import" disabled></button>
</form>

</body>
</html>
28 changes: 28 additions & 0 deletions chromium/options.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
document.addEventListener("DOMContentLoaded", () => {

let json_data;
let import_button = document.querySelector("#import");

function import_json(e) {
e.preventDefault();

let settings = JSON.parse(json_data);
sendMessage("import_settings", settings, resp => {
document.querySelector("#import-confirmed").style.display = "block";
document.querySelector("form").style.display = "none";
});
}

document.querySelector("#import-settings").addEventListener("change", event => {
const file = event.target.files[0];
const reader = new FileReader();
reader.onload = event => {
json_data = event.target.result;
import_button.disabled = false;
};

reader.readAsText(file);
});

document.querySelector("form").addEventListener("submit", import_json);
});
2 changes: 2 additions & 0 deletions chromium/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

<link href="popup.css" rel="stylesheet" type="text/css"/>
<script src="popup.js"></script>
<script src="translation.js"></script>
<script src="send-message.js"></script>

</head>

Expand Down
19 changes: 0 additions & 19 deletions chromium/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,6 @@ document.addEventListener("DOMContentLoaded", function () {
httpNowhereCheckbox.setAttribute('checked', '');
}
});

// auto-translate all elements with i18n attributes
var elem = document.querySelectorAll("[i18n]");
for (let el of elem) {
el.innerHTML = chrome.i18n.getMessage(el.getAttribute("i18n"));
}

// other translations
e("aboutTitle").setAttribute("title", chrome.i18n.getMessage("about_title"));
e("add-rule-link").addEventListener("click", addManualRule);
});


Expand Down Expand Up @@ -278,12 +268,3 @@ function setOption_(opt, value) {
details[opt] = value;
sendMessage("set_option", details);
}

function sendMessage(type, object, callback) {
var packet = {};
packet.type = type;
if(object){
packet.object = object;
}
chrome.runtime.sendMessage(packet, callback);
}
8 changes: 8 additions & 0 deletions chromium/send-message.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function sendMessage(type, object, callback) {
var packet = {};
packet.type = type;
if(object){
packet.object = object;
}
chrome.runtime.sendMessage(packet, callback);
}
11 changes: 11 additions & 0 deletions chromium/translation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
document.addEventListener("DOMContentLoaded", function () {
// auto-translate all elements with i18n attributes
var elem = document.querySelectorAll("[i18n]");
for (let el of elem) {
el.innerHTML = chrome.i18n.getMessage(el.getAttribute("i18n"));
}

// other translations
e("aboutTitle").setAttribute("title", chrome.i18n.getMessage("about_title"));
e("add-rule-link").addEventListener("click", addManualRule);
});
25 changes: 23 additions & 2 deletions makexpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ die() {
}

bash utils/validate.sh
cp pkg/rulesets.json src/chrome/content/rulesets.json

# The name/version of the XPI we're building comes from src/install.rdf
XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3`"
Expand All @@ -101,7 +100,29 @@ fi
# Prepare packages suitable for uploading to EFF and AMO, respectively.
[ -d pkg ] || mkdir pkg
rsync -aL --delete --delete-excluded --exclude /chrome/content/rules src/ pkg/xpi-eff
cp -a translations/* pkg/xpi-eff/chrome/locale/

# START: The next lines are for embedded WebExtensions, and can be deleted after the full transition to WebExtensions
[ -d pkg/xpi-eff/webextension ] || mkdir pkg/xpi-eff/webextension
rsync -aL --delete chromium/ pkg/xpi-eff/webextension/

mkdir pkg/xpi-eff/webextension/_locales/
python2.7 utils/chromium-translations.py translations/ pkg/xpi-eff/webextension/_locales/
python2.7 utils/chromium-translations.py src/chrome/locale/ pkg/xpi-eff/webextension/_locales/

cd pkg/xpi-eff/webextension
do_not_ship="*.py *.xml icon.jpg"
rm -f $do_not_ship
cd ../../..

rm -rf pkg/xpi-eff/chrome/content/rulesets.json
rm -rf pkg/xpi-eff/chrome/locale

mkdir pkg/xpi-eff/webextension/rules/
. ./utils/merge-rulesets.sh || exit 1

cp src/$RULESETS pkg/xpi-eff/webextension/rules/default.rulesets
# END

rsync -a --delete pkg/xpi-eff/ pkg/xpi-amo
# The AMO version of the package cannot contain the updateKey or updateURL tags.
# Also, it has a different id than the eff-hosted version, because Firefox now
Expand Down
118 changes: 118 additions & 0 deletions src/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
"use strict";

const CI = Components.interfaces;
const CC = Components.classes;

function get_prefs(branch_name){
let o_prefs = CC["@mozilla.org/preferences-service;1"]
.getService(CI.nsIPrefService);
let o_branch = o_prefs.getBranch(branch_name);
return o_branch;
}

function get_custom_rulesets_array(){
var loc = "ProfD"; // profile directory
var dir =
CC["@mozilla.org/file/directory_service;1"]
.getService(CI.nsIProperties)
.get(loc, CI.nsILocalFile)
.clone();
dir.append("HTTPSEverywhereUserRules");
// Check for existence, if not, create.
if (!dir.exists()) {
return [];
}

var entries = dir.directoryEntries;
var files = [];
while(entries.hasMoreElements()) {
var entry = entries.getNext();
entry.QueryInterface(CI.nsIFile);
files.push(entry);
}

let file_data = []
for(let file of files){
var data = "";
var fstream = CC["@mozilla.org/network/file-input-stream;1"]
.createInstance(CI.nsIFileInputStream);
var sstream = CC["@mozilla.org/scriptableinputstream;1"]
.createInstance(CI.nsIScriptableInputStream);
fstream.init(file, -1, 0, 0);
sstream.init(fstream);

var str = sstream.read(4096);
while (str.length > 0) {
data += str;
str = sstream.read(4096);
}

sstream.close();
fstream.close();
file_data.push(data);
}

return file_data;
}

function startup({webExtension}) {
webExtension.startup().then(api => {
const {browser} = api;
browser.runtime.onMessage.addListener((msg, sender, sendReply) => {
if (msg == "import-legacy-data") {
let globals = get_prefs("extensions.https_everywhere.");
if(!pref_retrieve_bool_with_default(globals, "webextension-migrated", false)){
let changed = false;

let prefs = {
http_nowhere_enabled: pref_retrieve_bool_with_default(globals, "http_nowhere.enabled", false),
global_enabled: pref_retrieve_bool_with_default(globals, "globalEnabled", true),
show_counter: pref_retrieve_bool_with_default(globals, "show_counter", true)
};

if(prefs.http_nowhere_enabled == true ||
prefs.global_enabled == false ||
prefs.show_counter == true
){
changed = true;
}

let rule_toggle = {}
let rules = get_prefs("extensions.https_everywhere.rule_toggle.");
for(let rule_toggle_key of rules.getChildList("", {})){
rule_toggle[rule_toggle_key] = rules.getBoolPref(rule_toggle_key);
changed = true;
}

let custom_rulesets = get_custom_rulesets_array();
if(custom_rulesets.length > 0){
changed = true;
}

sendReply({
prefs: prefs,
rule_toggle: rule_toggle,
custom_rulesets: custom_rulesets,
changed: changed
});

globals.setBoolPref("webextensions-migrated", true);
} else {
sendReply({changed: false});
}
}
});
});
}

function pref_retrieve_bool_with_default(pref_branch, element, default_value){
const pref_array = pref_branch.getChildList("", {});

if(pref_array.indexOf(element) !== -1){
return pref_branch.getBoolPref(element);
}
return default_value;
}

function shutdown(data) {
}
14 changes: 0 additions & 14 deletions src/chrome/content/about.js

This file was deleted.

Loading