From af9eb29bb8228d75575016750f33c8e59cc6a33b Mon Sep 17 00:00:00 2001 From: afarrow Date: Wed, 6 Dec 2017 20:21:54 -0500 Subject: [PATCH 001/844] e.snmc.io.xml (#9325) --- src/chrome/content/rules/Snmc.io.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Snmc.io.xml diff --git a/src/chrome/content/rules/Snmc.io.xml b/src/chrome/content/rules/Snmc.io.xml new file mode 100644 index 000000000000..d1a2a24c0664 --- /dev/null +++ b/src/chrome/content/rules/Snmc.io.xml @@ -0,0 +1,10 @@ + + + + + + From 473c5d4e64381678f9a3627c5c7c624b9c6d60d6 Mon Sep 17 00:00:00 2001 From: Balgden Date: Thu, 7 Dec 2017 15:11:09 +0000 Subject: [PATCH 002/844] Add Nhentai.net (#10115) --- src/chrome/content/rules/Nhentai.net.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/Nhentai.net.xml diff --git a/src/chrome/content/rules/Nhentai.net.xml b/src/chrome/content/rules/Nhentai.net.xml new file mode 100644 index 000000000000..e2756aba9422 --- /dev/null +++ b/src/chrome/content/rules/Nhentai.net.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + From d136e19170aefb00bcd60152bb4c8739cacf8a3b Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 7 Dec 2017 18:14:45 +0200 Subject: [PATCH 003/844] Create almasdarnews.com.xml (#7908) --- src/chrome/content/rules/AlMasdarNews.com.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/AlMasdarNews.com.xml diff --git a/src/chrome/content/rules/AlMasdarNews.com.xml b/src/chrome/content/rules/AlMasdarNews.com.xml new file mode 100644 index 000000000000..02195f8ab05c --- /dev/null +++ b/src/chrome/content/rules/AlMasdarNews.com.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From 52caf0f1b2c6f79e1678beb19f3d1194f68bad86 Mon Sep 17 00:00:00 2001 From: patheticcockroach Date: Thu, 7 Dec 2017 18:13:51 +0100 Subject: [PATCH 004/844] Added ruleset for pops.co (#13902) --- src/chrome/content/rules/Pops.co.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Pops.co.xml diff --git a/src/chrome/content/rules/Pops.co.xml b/src/chrome/content/rules/Pops.co.xml new file mode 100644 index 000000000000..ed1ece933c2d --- /dev/null +++ b/src/chrome/content/rules/Pops.co.xml @@ -0,0 +1,11 @@ + + + + + + + From 5cbcbd580ae3c84bbf0d720fb9b242e6032959bd Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 7 Dec 2017 19:23:03 +0200 Subject: [PATCH 005/844] Update Rossia.org.xml (#7980) --- src/chrome/content/rules/Lj.Rossia.Org.xml | 9 --------- src/chrome/content/rules/Rossia.org.xml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 src/chrome/content/rules/Lj.Rossia.Org.xml create mode 100644 src/chrome/content/rules/Rossia.org.xml diff --git a/src/chrome/content/rules/Lj.Rossia.Org.xml b/src/chrome/content/rules/Lj.Rossia.Org.xml deleted file mode 100644 index 54d70b481889..000000000000 --- a/src/chrome/content/rules/Lj.Rossia.Org.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/src/chrome/content/rules/Rossia.org.xml b/src/chrome/content/rules/Rossia.org.xml new file mode 100644 index 000000000000..0ab5c2be4106 --- /dev/null +++ b/src/chrome/content/rules/Rossia.org.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file From 98994a936d901a150631e2807464460db61f9ac6 Mon Sep 17 00:00:00 2001 From: MilanKral Date: Thu, 7 Dec 2017 18:28:16 +0100 Subject: [PATCH 006/844] Openquantumsafe.org (#13903) --- src/chrome/content/rules/Openquantumsafe.org.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Openquantumsafe.org.xml diff --git a/src/chrome/content/rules/Openquantumsafe.org.xml b/src/chrome/content/rules/Openquantumsafe.org.xml new file mode 100644 index 000000000000..910215ddefbe --- /dev/null +++ b/src/chrome/content/rules/Openquantumsafe.org.xml @@ -0,0 +1,6 @@ + + + + + + From 599b34d8d2ed0b5ffd597b73e72f03bcf6c5f40e Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 7 Dec 2017 21:51:49 +0200 Subject: [PATCH 007/844] Create hentai-foundry.com.xml (#9998) --- .../content/rules/Hentai-Foundry.com.xml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/chrome/content/rules/Hentai-Foundry.com.xml diff --git a/src/chrome/content/rules/Hentai-Foundry.com.xml b/src/chrome/content/rules/Hentai-Foundry.com.xml new file mode 100644 index 000000000000..8e8a40f896ed --- /dev/null +++ b/src/chrome/content/rules/Hentai-Foundry.com.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + From ded9a4cc9ae8ffd56ef7db0df7a5da9b6d7efd4a Mon Sep 17 00:00:00 2001 From: gopherit Date: Thu, 7 Dec 2017 15:08:24 -0500 Subject: [PATCH 008/844] Add 800HelpFla.com.xml (#11328) --- src/chrome/content/rules/800HelpFla.com.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/chrome/content/rules/800HelpFla.com.xml diff --git a/src/chrome/content/rules/800HelpFla.com.xml b/src/chrome/content/rules/800HelpFla.com.xml new file mode 100644 index 000000000000..fd2086bee703 --- /dev/null +++ b/src/chrome/content/rules/800HelpFla.com.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + From acc9e77d53f262ce795c66e0ba5350565f9999ed Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 7 Dec 2017 13:57:58 -0800 Subject: [PATCH 009/844] HTML fixes (#12052) --- chromium/popup.css | 4 ++ chromium/popup.html | 115 +++++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 55 deletions(-) diff --git a/chromium/popup.css b/chromium/popup.css index 7d80e2a08858..1a520badf730 100644 --- a/chromium/popup.css +++ b/chromium/popup.css @@ -1,3 +1,7 @@ +html { + background-color: #fff +} + body { cursor: default; margin-left: 1em; diff --git a/chromium/popup.html b/chromium/popup.html index e68089a98839..8976a62ef8aa 100644 --- a/chromium/popup.html +++ b/chromium/popup.html @@ -1,71 +1,76 @@ + - + + - + + + +
+

+
- - - - - - - - -
-

-
- - + -
-

-

- -

(Version: )

-
+
+
+
+
+
+ +

(Version: )

+
- + + + + From 57fe313845ff432995e7778dc98297fe6bd69fe9 Mon Sep 17 00:00:00 2001 From: "Fabian Franz, BSc" Date: Thu, 7 Dec 2017 23:13:43 +0100 Subject: [PATCH 010/844] add rule for Magictail (#10148) --- src/chrome/content/rules/Magictail.net.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Magictail.net.xml diff --git a/src/chrome/content/rules/Magictail.net.xml b/src/chrome/content/rules/Magictail.net.xml new file mode 100644 index 000000000000..a804718bb9ee --- /dev/null +++ b/src/chrome/content/rules/Magictail.net.xml @@ -0,0 +1,6 @@ + + + + + + From 3beae95fadddea2f1decce79dedd4438ca82674d Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Fri, 8 Dec 2017 20:41:27 +0100 Subject: [PATCH 011/844] Add some sites from uni-stuttgart.de (#13883) --- src/chrome/content/rules/Uni-Stuttgart.de.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/content/rules/Uni-Stuttgart.de.xml b/src/chrome/content/rules/Uni-Stuttgart.de.xml index bcd8d02f92d5..9a322c0d4678 100644 --- a/src/chrome/content/rules/Uni-Stuttgart.de.xml +++ b/src/chrome/content/rules/Uni-Stuttgart.de.xml @@ -19,6 +19,17 @@ + + + + + + + + + + + From f37f3ce908ddc88a2499e62d200722a7673fa821 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Fri, 8 Dec 2017 21:47:17 +0100 Subject: [PATCH 012/844] Add mannheim24.de, heidelberg24.de, ludwigshafen24.de (#13869) * Add mannheim24.de, heidelberg24.de, ludwigshafen24.de * Add blank for securecookie --- src/chrome/content/rules/headline24.de.xml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/chrome/content/rules/headline24.de.xml diff --git a/src/chrome/content/rules/headline24.de.xml b/src/chrome/content/rules/headline24.de.xml new file mode 100644 index 000000000000..f313ca520671 --- /dev/null +++ b/src/chrome/content/rules/headline24.de.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 6554a7b570e283cfbee1a76867c12a49f64c7501 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 9 Dec 2017 10:08:02 +1030 Subject: [PATCH 013/844] [ebay.ru] New ruleset (#13892) --- src/chrome/content/rules/ebay.ru.xml | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/chrome/content/rules/ebay.ru.xml diff --git a/src/chrome/content/rules/ebay.ru.xml b/src/chrome/content/rules/ebay.ru.xml new file mode 100644 index 000000000000..9f4df400325a --- /dev/null +++ b/src/chrome/content/rules/ebay.ru.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 63ca5ce659198a7afd93214ccee173bd4576b9e9 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 9 Dec 2017 10:15:24 +1030 Subject: [PATCH 014/844] [ebay.ph] New ruleset (#13863) --- src/chrome/content/rules/ebay.ph.xml | 181 +++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 src/chrome/content/rules/ebay.ph.xml diff --git a/src/chrome/content/rules/ebay.ph.xml b/src/chrome/content/rules/ebay.ph.xml new file mode 100644 index 000000000000..658e64111e76 --- /dev/null +++ b/src/chrome/content/rules/ebay.ph.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0f41d4d6335b00468515941683dd689805254502 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 9 Dec 2017 10:21:00 +1030 Subject: [PATCH 015/844] [ebay.pl] New ruleset (#13891) --- src/chrome/content/rules/ebay.pl.xml | 195 +++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 src/chrome/content/rules/ebay.pl.xml diff --git a/src/chrome/content/rules/ebay.pl.xml b/src/chrome/content/rules/ebay.pl.xml new file mode 100644 index 000000000000..79eb1b6027de --- /dev/null +++ b/src/chrome/content/rules/ebay.pl.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bc58f6f79aaac7726f8f36326d172ffaaea69ddd Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 9 Dec 2017 10:26:41 +1030 Subject: [PATCH 016/844] [ebay.ie] New ruleset (#13861) --- src/chrome/content/rules/ebay.ie.xml | 213 +++++++++++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 src/chrome/content/rules/ebay.ie.xml diff --git a/src/chrome/content/rules/ebay.ie.xml b/src/chrome/content/rules/ebay.ie.xml new file mode 100644 index 000000000000..223271515570 --- /dev/null +++ b/src/chrome/content/rules/ebay.ie.xml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ee5a31ebd95f3205e23862aeda997e9eaf3bbafc Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 9 Dec 2017 10:31:28 +1030 Subject: [PATCH 017/844] [ebay.in] New ruleset (#13860) --- src/chrome/content/rules/ebay.in.xml | 219 +++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) create mode 100644 src/chrome/content/rules/ebay.in.xml diff --git a/src/chrome/content/rules/ebay.in.xml b/src/chrome/content/rules/ebay.in.xml new file mode 100644 index 000000000000..27d279343086 --- /dev/null +++ b/src/chrome/content/rules/ebay.in.xml @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b06dba200b90c9eb1f9118bfe08f5229a1705f59 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 9 Dec 2017 10:35:18 +1030 Subject: [PATCH 018/844] [ebay.com.hk] New ruleset (#13878) --- src/chrome/content/rules/ebay.com.hk.xml | 201 +++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 src/chrome/content/rules/ebay.com.hk.xml diff --git a/src/chrome/content/rules/ebay.com.hk.xml b/src/chrome/content/rules/ebay.com.hk.xml new file mode 100644 index 000000000000..a15266a5cebb --- /dev/null +++ b/src/chrome/content/rules/ebay.com.hk.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From dd5efb7dbfb28a8f6fdc9ea289b2d73512d5d836 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 9 Dec 2017 02:27:38 +0100 Subject: [PATCH 019/844] Re-enable Raiffeisen.xml (#11635) --- src/chrome/content/rules/Raiffeisen.ch.xml | 39 ++++++++++++++++++++++ src/chrome/content/rules/Raiffeisen.xml | 28 ---------------- 2 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 src/chrome/content/rules/Raiffeisen.ch.xml delete mode 100644 src/chrome/content/rules/Raiffeisen.xml diff --git a/src/chrome/content/rules/Raiffeisen.ch.xml b/src/chrome/content/rules/Raiffeisen.ch.xml new file mode 100644 index 000000000000..c0f2adf7cd95 --- /dev/null +++ b/src/chrome/content/rules/Raiffeisen.ch.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Raiffeisen.xml b/src/chrome/content/rules/Raiffeisen.xml deleted file mode 100644 index 83d331eed5ec..000000000000 --- a/src/chrome/content/rules/Raiffeisen.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - From f9fe700e90684b4e8ead5000518fb13f8881de54 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 8 Dec 2017 19:05:34 -0800 Subject: [PATCH 020/844] Fix tests by ensuring UX controls only appear after being set (#13912) * Change version of geckodriver in dev environment to be standard with tests * Move scripts back to header --- chromium/popup.html | 10 +++++----- chromium/popup.js | 4 ++-- install-dev-dependencies.sh | 12 ++++++------ test/selenium/shim.py | 3 +-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/chromium/popup.html b/chromium/popup.html index 8976a62ef8aa..e650c0404e6b 100644 --- a/chromium/popup.html +++ b/chromium/popup.html @@ -5,20 +5,23 @@ + + +

-
+ -
+ @@ -69,8 +72,5 @@

(Version: )

- - - diff --git a/chromium/popup.js b/chromium/popup.js index 967a6ba49e37..d9276cc19039 100644 --- a/chromium/popup.js +++ b/chromium/popup.js @@ -89,7 +89,7 @@ function showHttpNowhereUI() { if (item.httpNowhere) { e('http-nowhere-checkbox').checked = true; } - show(e('HttpNowhere')); + e('HttpNowhere').style.visibility = "visible"; }); }; @@ -97,7 +97,7 @@ function showHttpNowhereUI() { function updateEnabledDisabledUI() { getOption_('globalEnabled', true, function(item) { document.getElementById('onoffswitch').checked = item.globalEnabled; - show(e('disableButton')); + e('disableButton').style.visibility = "visible"; // Hide or show the rules sections if (item.globalEnabled) { document.body.className = "" diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh index ca6e6a020111..92b5f552ba5e 100755 --- a/install-dev-dependencies.sh +++ b/install-dev-dependencies.sh @@ -39,9 +39,9 @@ if type apt-get >/dev/null ; then python-dev $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \ libssl-dev git curl $CHROMEDRIVER if ! type geckodriver >/dev/null; then - curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-linux64.tar.gz" - tar -zxvf "geckodriver-v0.16.1-linux64.tar.gz" - rm -f "geckodriver-v0.16.1-linux64.tar.gz" + curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz" + tar -zxvf "geckodriver-v0.17.0-linux64.tar.gz" + rm -f "geckodriver-v0.17.0-linux64.tar.gz" $SUDO_SHIM mv geckodriver /usr/bin/geckodriver $SUDO_SHIM chown root /usr/bin/geckodriver $SUDO_SHIM chmod 755 /usr/bin/geckodriver @@ -73,9 +73,9 @@ elif type dnf >/dev/null ; then $SUDO_SHIM chmod 755 /usr/bin/chromedriver fi if ! type geckodriver >/dev/null; then - curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-macos.tar.gz" - tar -zxvf "geckodriver-v0.16.1-macos.tar.gz" - rm -f "geckodriver-v0.16.1-macos.tar.gz" + curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-macos.tar.gz" + tar -zxvf "geckodriver-v0.17.0-macos.tar.gz" + rm -f "geckodriver-v0.17.0-macos.tar.gz" $SUDO_SHIM mv geckodriver /usr/bin/geckodriver $SUDO_SHIM chown root /usr/bin/geckodriver $SUDO_SHIM chmod 755 /usr/bin/geckodriver diff --git a/test/selenium/shim.py b/test/selenium/shim.py index 30ce763b3152..07ebb6ce8f3d 100644 --- a/test/selenium/shim.py +++ b/test/selenium/shim.py @@ -68,8 +68,7 @@ def install_ext_on_ff(driver, extension_path): included in Selenium. See https://github.com/SeleniumHQ/selenium/issues/4215 ''' command = 'addonInstall' - driver.command_executor._commands[command] = ('POST', '/session/$sessionId/moz/addon/install') - driver.execute(command, params={'path': extension_path, 'temporary': True}) + driver.install_addon(extension_path, temporary = True) time.sleep(2) From 761f0b2d44e9d5e49dd1006e0e9096747c4bbe73 Mon Sep 17 00:00:00 2001 From: "Fabian Franz, BSc" Date: Sat, 9 Dec 2017 17:17:40 +0100 Subject: [PATCH 021/844] add Mermaid Kat Shop rules (#10149) --- src/chrome/content/rules/Mermaid-kat-shop.de.xml | 10 ++++++++++ src/chrome/content/rules/Mermaidkatshop.co.uk.xml | 10 ++++++++++ src/chrome/content/rules/Mermaidkatshop.com.xml | 10 ++++++++++ .../content/rules/Mermaidtailaustralia.com.au.xml | 13 +++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/Mermaid-kat-shop.de.xml create mode 100644 src/chrome/content/rules/Mermaidkatshop.co.uk.xml create mode 100644 src/chrome/content/rules/Mermaidkatshop.com.xml create mode 100644 src/chrome/content/rules/Mermaidtailaustralia.com.au.xml diff --git a/src/chrome/content/rules/Mermaid-kat-shop.de.xml b/src/chrome/content/rules/Mermaid-kat-shop.de.xml new file mode 100644 index 000000000000..25634abe3aee --- /dev/null +++ b/src/chrome/content/rules/Mermaid-kat-shop.de.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/src/chrome/content/rules/Mermaidkatshop.co.uk.xml b/src/chrome/content/rules/Mermaidkatshop.co.uk.xml new file mode 100644 index 000000000000..033cbd7d1869 --- /dev/null +++ b/src/chrome/content/rules/Mermaidkatshop.co.uk.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/src/chrome/content/rules/Mermaidkatshop.com.xml b/src/chrome/content/rules/Mermaidkatshop.com.xml new file mode 100644 index 000000000000..6ae0fc6e0b3a --- /dev/null +++ b/src/chrome/content/rules/Mermaidkatshop.com.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/src/chrome/content/rules/Mermaidtailaustralia.com.au.xml b/src/chrome/content/rules/Mermaidtailaustralia.com.au.xml new file mode 100644 index 000000000000..38d859cc5b78 --- /dev/null +++ b/src/chrome/content/rules/Mermaidtailaustralia.com.au.xml @@ -0,0 +1,13 @@ + + + + + + + From 3455e50739d3eeb40ef73dc002dcb291a6ea5ef2 Mon Sep 17 00:00:00 2001 From: Valentine Anderson Date: Sat, 9 Dec 2017 19:38:48 +0300 Subject: [PATCH 022/844] Add Invisible Institute ruleset (#7447) --- src/chrome/content/rules/Invisible.institute.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Invisible.institute.xml diff --git a/src/chrome/content/rules/Invisible.institute.xml b/src/chrome/content/rules/Invisible.institute.xml new file mode 100644 index 000000000000..d3ea20ac3cb9 --- /dev/null +++ b/src/chrome/content/rules/Invisible.institute.xml @@ -0,0 +1,8 @@ + + + + + + + + From 5668ca41029bcf25bbc671ecf26e711aad9ec1ca Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 9 Dec 2017 18:17:09 +0100 Subject: [PATCH 023/844] [LinuxTag.org] Add CAcert platform (#13626) --- src/chrome/content/rules/LinuxTag.org.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/LinuxTag.org.xml b/src/chrome/content/rules/LinuxTag.org.xml index ae42698bc784..48db7da09fab 100644 --- a/src/chrome/content/rules/LinuxTag.org.xml +++ b/src/chrome/content/rules/LinuxTag.org.xml @@ -9,7 +9,7 @@ - openmusic.linuxtag.org --> - + From 599849afcfcb642e50933029887760de0ecaed73 Mon Sep 17 00:00:00 2001 From: "Fabian Franz, BSc" Date: Sun, 10 Dec 2017 19:08:37 +0100 Subject: [PATCH 024/844] add rule for mertailor (#10179) --- src/chrome/content/rules/Themertailor.com.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Themertailor.com.xml diff --git a/src/chrome/content/rules/Themertailor.com.xml b/src/chrome/content/rules/Themertailor.com.xml new file mode 100644 index 000000000000..b0ff7cabd01e --- /dev/null +++ b/src/chrome/content/rules/Themertailor.com.xml @@ -0,0 +1,11 @@ + + + + + + + From 5d73bed3c8f8d7227206546e8fd9c4783b284a65 Mon Sep 17 00:00:00 2001 From: Valentine Anderson Date: Sun, 10 Dec 2017 21:10:02 +0300 Subject: [PATCH 025/844] Add royal.uk ruleset (#7446) --- src/chrome/content/rules/Royal.uk.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Royal.uk.xml diff --git a/src/chrome/content/rules/Royal.uk.xml b/src/chrome/content/rules/Royal.uk.xml new file mode 100644 index 000000000000..cbd3ca491132 --- /dev/null +++ b/src/chrome/content/rules/Royal.uk.xml @@ -0,0 +1,10 @@ + + + + + + + From 2ac66d120e7f17d8d7a634b1548926a8c0f9b097 Mon Sep 17 00:00:00 2001 From: Folant Date: Mon, 11 Dec 2017 01:12:23 +0200 Subject: [PATCH 026/844] Create gorod.dp.ua.xml (#13473) --- src/chrome/content/rules/Gorod.dp.ua.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/Gorod.dp.ua.xml diff --git a/src/chrome/content/rules/Gorod.dp.ua.xml b/src/chrome/content/rules/Gorod.dp.ua.xml new file mode 100644 index 000000000000..7e905604073d --- /dev/null +++ b/src/chrome/content/rules/Gorod.dp.ua.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + From bff7f2cee6ae3ad47084d2ec7b8ce06218f053f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 11 Dec 2017 02:16:07 +0100 Subject: [PATCH 027/844] Added ruleset for bamf.de (#13809) * Added ruleset for bamf.de * Added host to comment. --- src/chrome/content/rules/bamf.de.xml | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/chrome/content/rules/bamf.de.xml diff --git a/src/chrome/content/rules/bamf.de.xml b/src/chrome/content/rules/bamf.de.xml new file mode 100644 index 000000000000..dd0fa31c43ae --- /dev/null +++ b/src/chrome/content/rules/bamf.de.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 19e59d3af1784a07931921ab9a25fdb3230d9b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 11 Dec 2017 02:16:27 +0100 Subject: [PATCH 028/844] Fixed and updated cloudbees.com ruleset. (#13791) * Fixed and updated cloudbees.com ruleset. * Added more tests. * Added trailing slashes to tests. * Removed hosts from comment. --- src/chrome/content/rules/cloudbees.com.xml | 66 +++++++++++++++------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/rules/cloudbees.com.xml b/src/chrome/content/rules/cloudbees.com.xml index c6c263cc18f4..7263a5f0fae9 100644 --- a/src/chrome/content/rules/cloudbees.com.xml +++ b/src/chrome/content/rules/cloudbees.com.xml @@ -1,32 +1,58 @@ - - + + - - - - - - + + + + + + + + + + + + + + + + - + + + + + - - - - - - - + + + + + + + + + + + + + + + + From dd73ec57a9451936c4c5a6cc5deb25468d6e86e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 11 Dec 2017 02:16:48 +0100 Subject: [PATCH 029/844] Added ruleset for bellewaerde.be (#13619) * Added ruleset for bellewaerde.be * Changed comment about cert chain. --- src/chrome/content/rules/bellewaerde.be.xml | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/chrome/content/rules/bellewaerde.be.xml diff --git a/src/chrome/content/rules/bellewaerde.be.xml b/src/chrome/content/rules/bellewaerde.be.xml new file mode 100644 index 000000000000..c2ef19332c4e --- /dev/null +++ b/src/chrome/content/rules/bellewaerde.be.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + From 584a42a528079c66673d5b463dea30e30d3e31b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 11 Dec 2017 02:17:35 +0100 Subject: [PATCH 030/844] Added ruleset for community-ix.de (#13332) * Added ruleset for community-ix.de * Escaped dot in rule. --- src/chrome/content/rules/community-ix.de.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/community-ix.de.xml diff --git a/src/chrome/content/rules/community-ix.de.xml b/src/chrome/content/rules/community-ix.de.xml new file mode 100644 index 000000000000..64fd010eb009 --- /dev/null +++ b/src/chrome/content/rules/community-ix.de.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + From fdeca8a01c12fcb099954b6722792d7660e2eb6a Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Mon, 11 Dec 2017 02:19:25 +0100 Subject: [PATCH 031/844] Add uni-mannheim.de (partial) (#13882) * Add *.uni-mannheim.de * Remove uni-mannheim.de * Add some sites / Sort the table --- src/chrome/content/rules/uni-mannheim.de.xml | 42 ++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/chrome/content/rules/uni-mannheim.de.xml diff --git a/src/chrome/content/rules/uni-mannheim.de.xml b/src/chrome/content/rules/uni-mannheim.de.xml new file mode 100644 index 000000000000..5140c30f04ff --- /dev/null +++ b/src/chrome/content/rules/uni-mannheim.de.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 44166d3acb72b29fed55a6f64ba05230cb1590c5 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Mon, 11 Dec 2017 09:19:45 +0800 Subject: [PATCH 032/844] Split Landal.* from Wyndham.xml (#13851) * Splite Landal.* from Wyndham.xml * Move landalgreenparks.com to Landal.xml --- src/chrome/content/rules/Landal.xml | 81 ++++++++++++++++++++++++++++ src/chrome/content/rules/Wyndham.xml | 23 +------- 2 files changed, 82 insertions(+), 22 deletions(-) create mode 100644 src/chrome/content/rules/Landal.xml diff --git a/src/chrome/content/rules/Landal.xml b/src/chrome/content/rules/Landal.xml new file mode 100644 index 000000000000..e16fc60771d6 --- /dev/null +++ b/src/chrome/content/rules/Landal.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 4d2c673c1f09..8ca801e38a49 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -16,6 +16,7 @@ + Welsh-Country-Cottages.co.uk.xml + WyndhamJobs.com.xml + Wyndhamvrap.com.xml + + Landal.xml + landalskilife.be.xml + landalskilife.ch.xml + landalskilife.com.xml @@ -73,11 +74,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - - - @@ -101,7 +97,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - @@ -114,16 +109,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - - - - - @@ -131,13 +116,7 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - - From c52710a20f6ef2e76a9bee63c86247ee61b362c4 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 11 Dec 2017 02:30:26 +0100 Subject: [PATCH 033/844] [ScienceDirect.com] Remove mixedcontent platform (#13916) * [ScienceDirect.com] Remove mixedcontent platform * [ScienceDirect.com] Update top comment * [ScienceDirect.com] Remove broken target --- src/chrome/content/rules/sciencedirect.com.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/sciencedirect.com.xml b/src/chrome/content/rules/sciencedirect.com.xml index 4c81e4c5790e..0875ecf82d73 100644 --- a/src/chrome/content/rules/sciencedirect.com.xml +++ b/src/chrome/content/rules/sciencedirect.com.xml @@ -10,21 +10,20 @@ Invalid certificate: ars.sciencedirect.com binary-services.sciencedirect.com - www.info.sciencedirect.com metrics.sciencedirect.com technology.sciencedirect.com - topics.sciencedirect.com Refused connection: help.sciencedirect.com (website sometimes links to //help.sciencedirect.com even though it is not working) + info.sciencedirect.com + www.info.sciencedirect.com Secure connection failed: top25.sciencedirect.com --> - - + @@ -39,7 +38,6 @@ - From a01f7e29f5efa9680ea31df29b9ded3996a20c7b Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 11 Dec 2017 02:33:29 +0100 Subject: [PATCH 034/844] Create Music-Map.com.xml (#13918) --- src/chrome/content/rules/Music-Map.com.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/Music-Map.com.xml diff --git a/src/chrome/content/rules/Music-Map.com.xml b/src/chrome/content/rules/Music-Map.com.xml new file mode 100644 index 000000000000..2017cb0880d8 --- /dev/null +++ b/src/chrome/content/rules/Music-Map.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + From 21bf36ae5ac295d8c9804e30bbe1b416f875b2dd Mon Sep 17 00:00:00 2001 From: Folant Date: Mon, 11 Dec 2017 17:51:10 +0200 Subject: [PATCH 035/844] Create nv.ua.xml (#12495) --- src/chrome/content/rules/NV.ua.xml | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/NV.ua.xml diff --git a/src/chrome/content/rules/NV.ua.xml b/src/chrome/content/rules/NV.ua.xml new file mode 100644 index 000000000000..b0a2e139bac0 --- /dev/null +++ b/src/chrome/content/rules/NV.ua.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + From 4360351d30f2745e97a0121c18c684b2ac098db4 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 12 Dec 2017 02:22:54 +1030 Subject: [PATCH 036/844] [nyaa.si] New ruleset (#13636) --- src/chrome/content/rules/Nyaa.si.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Nyaa.si.xml diff --git a/src/chrome/content/rules/Nyaa.si.xml b/src/chrome/content/rules/Nyaa.si.xml new file mode 100644 index 000000000000..019ce97a4c95 --- /dev/null +++ b/src/chrome/content/rules/Nyaa.si.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + From a94d4bc3baaab869da580d0cf069737f1c4ed9d7 Mon Sep 17 00:00:00 2001 From: Folant Date: Mon, 11 Dec 2017 23:49:44 +0200 Subject: [PATCH 037/844] Create Sexstories.com.xml (#13936) --- src/chrome/content/rules/Sexstories.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Sexstories.com.xml diff --git a/src/chrome/content/rules/Sexstories.com.xml b/src/chrome/content/rules/Sexstories.com.xml new file mode 100644 index 000000000000..733324b3f772 --- /dev/null +++ b/src/chrome/content/rules/Sexstories.com.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From ca6e43f1ff1815dc2b7a276f883098da144d9a31 Mon Sep 17 00:00:00 2001 From: Folant Date: Tue, 12 Dec 2017 00:24:44 +0200 Subject: [PATCH 038/844] Update and rename SAnet.me.xml to SAnet.cd.xml (#8624) --- src/chrome/content/rules/SAnet.cd.xml | 14 +++++++++++ src/chrome/content/rules/SAnet.me.xml | 34 --------------------------- 2 files changed, 14 insertions(+), 34 deletions(-) create mode 100644 src/chrome/content/rules/SAnet.cd.xml delete mode 100644 src/chrome/content/rules/SAnet.me.xml diff --git a/src/chrome/content/rules/SAnet.cd.xml b/src/chrome/content/rules/SAnet.cd.xml new file mode 100644 index 000000000000..b1f86ed5b510 --- /dev/null +++ b/src/chrome/content/rules/SAnet.cd.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/chrome/content/rules/SAnet.me.xml b/src/chrome/content/rules/SAnet.me.xml deleted file mode 100644 index 396a5181e5b6..000000000000 --- a/src/chrome/content/rules/SAnet.me.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - From 36b589b573d8c3719e50ce4b475d88b3bb77fd0e Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 12 Dec 2017 10:45:21 +1030 Subject: [PATCH 039/844] [ebay.nl] New ruleset (#13862) --- src/chrome/content/rules/ebay.nl.xml | 205 +++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 src/chrome/content/rules/ebay.nl.xml diff --git a/src/chrome/content/rules/ebay.nl.xml b/src/chrome/content/rules/ebay.nl.xml new file mode 100644 index 000000000000..bf06cecccff3 --- /dev/null +++ b/src/chrome/content/rules/ebay.nl.xml @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From efda143bdd6039beda51022a85f34341f556640c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Tue, 12 Dec 2017 01:16:38 +0100 Subject: [PATCH 040/844] Added ruleset for stern.de (#13667) * Added ruleset for stern.de * Fixed typo. * Removed not working host. --- src/chrome/content/rules/Stern.de.xml | 91 +++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 src/chrome/content/rules/Stern.de.xml diff --git a/src/chrome/content/rules/Stern.de.xml b/src/chrome/content/rules/Stern.de.xml new file mode 100644 index 000000000000..c07d6c4434da --- /dev/null +++ b/src/chrome/content/rules/Stern.de.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7498f3a6ca16028b7a5736533c8a2d68c2686310 Mon Sep 17 00:00:00 2001 From: Folant Date: Tue, 12 Dec 2017 19:04:34 +0200 Subject: [PATCH 041/844] Update xvideos.com.xml (#8245) --- src/chrome/content/rules/XVideos-cdn.com.xml | 22 ++++++ src/chrome/content/rules/XVideos.com.xml | 52 +++++++++++++++ src/chrome/content/rules/xvideos.com.xml | 70 -------------------- 3 files changed, 74 insertions(+), 70 deletions(-) create mode 100644 src/chrome/content/rules/XVideos-cdn.com.xml create mode 100644 src/chrome/content/rules/XVideos.com.xml delete mode 100644 src/chrome/content/rules/xvideos.com.xml diff --git a/src/chrome/content/rules/XVideos-cdn.com.xml b/src/chrome/content/rules/XVideos-cdn.com.xml new file mode 100644 index 000000000000..082d139cc5f2 --- /dev/null +++ b/src/chrome/content/rules/XVideos-cdn.com.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/chrome/content/rules/XVideos.com.xml b/src/chrome/content/rules/XVideos.com.xml new file mode 100644 index 000000000000..0c3f4eaf9c7f --- /dev/null +++ b/src/chrome/content/rules/XVideos.com.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/xvideos.com.xml b/src/chrome/content/rules/xvideos.com.xml deleted file mode 100644 index 3c9d57283e0e..000000000000 --- a/src/chrome/content/rules/xvideos.com.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f7028181e16f7369c9459729a94e9800b4da5950 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 19:32:10 +0000 Subject: [PATCH 042/844] Create Lainfile.pw.xml (#13796) --- src/chrome/content/rules/Lainfile.pw.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Lainfile.pw.xml diff --git a/src/chrome/content/rules/Lainfile.pw.xml b/src/chrome/content/rules/Lainfile.pw.xml new file mode 100644 index 000000000000..1df4027912e7 --- /dev/null +++ b/src/chrome/content/rules/Lainfile.pw.xml @@ -0,0 +1,8 @@ + + + + + + + + From 4cfe11a77d6f71287b4f72bf9da4f9dc60afa134 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 19:59:50 +0000 Subject: [PATCH 043/844] Create MarsVenus.com.xml (#13795) --- src/chrome/content/rules/MarsVenus.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/MarsVenus.com.xml diff --git a/src/chrome/content/rules/MarsVenus.com.xml b/src/chrome/content/rules/MarsVenus.com.xml new file mode 100644 index 000000000000..0c7afb41910a --- /dev/null +++ b/src/chrome/content/rules/MarsVenus.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 3f7ab70ae1d6ff8cc6980f66bd1faa9d3ab15c3f Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 20:14:24 +0000 Subject: [PATCH 044/844] Create Mishari_alAfasy.net.xml (#13740) --- src/chrome/content/rules/Mishari_alAfasy.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Mishari_alAfasy.net.xml diff --git a/src/chrome/content/rules/Mishari_alAfasy.net.xml b/src/chrome/content/rules/Mishari_alAfasy.net.xml new file mode 100644 index 000000000000..49be5ee2b94c --- /dev/null +++ b/src/chrome/content/rules/Mishari_alAfasy.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From d16c5b83b826c1789a604b690023a8b5fc7249dd Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 20:44:35 +0000 Subject: [PATCH 045/844] Create IslamicFiles.net.xml (#13739) --- src/chrome/content/rules/IslamicFiles.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/IslamicFiles.net.xml diff --git a/src/chrome/content/rules/IslamicFiles.net.xml b/src/chrome/content/rules/IslamicFiles.net.xml new file mode 100644 index 000000000000..c2f11474202e --- /dev/null +++ b/src/chrome/content/rules/IslamicFiles.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From de84fe3cb11d005a26f0ba977e2c32c6012c2290 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 20:44:53 +0000 Subject: [PATCH 046/844] Create TheMuslimahDiaries.com.xml (#13737) --- src/chrome/content/rules/TheMuslimahDiaries.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/TheMuslimahDiaries.com.xml diff --git a/src/chrome/content/rules/TheMuslimahDiaries.com.xml b/src/chrome/content/rules/TheMuslimahDiaries.com.xml new file mode 100644 index 000000000000..cfd132a3dfb0 --- /dev/null +++ b/src/chrome/content/rules/TheMuslimahDiaries.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 376c376c89d5eb5c40bec49dcf1828d85c606dff Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 20:51:40 +0000 Subject: [PATCH 047/844] Create ModerateUmmah.com.xml (#13735) --- src/chrome/content/rules/ModerateUmmah.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ModerateUmmah.com.xml diff --git a/src/chrome/content/rules/ModerateUmmah.com.xml b/src/chrome/content/rules/ModerateUmmah.com.xml new file mode 100644 index 000000000000..bdb266ced85a --- /dev/null +++ b/src/chrome/content/rules/ModerateUmmah.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From d456e8615d8e6bf0722d5178a3bf77645e54a51f Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 22:01:17 +0000 Subject: [PATCH 048/844] Create ImgTC.com.xml (#13730) --- src/chrome/content/rules/ImgTC.com.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/ImgTC.com.xml diff --git a/src/chrome/content/rules/ImgTC.com.xml b/src/chrome/content/rules/ImgTC.com.xml new file mode 100644 index 000000000000..513aababa310 --- /dev/null +++ b/src/chrome/content/rules/ImgTC.com.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 19e60423606c51e27ee215b23ba0416cbe6af022 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 22:01:43 +0000 Subject: [PATCH 049/844] Create JusticeForKatie.com.xml (#13628) --- src/chrome/content/rules/JusticeForKatie.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/JusticeForKatie.com.xml diff --git a/src/chrome/content/rules/JusticeForKatie.com.xml b/src/chrome/content/rules/JusticeForKatie.com.xml new file mode 100644 index 000000000000..146b4f40c642 --- /dev/null +++ b/src/chrome/content/rules/JusticeForKatie.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 263e2c4a78cf4c77796de87d03caaddfde30dc98 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 22:02:06 +0000 Subject: [PATCH 050/844] Create Thaqafa.org.xml (#13125) --- src/chrome/content/rules/Thaqafa.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Thaqafa.org.xml diff --git a/src/chrome/content/rules/Thaqafa.org.xml b/src/chrome/content/rules/Thaqafa.org.xml new file mode 100644 index 000000000000..b41fc64e5af5 --- /dev/null +++ b/src/chrome/content/rules/Thaqafa.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From 5daae4807ca11644089f8c3ffdee77f361591a9e Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 22:02:27 +0000 Subject: [PATCH 051/844] Create Waqf.info.xml (#13112) --- src/chrome/content/rules/Waqf.info.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Waqf.info.xml diff --git a/src/chrome/content/rules/Waqf.info.xml b/src/chrome/content/rules/Waqf.info.xml new file mode 100644 index 000000000000..b1edd87947e0 --- /dev/null +++ b/src/chrome/content/rules/Waqf.info.xml @@ -0,0 +1,8 @@ + + + + + + + + From daedb7762dfb73c9a1c8e8386dfa7c9d1b815854 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 12 Dec 2017 22:15:29 +0000 Subject: [PATCH 052/844] Create CallingChristians.com.xml (#13104) --- src/chrome/content/rules/CallingChristians.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/CallingChristians.com.xml diff --git a/src/chrome/content/rules/CallingChristians.com.xml b/src/chrome/content/rules/CallingChristians.com.xml new file mode 100644 index 000000000000..d8f42921ddef --- /dev/null +++ b/src/chrome/content/rules/CallingChristians.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 59f1c85a218914ffb15507c643d81498c9860028 Mon Sep 17 00:00:00 2001 From: ccfb3ee765a58cae Date: Tue, 12 Dec 2017 16:41:51 -0700 Subject: [PATCH 053/844] [myetherwallet.com] New ruleset (#13950) --- src/chrome/content/rules/MyEtherWallet.com.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/MyEtherWallet.com.xml diff --git a/src/chrome/content/rules/MyEtherWallet.com.xml b/src/chrome/content/rules/MyEtherWallet.com.xml new file mode 100644 index 000000000000..9f3aadb15326 --- /dev/null +++ b/src/chrome/content/rules/MyEtherWallet.com.xml @@ -0,0 +1,12 @@ + + + + + + + + From 2094fe9bbe0afb3bbfc43739af3cd1a7d20df7f3 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 13 Dec 2017 07:46:49 +0800 Subject: [PATCH 054/844] Remove mijnlandal.nl from Wyndham.xml (#13957) --- src/chrome/content/rules/Wyndham.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 8ca801e38a49..62cbd586b2f8 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -30,8 +30,6 @@ Fetch error: http://competitionsbywyndham.com.au/ => https://competitionsbywyndh Fetch error: http://www.competitionsbywyndham.com.au/ => https://www.competitionsbywyndham.com.au/: (60, 'SSL certificate problem: unable to get local issuer certificate') Fetch error: http://individual-villas.co.uk/ => https://www.individual-villas.co.uk/: (7, 'Failed to connect to www.individual-villas.co.uk port 443: Connection refused') Fetch error: http://www.individual-villas.co.uk/ => https://www.individual-villas.co.uk/: (7, 'Failed to connect to www.individual-villas.co.uk port 443: Connection refused') -Fetch error: http://mijnlandal.nl/ => https://mijnlandal.nl/: (28, 'Connection timed out after 20000 milliseconds') -Fetch error: http://www.mijnlandal.nl/ => https://www.mijnlandal.nl/: (28, 'Connection timed out after 20001 milliseconds') Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://wyndham.com/ => https://www.wyndham.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received') @@ -41,7 +39,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: Disabled by https-everywhere-checker because: Fetch error: http://competitionsbywyndham.com.au/ => https://competitionsbywyndham.com.au/: (60, 'SSL certificate problem: certificate has expired') Fetch error: http://www.competitionsbywyndham.com.au/ => https://www.competitionsbywyndham.com.au/: (60, 'SSL certificate problem: certificate has expired') -Fetch error: http://mijnlandal.nl/ => https://mijnlandal.nl/: (51, "SSL: no alternative certificate subject name matches target host name 'mijnlandal.nl'") Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 10001 milliseconds') Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 10000 milliseconds') Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') @@ -78,8 +75,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - @@ -116,10 +111,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - From ec7d8dee752033bfcf0ab999ceaaffa7d95d29cc Mon Sep 17 00:00:00 2001 From: Folant Date: Wed, 13 Dec 2017 01:56:05 +0200 Subject: [PATCH 055/844] Create Ganjoor.net.xml (#13956) --- src/chrome/content/rules/Ganjoor.net.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/Ganjoor.net.xml diff --git a/src/chrome/content/rules/Ganjoor.net.xml b/src/chrome/content/rules/Ganjoor.net.xml new file mode 100644 index 000000000000..ce5022e12566 --- /dev/null +++ b/src/chrome/content/rules/Ganjoor.net.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file From f20ea5bf625e92b25204df709acc1cea943b1187 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 13 Dec 2017 10:36:13 +0800 Subject: [PATCH 056/844] Add Travis test for obsolete ruleset references (#13732) --- test/travis.sh | 1 + utils/remove-obsolete-references.sh | 39 +++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 utils/remove-obsolete-references.sh diff --git a/test/travis.sh b/test/travis.sh index 10f822e73377..019c49c5257b 100755 --- a/test/travis.sh +++ b/test/travis.sh @@ -39,6 +39,7 @@ set -e if [ "$TEST" == "rules" ]; then echo >&2 "Performing comprehensive coverage test." docker run --rm -ti -v $(pwd):/opt httpse python utils/ruleset_filenames_validate.py + docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/remove-obsolete-references.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/validate.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/rules.sh" docker run --rm -ti -v $(pwd):/opt node bash -c "cd /opt && node utils/normalize-securecookie.js" diff --git a/utils/remove-obsolete-references.sh b/utils/remove-obsolete-references.sh new file mode 100644 index 000000000000..6b7d899445ce --- /dev/null +++ b/utils/remove-obsolete-references.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# Remove obsolete references to child rulesets which +# has been renamed/ deleted + + +# Change directory to git root; taken from ../test/test.sh +if [ -n "$GIT_DIR" ] +then + # $GIT_DIR is set, so we're running as a hook. + cd $GIT_DIR +else + # Git command exists? Cool, let's CD to the right place. + git rev-parse && cd "$(git rev-parse --show-toplevel)" +fi + +# Run from ruleset folder to simplify the output +cd src/chrome/content/rules + +# Default exit status +EXIT_CODE=0 + +# List of file(s) which contain at least one reference +FILES=`egrep -l '^\s*[-|+]\s*([^ ]*\.xml)\s*$' *.xml` + +while read FILE; do + # List of referenced rulesets + REFS=`sed -n 's/^\s*[-|+]\s*\([^ ]*\.xml\)\s*$/\1/gp' "$FILE"` + + while read REF; do + if [ ! -f "$REF" ]; then + echo >&2 "ERROR src/chrome/content/rules/$FILE: Dangling reference to $REF" + sed -i "/^\s*[-|+]\s*$REF$/d" "$FILE" + EXIT_CODE=1 + fi + done <<< "$REFS" +done <<< "$FILES" + +# Exit with errors, if any +exit "$EXIT_CODE" From f6cbf575de698d165873889dd0c149b203346a16 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 12 Dec 2017 15:22:30 -0800 Subject: [PATCH 057/844] Run utils/remove-obsolete-references.sh --- src/chrome/content/rules/360.cn.xml | 1 - src/chrome/content/rules/ABC-Music-Publishing.xml | 1 - src/chrome/content/rules/AOL.xml | 3 --- src/chrome/content/rules/Akamai.xml | 1 - src/chrome/content/rules/Apache.xml | 1 - src/chrome/content/rules/Ars-Technica.xml | 1 - src/chrome/content/rules/Arukereso.xml | 1 - src/chrome/content/rules/Atlassian.xml | 2 -- src/chrome/content/rules/AvaHost.xml | 1 - src/chrome/content/rules/Avast.com.xml | 1 - src/chrome/content/rules/BitQuick.xml | 1 - src/chrome/content/rules/Burst_Media.xml | 1 - src/chrome/content/rules/CBS.xml | 3 --- src/chrome/content/rules/CCH.xml | 1 - src/chrome/content/rules/Canon.xml | 1 - src/chrome/content/rules/Charts_in_France.xml | 1 - src/chrome/content/rules/CloudFlare.xml | 1 - src/chrome/content/rules/Corban_Works.com.xml | 1 - src/chrome/content/rules/Cosmopolitan.xml | 1 - src/chrome/content/rules/DANTE.net.xml | 1 - src/chrome/content/rules/DNB.no.xml | 1 - src/chrome/content/rules/Delish.xml | 1 - src/chrome/content/rules/Demand-Media.xml | 1 - src/chrome/content/rules/Demandware.xml | 1 - src/chrome/content/rules/Dice.xml | 1 - src/chrome/content/rules/Digia.xml | 1 - src/chrome/content/rules/Digital-River.xml | 1 - src/chrome/content/rules/Drchrono.com.xml | 1 - src/chrome/content/rules/DuckCorp.xml | 1 - src/chrome/content/rules/EDRi.org.xml | 1 - src/chrome/content/rules/EFF.xml | 1 - src/chrome/content/rules/EW-Scripps-Company.xml | 1 - src/chrome/content/rules/Edoceo.com.xml | 1 - src/chrome/content/rules/Elsevier.xml | 1 - src/chrome/content/rules/Eventim.xml | 1 - src/chrome/content/rules/Evidon.xml | 1 - src/chrome/content/rules/FierceMarkets.xml | 1 - src/chrome/content/rules/Flipkart.com.xml | 1 - src/chrome/content/rules/Flite.xml | 1 - src/chrome/content/rules/GMO_Internet.xml | 1 - src/chrome/content/rules/GOV.UK.xml | 1 - src/chrome/content/rules/Gannett-Company.xml | 1 - src/chrome/content/rules/German_Privacy_Foundation.xml | 1 - src/chrome/content/rules/Gigabyte.com.xml | 2 -- src/chrome/content/rules/GoogleServices.xml | 1 - src/chrome/content/rules/HH.ru.xml | 1 - src/chrome/content/rules/Hearst-Corporation.xml | 1 - src/chrome/content/rules/IBM.xml | 1 - src/chrome/content/rules/INet-Interactive.xml | 1 - src/chrome/content/rules/IOS_Dev_Weekly.com.xml | 1 - src/chrome/content/rules/JD.com.xml | 1 - src/chrome/content/rules/Jappix.xml | 3 --- src/chrome/content/rules/Khronos.xml | 1 - src/chrome/content/rules/Ksplice.xml | 1 - src/chrome/content/rules/LinuxFoundation.xml | 1 - src/chrome/content/rules/Mochimedia.xml | 1 - src/chrome/content/rules/Mozilla.xml | 4 ---- src/chrome/content/rules/NHN-Corporation.xml | 1 - src/chrome/content/rules/NPario.xml | 1 - src/chrome/content/rules/NYTimes.xml | 1 - src/chrome/content/rules/National-Broadcasting-Company.xml | 1 - .../content/rules/National-Renewable-Energy-Laboratory.xml | 7 ------- src/chrome/content/rules/NeuStar.xml | 1 - src/chrome/content/rules/News-Corporation.xml | 1 - src/chrome/content/rules/Nitro_Cloud.com.xml | 1 - src/chrome/content/rules/OkCupid.xml | 1 - src/chrome/content/rules/Open_Rights_Group.xml | 1 - src/chrome/content/rules/Openstreetmap.fr.xml | 1 - src/chrome/content/rules/Oracle.xml | 1 - src/chrome/content/rules/Ping_Identity.xml | 1 - src/chrome/content/rules/Pivotal.xml | 1 - src/chrome/content/rules/PlugRush.com.xml | 1 - src/chrome/content/rules/Portner_Press.com.au.xml | 1 - src/chrome/content/rules/PriceGrabber.xml | 1 - src/chrome/content/rules/Puush.me.xml | 1 - src/chrome/content/rules/QualityUnit.xml | 1 - src/chrome/content/rules/Rakuten.co.jp.xml | 7 ------- src/chrome/content/rules/Raptr.com.xml | 1 - src/chrome/content/rules/RoseHosting.com.xml | 3 --- src/chrome/content/rules/Rovi.xml | 1 - src/chrome/content/rules/Samsung.xml | 1 - src/chrome/content/rules/Schwartz_Media.com.au.xml | 2 -- src/chrome/content/rules/Sears.com.xml | 1 - src/chrome/content/rules/Silent_Circle.xml | 1 - src/chrome/content/rules/SixApart.xml | 1 - src/chrome/content/rules/Sony.xml | 1 - src/chrome/content/rules/Sourcefabric.org.xml | 1 - src/chrome/content/rules/Springer.xml | 1 - src/chrome/content/rules/Swisscom.ch.xml | 1 - src/chrome/content/rules/Sylvan_Company.com.xml | 1 - src/chrome/content/rules/TNS-Global.xml | 2 -- src/chrome/content/rules/TSO.co.uk.xml | 1 - src/chrome/content/rules/ThePirateBay.xml | 3 --- src/chrome/content/rules/The_Guardian.com.xml | 1 - src/chrome/content/rules/Thomson-Reuters.xml | 1 - src/chrome/content/rules/Trellian.xml | 1 - src/chrome/content/rules/Tremor_Video.com.xml | 1 - src/chrome/content/rules/Tumblr.xml | 1 - src/chrome/content/rules/Ubuntu.xml | 1 - src/chrome/content/rules/Uninett.xml | 1 - src/chrome/content/rules/Us_Magazine.com.xml | 1 - src/chrome/content/rules/Verio.xml | 1 - src/chrome/content/rules/Vox.com.xml | 1 - src/chrome/content/rules/Wargaming.net.xml | 1 - src/chrome/content/rules/Washington-Post-Company.xml | 2 -- src/chrome/content/rules/WebMoney.xml | 1 - src/chrome/content/rules/Western_Union.xml | 1 - src/chrome/content/rules/Whitepages.com.xml | 1 - src/chrome/content/rules/WorldWildlife.org.xml | 1 - src/chrome/content/rules/YoursAV.com.xml | 2 -- src/chrome/content/rules/ZUNO.eu.xml | 1 - src/chrome/content/rules/ZeniMax.com.xml | 1 - src/chrome/content/rules/Ziff-Davis.xml | 1 - src/chrome/content/rules/bizx.info.xml | 1 - src/chrome/content/rules/istockphoto.com.xml | 1 - 115 files changed, 146 deletions(-) diff --git a/src/chrome/content/rules/360.cn.xml b/src/chrome/content/rules/360.cn.xml index e2290752ad2c..9db6a5f731ff 100644 --- a/src/chrome/content/rules/360.cn.xml +++ b/src/chrome/content/rules/360.cn.xml @@ -2,7 +2,6 @@ Other Qihoo 360 Technology rulesets: - 360_Safe.com.xml - 360_Total_Security.com.xml - - Qh_img.com.xml - Qihu_CDN.com.xml - So.com.xml diff --git a/src/chrome/content/rules/ABC-Music-Publishing.xml b/src/chrome/content/rules/ABC-Music-Publishing.xml index 1696a57180c8..c388e7f7a79b 100644 --- a/src/chrome/content/rules/ABC-Music-Publishing.xml +++ b/src/chrome/content/rules/ABC-Music-Publishing.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/AOL.xml b/src/chrome/content/rules/AOL.xml index 03385b28eed2..0620b1e54870 100644 --- a/src/chrome/content/rules/AOL.xml +++ b/src/chrome/content/rules/AOL.xml @@ -5,7 +5,6 @@ Other AOL rulesets: - - 5min.xml - AboutMe.xml - AdSonar.com.xml - Adap.TV.xml @@ -19,12 +18,10 @@ - AOL_On_Network.com.xml - AOL_Platforms.com.xml - Auto_Blog.com.xml - - Blogcdn.com.xml - blogsmithmedia.com.xml - CrunchBoard.com.xml - Engadget.com.xml - Huffington-Post.xml - - Joystiq.com.xml - Moviefone.xml - Netscape.com.xml diff --git a/src/chrome/content/rules/Akamai.xml b/src/chrome/content/rules/Akamai.xml index 629bd3bf93ea..37f258c766b8 100644 --- a/src/chrome/content/rules/Akamai.xml +++ b/src/chrome/content/rules/Akamai.xml @@ -5,7 +5,6 @@ Other Akamai rulesets: - Akamai.com.xml - - Edgeboss.net.xml Nonfunctional domains: diff --git a/src/chrome/content/rules/Apache.xml b/src/chrome/content/rules/Apache.xml index ef7e47bc574f..4ef0d5795c38 100644 --- a/src/chrome/content/rules/Apache.xml +++ b/src/chrome/content/rules/Apache.xml @@ -6,7 +6,6 @@ - ApacheCon.com.xml - Apache-OpenOffice.xml - - Apache-SSL.org.xml Nonfunctional subdomains: diff --git a/src/chrome/content/rules/Ars-Technica.xml b/src/chrome/content/rules/Ars-Technica.xml index 85ec7d9c6031..4e439ca4029e 100644 --- a/src/chrome/content/rules/Ars-Technica.xml +++ b/src/chrome/content/rules/Ars-Technica.xml @@ -4,7 +4,6 @@ Other Ars Technica rulesets: - - arstechnica.co.uk.xml CDN buckets: diff --git a/src/chrome/content/rules/Arukereso.xml b/src/chrome/content/rules/Arukereso.xml index a2130a75ca72..a546425f8183 100644 --- a/src/chrome/content/rules/Arukereso.xml +++ b/src/chrome/content/rules/Arukereso.xml @@ -3,7 +3,6 @@ - Compari.ro.xml - Pazaruvaj.com.xml - - Precos.com.pt.xml - Ucuzu.com.xml diff --git a/src/chrome/content/rules/Atlassian.xml b/src/chrome/content/rules/Atlassian.xml index 8320339e48a5..a852e969fc77 100644 --- a/src/chrome/content/rules/Atlassian.xml +++ b/src/chrome/content/rules/Atlassian.xml @@ -1,8 +1,6 @@ diff --git a/src/chrome/content/rules/Demand-Media.xml b/src/chrome/content/rules/Demand-Media.xml index d369cd6f2035..3c5fa1e094e4 100644 --- a/src/chrome/content/rules/Demand-Media.xml +++ b/src/chrome/content/rules/Demand-Media.xml @@ -13,7 +13,6 @@ Fetch error: http://www.demandstudios.com/ => https://www.demandstudios.com/: (2 - Enom.xml - ENomCentral.xml - GolfLink.com.xml - - Live_Strong.com.xml - Registryrocket.com.xml diff --git a/src/chrome/content/rules/Demandware.xml b/src/chrome/content/rules/Demandware.xml index 7e339b16e796..fe744a0d3df8 100644 --- a/src/chrome/content/rules/Demandware.xml +++ b/src/chrome/content/rules/Demandware.xml @@ -8,7 +8,6 @@ Fetch error: http://investors.demandware.com/media_files/IROL/24/247632/2015/img - cquotient.com.xml - Demandware.net.xml - - Demandware.edgesuite.net.xml bucket: demandware.edgesuite.net/aabl_prd/on/demandware.static/ diff --git a/src/chrome/content/rules/Dice.xml b/src/chrome/content/rules/Dice.xml index 43efab846868..6384a9fbc5d3 100644 --- a/src/chrome/content/rules/Dice.xml +++ b/src/chrome/content/rules/Dice.xml @@ -6,7 +6,6 @@ - EFinancialCareers.xml - EFinancialCareers.cn.xml - - SlashCDN.com.xml - Slashdot_Media.xml diff --git a/src/chrome/content/rules/Digia.xml b/src/chrome/content/rules/Digia.xml index 8bfcfa7be53c..a5f3807fd288 100644 --- a/src/chrome/content/rules/Digia.xml +++ b/src/chrome/content/rules/Digia.xml @@ -7,7 +7,6 @@ Disabled by https-everywhere-checker because: Fetch error: http://blog.qt.digia.com/ => https://blog.qt.digia.com/: (51, "SSL: no alternative certificate subject name matches target host name 'blog.qt.digia.com'") Other Digia rulesets: - - Qt.xml - Qt.io.xml - Qt_Cloud_Services.com.xml diff --git a/src/chrome/content/rules/Digital-River.xml b/src/chrome/content/rules/Digital-River.xml index 215289118a6b..25e634fea5fe 100644 --- a/src/chrome/content/rules/Digital-River.xml +++ b/src/chrome/content/rules/Digital-River.xml @@ -6,7 +6,6 @@ - Element_5.xml - Esellerate.net.xml - Find_My_Order.com.xml - - Fireclick.com.xml - Marketstudio.net.xml - MyCommerce.xml - Netflame.cc.xml diff --git a/src/chrome/content/rules/Drchrono.com.xml b/src/chrome/content/rules/Drchrono.com.xml index eba1c3f94244..97ec6e4347af 100644 --- a/src/chrome/content/rules/Drchrono.com.xml +++ b/src/chrome/content/rules/Drchrono.com.xml @@ -5,7 +5,6 @@ Fetch error: http://drchrono.com/ => https://drchrono.com/: Too many redirects w Other Drchrono rulesets: - - Onpatient.com.xml Insecure cookies are set for these hosts: diff --git a/src/chrome/content/rules/DuckCorp.xml b/src/chrome/content/rules/DuckCorp.xml index 30664e1cfbbe..61fb73769945 100644 --- a/src/chrome/content/rules/DuckCorp.xml +++ b/src/chrome/content/rules/DuckCorp.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/EW-Scripps-Company.xml b/src/chrome/content/rules/EW-Scripps-Company.xml index 9cff39f25527..e029ea193d7e 100644 --- a/src/chrome/content/rules/EW-Scripps-Company.xml +++ b/src/chrome/content/rules/EW-Scripps-Company.xml @@ -12,7 +12,6 @@ Fetch error: http://redding.com/ => https://www.redding.com/: (51, "SSL: no alte Fetch error: http://www.redding.com/ => https://www.redding.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.redding.com'") Other E. W. Scripps Company rulesets: - - Scrippsing.com.xml CDN buckets: diff --git a/src/chrome/content/rules/Edoceo.com.xml b/src/chrome/content/rules/Edoceo.com.xml index 82382833dd6a..6077a1d3d6e8 100644 --- a/src/chrome/content/rules/Edoceo.com.xml +++ b/src/chrome/content/rules/Edoceo.com.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/Gigabyte.com.xml b/src/chrome/content/rules/Gigabyte.com.xml index ce9df4936134..0749029a609a 100644 --- a/src/chrome/content/rules/Gigabyte.com.xml +++ b/src/chrome/content/rules/Gigabyte.com.xml @@ -1,8 +1,6 @@ diff --git a/src/chrome/content/rules/Ksplice.xml b/src/chrome/content/rules/Ksplice.xml index 15c0bda64809..229df857b751 100644 --- a/src/chrome/content/rules/Ksplice.xml +++ b/src/chrome/content/rules/Ksplice.xml @@ -2,7 +2,6 @@ Other Oracle rulesets: - MySQL.xml - - MySQL-mismatches.xml - NetBeans.zml - Oracle.xml - Oracle-mismatches.xml diff --git a/src/chrome/content/rules/LinuxFoundation.xml b/src/chrome/content/rules/LinuxFoundation.xml index 8d23eb275b33..4c7bfe64c777 100644 --- a/src/chrome/content/rules/LinuxFoundation.xml +++ b/src/chrome/content/rules/LinuxFoundation.xml @@ -4,7 +4,6 @@ - AllSeen_Alliance.org.xml - Automotive_Linux.org.xml - - Core_Infrastructure.org.xml - FOSSBazaar.org.xml - hyperledger.org.xml - iovisor.org.xml diff --git a/src/chrome/content/rules/Mochimedia.xml b/src/chrome/content/rules/Mochimedia.xml index 0cc75465c5ac..236f4fca908a 100644 --- a/src/chrome/content/rules/Mochimedia.xml +++ b/src/chrome/content/rules/Mochimedia.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml index 892ac809329e..d2f5d8541c1c 100644 --- a/src/chrome/content/rules/Mozilla.xml +++ b/src/chrome/content/rules/Mozilla.xml @@ -9,7 +9,6 @@ - BadgeKit.org.xml - Bugzilla.xml - Firefox.com.xml - - GetPersonas.xml - Lizard_Wrangler.com.xml - Makes.org.xml - Mozilla.com.xml @@ -18,14 +17,11 @@ - Mozilla.net.xml - Mozilla-Community.org.xml - Mozilla_Demos.org.xml - - Mozilla_Ignite.org.xml - Mozilla_Messaging.com.xml - Mozilla_Webmaker.xml - - Mozillians.org.xml - Moztw.org.xml - mzl.la (via Bitly_branded_short_domains.xml) - Open_Badges.xml - - Public_Suffix.org.xml - Searchfox.org.xml - TaskCluster.net - TogetherJS.com.xml diff --git a/src/chrome/content/rules/NHN-Corporation.xml b/src/chrome/content/rules/NHN-Corporation.xml index a827378841b8..cb7e099aab95 100644 --- a/src/chrome/content/rules/NHN-Corporation.xml +++ b/src/chrome/content/rules/NHN-Corporation.xml @@ -2,7 +2,6 @@ Other NHN Corporation rulesets: - - Anker.xml - Unthem.xml --> diff --git a/src/chrome/content/rules/NPario.xml b/src/chrome/content/rules/NPario.xml index e515c09988a6..4978fb4f7ce5 100644 --- a/src/chrome/content/rules/NPario.xml +++ b/src/chrome/content/rules/NPario.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml b/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml index f759d19e214e..6e85c3c854c1 100644 --- a/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml +++ b/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml @@ -3,27 +3,20 @@ - Colorado-Attorney-General.xml - CPSC.xml - - Disability.gov.xml - ED.gov.xml - Employeeexpress.gov.xml - EnergyStar.xml - - Epls.gov.xml - Federal-Register.xml - G5.gov.xml - - NSF.gov.xml - OSHA.gov.xml - Pay.gov.xml - - Senate.gov.xml - SocialSecurity.xml - - StudentLoans.gov.xml - Treasurydirect.gov.xml - USA.gov.xml - US-CBO.gov.xml - Us-cert.gov.xml - USDA-ARS.xml - US-Dept-of-Veterans-Affairs.xml - - US-government.xml - - US-government-mismatches.xml - US-Selective-Service-System.xml --> diff --git a/src/chrome/content/rules/NeuStar.xml b/src/chrome/content/rules/NeuStar.xml index 1daca4d0b951..c53ea1a39e2b 100644 --- a/src/chrome/content/rules/NeuStar.xml +++ b/src/chrome/content/rules/NeuStar.xml @@ -13,7 +13,6 @@ Fetch error: http://registry.neustar.biz/ => https://registry.neustar.biz/: (60, - Neuweb.biz.xml - TCPA_Compliance.us.xml - UltraDNS.xml - - UltraDNS.com.xml - Webmetrics.com.xml - Neustar.com.xml - UltraTools.com.xml diff --git a/src/chrome/content/rules/News-Corporation.xml b/src/chrome/content/rules/News-Corporation.xml index b408132a184d..d272b8a2b374 100644 --- a/src/chrome/content/rules/News-Corporation.xml +++ b/src/chrome/content/rules/News-Corporation.xml @@ -26,7 +26,6 @@ Fetch error: http://services.wsje.com/ => https://services.wsje.com/: (60, 'SSL - thesun.ie.xml - Times.xml - wsj.com.xml - - wsj.net.xml CDN buckets: diff --git a/src/chrome/content/rules/Nitro_Cloud.com.xml b/src/chrome/content/rules/Nitro_Cloud.com.xml index 7667a6485266..8cc8ad2f8d56 100644 --- a/src/chrome/content/rules/Nitro_Cloud.com.xml +++ b/src/chrome/content/rules/Nitro_Cloud.com.xml @@ -2,7 +2,6 @@ Other Nitro Software rulesets: - - Milodev.com.xml - PDF_to_Word.com.xml --> diff --git a/src/chrome/content/rules/OkCupid.xml b/src/chrome/content/rules/OkCupid.xml index b22d3e589fed..bc9f4c240e96 100644 --- a/src/chrome/content/rules/OkCupid.xml +++ b/src/chrome/content/rules/OkCupid.xml @@ -1,6 +1,5 @@ diff --git a/src/chrome/content/rules/TNS-Global.xml b/src/chrome/content/rules/TNS-Global.xml index cdb731580b37..9371a448352b 100644 --- a/src/chrome/content/rules/TNS-Global.xml +++ b/src/chrome/content/rules/TNS-Global.xml @@ -1,12 +1,10 @@ diff --git a/src/chrome/content/rules/Western_Union.xml b/src/chrome/content/rules/Western_Union.xml index 91331e5ac597..4c2dbb5920e6 100644 --- a/src/chrome/content/rules/Western_Union.xml +++ b/src/chrome/content/rules/Western_Union.xml @@ -5,7 +5,6 @@ Non-2xx HTTP code: http://westernunion.com/ (200) => https://westernunion.com/ ( Other Western Union rulesets: - - WU_Payment_Solutions.com.xml - westernunion.com.d1.sc.omtrdc.net diff --git a/src/chrome/content/rules/Whitepages.com.xml b/src/chrome/content/rules/Whitepages.com.xml index c13ff7ecb9e0..87b15f6ff692 100644 --- a/src/chrome/content/rules/Whitepages.com.xml +++ b/src/chrome/content/rules/Whitepages.com.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/ZUNO.eu.xml b/src/chrome/content/rules/ZUNO.eu.xml index 661389a23049..f5a1210c82ac 100644 --- a/src/chrome/content/rules/ZUNO.eu.xml +++ b/src/chrome/content/rules/ZUNO.eu.xml @@ -1,6 +1,5 @@ diff --git a/src/chrome/content/rules/ZeniMax.com.xml b/src/chrome/content/rules/ZeniMax.com.xml index b817caf02be6..dab8d8d41afc 100644 --- a/src/chrome/content/rules/ZeniMax.com.xml +++ b/src/chrome/content/rules/ZeniMax.com.xml @@ -6,7 +6,6 @@ - ElderScrolls.com.xml - Elder_Scrolls_Online.com.xml - Dishonored.com.xml - - Id-Software.com.xml - ZeniMaxOnline.com.xml diff --git a/src/chrome/content/rules/Ziff-Davis.xml b/src/chrome/content/rules/Ziff-Davis.xml index 87b42d8f3f4c..3c026fdd149c 100644 --- a/src/chrome/content/rules/Ziff-Davis.xml +++ b/src/chrome/content/rules/Ziff-Davis.xml @@ -7,7 +7,6 @@ - Extreme_Tech.com.xml - Geek.com.xml - IT_Toolbox.com.xml - - Toolbox.com.xml - ZDbb.net.xml - ZDmcirc.com.xml diff --git a/src/chrome/content/rules/bizx.info.xml b/src/chrome/content/rules/bizx.info.xml index 272733b8ed31..83a05e84b573 100644 --- a/src/chrome/content/rules/bizx.info.xml +++ b/src/chrome/content/rules/bizx.info.xml @@ -1,7 +1,6 @@ diff --git a/src/chrome/content/rules/Ars-Technica.xml b/src/chrome/content/rules/Ars-Technica.xml index 4e439ca4029e..6c0caa9d7deb 100644 --- a/src/chrome/content/rules/Ars-Technica.xml +++ b/src/chrome/content/rules/Ars-Technica.xml @@ -2,10 +2,6 @@ For other Condé Nast coverage, see Conde-Nast.xml. - Other Ars Technica rulesets: - - - CDN buckets: - condenast.112.2o7.net diff --git a/src/chrome/content/rules/AvaHost.xml b/src/chrome/content/rules/AvaHost.xml index db9a6d7d8ef5..5cd6a9d2622a 100644 --- a/src/chrome/content/rules/AvaHost.xml +++ b/src/chrome/content/rules/AvaHost.xml @@ -6,9 +6,6 @@ Fetch error: http://www.secure.avahost.net/ => https://www.secure.avahost.net/: Disabled by https-everywhere-checker because: Fetch error: http://secure.avahost.net/ => https://secure.avahost.net/: (60, 'SSL certificate problem: unable to get local issuer certificate') Fetch error: http://www.secure.avahost.net/ => https://www.secure.avahost.net/: (60, 'SSL certificate problem: unable to get local issuer certificate') - Other AvaHost rulesets: - - Nonfunctional subdomains: @@ -26,4 +23,4 @@ Fetch error: http://www.secure.avahost.net/ => https://www.secure.avahost.net/: - \ No newline at end of file + diff --git a/src/chrome/content/rules/Avast.com.xml b/src/chrome/content/rules/Avast.com.xml index 670eaf2ef087..fa6201027482 100644 --- a/src/chrome/content/rules/Avast.com.xml +++ b/src/chrome/content/rules/Avast.com.xml @@ -1,6 +1,4 @@ @@ -14,4 +9,4 @@ - \ No newline at end of file + diff --git a/src/chrome/content/rules/Gigabyte.com.xml b/src/chrome/content/rules/Gigabyte.com.xml index 0749029a609a..03d0260442a2 100644 --- a/src/chrome/content/rules/Gigabyte.com.xml +++ b/src/chrome/content/rules/Gigabyte.com.xml @@ -1,7 +1,4 @@ diff --git a/src/chrome/content/rules/Mochimedia.xml b/src/chrome/content/rules/Mochimedia.xml index 236f4fca908a..8aa94c1c8551 100644 --- a/src/chrome/content/rules/Mochimedia.xml +++ b/src/chrome/content/rules/Mochimedia.xml @@ -1,8 +1,3 @@ - diff --git a/src/chrome/content/rules/NPario.xml b/src/chrome/content/rules/NPario.xml index 4978fb4f7ce5..79ce120e2327 100644 --- a/src/chrome/content/rules/NPario.xml +++ b/src/chrome/content/rules/NPario.xml @@ -1,8 +1,4 @@ diff --git a/src/chrome/content/rules/TSO.co.uk.xml b/src/chrome/content/rules/TSO.co.uk.xml index 799b81e87d6f..0db903cc31b1 100644 --- a/src/chrome/content/rules/TSO.co.uk.xml +++ b/src/chrome/content/rules/TSO.co.uk.xml @@ -3,10 +3,6 @@ Disabled by https-everywhere-checker because: Non-2xx HTTP code: http://tso.co.uk/ (200) => https://www.tso.co.uk/ (503) - Other TSO rulesets: - - - Problematic subdomains: - ^ (cert only matches www) @@ -27,4 +23,4 @@ Non-2xx HTTP code: http://tso.co.uk/ (200) => https://www.tso.co.uk/ (503) - \ No newline at end of file + diff --git a/src/chrome/content/rules/Us_Magazine.com.xml b/src/chrome/content/rules/Us_Magazine.com.xml index 6f9beeebd9bc..40f55d8ee1df 100644 --- a/src/chrome/content/rules/Us_Magazine.com.xml +++ b/src/chrome/content/rules/Us_Magazine.com.xml @@ -1,8 +1,4 @@ diff --git a/src/chrome/content/rules/istockphoto.com.xml b/src/chrome/content/rules/istockphoto.com.xml index 63a935272dde..f459d08fdc97 100644 --- a/src/chrome/content/rules/istockphoto.com.xml +++ b/src/chrome/content/rules/istockphoto.com.xml @@ -4,10 +4,6 @@ Disabled by https-everywhere-checker because: Fetch error: http://istockphoto.com/ => https://istockphoto.com/: Too many redirects while fetching 'https://istockphoto.com/' Fetch error: http://refer.istockphoto.com/ => https://refer.istockphoto.com/: Too many redirects while fetching 'https://refer.istockphoto.com/' - Other iStockphoto rulesets: - - - Nonfunctional hosts in istockphoto.com: - content ᵈ From 2f3bf2bf0a0bdcfe103662788363140bc77fa55e Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 12 Dec 2017 18:38:38 -0800 Subject: [PATCH 059/844] Remove whitespace from blank line --- utils/remove-obsolete-references.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/remove-obsolete-references.sh b/utils/remove-obsolete-references.sh index 6b7d899445ce..04dba095c2c3 100644 --- a/utils/remove-obsolete-references.sh +++ b/utils/remove-obsolete-references.sh @@ -25,7 +25,7 @@ FILES=`egrep -l '^\s*[-|+]\s*([^ ]*\.xml)\s*$' *.xml` while read FILE; do # List of referenced rulesets REFS=`sed -n 's/^\s*[-|+]\s*\([^ ]*\.xml\)\s*$/\1/gp' "$FILE"` - + while read REF; do if [ ! -f "$REF" ]; then echo >&2 "ERROR src/chrome/content/rules/$FILE: Dangling reference to $REF" From 277e98947688f7f7acd9ffe6d716e7a463ae42da Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 12 Dec 2017 19:01:54 -0800 Subject: [PATCH 060/844] Only consider ".+" a trivial cookie rule regex (#11872) --- chromium/rules.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/chromium/rules.js b/chromium/rules.js index 940eb0204e9f..6efb12a96c4a 100644 --- a/chromium/rules.js +++ b/chromium/rules.js @@ -10,10 +10,9 @@ let settings = { }; // To reduce memory usage for the numerous rules/cookies with trivial rules -const trivial_rule_to = "https:"; -const trivial_rule_from_c = new RegExp("^http:"); -const trivial_cookie_name_c = new RegExp(".*"); -const trivial_cookie_host_c = new RegExp(".*"); +const trivial_rule_from_c = /^http:/; +const trivial_rule_to = 'https:'; +const trivial_cookie_rule_c = /.+/; // Empty iterable singleton to reduce memory usage const nullIterable = Object.create(null, { @@ -62,16 +61,16 @@ function Exclusion(pattern) { * @constructor */ function CookieRule(host, cookiename) { - if (host === ".*" || host === ".+" || host === ".") { + if (host === '.+') { // Some cookie rules trivially match any host. - this.host_c = trivial_cookie_host_c; + this.host_c = trivial_cookie_rule_c; } else { this.host_c = new RegExp(host); } - if (cookiename === ".*" || cookiename === ".+" || cookiename === ".") { + if (cookiename === '.+') { // About 50% of cookie rules trivially match any name. - this.name_c = trivial_cookie_name_c; + this.name_c = trivial_cookie_rule_c; } else { this.name_c = new RegExp(cookiename); } From 38aa5cf874731b7c05fb0497574f5799fc4b7fb7 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 12 Dec 2017 19:02:43 -0800 Subject: [PATCH 061/844] Update devtools-panel.html (#12277) --- chromium/devtools-panel.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/devtools-panel.html b/chromium/devtools-panel.html index 38aeec0024ae..041cc1890c4d 100644 --- a/chromium/devtools-panel.html +++ b/chromium/devtools-panel.html @@ -4,7 +4,10 @@ From 57235592e0a2c023f88580a3e2deef5104965da8 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 12 Dec 2017 19:13:16 -0800 Subject: [PATCH 062/844] Add execution flag to utils/remove-obsolete-references.sh --- utils/remove-obsolete-references.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 utils/remove-obsolete-references.sh diff --git a/utils/remove-obsolete-references.sh b/utils/remove-obsolete-references.sh old mode 100644 new mode 100755 From c52351c5e862700398e4548f0e2691cd8fa1cb94 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 12 Dec 2017 22:36:09 -0800 Subject: [PATCH 063/844] Replacing whitelist with updated hashes --- utils/ruleset-whitelist.csv | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 05491fc9116d..771a5efb476e 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -127,7 +127,7 @@ aee8c092d43b19e5d72ec8c69b30072bb2412d73215775a488833c922a9aaaf4,1,1,AIA-Surety. 3795b077a9e02ed07bc05bac637c61549dcd7d90a84a1248bb52fc82a31e5f94,1,1,Airtricity.xml 034ff7106c791ad8f0fa08fb6d9a415dd04f5fc3a4836accba2e91dc899e54b9,1,1,AkademikerForsakring.se.xml a545c25b0283cf517189ce36a6dddce5df2929e18e6ecec11e7d392ded07c12f,1,1,AkademiskaHus.se.xml -28b76c2f702492d40ad9323055074697317885c2a8e6be377f08199c15f90f94,1,0,Akamai.xml +7cc75135ed0cd3b81ef62e24de4ca2da433caeb54b12aca1bd0d4efdc01f31db,1,0,Akamai.xml 5e1cdb7d9af34842a8c2b7c7f414caa8b84bafe4072bb7d883f7084dd5edcdfb,0,1,Akban.org.xml a51944a1bddd9a16f65544770d110e4f3d8db4a39a341d9bdd907a38a5b4d98d,1,1,Aktion-Deutschland-Hilft.de.xml 4be7e0c8c19b3bc7ce6a228c7f867f4ca8fa474671c4c1a2fa1186e31f0fed06,1,1,AlaskaAirlines.xml @@ -549,13 +549,13 @@ f57a8aceb54e732b6b3c8fd1648b923d7061e7f2a4e740fa769fe264cf0f317f,1,1,CatN.com.xm cb89627369982908c0f26a2057bfc12a61b87dc3859a7524a6fb20f638d07db2,1,1,CBSIstatic.net.xml fc23e2bcd6c3abd0e6d5304c0a11e8c3812a60b34809ed8b7b2bb2240b811368,0,1,CBS-Sports-Network.xml dce47057289512712f6a81473c0392ebeec435bede445e2418949d20001d4c5b,1,1,CBS_Store.xml -67d3897fa7d1811469ed6d32a8074309474f41d03fe151ed65259607269f822a,1,1,CBS.xml +fa4b5cc10eda4105a919a14355ee198140034cf659b4de8d84c4db1b2e0d0647,1,1,CBS.xml 30013485574b054268bdaee6655f649027c836449bbea345526fde438960fe73,1,1,CCAvenue.xml dded44f856c5b22d92e7be6fc15b90dce78ce9a0c565ef54ba0fe815e78cdbcf,1,1,CC.com.xml 2d265021229b69c10311b29249bbac63a42cdbbf79f925a44ba9559e7a7f9bf7,1,1,CCCure.training.xml 7955a0d3d6af6b18aca473a36e0f62d93db444b63e032c8022673c2dae949c0a,1,0,ccczh.ch.xml 1c4096e30615c3d13b6ecac18f42304e15922a35c07ef669ec8f3dc245701606,0,1,Cchtml.com.xml -430a652e306a687903f0c37e1e48de430b7a83ec245f7a4be1000b2b19c57be6,1,1,CCH.xml +db451c15ae5f229be88b4de367c9a6a0589742ddf7a26b1eacd518efc87527d4,1,1,CCH.xml 395743d4266969cafec28bb5a7d0ea3df0f409f417bbd5198dac7407dbb6b08e,0,1,CDN77.com-problematic.xml dadc27805296e0616502f8dab61f19e1101e29bceeb58be4d7628fffe56f0a8d,1,1,CDN77.com.xml 12021169f7500a9698c21fb42390772f04504964944dfc3a2e7d709980879cee,1,0,cdngc.net.xml @@ -805,7 +805,7 @@ fda707e8dada58291ee3866612e09eb478bb59cec4e118d8a3e1322fd624f194,0,1,Daily_Mail_ 607ae42d3906148f643091e3d42025c9ffc9997b3064de7de892580adfbee5dc,0,1,Dakko.us.xml 0d3faf3da32111974235f26aaa4eb8ddc0f33c008708c891bc5cd95e29172e8c,0,1,Damn_Small_Linux.org.xml f93e9da945b15136beb53eeabcb53d9d5bf1f31abe20c877ffb727cba27a2f00,1,1,DandB.xml -8ea64c00a8ef34aa30fd5d8f5eb03784eb80ee443e59122976baceaba695d1bb,1,1,DANTE.net.xml +d34d3a77ed0a2a71ab5a995bc8bd73f2fdc28bf55c1b78033d5b4dfa546b8cae,1,1,DANTE.net.xml fa6bf5ecbf93413bbfdfc339db3977600f5056a2837d15df74fbbb5dfcdcc1b6,1,1,Darmstadt_University_of_Applied_Sciences.xml 2d7db66046578cb426ac52ffa00a0fc9091ea3c478a40f085fbfb2105f24d2ae,1,1,Dartmouth_College.xml 3403f1624cd1350a9d7db9ccc20fe13619099815c6c6641ef55f4d3160338c78,0,1,Dasource.xml @@ -881,7 +881,7 @@ fe8912569f087a1973bb0d9035dc00ab630eefed150c06a51cd6756243af917e,1,1,DevZing.com 72099e236e3d90ddc3029f251a6bb77bd29d4f63715c940a7953d1a124181c67,0,1,Digilinux.ru.xml 3449a7d7da46522205fec252bc4bd787e9dfac2f15e635750d9cfafcc825f3a0,1,1,Digital_Photography_Review.xml 1ae5023d7b4801aa93edc7b86c769faba82f98f393f917df3f9175b5bc594855,1,0,Digital_River_content.net.xml -4c960fbf88d31cd33a0a4f9a6547bbd0cbf261b3410b227aed8f41926d4a10c1,1,0,Digital-River.xml +e310e63ef6342c335d5e5b08228adcd3af2f0ccdcb966e42cffeb07cfa76a0dc,1,0,Digital-River.xml 81e06d0984af4aa05d175c084ce819c1859ecbf2bf5717a2336d92f2e26b6450,1,1,Digitaria.xml 8f24d6a49faf7ac63a5a48b5dfea5d55a076865183dd5319b9cee2f6e6de8cfb,1,1,DigiumEnterprise.com.xml c92f784016627bcb6be1548ceefee4680d0a955a0ed387a43ac4df11053d6cbd,1,1,Digium.xml @@ -1081,7 +1081,7 @@ c3ce6b72a929adc8d7e227f86884c300979feb2a571c85cc44db4262eaa6881a,0,1,EuroSmartz. 37d22280f426eba13e6ab26c326c626ed45229c4743065d529956265887b4415,1,1,EUSecWest.xml ba895fc1fee78f637b19286b6836b2faa3c965363e4f93c02b3c3e4e098d8248,1,1,EUserv.de.xml c7d1a78c0d09e8db961d0d711d81b4967193f1692e7a23198a996e9dc8dbfd29,1,0,Eventbrite.co.uk.xml -dac1b4f1a77e082ec67d729b5970634f14d036157fb55e32d317a5d44f70a132,1,1,Eventim.xml +efd880c7e0b22e305ac75d6d915f416fa3b695b1d2fd357a8925e9b661215388,1,1,Eventim.xml 7ddbf472286dea4067fe4c1a3725df3c096d6b0144fe01f43fb8df5db7cf19b0,1,1,eveonline.com.xml cd93ab59fa23cbcc434b5a873d291fee6a7f759dabdbf480ee4f6fcebc2c26d6,1,1,EVE_Online.com.xml 1213b9bcc58aef69599cda534a1140050ba6a542bafdadd27e62d1e88b6e3b56,1,0,Everest_Technology.xml @@ -1149,7 +1149,7 @@ c1ef55cc3abfb330c375f30f904299acf383d9aed579ba2b95432f8c5acf192d,1,1,FetLife.xml 387ecea2d464c5de4043428433276de40b08f1d4c2f674c20082c60a1e52bb83,1,1,FetShop.co.uk.xml b415e81d1a66aef7b49d2569612f1ca6eb70cf80ed84d2dfb6137889d95d5a5e,1,1,Fibank.xml 695f2cbb45552fb9b20b3dd59d70843ee1a2ec102625b330d8900d3d149ad8dc,1,1,Fidelity.com.xml -61694ca6e8522e272c3caa8ac40d6619397131e4eb53d38582dd67562037cafb,1,1,FierceMarkets.xml +4fe40f6560c89da3fdcd511a681c9bfab0089ae3e7d791e6150f0314c57845d2,1,1,FierceMarkets.xml 6c5fc7be0086b16f85edf4e13d77f5bb86d0ff940e14524e7cda87bfd30a7bbd,0,1,FiercePharma.xml b18bfe335ab271a0aa72bbe6836acf7b4a9fa299cf03b54bdca37aa90842ef16,0,1,FIFE.xml 03880d4b9139e6707bcf197915a4fb951af11692b30d0be2875ff60889f45e70,0,1,Fifi.Org.xml @@ -1179,7 +1179,7 @@ c2a6e87647595dd9487c3959ff5cc3b598bcf08ccbd358f24f90b988c478d8be,1,1,Firedrive.c 9eda8209afff61900e1b48f9864a11eba047613312f2a7dc0b644da1e26ed4b8,1,1,Flaska.net.xml d70fd53f82da347a3ce16ffe036fd12a6f32ab6b186e14eb6975359d24c5d0bb,1,1,Flightglobal.xml ec9d02d41957b37a86d5d2fe66f099b956d084f4f616f2baa74cac3b040d7495,1,1,Flinto.com.xml -666780626f5dd9645bfa25516269584f733a8d1af9fa0f2a17c3700106d7913b,1,1,Flite.xml +08209bebe2a624ee9c807208227376a322cd6ed48db90991b4b5ad6301e4cc83,1,1,Flite.xml 8ea7a8f22b03f1b163013b35d0ec7061ecf92eeddcaea9df4196738906859924,0,1,Floating_Hospital.org.xml 3de483cf9eacbccfaef3a558edb6df3c60ebd7d167cbb9c7744da089487651c4,1,1,Floek.net.xml b2b785c62c6cc9f4ed815d08e4e8d92e9349e72d303e9ffdcca16b74b380b0ac,1,0,FlokiNET.is.xml @@ -1340,7 +1340,7 @@ be8c815a9a7c2029433fc542255094e8083842c1ee37ab849f2a399393506241,0,1,Global_Prom 0715fbd6c0bf73916c3e5775a10ac61749d164731c8f3d940589f7a5d643463e,1,1,Global-Witness.xml f22df2b55cad5bffc0391a605da14db77761721e70442486d6f5824c68d15583,1,1,Globat.xml a7560b209af91022474e97ccb8ce8778b611953fd744957f67c8a39339b21d6b,1,1,Gmedianetworks.com.xml -47e0c20970e7fde9ee841ccc5c99768e9f3637d251afb92996622e080c55e3f5,1,0,GMO_Internet.xml +d89bda534f62eb8d0f44b067500d045c285f41a5c350a4e8e408b557fb6f4a05,1,0,GMO_Internet.xml 06dbc3577073e0c75700c48d78f46df7f433aae53f2923c96f209393384a849d,0,1,GND-Tech.com-problematic.xml 8ece7b9a55dcc63fa7784890ada48016392aca3f34f12086284dc2dbbdd0e50f,0,1,GND-Tech.com.xml f2dd726fcddd931e373745c28ddd66625748b26773ff8a2dae8b22d683a943f2,1,1,Gngr.info.xml @@ -1366,7 +1366,7 @@ dbc8f2862e1855fd07a89a7d842b4ff03b2a93340d912a1f321e8a2c9a0840a8,1,1,GO_Transit. 73cc7eb8fa700154372dbc586aaa1adc8d0c0b86d17f2efcc14b7e9843a09004,1,1,Got_Vape.net.xml b2ee2374e3bdc3d03f5d60bd4b00bec95592a38b54a32a8b3097d1ec6cf1c86b,1,1,GourmetGiftBaskets.com.xml 38ea979b7f650765d00622f7919e2589f093c8f0df62b005e1ee37f97e821289,1,1,Government-Security-News.xml -d4ac9612c814f635beceb9ccba936b25fe6c20a1517260fc56cc36e29b7d8a72,1,0,GOV.UK.xml +d260b4da347c8b65d83536ac0d29c64485a22f36ce6ff03541ad6274ec7a532b,1,0,GOV.UK.xml b4741f899272079753bb0118f166d0130bbedf31d16434e9b8127821fcc41f50,1,0,GoWork.pl.xml 0ee8f20c7adbecd195a0b332aaeb6fa49a1b97192c94840236733f0a29dd5d75,1,0,GQ-magazine.co.uk.xml b4936c9408ab836adc37b0b41551860a35d85bd2adb24c2df60cc8fc04084e55,0,1,Grab_Media.xml @@ -1773,7 +1773,7 @@ cc4ede67cbb2b5809ac7bb84b1a3e4364ad98f9f3fc139ac38683c67256750a5,1,0,KernelOrg.x 499d9c70a8be988de7982c15bb9281ed6e9f1076f26f255574f0f958b3739537,1,1,Ketchum.com.xml 911d17e381f38a6bc6ef545f5ca260fc0954922ed63bf05e2f7ca0e6035f4535,1,1,Keymile.com.xml c61b499fb7ce7de7eb4bc86bb6c047a202cbb60c30b6c78110b36e0e0ccec9d4,1,1,KHN.nl.xml -1b1ffc9653dade7a60e5c8a0cb43858b583fa3726860f4cf3c34d491c2b30e88,1,1,Khronos.xml +5fb3e2cc1c993880a2f59cf36840a623d0d7f329e31b725c711619d78031845b,1,1,Khronos.xml e71f0286187bd70833f0c421f31b4c23780d670da9ba33e8487b66ae4229a629,1,1,Kids_Foot_Locker.xml 12ae40cfc95aaaae2573664fd2fea40b4aa90e5adb75d013953225121bd38361,1,1,King.com.xml 4b71dc7dbecc49f2b48f869a78b2cea026dc9eab9ee6627a49581d58bbf936a4,1,1,KingHost.xml @@ -2139,7 +2139,7 @@ f7aa20d5eb594ad6714f0aecedf5b55b6d9b6cf8be092160dc89d631b1ca89ac,0,1,Mobile_Asia c50a74b47e0a1ffe551d97307b99d692a4d15c4f6d6eb27fc150f54b660ad90d,1,1,Mobile_Nations.xml ee597a30968e3fcc5470ceeef5b7ab18cdac35b691c708119fc085e555c39d7c,1,1,MOBIUS_Catalog.xml 6740d71dc20cb018a8808cf1fdff3032705b1fd79b467a42f4489233e0fed651,1,1,MobStac.xml -ef525a968490246433866120f8f3639c161703aaa6f5231babbd614dbb8752d1,1,1,Mochimedia.xml +089e42772722545c5013f3a48f05429db2991825eadaf29c1b80ccd769f4621a,1,1,Mochimedia.xml 2aeed5b7608ed2cd5fbf95b9d233412e2b384dcb179cd0cd0b4be180f3a7b1c4,1,1,ModCloth.com.xml 92ade4bf454341ea607fc18eda3f160e13336fa1303c20d35e270b4624e40036,1,1,Mod_DB.com.xml c3214ec163aa9df0dd6712d7d99aaa8b60ace6ccf4ee9cf6a18dc8d5f030a6a7,0,1,Model_Mayhem-problematic.xml @@ -2243,7 +2243,7 @@ b8317133e03efaee48297bdb5c09b95e33a56f9c20cd60e6edac0a1a4d86661a,1,1,NationalE-H 4f3d0dc561b1d5aa8256a5c6b3836f1d624a29142b47bb7d9229916c2abc6aed,1,1,NationalLibraryofAustralia.xml 1fdbf03f38170dbf7fcc2e857edff149d2fc104f1cfe992e3346a6eaea3d9801,0,1,National_Priorities.org.xml 3eeda47a0d58e2fa12af871efccefb70709c9aa4a94f25da447e491a58e6f231,1,1,National-Rail-Enquiries.xml -a73846c13f495130fbf563b82ffbe3c1fcff8c874abda978e124e3af97ca8ffa,1,1,National-Renewable-Energy-Laboratory.xml +85d3619ee98960417573a2614c707f30d2920c4a638dfd712362a70c3a2fcd50,1,1,National-Renewable-Energy-Laboratory.xml 77df8cd849c8f7755860365c3cb10c51ed391f95ad21327a88546086eb5a29f9,1,0,National-Science-Foundation.xml 12eaba9bec7055b45b10dbdc36cfee93e480124f3cec55814ebc49fad23ff395,0,1,National-University-of-Ireland-mismatches.xml ebcc8d760dad213f091f650b11dbd48341e8039af99e39d0e1ea98115899e204,0,1,NatMonitor.com.xml @@ -2353,7 +2353,7 @@ d88941553216a375019bef623617831cfed119f7e9a45de9c09e31cf9259c4ca,1,1,Norton_Onli 810d45a0584894225fd3c3e66c707a791528729a596c246aeba0b1e69c5ffe68,1,1,NoTex.xml 0c6c06f058c319c6c3d20b95c033c01e344f10179b032110a16706bc2333d3a1,0,1,Novartisart.com.xml 65f54df3f15bdf0f223df2a16aee88e2f7c86595a22855e25e02f5bfd8fe209a,0,1,Nowy_BIP.xml -71a41ad3b515f5b752516a9574116a1df6a7dc1a388d750e3ab6f7e6a27bbbeb,1,1,NPario.xml +6c9a823e3a18a17c3ecc62249c7849fb7205d4a3914bd90a63a55d388f44b207,1,1,NPario.xml dd6b12c407efb9469efb6c2428ba486570a3468515291282c02b52f6a9d8eb4a,1,1,NPD_Group.xml 005d6ae4ecf390a96f0cabfa24bf3542de3358ed187c7d3fb6a9ceae451436c0,1,1,Npmawesome.com.xml b8a8048fa9d78e8f49ad9eb38a05c4dd88ad22df91e48f65496580938fde7370,1,1,NPO.nl.xml @@ -2577,7 +2577,7 @@ a64aadfc5703638d06d42fb40b03ed571d3553b67c5b8ef1c2ccbb3ca41ed3fc,1,1,PIERS.xml 73228b03209d957e30c9949ed6f98aea5cb7625806c66b5b57d43d5cefe23273,1,1,Pimg.net.xml 5c642d04588720a0e664a199e104302b390ea9164d5f94679eb3071cc419e6d7,1,1,Pinescharter.net.xml 351933a4ca393d784a3e0255666cdba8645c9e2d8f56ea3231467b53937a7460,0,1,Ping-Fast.com.xml -7b985d61f4de854ab3c4e22ae7a751e94195674a4da418aff52ba59ae9987577,1,1,Ping_Identity.xml +6febccf9fd5fedb160b70b5cf4e5d7e19082b4e6fcdc034cd95799ff16389bad,1,1,Ping_Identity.xml afedb6420fe0dc9246a1e3704d1b06967e04611e72032e5103d6937ad97798de,1,1,Pingless.xml 3c5a6453f20a2462fedce8629a68e47c615c8717e7f5934f3271d71bbf3980ee,1,1,Pinme.ru.xml 662023093afa853230351a22ad3a03d92674583751f67b1c77db57439da389b0,0,1,Pipping.org.xml @@ -2637,7 +2637,7 @@ e80eec223937d00477f33bea225ad1396cc725ba489e205a3cc07aaeeeced790,0,1,Porlaputa.c 4a41e0b110b0169599c19812065cb38f34e8fb0ab2aacf0937089d1ff9f662c4,1,1,Portland_Mercury.com.xml a9497c487231592a8acc567050cf06845efd8df27df3744d693335fb25ae803b,1,1,Portland_State_University.xml 9d9f29b0e53a626445a096648cce8a40e721bfaf0c3e45b3066f19e78ae9fdf1,0,1,PortMorgan.com.xml -5a938e46030284ef487b8685ea678529ee8ae116db9b74824d0a160308be3d59,0,1,Portner_Press.com.au.xml +6b0d7ddf3bdd5ad91f34402c6d3f7f7d0386490d94b03dd8f129412f4e514d20,0,1,Portner_Press.com.au.xml a3e9889f1fab89464f2a4ef9b23b21eb9b2a6aeed3b4f6ab8558529e4741a0e5,1,1,POS_Portal.com.xml 19d456c372cae14406899cbba5abba4c69579ab946d75d80912d6ff588c45182,1,1,PostgreSQL.xml 291f134543859ee92992b451afa2071cc6380c39e54f763bab95948f81d48090,0,1,Posthaven.com-problematic.xml @@ -2919,7 +2919,7 @@ f9d6bcf44dbcc10b354910f43ace3fb992ad105f9743b1db2855084e40ffaf1a,1,1,Sculpteo.co fd71c353d28fceb8b115719e83bc37fc7f717fa194e03d48d2cabacc00fdcd29,1,1,SDSU.edu.xml 2006782a2d8e1e624b4bb2de5dd7b71127a36079937f0225de4ca18017d3c6f6,0,1,Sealed_Abstract.com.xml a72eadb29ac48aacf0a5061a3796f94df5f1b7f5a2663a192baccdde97ef757e,1,1,Searchmarketing.com.xml -570383abca43e54090af735c8962a57f339bd8eae677c1224e9a5a0aa96e0c37,1,1,Sears.com.xml +54ddc0c71bfceb9e4d8b41198da88bf0cdd4dbf92bfe8635c398204f8c188847,1,1,Sears.com.xml b47e3b0004ed2b922443aa48b3dca1012843ed67610e4f15f881dc0b5d8494a3,1,0,SeaShepherd.org.xml 6835368660d2c2932d163024a8da85984bcaf646184f5eacd658c0fb52a62c5c,1,1,Seattle_Technical_Books.com.xml 0e8e772f5af7e798a343bc7ffc07367d78688f53fc2b361b9b6f574c3f9bf55f,0,1,Secret-Maryo-Chronicles.xml @@ -3377,7 +3377,7 @@ f29c66a5f213e6258665d3ecfbcd498dbac77cd5137244c85589a8b85ea02ec5,1,1,Travelingnu c7c57b65cd13e5ed94238a546ff86f9af27333129ec503e4d00067eb5444a4c0,1,1,Travelzoo.com.xml a40a21c802bc8c74243e4a5b17bf171b8a9de5be9ea9d04bba0aaae7097c90c2,1,1,Trefis.xml a15f218ce90ba990333edd6061220b58b4bb4d762e26e307fa0e5d583ea93fce,1,1,Trekaroo.xml -b9a95a8cc5bd940e6ba88dfae646ad3a2ceccf4c5604df2c5291df0a4a60063c,1,1,Tremor_Video.com.xml +bcfd7bce8a3d673291b87c3c62f821290d4ff89c2e1da623e08109eb8c8449f8,1,1,Tremor_Video.com.xml 315c8baf521d9edb49a5a49a91630711255a5f86162562bfc5e31a56198a1176,1,1,TrialPay.xml 6f858769c48e6e19db4faf2b056420773d9e9c936e6a28322c04e068a115cfc6,1,0,Tribune.xml a3906adccfc4301efbc4cea0a097d22264fa09498b92e9ab18dbe4deb4f9e3e6,0,1,Trinity_Home.org.xml @@ -3558,7 +3558,7 @@ e8405ab7de7e35328c149fde0221a4b584545b98daf10f5cfb5f971a53459403,0,1,USENIX.xml 572e6c6c3fe2566a715dec30b294a7f34c2e2a9d54a5102f280d5e7b640288c3,1,1,User_Local.xml 8b9757d610171917073c32268fe0d7bc7631fcd4761316ed92b54dfd74745172,1,1,USF_CA.edu.xml 95ef65e8f7f8431c9ae9dd2559d1b8c7885adcd11940c6f0136c7b1c83660bc2,1,1,USFreeads.xml -c31698af63e6f00a03efa46bd1bf18ecb7a0ed5599f9f45d65bed5a2567da7a9,1,1,Us_Magazine.com.xml +0459389c2f8fa05a34ad3dc433d7cd0581dd707c79e49429d5ac0aa437f2e7e4,1,1,Us_Magazine.com.xml 2b171e0c1a41d6836b6b5fbbf97b98892b673ce3d96d1edaf8fd033833627cde,0,1,US-military.xml f2618d5b46589e1746a59effbf739199baa32d0664a676bcfc167b580f51633e,1,1,US_Nautic.xml 37eb6c467058dd4c92fc635e6daa2c37fa7ef6c2d7c24996fafbde8fe43071e6,0,1,USNI.org-problematic.xml @@ -3604,7 +3604,7 @@ a2678d219a759ab4e9acd04c0325e691f559c7ef55a4f2339d8138274d95d586,1,1,Vendetta-On 03142920bcbd18f915c755c8a6feb9026a44156731240b30534a05b95fa051c5,0,1,Venuscafem.com.xml 2c6ef10eb55db8e24789d312206e9912c7ef86db24585146659860398002b639,0,1,Verbraucher-Sicher-Online.xml 6dcce26da889c8a152970f62daa73d12b350cdc9940a7df4a7afdf7f73808d3a,0,1,Verdad_Media.xml -8ed22adeec50f1fd7448178c5673fead3b1df2ade9cea67abeb94564458a23ff,1,1,Verio.xml +e12b6d5c3eb3e1115119c50070ef4410f6a1e1bc3dbfc9791bb77cb6d82fc52f,1,1,Verio.xml 4ba3afa6e1e3e9f6e447986b6da4ce1ae8ffcba7c34c6bcf25e7b9ada2396f48,1,1,Verivox.xml a321163ecff3304c427ebd7c7e1bf7ea5e0cd763fd1a90ce92f5a09cf236c2ea,1,1,Verizon_Enterprise.xml c203bd812b538ac7a93a711f6fc1ee663f78ccb6320db05cbcde811059abd45c,1,1,Verizon_Wireless.xml From 40c054a9fc70e16bfbf40a3bc8ec1fe86cbcdd77 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 13 Dec 2017 23:40:37 +0800 Subject: [PATCH 064/844] Remove individual-villas.co.uk from Wyndham.xml (#13958) --- src/chrome/content/rules/Wyndham.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 62cbd586b2f8..a16fe54669ee 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -28,8 +28,6 @@ Disabled by https-everywhere-checker because: Fetch error: http://competitionsbywyndham.com.au/ => https://competitionsbywyndham.com.au/: (60, 'SSL certificate problem: unable to get local issuer certificate') Fetch error: http://www.competitionsbywyndham.com.au/ => https://www.competitionsbywyndham.com.au/: (60, 'SSL certificate problem: unable to get local issuer certificate') -Fetch error: http://individual-villas.co.uk/ => https://www.individual-villas.co.uk/: (7, 'Failed to connect to www.individual-villas.co.uk port 443: Connection refused') -Fetch error: http://www.individual-villas.co.uk/ => https://www.individual-villas.co.uk/: (7, 'Failed to connect to www.individual-villas.co.uk port 443: Connection refused') Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://wyndham.com/ => https://www.wyndham.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received') @@ -69,8 +67,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - @@ -90,12 +86,12 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - + - Date: Wed, 13 Dec 2017 16:01:24 +0000 Subject: [PATCH 065/844] Create Attyyar.net.xml (#13736) --- src/chrome/content/rules/Attyyar.net.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/Attyyar.net.xml diff --git a/src/chrome/content/rules/Attyyar.net.xml b/src/chrome/content/rules/Attyyar.net.xml new file mode 100644 index 000000000000..e80416bef7ec --- /dev/null +++ b/src/chrome/content/rules/Attyyar.net.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 637d261f1663281fe477e0bd496cdd999ecdd197 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 13 Dec 2017 16:02:24 +0000 Subject: [PATCH 066/844] Create Assakina.com.xml (#13717) --- src/chrome/content/rules/Assakina.com.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Assakina.com.xml diff --git a/src/chrome/content/rules/Assakina.com.xml b/src/chrome/content/rules/Assakina.com.xml new file mode 100644 index 000000000000..9753e2c7a1fd --- /dev/null +++ b/src/chrome/content/rules/Assakina.com.xml @@ -0,0 +1,11 @@ + + + + + + + From bca6fb2c233b76fc8fc0d47c225f99e27fb23b1f Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 13 Dec 2017 16:04:22 +0000 Subject: [PATCH 067/844] Create MuhibAdDeen.com.xml (#13106) --- src/chrome/content/rules/MuhibAdDeen.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/MuhibAdDeen.com.xml diff --git a/src/chrome/content/rules/MuhibAdDeen.com.xml b/src/chrome/content/rules/MuhibAdDeen.com.xml new file mode 100644 index 000000000000..eaa70dbe3eee --- /dev/null +++ b/src/chrome/content/rules/MuhibAdDeen.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 4b829edf249b2d42af6a34162a07840028bc062d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 13 Dec 2017 16:05:28 +0000 Subject: [PATCH 068/844] Create Al-Mostafa.info.xml (#13107) --- src/chrome/content/rules/Al-Mostafa.info.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Al-Mostafa.info.xml diff --git a/src/chrome/content/rules/Al-Mostafa.info.xml b/src/chrome/content/rules/Al-Mostafa.info.xml new file mode 100644 index 000000000000..f3cfc1c385ef --- /dev/null +++ b/src/chrome/content/rules/Al-Mostafa.info.xml @@ -0,0 +1,6 @@ + + + + + + From 81d2d65bd4c19c2ad97a923d15540678ff8c4ed1 Mon Sep 17 00:00:00 2001 From: patheticcockroach Date: Wed, 13 Dec 2017 17:21:41 +0100 Subject: [PATCH 069/844] Added ruleset for keygiveaway.com (#13960) --- src/chrome/content/rules/Keygiveaway.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Keygiveaway.xml diff --git a/src/chrome/content/rules/Keygiveaway.xml b/src/chrome/content/rules/Keygiveaway.xml new file mode 100644 index 000000000000..ed26a0041238 --- /dev/null +++ b/src/chrome/content/rules/Keygiveaway.xml @@ -0,0 +1,6 @@ + + + + + + From 2ea7c6e240ee198c90b293eb92d44763cb6a5d8f Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 13 Dec 2017 17:01:09 +0000 Subject: [PATCH 070/844] Create CardsAgainstHumanityStopsTheWall.com.xml (#13824) --- .../rules/CardsAgainstHumanityStopsTheWall.com.xml | 11 +++++++++++ .../content/rules/Cards_Against_Humanity.com.xml | 1 + 2 files changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/CardsAgainstHumanityStopsTheWall.com.xml diff --git a/src/chrome/content/rules/CardsAgainstHumanityStopsTheWall.com.xml b/src/chrome/content/rules/CardsAgainstHumanityStopsTheWall.com.xml new file mode 100644 index 000000000000..1e41423cb26b --- /dev/null +++ b/src/chrome/content/rules/CardsAgainstHumanityStopsTheWall.com.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Cards_Against_Humanity.com.xml b/src/chrome/content/rules/Cards_Against_Humanity.com.xml index 08cd6d33544a..cc1bc2427553 100644 --- a/src/chrome/content/rules/Cards_Against_Humanity.com.xml +++ b/src/chrome/content/rules/Cards_Against_Humanity.com.xml @@ -1,6 +1,7 @@ + + + + + + + + + + + + + + + + + + From f78e4e77dcda901f856f37c2f25f4dc0dc095aac Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 14 Dec 2017 23:57:18 +0800 Subject: [PATCH 073/844] Delete Igcdn.com.xml (#13966) --- src/chrome/content/rules/Igcdn.com.xml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 src/chrome/content/rules/Igcdn.com.xml diff --git a/src/chrome/content/rules/Igcdn.com.xml b/src/chrome/content/rules/Igcdn.com.xml deleted file mode 100644 index aafaadf54f2f..000000000000 --- a/src/chrome/content/rules/Igcdn.com.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - From 32602cf179f366485cc817d16c3f6f3b4d7c0ba3 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 14 Dec 2017 23:57:55 +0800 Subject: [PATCH 074/844] Delete Bunadformenn.info.xml (#13967) --- .../content/rules/Bunadformenn.info.xml | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/chrome/content/rules/Bunadformenn.info.xml diff --git a/src/chrome/content/rules/Bunadformenn.info.xml b/src/chrome/content/rules/Bunadformenn.info.xml deleted file mode 100644 index 6edc16524e56..000000000000 --- a/src/chrome/content/rules/Bunadformenn.info.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file From 6ab96fb75f671034e2f3a613b2cae1fe6be7e4e5 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 14 Dec 2017 23:58:26 +0800 Subject: [PATCH 075/844] Delete Coin-Swap.net.xml (#13968) --- src/chrome/content/rules/Coin-Swap.net.xml | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/chrome/content/rules/Coin-Swap.net.xml diff --git a/src/chrome/content/rules/Coin-Swap.net.xml b/src/chrome/content/rules/Coin-Swap.net.xml deleted file mode 100644 index aa57bfb93b8e..000000000000 --- a/src/chrome/content/rules/Coin-Swap.net.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - From abe5f9c64669357fbfcea800d22f110ba53290d3 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 14 Dec 2017 23:59:32 +0800 Subject: [PATCH 076/844] Delete Meet.fm.xml (#13969) --- src/chrome/content/rules/Meet.fm.xml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/chrome/content/rules/Meet.fm.xml diff --git a/src/chrome/content/rules/Meet.fm.xml b/src/chrome/content/rules/Meet.fm.xml deleted file mode 100644 index 35f64825fb92..000000000000 --- a/src/chrome/content/rules/Meet.fm.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From f77732c3de34b42bbe96c7f54a920aaa853e3e0a Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 15 Dec 2017 00:00:12 +0800 Subject: [PATCH 077/844] Delete Ctwatch.net.xml (#13970) --- src/chrome/content/rules/Ctwatch.net.xml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/chrome/content/rules/Ctwatch.net.xml diff --git a/src/chrome/content/rules/Ctwatch.net.xml b/src/chrome/content/rules/Ctwatch.net.xml deleted file mode 100644 index 7f2e49443172..000000000000 --- a/src/chrome/content/rules/Ctwatch.net.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - From e51f584d0b9b7fdd5c5c91d5d541f6725ea4450c Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 15 Dec 2017 00:01:05 +0800 Subject: [PATCH 078/844] Delete MarsHut.net.xml (#13971) --- src/chrome/content/rules/MarsHut.net.xml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/chrome/content/rules/MarsHut.net.xml diff --git a/src/chrome/content/rules/MarsHut.net.xml b/src/chrome/content/rules/MarsHut.net.xml deleted file mode 100644 index 1af99e5006fd..000000000000 --- a/src/chrome/content/rules/MarsHut.net.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - From a8c59b178d41db5d8d826b01f7b0c946eb79abd8 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 15 Dec 2017 00:01:28 +0800 Subject: [PATCH 079/844] Delete Hendrik.luup.info.xml (#13972) --- src/chrome/content/rules/Hendrik.luup.info.xml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/chrome/content/rules/Hendrik.luup.info.xml diff --git a/src/chrome/content/rules/Hendrik.luup.info.xml b/src/chrome/content/rules/Hendrik.luup.info.xml deleted file mode 100644 index e955aaf4f09b..000000000000 --- a/src/chrome/content/rules/Hendrik.luup.info.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - From 1b2cff62e736cdad1db3ebb8f299de620a5b8cb8 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 15 Dec 2017 00:02:10 +0800 Subject: [PATCH 080/844] Delete SexSlurp.xml (#13973) --- src/chrome/content/rules/SexSlurp.xml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/chrome/content/rules/SexSlurp.xml diff --git a/src/chrome/content/rules/SexSlurp.xml b/src/chrome/content/rules/SexSlurp.xml deleted file mode 100644 index e8e34cd67a1f..000000000000 --- a/src/chrome/content/rules/SexSlurp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From 482bc9b49553f0d78aaed48d24a93092424530cb Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 16:05:40 +0000 Subject: [PATCH 081/844] Create Genofond.org.xml (#13102) --- src/chrome/content/rules/Genofond.org.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Genofond.org.xml diff --git a/src/chrome/content/rules/Genofond.org.xml b/src/chrome/content/rules/Genofond.org.xml new file mode 100644 index 000000000000..ee8ce3d21ce3 --- /dev/null +++ b/src/chrome/content/rules/Genofond.org.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + From 4dbe330bc6a441f447a9f822803429981d3b829d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 16:15:14 +0000 Subject: [PATCH 082/844] Create Muflihun.com.xml (#13101) --- src/chrome/content/rules/Muflihun.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Muflihun.com.xml diff --git a/src/chrome/content/rules/Muflihun.com.xml b/src/chrome/content/rules/Muflihun.com.xml new file mode 100644 index 000000000000..8773caa8ffbb --- /dev/null +++ b/src/chrome/content/rules/Muflihun.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From 5c7ddb583fef768e2e15e457305a44bdae6d6064 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 16:26:55 +0000 Subject: [PATCH 083/844] Create Avogadr.io.xml (#12572) --- src/chrome/content/rules/Avogadr.io.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Avogadr.io.xml diff --git a/src/chrome/content/rules/Avogadr.io.xml b/src/chrome/content/rules/Avogadr.io.xml new file mode 100644 index 000000000000..7ee0bfc537cd --- /dev/null +++ b/src/chrome/content/rules/Avogadr.io.xml @@ -0,0 +1,8 @@ + + + + + + + + From a719c63c6b2e974fd1755f045fd6b30aba4bbf27 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 16:41:13 +0000 Subject: [PATCH 084/844] Create YourBrainOnPorn.com.xml (#12692) --- src/chrome/content/rules/YourBrainOnPorn.com.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/YourBrainOnPorn.com.xml diff --git a/src/chrome/content/rules/YourBrainOnPorn.com.xml b/src/chrome/content/rules/YourBrainOnPorn.com.xml new file mode 100644 index 000000000000..34c690d6d2ff --- /dev/null +++ b/src/chrome/content/rules/YourBrainOnPorn.com.xml @@ -0,0 +1,10 @@ + + + + + + + From 78ecf4753b2098bd197440c89e1831fe2e09316d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 16:51:02 +0000 Subject: [PATCH 085/844] Create Dafatiri.com.xml (#12701) --- src/chrome/content/rules/Dafatiri.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Dafatiri.com.xml diff --git a/src/chrome/content/rules/Dafatiri.com.xml b/src/chrome/content/rules/Dafatiri.com.xml new file mode 100644 index 000000000000..20ddcfe9efae --- /dev/null +++ b/src/chrome/content/rules/Dafatiri.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 930c307134daedc217f93b551089eee1992ba90a Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 15 Dec 2017 03:33:53 +1030 Subject: [PATCH 086/844] [ebay.be] New ruleset (#13775) * [ebay.be] New ruleset * Add befr & benl subdomains * Add https redirect to 'befr' and 'benl' subdomains --- src/chrome/content/rules/ebay.be.xml | 352 +++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 src/chrome/content/rules/ebay.be.xml diff --git a/src/chrome/content/rules/ebay.be.xml b/src/chrome/content/rules/ebay.be.xml new file mode 100644 index 000000000000..c69db74c2ff4 --- /dev/null +++ b/src/chrome/content/rules/ebay.be.xml @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 59e04ff982910cf959263b8b14037e43bd321c76 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 15 Dec 2017 03:34:10 +1030 Subject: [PATCH 087/844] [ebay.ca] New ruleset (#13777) * [ebay.ca.xml] New ruleset * Remove securecookie tag * Add ebay.ca redirect * Add cafr subdomain * Add https redirect for 'cafr' subdomain --- src/chrome/content/rules/ebay.ca.xml | 350 +++++++++++++++++++++++++++ 1 file changed, 350 insertions(+) create mode 100644 src/chrome/content/rules/ebay.ca.xml diff --git a/src/chrome/content/rules/ebay.ca.xml b/src/chrome/content/rules/ebay.ca.xml new file mode 100644 index 000000000000..6f06a1e5efde --- /dev/null +++ b/src/chrome/content/rules/ebay.ca.xml @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6622baf43c175197780220c9519a7fe0e6ebcb7f Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 17:06:23 +0000 Subject: [PATCH 088/844] Create S-ajfan.com.xml (#12697) --- src/chrome/content/rules/S-ajfan.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/S-ajfan.com.xml diff --git a/src/chrome/content/rules/S-ajfan.com.xml b/src/chrome/content/rules/S-ajfan.com.xml new file mode 100644 index 000000000000..731f4b083481 --- /dev/null +++ b/src/chrome/content/rules/S-ajfan.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From a0238fd0745dc2960b3527837b7e815e4d2cd616 Mon Sep 17 00:00:00 2001 From: xinomilo Date: Thu, 14 Dec 2017 19:11:05 +0200 Subject: [PATCH 089/844] + search.stinpriza.org (#13909) * + search.stinpriza.org * remove search.stinpriza.org * add *.stinpriza.org ruleset * fix duplicate host * modifications --- src/chrome/content/rules/stinpriza.org.xml | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/stinpriza.org.xml diff --git a/src/chrome/content/rules/stinpriza.org.xml b/src/chrome/content/rules/stinpriza.org.xml new file mode 100644 index 000000000000..8b28eaac9980 --- /dev/null +++ b/src/chrome/content/rules/stinpriza.org.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + From fe9f98c88688752cb88bbb328e29e7866683d743 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 17:50:29 +0000 Subject: [PATCH 090/844] Re-activate IslamHouse.com.xml (#13718) --- src/chrome/content/rules/IslamHouse.com.xml | 24 +++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/IslamHouse.com.xml b/src/chrome/content/rules/IslamHouse.com.xml index 9609ea5885df..e3b1a5a6158b 100644 --- a/src/chrome/content/rules/IslamHouse.com.xml +++ b/src/chrome/content/rules/IslamHouse.com.xml @@ -1,30 +1,26 @@ - - + - - - + - - + From 9fb79f9b17e3adffc883529e4f0b71d870ab5242 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 20:30:14 +0000 Subject: [PATCH 091/844] Create B7oth.com.xml (#12685) --- src/chrome/content/rules/B7oth.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/B7oth.com.xml diff --git a/src/chrome/content/rules/B7oth.com.xml b/src/chrome/content/rules/B7oth.com.xml new file mode 100644 index 000000000000..69b53141d529 --- /dev/null +++ b/src/chrome/content/rules/B7oth.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From eda03b42f898941a9d4eb79bbc005057d820bc36 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 20:30:39 +0000 Subject: [PATCH 092/844] Create FiqhAcademy.com.xml (#12681) --- src/chrome/content/rules/FiqhAcademy.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/FiqhAcademy.com.xml diff --git a/src/chrome/content/rules/FiqhAcademy.com.xml b/src/chrome/content/rules/FiqhAcademy.com.xml new file mode 100644 index 000000000000..e20f64923156 --- /dev/null +++ b/src/chrome/content/rules/FiqhAcademy.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 050657db41a24ef07d43efe016d25a18ace6d175 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 20:30:58 +0000 Subject: [PATCH 093/844] Create FeqhBook.com.xml (#12570) --- src/chrome/content/rules/FeqhBook.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/FeqhBook.com.xml diff --git a/src/chrome/content/rules/FeqhBook.com.xml b/src/chrome/content/rules/FeqhBook.com.xml new file mode 100644 index 000000000000..b3632b6e04b2 --- /dev/null +++ b/src/chrome/content/rules/FeqhBook.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 4bd59792b393a11f08d19cbdae2321ba6b87bb30 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 23:24:14 +0000 Subject: [PATCH 094/844] Create ElmyWeb.com.xml (#12567) --- src/chrome/content/rules/ElmyWeb.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ElmyWeb.com.xml diff --git a/src/chrome/content/rules/ElmyWeb.com.xml b/src/chrome/content/rules/ElmyWeb.com.xml new file mode 100644 index 000000000000..662821c3ff49 --- /dev/null +++ b/src/chrome/content/rules/ElmyWeb.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 307d1d91717eac4c397dab46fda18daa652c0b7a Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Thu, 14 Dec 2017 23:25:03 +0000 Subject: [PATCH 095/844] Create FeqhUp.com.xml (#12568) --- src/chrome/content/rules/FeqhUp.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/FeqhUp.com.xml diff --git a/src/chrome/content/rules/FeqhUp.com.xml b/src/chrome/content/rules/FeqhUp.com.xml new file mode 100644 index 000000000000..1e22e901ffbe --- /dev/null +++ b/src/chrome/content/rules/FeqhUp.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 04af448032553b0cf84d80f61935dd2f7e59e3a6 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Fri, 15 Dec 2017 00:02:51 +0000 Subject: [PATCH 096/844] Create NewIslamicDirections.com.xml (#13100) --- src/chrome/content/rules/NewIslamicDirections.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/NewIslamicDirections.com.xml diff --git a/src/chrome/content/rules/NewIslamicDirections.com.xml b/src/chrome/content/rules/NewIslamicDirections.com.xml new file mode 100644 index 000000000000..902d87c5ae5c --- /dev/null +++ b/src/chrome/content/rules/NewIslamicDirections.com.xml @@ -0,0 +1,6 @@ + + + + + + From 0d10b26d1382835062f255ae2c8c2aba2725218c Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Fri, 15 Dec 2017 00:04:06 +0000 Subject: [PATCH 097/844] Create Zaytuna.edu.xml (#12566) --- src/chrome/content/rules/Zaytuna.edu.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/Zaytuna.edu.xml diff --git a/src/chrome/content/rules/Zaytuna.edu.xml b/src/chrome/content/rules/Zaytuna.edu.xml new file mode 100644 index 000000000000..9455991bb0b4 --- /dev/null +++ b/src/chrome/content/rules/Zaytuna.edu.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From 738e1d18263b9d9bb28277a4dafbaaff7e5ffe51 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Fri, 15 Dec 2017 15:31:17 +0000 Subject: [PATCH 098/844] Create Catbox.moe.xml (#13578) --- src/chrome/content/rules/Catbox.moe.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/Catbox.moe.xml diff --git a/src/chrome/content/rules/Catbox.moe.xml b/src/chrome/content/rules/Catbox.moe.xml new file mode 100644 index 000000000000..8a07bbc594d2 --- /dev/null +++ b/src/chrome/content/rules/Catbox.moe.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + From 855af87569667df832050e2208f38c2db5eeaa56 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Fri, 15 Dec 2017 16:32:41 +0100 Subject: [PATCH 099/844] Add rheinpfalz.de (partial) (#13952) --- src/chrome/content/rules/Rheinpfalz.de.xml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/Rheinpfalz.de.xml diff --git a/src/chrome/content/rules/Rheinpfalz.de.xml b/src/chrome/content/rules/Rheinpfalz.de.xml new file mode 100644 index 000000000000..f9754ab45526 --- /dev/null +++ b/src/chrome/content/rules/Rheinpfalz.de.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file From d60a9546a7d9a0d1368d2f557bd9e11696b2c3bb Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Fri, 15 Dec 2017 19:05:18 +0100 Subject: [PATCH 100/844] Rename and update Enhancedsteam.com.xml (#12489) --- src/chrome/content/rules/EnhancedSteam.com.xml | 14 ++++++++++++++ src/chrome/content/rules/Enhancedsteam.com.xml | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 src/chrome/content/rules/EnhancedSteam.com.xml delete mode 100644 src/chrome/content/rules/Enhancedsteam.com.xml diff --git a/src/chrome/content/rules/EnhancedSteam.com.xml b/src/chrome/content/rules/EnhancedSteam.com.xml new file mode 100644 index 000000000000..c2333c2c79da --- /dev/null +++ b/src/chrome/content/rules/EnhancedSteam.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/Enhancedsteam.com.xml b/src/chrome/content/rules/Enhancedsteam.com.xml deleted file mode 100644 index f9812a93566b..000000000000 --- a/src/chrome/content/rules/Enhancedsteam.com.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - From 2a6a4b136e29d39706219b6c9753819139403228 Mon Sep 17 00:00:00 2001 From: Valentine Anderson Date: Fri, 15 Dec 2017 21:41:27 +0300 Subject: [PATCH 101/844] Add cpdb.co ruleset (#7445) --- src/chrome/content/rules/CPDB.co.xml | 16 ++++++++++++++++ src/chrome/content/rules/CPDP.co.xml | 14 ++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/CPDB.co.xml create mode 100644 src/chrome/content/rules/CPDP.co.xml diff --git a/src/chrome/content/rules/CPDB.co.xml b/src/chrome/content/rules/CPDB.co.xml new file mode 100644 index 000000000000..9ab038c1e826 --- /dev/null +++ b/src/chrome/content/rules/CPDB.co.xml @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/CPDP.co.xml b/src/chrome/content/rules/CPDP.co.xml new file mode 100644 index 000000000000..206b9b969be8 --- /dev/null +++ b/src/chrome/content/rules/CPDP.co.xml @@ -0,0 +1,14 @@ + + + + + + + + From 45dd7e40d3116dadfb9bc70658535b497c1f4256 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 16 Dec 2017 04:44:28 +0800 Subject: [PATCH 102/844] Create utils/normalize-securecookie.py (#13864) --- test/travis.sh | 3 +- utils/normalize-securecookie.js | 120 -------------------------------- utils/normalize-securecookie.py | 58 +++++++++++++++ 3 files changed, 59 insertions(+), 122 deletions(-) delete mode 100644 utils/normalize-securecookie.js create mode 100644 utils/normalize-securecookie.py diff --git a/test/travis.sh b/test/travis.sh index 019c49c5257b..9dba720c0f83 100755 --- a/test/travis.sh +++ b/test/travis.sh @@ -42,8 +42,7 @@ if [ "$TEST" == "rules" ]; then docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/remove-obsolete-references.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/validate.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/rules.sh" - docker run --rm -ti -v $(pwd):/opt node bash -c "cd /opt && node utils/normalize-securecookie.js" - [ `git diff --name-only $RULESETFOLDER | wc -l` -eq 0 ] + docker run --rm -ti -v $(pwd):/opt httpse python utils/normalize-securecookie.py fi if [ "$TEST" == "fetch" ]; then diff --git a/utils/normalize-securecookie.js b/utils/normalize-securecookie.js deleted file mode 100644 index b30e68100386..000000000000 --- a/utils/normalize-securecookie.js +++ /dev/null @@ -1,120 +0,0 @@ -'use strict' - -const crypto = require('crypto') - -const fs = require('fs') - -const path = require('path') - -const util = require('util') - -const readFile = util.promisify(fs.readFile) - -const writeFile = util.promisify(fs.writeFile) - -const readdir = util.promisify(fs.readdir) - -const regexes = [ - { - from: //g, - to: '' - }, - { - from: //g, - to: '' - }, - { - from: //g, - to: '' - }, - { - from: //g, - to: '' - }, - { - from: //g, - to: '' - } -] - -function parseWhitelist (data) { - const lines = data.split('\n').slice(1) - const result = {} - - for (const line of lines) { - const lineSplit = line.split(',') - - if (lineSplit.length !== 4) continue - - const key = lineSplit[3].toLowerCase() - - const value = lineSplit[0] - - result[key] = value - } - - return result -} - -const rulesDir = path.resolve(__dirname, '../src/chrome/content/rules') -const rulesetWhitelistFile = path.join(__dirname, 'ruleset-whitelist.csv') - -async function main () { - const rulesetWhitelistContents = await readFile(rulesetWhitelistFile, 'utf8') - let rulesetWhitelistNewContents = rulesetWhitelistContents - - const rulesetWhitelist = parseWhitelist(rulesetWhitelistContents) - - const files = (await readdir(rulesDir)).filter(name => name.endsWith('.xml')).sort() - let changedCount = 0 - - for (const fileName of files) { - const fileNameLowerCase = fileName.toLowerCase() - - const file = path.join(rulesDir, fileName) - - const originalContents = await readFile(file, 'utf8') - - let fixHash = false - let originalHash - - if (fileNameLowerCase in rulesetWhitelist) { - originalHash = crypto.createHash('sha256').update(originalContents).digest('hex') - - if (rulesetWhitelist[fileNameLowerCase] === originalHash) { - fixHash = true - } - } - - let newContents = originalContents - - for (const regex of regexes) { - newContents = newContents.replace(regex.from, regex.to) - } - - if (newContents !== originalContents) { - if (fixHash) { - const newHash = crypto.createHash('sha256').update(newContents).digest('hex') - rulesetWhitelistNewContents = rulesetWhitelistNewContents.replace(originalHash, newHash) - - console.log(`"${fileName}" has been modified, its new hash is "${newHash}".`) - } else { - console.log(`"${fileName}" has been modified.`) - } - - await writeFile(file, newContents, 'utf8') - - changedCount++ - } - } - - console.log(`${changedCount} of ${files.length} files have changed (${changedCount / files.length * 100}%).`) - - if (rulesetWhitelistNewContents !== rulesetWhitelistContents) { - await writeFile(rulesetWhitelistFile, rulesetWhitelistNewContents, 'utf8') - - console.log('Ruleset whitelist has been updated.') - } -} - -main() diff --git a/utils/normalize-securecookie.py b/utils/normalize-securecookie.py new file mode 100644 index 000000000000..cad8361a3094 --- /dev/null +++ b/utils/normalize-securecookie.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python2.7 + +# This python utility check for wildcard securecookies which +# can be normalized, warn and exit with non-zero when such +# rulesets exist. + +# This is create in attempt to fix the issues on +# https://github.com/EFForg/https-everywhere/pull/13840 +# https://github.com/EFForg/https-everywhere/pull/12493 + +import argparse +import glob +import os +import unicodedata +import xml.etree.ElementTree + +def normalize_fn(fn): + """ + OSX and Linux filesystems encode composite characters differently in + filenames. We should normalize to NFC: https://unicode.org/reports/tr15/ + """ + fn = unicodedata.normalize("NFC", unicode(fn, "utf-8")).encode() + return fn + +def should_normalize_securecookie(host, name): + wildcards = [ ".", ".*" ] + return True if host in wildcards or name in wildcards else False + +# commandline arguments parsing (nobody use it, though) +parser = argparse.ArgumentParser(description="Normalize wildcard securecookies") +parser.add_argument("--source_dir", default="src/chrome/content/rules") + +args = parser.parse_args() + +# Exit code +exit_with_non_zero = False + +# XML ruleset files +filenames = map(normalize_fn, glob.glob(os.path.join(args.source_dir, "*.xml"))) + +for filename in filenames: + tree = xml.etree.ElementTree.parse(filename) + root = tree.getroot() + + for branch in root: + if branch.tag != "securecookie": + continue + + host = branch.attrib["host"] + name = branch.attrib["name"] + + if should_normalize_securecookie(host, name): + print ("ERROR %s: contains wildcard securecookies "\ + "which can be normalized." % filename) + exit_with_non_zero = True + break + +exit(0) if not exit_with_non_zero else exit(1) From a3c5b445b9078927ed688156937d2107188289e0 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 01:27:40 +0000 Subject: [PATCH 103/844] Create Alhaqlah.com.xml (#12699) --- src/chrome/content/rules/Alhaqlah.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Alhaqlah.com.xml diff --git a/src/chrome/content/rules/Alhaqlah.com.xml b/src/chrome/content/rules/Alhaqlah.com.xml new file mode 100644 index 000000000000..c975b80fad96 --- /dev/null +++ b/src/chrome/content/rules/Alhaqlah.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 1aa09710a74a03a4e772398d1e149e8a75a4cae3 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 01:30:00 +0000 Subject: [PATCH 104/844] Create Kt-b.com.xml (#12688) --- src/chrome/content/rules/Kt-b.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Kt-b.com.xml diff --git a/src/chrome/content/rules/Kt-b.com.xml b/src/chrome/content/rules/Kt-b.com.xml new file mode 100644 index 000000000000..9b925d001b59 --- /dev/null +++ b/src/chrome/content/rules/Kt-b.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From f8edc392efffdeccac142e6699d58ef01f41b63d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 01:57:13 +0000 Subject: [PATCH 105/844] Create Muftah.org.xml (#12252) --- src/chrome/content/rules/Muftah.org.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/Muftah.org.xml diff --git a/src/chrome/content/rules/Muftah.org.xml b/src/chrome/content/rules/Muftah.org.xml new file mode 100644 index 000000000000..2a88419fc6d5 --- /dev/null +++ b/src/chrome/content/rules/Muftah.org.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 88bb44fc27e816c4a38ec46cbb80d0e11b6cddcf Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 02:33:18 +0000 Subject: [PATCH 106/844] Create EncounteringIslam.org.xml (#12221) --- src/chrome/content/rules/EncounteringIslam.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/EncounteringIslam.org.xml diff --git a/src/chrome/content/rules/EncounteringIslam.org.xml b/src/chrome/content/rules/EncounteringIslam.org.xml new file mode 100644 index 000000000000..15c7c0a6de22 --- /dev/null +++ b/src/chrome/content/rules/EncounteringIslam.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From bd587965ee9d5a6b7c36edb63236113116ebd747 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 02:36:42 +0000 Subject: [PATCH 107/844] Create Etherscamdb.info.xml (#12196) --- src/chrome/content/rules/Etherscamdb.info.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/chrome/content/rules/Etherscamdb.info.xml diff --git a/src/chrome/content/rules/Etherscamdb.info.xml b/src/chrome/content/rules/Etherscamdb.info.xml new file mode 100644 index 000000000000..aeeb9a219a15 --- /dev/null +++ b/src/chrome/content/rules/Etherscamdb.info.xml @@ -0,0 +1,7 @@ + + + + + + + From c5cfcb8ceab8f9fe2a98826de66fd90808b8f868 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 02:50:35 +0000 Subject: [PATCH 108/844] Create AffaireRelig.net.xml (#12197) --- src/chrome/content/rules/AffaireRelig.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/AffaireRelig.net.xml diff --git a/src/chrome/content/rules/AffaireRelig.net.xml b/src/chrome/content/rules/AffaireRelig.net.xml new file mode 100644 index 000000000000..5ebf6d3fc5ef --- /dev/null +++ b/src/chrome/content/rules/AffaireRelig.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From 88a37ed6034229904d1ac8e96dcad10ce1ba707d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 03:58:01 +0000 Subject: [PATCH 109/844] Create TheMadinanWay.com.xml (#12194) --- src/chrome/content/rules/TheMadinanWay.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/TheMadinanWay.com.xml diff --git a/src/chrome/content/rules/TheMadinanWay.com.xml b/src/chrome/content/rules/TheMadinanWay.com.xml new file mode 100644 index 000000000000..949e0e2f82ad --- /dev/null +++ b/src/chrome/content/rules/TheMadinanWay.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 9fe023a6ef5b492aabce07a81b4c79b5579b8d3a Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 03:58:19 +0000 Subject: [PATCH 110/844] Create AhadithNotes.com.xml (#12193) --- src/chrome/content/rules/AhadithNotes.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/AhadithNotes.com.xml diff --git a/src/chrome/content/rules/AhadithNotes.com.xml b/src/chrome/content/rules/AhadithNotes.com.xml new file mode 100644 index 000000000000..eb756a773105 --- /dev/null +++ b/src/chrome/content/rules/AhadithNotes.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 71a67b737d94dc6c3ed9a12fdf0050f8e0c05fb8 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 03:58:52 +0000 Subject: [PATCH 111/844] Create PonderingIslam.com.xml (#12191) --- src/chrome/content/rules/PonderingIslam.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/PonderingIslam.com.xml diff --git a/src/chrome/content/rules/PonderingIslam.com.xml b/src/chrome/content/rules/PonderingIslam.com.xml new file mode 100644 index 000000000000..ca04f10166d3 --- /dev/null +++ b/src/chrome/content/rules/PonderingIslam.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 258101768a75802a95c04f9bccc272a89bcccdec Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 16 Dec 2017 16:33:38 +0100 Subject: [PATCH 112/844] Create EOL.org.xml (#13576) * Create EOL.org.xml * [EOL.org] Add platform="mixedcontent" * [EOL.org] Update top comment --- src/chrome/content/rules/EOL.org.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/EOL.org.xml diff --git a/src/chrome/content/rules/EOL.org.xml b/src/chrome/content/rules/EOL.org.xml new file mode 100644 index 000000000000..c3d74c96e9b0 --- /dev/null +++ b/src/chrome/content/rules/EOL.org.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + From 94cc24c1ec812e1ad822ed8f5f9257a67e1d7b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sat, 16 Dec 2017 16:55:35 +0100 Subject: [PATCH 113/844] Added ruleset for nap-pflanzenschutz.de (#13942) --- src/chrome/content/rules/nap-pflanzenschutz.de.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/nap-pflanzenschutz.de.xml diff --git a/src/chrome/content/rules/nap-pflanzenschutz.de.xml b/src/chrome/content/rules/nap-pflanzenschutz.de.xml new file mode 100644 index 000000000000..9e00da582f99 --- /dev/null +++ b/src/chrome/content/rules/nap-pflanzenschutz.de.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 701da314bf217432474cbb5d59baf8e106659e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sat, 16 Dec 2017 16:56:05 +0100 Subject: [PATCH 114/844] Added ruleset for waldkulturerbe.de (#13941) --- src/chrome/content/rules/waldkulturerbe.de.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/waldkulturerbe.de.xml diff --git a/src/chrome/content/rules/waldkulturerbe.de.xml b/src/chrome/content/rules/waldkulturerbe.de.xml new file mode 100644 index 000000000000..baba15a039f0 --- /dev/null +++ b/src/chrome/content/rules/waldkulturerbe.de.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From c980d515971c500050437106faa90a46530ede3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sat, 16 Dec 2017 16:58:05 +0100 Subject: [PATCH 115/844] Added ruleset for zugutfuerdietonne.de (#13939) --- src/chrome/content/rules/zugutfuerdietonne.de.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/zugutfuerdietonne.de.xml diff --git a/src/chrome/content/rules/zugutfuerdietonne.de.xml b/src/chrome/content/rules/zugutfuerdietonne.de.xml new file mode 100644 index 000000000000..9dd033814b8b --- /dev/null +++ b/src/chrome/content/rules/zugutfuerdietonne.de.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + From f235c718b34157e1fb6a28eeef8449622f91f714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sat, 16 Dec 2017 16:59:52 +0100 Subject: [PATCH 116/844] Added ruleset for bmel.de (#13938) --- src/chrome/content/rules/bmel.de.xml | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/chrome/content/rules/bmel.de.xml diff --git a/src/chrome/content/rules/bmel.de.xml b/src/chrome/content/rules/bmel.de.xml new file mode 100644 index 000000000000..59d488a9b11f --- /dev/null +++ b/src/chrome/content/rules/bmel.de.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + From 6a670bbc207e8d064b83aba2a3d967a74cb79875 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 16 Dec 2017 17:04:38 +0100 Subject: [PATCH 117/844] [RoyalSociety.org] Add targets (#13935) * [RoyalSociety.org] Add targets * Rename Royal_Society.org.xml to RoyalSociety.org.xml --- src/chrome/content/rules/RoyalSociety.org.xml | 41 +++++++++++++++++++ .../content/rules/Royal_Society.org.xml | 13 ------ 2 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 src/chrome/content/rules/RoyalSociety.org.xml delete mode 100644 src/chrome/content/rules/Royal_Society.org.xml diff --git a/src/chrome/content/rules/RoyalSociety.org.xml b/src/chrome/content/rules/RoyalSociety.org.xml new file mode 100644 index 000000000000..096392118b26 --- /dev/null +++ b/src/chrome/content/rules/RoyalSociety.org.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Royal_Society.org.xml b/src/chrome/content/rules/Royal_Society.org.xml deleted file mode 100644 index 569f4faca8e1..000000000000 --- a/src/chrome/content/rules/Royal_Society.org.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - From 146cddeb0cbb221246dfaec5f20d5ddff0a1c0f5 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:30:48 +0000 Subject: [PATCH 118/844] Create MSobieh.com.xml (#12080) --- src/chrome/content/rules/MSobieh.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/MSobieh.com.xml diff --git a/src/chrome/content/rules/MSobieh.com.xml b/src/chrome/content/rules/MSobieh.com.xml new file mode 100644 index 000000000000..86865b24b67c --- /dev/null +++ b/src/chrome/content/rules/MSobieh.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From ccab51bd2b10e7f522ccdc84b5b325d5bd16fd4e Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:31:07 +0000 Subject: [PATCH 119/844] Create Safeena.org.xml (#12078) --- src/chrome/content/rules/Safeena.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Safeena.org.xml diff --git a/src/chrome/content/rules/Safeena.org.xml b/src/chrome/content/rules/Safeena.org.xml new file mode 100644 index 000000000000..e26fa6a9d005 --- /dev/null +++ b/src/chrome/content/rules/Safeena.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From 99491104e96ca7307bf93d7d3969fc4fa0e070ef Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:31:49 +0000 Subject: [PATCH 120/844] Create RayyanInstitute.com.xml (#12123) --- src/chrome/content/rules/RayyanInstitute.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/RayyanInstitute.com.xml diff --git a/src/chrome/content/rules/RayyanInstitute.com.xml b/src/chrome/content/rules/RayyanInstitute.com.xml new file mode 100644 index 000000000000..d9f44e39543a --- /dev/null +++ b/src/chrome/content/rules/RayyanInstitute.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From d16485f82fd7da6e057017e400ee0bad6f5d9324 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:32:14 +0000 Subject: [PATCH 121/844] Create IbnouTaymiyya.com.xml (#12161) --- src/chrome/content/rules/IbnouTaymiyya.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/IbnouTaymiyya.com.xml diff --git a/src/chrome/content/rules/IbnouTaymiyya.com.xml b/src/chrome/content/rules/IbnouTaymiyya.com.xml new file mode 100644 index 000000000000..81c58f5d33a5 --- /dev/null +++ b/src/chrome/content/rules/IbnouTaymiyya.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 416edcfc9bcda51487be18bdfa09f84ba0ab983d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:34:28 +0000 Subject: [PATCH 122/844] Create Talaqqi.org.xml (#13099) --- src/chrome/content/rules/Talaqqi.org.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Talaqqi.org.xml diff --git a/src/chrome/content/rules/Talaqqi.org.xml b/src/chrome/content/rules/Talaqqi.org.xml new file mode 100644 index 000000000000..a40e324f4aec --- /dev/null +++ b/src/chrome/content/rules/Talaqqi.org.xml @@ -0,0 +1,10 @@ + + + + + + + From 8990e8638ccbf62a0fe98761b3b71b611c039035 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:36:05 +0000 Subject: [PATCH 123/844] Create SunniOnline.us.xml (#12256) --- src/chrome/content/rules/SunniOnline.us.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/SunniOnline.us.xml diff --git a/src/chrome/content/rules/SunniOnline.us.xml b/src/chrome/content/rules/SunniOnline.us.xml new file mode 100644 index 000000000000..5e42830fe4a4 --- /dev/null +++ b/src/chrome/content/rules/SunniOnline.us.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 0f1f3573c7285a49b92ad4297a411bd80a61792d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:38:31 +0000 Subject: [PATCH 124/844] Update Kreativvonalak.xml (#12250) --- src/chrome/content/rules/KreativVonalak.hu.xml | 14 ++++++++++++++ src/chrome/content/rules/Kreativvonalak.xml | 5 ----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 src/chrome/content/rules/KreativVonalak.hu.xml delete mode 100644 src/chrome/content/rules/Kreativvonalak.xml diff --git a/src/chrome/content/rules/KreativVonalak.hu.xml b/src/chrome/content/rules/KreativVonalak.hu.xml new file mode 100644 index 000000000000..d1454ab20b89 --- /dev/null +++ b/src/chrome/content/rules/KreativVonalak.hu.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/src/chrome/content/rules/Kreativvonalak.xml b/src/chrome/content/rules/Kreativvonalak.xml deleted file mode 100644 index 80e5705850b7..000000000000 --- a/src/chrome/content/rules/Kreativvonalak.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - From 7c71d9c3e21f5972f9bf33e9fd9e079280696c0b Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:40:15 +0000 Subject: [PATCH 125/844] Create 3refe.com.xml (#12223) --- src/chrome/content/rules/3refe.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/3refe.com.xml diff --git a/src/chrome/content/rules/3refe.com.xml b/src/chrome/content/rules/3refe.com.xml new file mode 100644 index 000000000000..cca7b473c762 --- /dev/null +++ b/src/chrome/content/rules/3refe.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From a374dafc720878539c00c47f309eb35337346d38 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 17:55:07 +0000 Subject: [PATCH 126/844] Create Saaid.net.xml (#12206) --- src/chrome/content/rules/Saaid.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Saaid.net.xml diff --git a/src/chrome/content/rules/Saaid.net.xml b/src/chrome/content/rules/Saaid.net.xml new file mode 100644 index 000000000000..02bcd4a47a6c --- /dev/null +++ b/src/chrome/content/rules/Saaid.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From 8a901bd6e07c344107ab4c2de94c11a63a22c84c Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 06:41:43 +1030 Subject: [PATCH 127/844] [publicbank.com.vn] New ruleset (#13965) --- .../content/rules/PublicBank.com.vn.xml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/PublicBank.com.vn.xml diff --git a/src/chrome/content/rules/PublicBank.com.vn.xml b/src/chrome/content/rules/PublicBank.com.vn.xml new file mode 100644 index 000000000000..08970d6f2408 --- /dev/null +++ b/src/chrome/content/rules/PublicBank.com.vn.xml @@ -0,0 +1,29 @@ + + + + + + + + + + From e4873ad74c1e539acc5cc04d2e0a371903c945fa Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 06:43:24 +1030 Subject: [PATCH 128/844] [publicislamicbank.com.my] New ruleset (#13963) --- .../content/rules/PublicIslamicBank.xml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/chrome/content/rules/PublicIslamicBank.xml diff --git a/src/chrome/content/rules/PublicIslamicBank.xml b/src/chrome/content/rules/PublicIslamicBank.xml new file mode 100644 index 000000000000..6661b8eb4c0a --- /dev/null +++ b/src/chrome/content/rules/PublicIslamicBank.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + From 6bc63b5c03d2c16ea69bc0097174649ef7a31859 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 17 Dec 2017 04:16:12 +0800 Subject: [PATCH 129/844] Remove CompetitionsByWyndham.com.au from Wyndham.xml (#13974) --- .../content/rules/CompetitionsByWyndham.com.au.xml | 12 ++++++++++++ src/chrome/content/rules/Wyndham.xml | 11 +---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 src/chrome/content/rules/CompetitionsByWyndham.com.au.xml diff --git a/src/chrome/content/rules/CompetitionsByWyndham.com.au.xml b/src/chrome/content/rules/CompetitionsByWyndham.com.au.xml new file mode 100644 index 000000000000..cf245db06ece --- /dev/null +++ b/src/chrome/content/rules/CompetitionsByWyndham.com.au.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index a16fe54669ee..d5bf952d713c 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -2,6 +2,7 @@ Other Wyndham related rulesets: + CanvasHolidays.co.uk.xml + Cheznous.com.xml + + CompetitionsByWyndham.com.au.xml + Cottages.com.xml + Cottages4you.co.uk.xml + English-Country-Cottages.co.uk.xml @@ -26,8 +27,6 @@ + landalskilife.nl.xml Disabled by https-everywhere-checker because: -Fetch error: http://competitionsbywyndham.com.au/ => https://competitionsbywyndham.com.au/: (60, 'SSL certificate problem: unable to get local issuer certificate') -Fetch error: http://www.competitionsbywyndham.com.au/ => https://www.competitionsbywyndham.com.au/: (60, 'SSL certificate problem: unable to get local issuer certificate') Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://wyndham.com/ => https://www.wyndham.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received') @@ -35,8 +34,6 @@ Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') Disabled by https-everywhere-checker because: -Fetch error: http://competitionsbywyndham.com.au/ => https://competitionsbywyndham.com.au/: (60, 'SSL certificate problem: certificate has expired') -Fetch error: http://www.competitionsbywyndham.com.au/ => https://www.competitionsbywyndham.com.au/: (60, 'SSL certificate problem: certificate has expired') Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 10001 milliseconds') Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 10000 milliseconds') Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') @@ -63,8 +60,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: --> - - @@ -87,16 +82,12 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - From e43baf55725748032b9deb05eb58dd323ba72d80 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 06:46:27 +1030 Subject: [PATCH 130/844] [publicmutualonline.com.my] New ruleset (#13962) --- src/chrome/content/rules/PublicMutual.xml | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/chrome/content/rules/PublicMutual.xml diff --git a/src/chrome/content/rules/PublicMutual.xml b/src/chrome/content/rules/PublicMutual.xml new file mode 100644 index 000000000000..0e25781ce663 --- /dev/null +++ b/src/chrome/content/rules/PublicMutual.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + From da0d41b0aa4e2afb0286343fa881db3f8c7f9376 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 20:29:14 +0000 Subject: [PATCH 131/844] Create JoeBradford.net.xml (#12195) --- src/chrome/content/rules/JoeBradford.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/JoeBradford.net.xml diff --git a/src/chrome/content/rules/JoeBradford.net.xml b/src/chrome/content/rules/JoeBradford.net.xml new file mode 100644 index 000000000000..2068405d9b70 --- /dev/null +++ b/src/chrome/content/rules/JoeBradford.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From fa26cf5850d8f5eabb844385e10f138d2157e0aa Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:03:03 +1030 Subject: [PATCH 132/844] [WoolworthsPetrol.com.au] New ruleset (#13931) --- .../content/rules/WoolworthsPetrol.com.au.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/chrome/content/rules/WoolworthsPetrol.com.au.xml diff --git a/src/chrome/content/rules/WoolworthsPetrol.com.au.xml b/src/chrome/content/rules/WoolworthsPetrol.com.au.xml new file mode 100644 index 000000000000..5ac9ca8ac67b --- /dev/null +++ b/src/chrome/content/rules/WoolworthsPetrol.com.au.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + From 0ee2fd6fbc7446b0fb88bcadff239517faa9c71e Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:03:57 +1030 Subject: [PATCH 133/844] [WoolworthsPay.com.au] New ruleset (#13930) --- .../content/rules/WoolworthsPay.com.au.xml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/WoolworthsPay.com.au.xml diff --git a/src/chrome/content/rules/WoolworthsPay.com.au.xml b/src/chrome/content/rules/WoolworthsPay.com.au.xml new file mode 100644 index 000000000000..b78661ad7394 --- /dev/null +++ b/src/chrome/content/rules/WoolworthsPay.com.au.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From 3e3ccd02f04cfc4a55a55f96dd26a3173b67f96f Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:04:32 +1030 Subject: [PATCH 134/844] [LastStopShop.co.nz] New ruleset (#13932) --- .../content/rules/LastStopShop.co.nz.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/chrome/content/rules/LastStopShop.co.nz.xml diff --git a/src/chrome/content/rules/LastStopShop.co.nz.xml b/src/chrome/content/rules/LastStopShop.co.nz.xml new file mode 100644 index 000000000000..56a1e226293c --- /dev/null +++ b/src/chrome/content/rules/LastStopShop.co.nz.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + From c96d5b982e1bdef03d4b445b6b720a739ba46eba Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:05:27 +1030 Subject: [PATCH 135/844] [bigw.com.au] New ruleset (#13927) * [bigw.com.au] New ruleset * Remove non-functional subdomain --- src/chrome/content/rules/bigw.com.au.xml | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/bigw.com.au.xml diff --git a/src/chrome/content/rules/bigw.com.au.xml b/src/chrome/content/rules/bigw.com.au.xml new file mode 100644 index 000000000000..e81e6296ac05 --- /dev/null +++ b/src/chrome/content/rules/bigw.com.au.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + From d36ce99f0af03687a6ae02536c58e38a764205e0 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:05:59 +1030 Subject: [PATCH 136/844] [masters.com.au] New ruleset (#13928) --- src/chrome/content/rules/Masters.com.au.xml | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/Masters.com.au.xml diff --git a/src/chrome/content/rules/Masters.com.au.xml b/src/chrome/content/rules/Masters.com.au.xml new file mode 100644 index 000000000000..fc43563e4b37 --- /dev/null +++ b/src/chrome/content/rules/Masters.com.au.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + From 855dc0abc0df019d5c2171c5ca0a39224e3336a7 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 20:52:28 +0000 Subject: [PATCH 137/844] Create AlJamaa.net.xml (#11743) --- src/chrome/content/rules/AlJamaa.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/AlJamaa.net.xml diff --git a/src/chrome/content/rules/AlJamaa.net.xml b/src/chrome/content/rules/AlJamaa.net.xml new file mode 100644 index 000000000000..c5a1b084fab8 --- /dev/null +++ b/src/chrome/content/rules/AlJamaa.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From a0bd63208b32ca6c63f799f9b7065df97c50664d Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:22:55 +1030 Subject: [PATCH 138/844] [bws.com.au] New ruleset (#13929) --- src/chrome/content/rules/bws.com.au.xml | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/bws.com.au.xml diff --git a/src/chrome/content/rules/bws.com.au.xml b/src/chrome/content/rules/bws.com.au.xml new file mode 100644 index 000000000000..68d5ce53599e --- /dev/null +++ b/src/chrome/content/rules/bws.com.au.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + From 0397e183fd86e1d66127f6c4f1f6487f6522dc53 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 07:23:20 +1030 Subject: [PATCH 139/844] [LastStopShop.com.au] New ruleset (#13921) --- .../content/rules/LastStopShop.com.au.xml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/LastStopShop.com.au.xml diff --git a/src/chrome/content/rules/LastStopShop.com.au.xml b/src/chrome/content/rules/LastStopShop.com.au.xml new file mode 100644 index 000000000000..ce555d69bce6 --- /dev/null +++ b/src/chrome/content/rules/LastStopShop.com.au.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + From 8bb69b068fd82503ee21cc706cc997df5dc23e87 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 21:02:56 +0000 Subject: [PATCH 140/844] Create Quran_wa_Hadith.com.xml (#12116) --- src/chrome/content/rules/Quran_wa_Hadith.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Quran_wa_Hadith.com.xml diff --git a/src/chrome/content/rules/Quran_wa_Hadith.com.xml b/src/chrome/content/rules/Quran_wa_Hadith.com.xml new file mode 100644 index 000000000000..abbce4aa775d --- /dev/null +++ b/src/chrome/content/rules/Quran_wa_Hadith.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 1531a2d409c043ae07c0bd244bc186348b1cfa26 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 21:04:59 +0000 Subject: [PATCH 141/844] Create RobertJPrince.net.xml (#11685) --- src/chrome/content/rules/RobertJPrince.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/RobertJPrince.net.xml diff --git a/src/chrome/content/rules/RobertJPrince.net.xml b/src/chrome/content/rules/RobertJPrince.net.xml new file mode 100644 index 000000000000..73fbe2eb9a4d --- /dev/null +++ b/src/chrome/content/rules/RobertJPrince.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From 196400be3748c27b4a7085eebc38d62c5e0fd0b0 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 21:08:48 +0000 Subject: [PATCH 142/844] Create Sahab.net.xml (#11656) --- src/chrome/content/rules/Sahab.net.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Sahab.net.xml diff --git a/src/chrome/content/rules/Sahab.net.xml b/src/chrome/content/rules/Sahab.net.xml new file mode 100644 index 000000000000..ef3f6a2c5d0b --- /dev/null +++ b/src/chrome/content/rules/Sahab.net.xml @@ -0,0 +1,8 @@ + + + + + + + + From 7bff9fb68eb84d243131ccee101f745e3e1d4527 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 22:38:30 +0000 Subject: [PATCH 143/844] Create IslamStory.com.xml (#12218) --- src/chrome/content/rules/IslamStory.com.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/IslamStory.com.xml diff --git a/src/chrome/content/rules/IslamStory.com.xml b/src/chrome/content/rules/IslamStory.com.xml new file mode 100644 index 000000000000..64f13369002e --- /dev/null +++ b/src/chrome/content/rules/IslamStory.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + From 692eb6c597ba518bd83c0d19c805be6d9f3cfd31 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 22:39:12 +0000 Subject: [PATCH 144/844] Update Arlt.com.xml (#12236) --- src/chrome/content/rules/Arlt.com.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Arlt.com.xml b/src/chrome/content/rules/Arlt.com.xml index 894021c39e85..ed1e62fa3297 100644 --- a/src/chrome/content/rules/Arlt.com.xml +++ b/src/chrome/content/rules/Arlt.com.xml @@ -1,5 +1,14 @@ + - + + - + From 9db709153e772a1e37fa8f3ff3ffd3cef89e7e2d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 22:39:40 +0000 Subject: [PATCH 145/844] Create Alftwa.com.xml (#12385) --- src/chrome/content/rules/Alftwa.com.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Alftwa.com.xml diff --git a/src/chrome/content/rules/Alftwa.com.xml b/src/chrome/content/rules/Alftwa.com.xml new file mode 100644 index 000000000000..253566c2d69d --- /dev/null +++ b/src/chrome/content/rules/Alftwa.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + From 21eb94a22cdd9a805d3ccccbf8c61a1caf591100 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 09:40:01 +1030 Subject: [PATCH 146/844] [Langtons.com.au] New ruleset (#13922) --- src/chrome/content/rules/Langtons.com.au.xml | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/Langtons.com.au.xml diff --git a/src/chrome/content/rules/Langtons.com.au.xml b/src/chrome/content/rules/Langtons.com.au.xml new file mode 100644 index 000000000000..81a17415c1af --- /dev/null +++ b/src/chrome/content/rules/Langtons.com.au.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + From 16da8c946899eb9750938bedd3203dbadfc9991a Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 09:47:45 +1030 Subject: [PATCH 147/844] [danmurphys.com.au] New ruleset (#13925) --- .../content/rules/danmurphys.com.au.xml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/danmurphys.com.au.xml diff --git a/src/chrome/content/rules/danmurphys.com.au.xml b/src/chrome/content/rules/danmurphys.com.au.xml new file mode 100644 index 000000000000..9ffee70b4f00 --- /dev/null +++ b/src/chrome/content/rules/danmurphys.com.au.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + From f255c4e240eefdedd229f55f5c7b80f7887933bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 17 Dec 2017 00:19:51 +0100 Subject: [PATCH 148/844] Added ruleset for silverwoodthemepark.com.xml (#13662) --- .../content/rules/silverwoodthemepark.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/silverwoodthemepark.com.xml diff --git a/src/chrome/content/rules/silverwoodthemepark.com.xml b/src/chrome/content/rules/silverwoodthemepark.com.xml new file mode 100644 index 000000000000..198818d21366 --- /dev/null +++ b/src/chrome/content/rules/silverwoodthemepark.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 6cf201d2cd3a5a6707656835a5ed7dfad81501ba Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 17 Dec 2017 07:22:01 +0800 Subject: [PATCH 149/844] Remove Right-wildcard from Atlantic-Metro-Communications.xml (#13982) Remove Left-wildcard from Atlantic-Metro-Communications.xml --- .../rules/Atlantic-Metro-Communications.xml | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/Atlantic-Metro-Communications.xml b/src/chrome/content/rules/Atlantic-Metro-Communications.xml index f4b2c8e71215..b22f6d6c7724 100644 --- a/src/chrome/content/rules/Atlantic-Metro-Communications.xml +++ b/src/chrome/content/rules/Atlantic-Metro-Communications.xml @@ -1,15 +1,33 @@ - - + + + + + + + + From 6fcab4b1b68c3cdfd1c301f7d6b664bd2d1b1126 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 17 Dec 2017 07:28:59 +0800 Subject: [PATCH 150/844] Update Judiciary_of_England_and_Wales.xml (#13979) --- .../rules/Judiciary_of_England_and_Wales.xml | 64 +++++++++---------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/src/chrome/content/rules/Judiciary_of_England_and_Wales.xml b/src/chrome/content/rules/Judiciary_of_England_and_Wales.xml index b1d5c4accc7f..5b1db85f292f 100644 --- a/src/chrome/content/rules/Judiciary_of_England_and_Wales.xml +++ b/src/chrome/content/rules/Judiciary_of_England_and_Wales.xml @@ -1,38 +1,34 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + From 6da93bbcb29860f2384cc99576a144d2fcb60801 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 17 Dec 2017 00:34:03 +0100 Subject: [PATCH 151/844] Create VisualNews.com.xml (#13888) --- src/chrome/content/rules/VisualNews.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/VisualNews.com.xml diff --git a/src/chrome/content/rules/VisualNews.com.xml b/src/chrome/content/rules/VisualNews.com.xml new file mode 100644 index 000000000000..3562a4e38d91 --- /dev/null +++ b/src/chrome/content/rules/VisualNews.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 70593adef7146ac4ceea3a47bdd2648428cdf6a3 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 17 Dec 2017 00:37:43 +0100 Subject: [PATCH 152/844] Create PhDelirium.com.xml (#13880) --- src/chrome/content/rules/PhDelirium.com.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/PhDelirium.com.xml diff --git a/src/chrome/content/rules/PhDelirium.com.xml b/src/chrome/content/rules/PhDelirium.com.xml new file mode 100644 index 000000000000..4bc50d90d8b1 --- /dev/null +++ b/src/chrome/content/rules/PhDelirium.com.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 95b56edd0c18c1899cc5603c45e3a0af537b21f2 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 17 Dec 2017 00:39:15 +0100 Subject: [PATCH 153/844] Create Ponderwall.com.xml (#13839) --- src/chrome/content/rules/Ponderwall.com.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Ponderwall.com.xml diff --git a/src/chrome/content/rules/Ponderwall.com.xml b/src/chrome/content/rules/Ponderwall.com.xml new file mode 100644 index 000000000000..a2d10ffdc63f --- /dev/null +++ b/src/chrome/content/rules/Ponderwall.com.xml @@ -0,0 +1,12 @@ + + + + + + + + + From b907cdd6052e85b601c235b514777f7784ec315e Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 17 Dec 2017 10:10:43 +1030 Subject: [PATCH 154/844] [nzwinesociety.co.nz] New ruleset (#13926) --- .../content/rules/nzwinesociety.co.nz.xml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/nzwinesociety.co.nz.xml diff --git a/src/chrome/content/rules/nzwinesociety.co.nz.xml b/src/chrome/content/rules/nzwinesociety.co.nz.xml new file mode 100644 index 000000000000..cd1e3f9ed9da --- /dev/null +++ b/src/chrome/content/rules/nzwinesociety.co.nz.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From a0639c76cf911382265854b248e1c3a975faef22 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Sun, 17 Dec 2017 10:44:44 +1100 Subject: [PATCH 155/844] [Infopackets] Update and re-enable ruleset. (#13802) --- src/chrome/content/rules/Infopackets.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Infopackets.xml b/src/chrome/content/rules/Infopackets.xml index 89565070f973..99cff7454be0 100644 --- a/src/chrome/content/rules/Infopackets.xml +++ b/src/chrome/content/rules/Infopackets.xml @@ -1,13 +1,18 @@ - + + Mismatched hosts in *infopackets.com: + + - go + - mail + - track + +--> + - - - + From 7ed0dbeeae6dd26551005e051263b9c455b627be Mon Sep 17 00:00:00 2001 From: numismatika Date: Sun, 17 Dec 2017 00:45:45 +0100 Subject: [PATCH 156/844] add rule for Vooxe.com (#13853) --- src/chrome/content/rules/Vooxe.com.xml | 55 ++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/chrome/content/rules/Vooxe.com.xml diff --git a/src/chrome/content/rules/Vooxe.com.xml b/src/chrome/content/rules/Vooxe.com.xml new file mode 100644 index 000000000000..ae5fd3fad675 --- /dev/null +++ b/src/chrome/content/rules/Vooxe.com.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + From 2d9aa1dd425595c8bba33a02c339505715e9d848 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sun, 17 Dec 2017 00:46:27 +0100 Subject: [PATCH 157/844] add rule for Attraqt.com (#13852) --- src/chrome/content/rules/Attraqt.com.xml | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/chrome/content/rules/Attraqt.com.xml diff --git a/src/chrome/content/rules/Attraqt.com.xml b/src/chrome/content/rules/Attraqt.com.xml new file mode 100644 index 000000000000..cdc09756cf83 --- /dev/null +++ b/src/chrome/content/rules/Attraqt.com.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d2afc19affe737116b8305dfebea1ea53f3b05d3 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sun, 17 Dec 2017 00:46:58 +0100 Subject: [PATCH 158/844] add rule for Semasio (#13835) --- src/chrome/content/rules/Semasio.net.xml | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/chrome/content/rules/Semasio.net.xml diff --git a/src/chrome/content/rules/Semasio.net.xml b/src/chrome/content/rules/Semasio.net.xml new file mode 100644 index 000000000000..91613895a258 --- /dev/null +++ b/src/chrome/content/rules/Semasio.net.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + From f0c1dd6bf64b546d5ab1dbf1b9fea9fe2196572d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 23:57:29 +0000 Subject: [PATCH 159/844] Create AlImam.ws.xml (#11595) --- src/chrome/content/rules/AlImam.ws.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/AlImam.ws.xml diff --git a/src/chrome/content/rules/AlImam.ws.xml b/src/chrome/content/rules/AlImam.ws.xml new file mode 100644 index 000000000000..1db7ac07c4ff --- /dev/null +++ b/src/chrome/content/rules/AlImam.ws.xml @@ -0,0 +1,8 @@ + + + + + + + + From 3e13152851cf0e3ae5fafa0ff58066a526cbe9ac Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sat, 16 Dec 2017 23:59:39 +0000 Subject: [PATCH 160/844] Create Starminder.xyz.xml (#11591) --- src/chrome/content/rules/Starminder.xyz.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Starminder.xyz.xml diff --git a/src/chrome/content/rules/Starminder.xyz.xml b/src/chrome/content/rules/Starminder.xyz.xml new file mode 100644 index 000000000000..4c44e6581587 --- /dev/null +++ b/src/chrome/content/rules/Starminder.xyz.xml @@ -0,0 +1,8 @@ + + + + + + + + From fd6b9cce6edcb712e2042a393d0592f61a951813 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 01:19:46 +0000 Subject: [PATCH 161/844] Create ForumIslam.com.xml (#12077) --- src/chrome/content/rules/ForumIslam.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ForumIslam.com.xml diff --git a/src/chrome/content/rules/ForumIslam.com.xml b/src/chrome/content/rules/ForumIslam.com.xml new file mode 100644 index 000000000000..32abf91a3417 --- /dev/null +++ b/src/chrome/content/rules/ForumIslam.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From f5ac005f6af3137f3f68f291c09d8e1b3f57d945 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 01:20:01 +0000 Subject: [PATCH 162/844] Create CharityChoice.co.uk.xml (#12068) --- src/chrome/content/rules/CharityChoice.co.uk.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/CharityChoice.co.uk.xml diff --git a/src/chrome/content/rules/CharityChoice.co.uk.xml b/src/chrome/content/rules/CharityChoice.co.uk.xml new file mode 100644 index 000000000000..c9738272adc1 --- /dev/null +++ b/src/chrome/content/rules/CharityChoice.co.uk.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 57ad57a7b139986913974b4c9f1675c025acbc3a Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 01:20:30 +0000 Subject: [PATCH 163/844] Create Globalogiq.com.xml (#12064) --- src/chrome/content/rules/Globalogiq.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Globalogiq.com.xml diff --git a/src/chrome/content/rules/Globalogiq.com.xml b/src/chrome/content/rules/Globalogiq.com.xml new file mode 100644 index 000000000000..0fc013ee3ccd --- /dev/null +++ b/src/chrome/content/rules/Globalogiq.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 9f0ed09c41e08f387d65273b6d3fda54f8866757 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 01:20:49 +0000 Subject: [PATCH 164/844] Create ISLAMODECO.fr.xml (#12060) --- src/chrome/content/rules/ISLAMODECO.fr.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ISLAMODECO.fr.xml diff --git a/src/chrome/content/rules/ISLAMODECO.fr.xml b/src/chrome/content/rules/ISLAMODECO.fr.xml new file mode 100644 index 000000000000..7328225efd33 --- /dev/null +++ b/src/chrome/content/rules/ISLAMODECO.fr.xml @@ -0,0 +1,8 @@ + + + + + + + + From 1bd2ca52ef7929c6a4e6e1336026d186dfc85d57 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 01:21:11 +0000 Subject: [PATCH 165/844] Create Mp3eee.com.xml (#12059) --- src/chrome/content/rules/Mp3eee.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Mp3eee.com.xml diff --git a/src/chrome/content/rules/Mp3eee.com.xml b/src/chrome/content/rules/Mp3eee.com.xml new file mode 100644 index 000000000000..1b7cc5359319 --- /dev/null +++ b/src/chrome/content/rules/Mp3eee.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 3fe8d61c0ee80bde86ed4231776dd81dd932cb5d Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 01:21:30 +0000 Subject: [PATCH 166/844] Create LaunchGood.com.xml (#12117) --- src/chrome/content/rules/LaunchGood.com.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/LaunchGood.com.xml diff --git a/src/chrome/content/rules/LaunchGood.com.xml b/src/chrome/content/rules/LaunchGood.com.xml new file mode 100644 index 000000000000..0785da7379fe --- /dev/null +++ b/src/chrome/content/rules/LaunchGood.com.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From 1928ee4db7b6d9299074fe2148c03911edc2bad6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 17 Dec 2017 16:35:07 +0100 Subject: [PATCH 167/844] Create Freetorrent.fr.xml (#13884) * Create Freetorrent.fr.xml * [Freetorrent.fr] Add forum.freetorrent.fr --- src/chrome/content/rules/Freetorrent.fr.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Freetorrent.fr.xml diff --git a/src/chrome/content/rules/Freetorrent.fr.xml b/src/chrome/content/rules/Freetorrent.fr.xml new file mode 100644 index 000000000000..137b4488818a --- /dev/null +++ b/src/chrome/content/rules/Freetorrent.fr.xml @@ -0,0 +1,13 @@ + + + + + + + + + From 65ca0e8e0ccdd7e2f773596553245269bf2a386c Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 17 Dec 2017 16:36:07 +0100 Subject: [PATCH 168/844] Create MSF.org.au.xml (#13631) * Create MSF.org.au.xml * [MSF.org.au] Fix typo in top comment --- src/chrome/content/rules/MSF.org.au.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/chrome/content/rules/MSF.org.au.xml diff --git a/src/chrome/content/rules/MSF.org.au.xml b/src/chrome/content/rules/MSF.org.au.xml new file mode 100644 index 000000000000..c77593b837dd --- /dev/null +++ b/src/chrome/content/rules/MSF.org.au.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + From d6fa3fa70ce2b4321910d2c6a62e15d9e980692e Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 18 Dec 2017 02:06:40 +1030 Subject: [PATCH 169/844] [publicbank.com.hk] New ruleset (#13964) --- .../content/rules/PublicBank.com.hk.xml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/PublicBank.com.hk.xml diff --git a/src/chrome/content/rules/PublicBank.com.hk.xml b/src/chrome/content/rules/PublicBank.com.hk.xml new file mode 100644 index 000000000000..0c8da04d17a2 --- /dev/null +++ b/src/chrome/content/rules/PublicBank.com.hk.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + From bafd4cb256f1cce5e4f7e47573ef986f1bc008ca Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 18 Dec 2017 02:08:16 +1030 Subject: [PATCH 170/844] [PublicInvestBank.com] New ruleset (#13989) --- .../content/rules/PublicInvestBank.com.xml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/PublicInvestBank.com.xml diff --git a/src/chrome/content/rules/PublicInvestBank.com.xml b/src/chrome/content/rules/PublicInvestBank.com.xml new file mode 100644 index 000000000000..25615dd2ba4e --- /dev/null +++ b/src/chrome/content/rules/PublicInvestBank.com.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + From 41ff8aad7e760a6273cbf54e879459043c6bfb24 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 15:40:47 +0000 Subject: [PATCH 171/844] Update Netim.com.xml (#12246) --- src/chrome/content/rules/Netim.com.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Netim.com.xml b/src/chrome/content/rules/Netim.com.xml index 0cadc857d764..dcc2a05fc44b 100644 --- a/src/chrome/content/rules/Netim.com.xml +++ b/src/chrome/content/rules/Netim.com.xml @@ -1,5 +1,15 @@ + - + + + - + + + From 5f6933119f4734d14c5ef24d2bd1798b95ac9f4c Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 15:41:04 +0000 Subject: [PATCH 172/844] Create Discover-the-Truth.com.xml (#12006) --- src/chrome/content/rules/Discover-the-Truth.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Discover-the-Truth.com.xml diff --git a/src/chrome/content/rules/Discover-the-Truth.com.xml b/src/chrome/content/rules/Discover-the-Truth.com.xml new file mode 100644 index 000000000000..15506fdfbed8 --- /dev/null +++ b/src/chrome/content/rules/Discover-the-Truth.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 1d2690699c3e47c35d365d916704fe7705e3d2f2 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 15:41:26 +0000 Subject: [PATCH 173/844] Create MuslimMatters.org.xml (#11951) --- src/chrome/content/rules/MuslimMatters.org.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/MuslimMatters.org.xml diff --git a/src/chrome/content/rules/MuslimMatters.org.xml b/src/chrome/content/rules/MuslimMatters.org.xml new file mode 100644 index 000000000000..135192f903e1 --- /dev/null +++ b/src/chrome/content/rules/MuslimMatters.org.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 30bb48e031b6f517aee16db94920c14794019384 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 15:41:45 +0000 Subject: [PATCH 174/844] Create Wqf.me.xml (#11754) --- src/chrome/content/rules/Wqf.me.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Wqf.me.xml diff --git a/src/chrome/content/rules/Wqf.me.xml b/src/chrome/content/rules/Wqf.me.xml new file mode 100644 index 000000000000..81f20db1f1e8 --- /dev/null +++ b/src/chrome/content/rules/Wqf.me.xml @@ -0,0 +1,8 @@ + + + + + + + + From 90cecce5c9be98a583aec3f2f1d268b99f7dcfa8 Mon Sep 17 00:00:00 2001 From: modem_down Date: Sun, 17 Dec 2017 15:42:18 +0000 Subject: [PATCH 175/844] Create Cqc.org.uk.xml (#10890) --- src/chrome/content/rules/Cqc.org.uk.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Cqc.org.uk.xml diff --git a/src/chrome/content/rules/Cqc.org.uk.xml b/src/chrome/content/rules/Cqc.org.uk.xml new file mode 100644 index 000000000000..b3dde4f39f53 --- /dev/null +++ b/src/chrome/content/rules/Cqc.org.uk.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From 83a6d9f5289ba7b265662fa63e893753b485d49c Mon Sep 17 00:00:00 2001 From: tossj Date: Sun, 17 Dec 2017 10:43:23 -0500 Subject: [PATCH 176/844] Create Toronto-Police-Services (#12503) --- .../content/rules/TorontoPolice.on.ca.xml | 27 +++++++++++++++++++ src/chrome/content/rules/Tpsmedia.ca.xml | 11 ++++++++ src/chrome/content/rules/Tpsnet.ca.xml | 11 ++++++++ .../content/rules/Tpsnews.ca-mixedcontent.xml | 19 +++++++++++++ src/chrome/content/rules/Tpsnews.ca.xml | 17 ++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 src/chrome/content/rules/TorontoPolice.on.ca.xml create mode 100644 src/chrome/content/rules/Tpsmedia.ca.xml create mode 100644 src/chrome/content/rules/Tpsnet.ca.xml create mode 100644 src/chrome/content/rules/Tpsnews.ca-mixedcontent.xml create mode 100644 src/chrome/content/rules/Tpsnews.ca.xml diff --git a/src/chrome/content/rules/TorontoPolice.on.ca.xml b/src/chrome/content/rules/TorontoPolice.on.ca.xml new file mode 100644 index 000000000000..74c039d1e1b1 --- /dev/null +++ b/src/chrome/content/rules/TorontoPolice.on.ca.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Tpsmedia.ca.xml b/src/chrome/content/rules/Tpsmedia.ca.xml new file mode 100644 index 000000000000..e7e2a602dcb6 --- /dev/null +++ b/src/chrome/content/rules/Tpsmedia.ca.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/chrome/content/rules/Tpsnet.ca.xml b/src/chrome/content/rules/Tpsnet.ca.xml new file mode 100644 index 000000000000..e5d060c59dda --- /dev/null +++ b/src/chrome/content/rules/Tpsnet.ca.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/chrome/content/rules/Tpsnews.ca-mixedcontent.xml b/src/chrome/content/rules/Tpsnews.ca-mixedcontent.xml new file mode 100644 index 000000000000..548a78f7782e --- /dev/null +++ b/src/chrome/content/rules/Tpsnews.ca-mixedcontent.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Tpsnews.ca.xml b/src/chrome/content/rules/Tpsnews.ca.xml new file mode 100644 index 000000000000..5044cef81a60 --- /dev/null +++ b/src/chrome/content/rules/Tpsnews.ca.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + From 8878b973942f3e0c83ae790d27805031481c8432 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:05:00 +0000 Subject: [PATCH 177/844] Update and rename hidester.com.xml to Hidester.com.xml (#13162) --- src/chrome/content/rules/Hidester.com.xml | 18 ++++++++++++++++++ src/chrome/content/rules/hidester.com.xml | 10 ---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 src/chrome/content/rules/Hidester.com.xml delete mode 100644 src/chrome/content/rules/hidester.com.xml diff --git a/src/chrome/content/rules/Hidester.com.xml b/src/chrome/content/rules/Hidester.com.xml new file mode 100644 index 000000000000..28a01920bc5a --- /dev/null +++ b/src/chrome/content/rules/Hidester.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/hidester.com.xml b/src/chrome/content/rules/hidester.com.xml deleted file mode 100644 index 718b7a5a7a8c..000000000000 --- a/src/chrome/content/rules/hidester.com.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - From e6243a09a5dd2ff47255fe1c051de14087430e30 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:06:37 +0000 Subject: [PATCH 178/844] Create GBP.ma.xml (#13520) --- src/chrome/content/rules/GBP.ma.xml | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/GBP.ma.xml diff --git a/src/chrome/content/rules/GBP.ma.xml b/src/chrome/content/rules/GBP.ma.xml new file mode 100644 index 000000000000..a66d731105c3 --- /dev/null +++ b/src/chrome/content/rules/GBP.ma.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + From c0c69d10245819616305124c5d2a78676377f69c Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:08:09 +0000 Subject: [PATCH 179/844] Create Islamophobie.net.xml (#11588) --- src/chrome/content/rules/Islamophobie.net.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Islamophobie.net.xml diff --git a/src/chrome/content/rules/Islamophobie.net.xml b/src/chrome/content/rules/Islamophobie.net.xml new file mode 100644 index 000000000000..130115026e76 --- /dev/null +++ b/src/chrome/content/rules/Islamophobie.net.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 98d3b97ed24d8082446ddf4fd506b5418e4c76e2 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:09:09 +0000 Subject: [PATCH 180/844] Create AbuAminaElias.com.xml (#12037) --- src/chrome/content/rules/AbuAminaElias.com.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/AbuAminaElias.com.xml diff --git a/src/chrome/content/rules/AbuAminaElias.com.xml b/src/chrome/content/rules/AbuAminaElias.com.xml new file mode 100644 index 000000000000..007a8fa183f8 --- /dev/null +++ b/src/chrome/content/rules/AbuAminaElias.com.xml @@ -0,0 +1,10 @@ + + + + + + + From 39683dd1c14b0fdda9921fdb45cc28d66d552cdd Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:10:41 +0000 Subject: [PATCH 181/844] Create MuslimCentral.com.xml (#12044) --- src/chrome/content/rules/MuslimCentral.com.xml | 14 ++++++++++++++ src/chrome/content/rules/QuranCentral.com.xml | 13 +++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/chrome/content/rules/MuslimCentral.com.xml create mode 100644 src/chrome/content/rules/QuranCentral.com.xml diff --git a/src/chrome/content/rules/MuslimCentral.com.xml b/src/chrome/content/rules/MuslimCentral.com.xml new file mode 100644 index 000000000000..843cba81c8c7 --- /dev/null +++ b/src/chrome/content/rules/MuslimCentral.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/QuranCentral.com.xml b/src/chrome/content/rules/QuranCentral.com.xml new file mode 100644 index 000000000000..693938ec6c61 --- /dev/null +++ b/src/chrome/content/rules/QuranCentral.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From d6f96cca253b13277479ac8a32b09723ee93c220 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:11:24 +0000 Subject: [PATCH 182/844] Create Ghazali.org.xml (#12069) --- src/chrome/content/rules/Ghazali.org.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Ghazali.org.xml diff --git a/src/chrome/content/rules/Ghazali.org.xml b/src/chrome/content/rules/Ghazali.org.xml new file mode 100644 index 000000000000..4bcc7615c8f2 --- /dev/null +++ b/src/chrome/content/rules/Ghazali.org.xml @@ -0,0 +1,10 @@ + + + + + + + From c44e6194d76d92929d3108e367705325559e2267 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:12:30 +0000 Subject: [PATCH 183/844] Create Dagenssamhalle.se.xml (#11817) --- src/chrome/content/rules/Dagenssamhalle.se.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/Dagenssamhalle.se.xml diff --git a/src/chrome/content/rules/Dagenssamhalle.se.xml b/src/chrome/content/rules/Dagenssamhalle.se.xml new file mode 100644 index 000000000000..acb7e50d83f0 --- /dev/null +++ b/src/chrome/content/rules/Dagenssamhalle.se.xml @@ -0,0 +1,15 @@ + + + + + + + + + From 3bc28151bdad3fb29687de354816c8ccc7189e44 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:15:44 +0000 Subject: [PATCH 184/844] Create IslamWay.net.xml (#11682) --- src/chrome/content/rules/IslamWay.net.xml | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/IslamWay.net.xml diff --git a/src/chrome/content/rules/IslamWay.net.xml b/src/chrome/content/rules/IslamWay.net.xml new file mode 100644 index 000000000000..9b26c47122af --- /dev/null +++ b/src/chrome/content/rules/IslamWay.net.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + From 7e46091b97acf025ecb0111dafeb3f19f7e7a584 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:16:29 +0000 Subject: [PATCH 185/844] Create WebIslam.com.xml (#11589) --- src/chrome/content/rules/WebIslam.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/WebIslam.com.xml diff --git a/src/chrome/content/rules/WebIslam.com.xml b/src/chrome/content/rules/WebIslam.com.xml new file mode 100644 index 000000000000..b831ace1a51d --- /dev/null +++ b/src/chrome/content/rules/WebIslam.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From 3aa28c7f0ab87fb6a8cf25c85f6ea4da60391d61 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:19:31 +0000 Subject: [PATCH 186/844] Create FocusTeam.ma.xml (#11585) --- src/chrome/content/rules/FocusTeam.ma.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/FocusTeam.ma.xml diff --git a/src/chrome/content/rules/FocusTeam.ma.xml b/src/chrome/content/rules/FocusTeam.ma.xml new file mode 100644 index 000000000000..1d53002c852c --- /dev/null +++ b/src/chrome/content/rules/FocusTeam.ma.xml @@ -0,0 +1,8 @@ + + + + + + + + From 1c2325243914350c72fed0e48e1abafff04c4ca3 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 17 Dec 2017 17:28:15 +0100 Subject: [PATCH 187/844] [PSSL.com] Update and simplify ruleset (#13666) * [PSSL.com] Update and simplify ruleset * [PSSL.com] Add subdomains --- src/chrome/content/rules/PSSL.com.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/PSSL.com.xml b/src/chrome/content/rules/PSSL.com.xml index 1779ab5c9f7c..81417f5fcbfb 100644 --- a/src/chrome/content/rules/PSSL.com.xml +++ b/src/chrome/content/rules/PSSL.com.xml @@ -1,22 +1,22 @@ - + + + - + - - - - - - \ No newline at end of file + From 28e1f265f6ca65c4e478d74616787f9efbcb5afe Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 16:30:34 +0000 Subject: [PATCH 188/844] Create IslamicBand.com.xml (#11580) --- src/chrome/content/rules/IslamicBand.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/IslamicBand.com.xml diff --git a/src/chrome/content/rules/IslamicBand.com.xml b/src/chrome/content/rules/IslamicBand.com.xml new file mode 100644 index 000000000000..4ab03d3cf8ff --- /dev/null +++ b/src/chrome/content/rules/IslamicBand.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 044bbc4a24ca7338f49d4301172ba0a960319226 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 18:06:58 +0000 Subject: [PATCH 189/844] Update Huque.com.xml (#12164) --- src/chrome/content/rules/Huque.com.xml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/Huque.com.xml b/src/chrome/content/rules/Huque.com.xml index fdaf74608886..ebbc62aab44e 100644 --- a/src/chrome/content/rules/Huque.com.xml +++ b/src/chrome/content/rules/Huque.com.xml @@ -1,21 +1,10 @@ - - - - + - - From d70ffc770e4d498418d6f339b32c153de7cea6b9 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 18:07:20 +0000 Subject: [PATCH 190/844] Create Yassine.net.xml (#11742) --- src/chrome/content/rules/Yassine.net.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Yassine.net.xml diff --git a/src/chrome/content/rules/Yassine.net.xml b/src/chrome/content/rules/Yassine.net.xml new file mode 100644 index 000000000000..01b98e6952ec --- /dev/null +++ b/src/chrome/content/rules/Yassine.net.xml @@ -0,0 +1,14 @@ + + + + + + + + + From 44261b9ec649a258ce17513627814942dbae6c57 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 19:46:26 +0000 Subject: [PATCH 191/844] Create UX-App.com.xml (#11583) --- src/chrome/content/rules/UX-App.com.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/UX-App.com.xml diff --git a/src/chrome/content/rules/UX-App.com.xml b/src/chrome/content/rules/UX-App.com.xml new file mode 100644 index 000000000000..426654614c87 --- /dev/null +++ b/src/chrome/content/rules/UX-App.com.xml @@ -0,0 +1,10 @@ + + + + + + + From 694ddeb610357533c8766fa8edeebca05c852662 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 19:47:49 +0000 Subject: [PATCH 192/844] Create Shobohat.com.xml (#11582) --- src/chrome/content/rules/Shobohat.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Shobohat.com.xml diff --git a/src/chrome/content/rules/Shobohat.com.xml b/src/chrome/content/rules/Shobohat.com.xml new file mode 100644 index 000000000000..d7fa35dd3516 --- /dev/null +++ b/src/chrome/content/rules/Shobohat.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 4849e1d4b976369ac0b13e26b83de7f7b56fea4e Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 21:48:01 +0000 Subject: [PATCH 193/844] Create BinBaz.org.sa.xml (#12062) --- src/chrome/content/rules/BinBaz.org.sa.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/BinBaz.org.sa.xml diff --git a/src/chrome/content/rules/BinBaz.org.sa.xml b/src/chrome/content/rules/BinBaz.org.sa.xml new file mode 100644 index 000000000000..97d670aad0c8 --- /dev/null +++ b/src/chrome/content/rules/BinBaz.org.sa.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From fd5eec86628154acc2a366be61b2bc5c3ec5fb6c Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 21:48:29 +0000 Subject: [PATCH 194/844] Create RockefellerFoundation.org.xml (#12220) --- .../rules/RockefellerFoundation.org.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/RockefellerFoundation.org.xml diff --git a/src/chrome/content/rules/RockefellerFoundation.org.xml b/src/chrome/content/rules/RockefellerFoundation.org.xml new file mode 100644 index 000000000000..af6feb1fdb6a --- /dev/null +++ b/src/chrome/content/rules/RockefellerFoundation.org.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + From f512db64f9046560f991bee050a1d04f1b979bd8 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Sun, 17 Dec 2017 21:48:59 +0000 Subject: [PATCH 195/844] Create PSI-Network.de.xml (#11577) --- src/chrome/content/rules/PSI-Network.de.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/PSI-Network.de.xml diff --git a/src/chrome/content/rules/PSI-Network.de.xml b/src/chrome/content/rules/PSI-Network.de.xml new file mode 100644 index 000000000000..3ece57ae3f17 --- /dev/null +++ b/src/chrome/content/rules/PSI-Network.de.xml @@ -0,0 +1,13 @@ + + + + + + + + From 07fba0055c85ec29a963c280dcb1073017ae3082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 18 Dec 2017 00:31:21 +0100 Subject: [PATCH 196/844] Added ruleset for in-form.de (#13940) * Added ruleset for in-form.de * Removed hosts without dns entries. --- src/chrome/content/rules/in-form.de.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/in-form.de.xml diff --git a/src/chrome/content/rules/in-form.de.xml b/src/chrome/content/rules/in-form.de.xml new file mode 100644 index 000000000000..af06ee49521c --- /dev/null +++ b/src/chrome/content/rules/in-form.de.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 01eb35e7860dabfa3001b41dcdcf8ff00d2a60df Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Mon, 18 Dec 2017 00:40:36 +0100 Subject: [PATCH 197/844] Create Spirit-animals.com.xml (#13994) --- src/chrome/content/rules/Spirit-animals.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Spirit-animals.com.xml diff --git a/src/chrome/content/rules/Spirit-animals.com.xml b/src/chrome/content/rules/Spirit-animals.com.xml new file mode 100644 index 000000000000..ac7646ee6a1c --- /dev/null +++ b/src/chrome/content/rules/Spirit-animals.com.xml @@ -0,0 +1,6 @@ + + + + + + From 96bfc850fc6430cb1338f57722c4dd1361704e22 Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 18 Dec 2017 00:42:25 +0100 Subject: [PATCH 198/844] add rule for Republik.ch (#13915) --- src/chrome/content/rules/Republik.ch.xml | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/chrome/content/rules/Republik.ch.xml diff --git a/src/chrome/content/rules/Republik.ch.xml b/src/chrome/content/rules/Republik.ch.xml new file mode 100644 index 000000000000..6f16d2ccea2f --- /dev/null +++ b/src/chrome/content/rules/Republik.ch.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1f1dd806088223c3084eda095b18bea92c631d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 18 Dec 2017 00:51:39 +0100 Subject: [PATCH 199/844] Updated avm.de ruleset. (#13954) * Updated avm.de ruleset. * Removed hosts without dns entry. --- src/chrome/content/rules/Avm.de.xml | 85 ++++++++++++++++++----------- 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/src/chrome/content/rules/Avm.de.xml b/src/chrome/content/rules/Avm.de.xml index 4c6bca0eec66..215dee8218b7 100644 --- a/src/chrome/content/rules/Avm.de.xml +++ b/src/chrome/content/rules/Avm.de.xml @@ -1,59 +1,82 @@ - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + @@ -61,8 +84,6 @@ - - + From 17a975dd39c8f7445458624c24950697284e07eb Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 18 Dec 2017 01:45:18 +0100 Subject: [PATCH 200/844] Split Appkb.ch.xml (#13986) --- src/chrome/content/rules/Appkb.ch.xml | 25 +++++++++++++++++++++ src/chrome/content/rules/kantonalbanken.xml | 12 +++------- 2 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 src/chrome/content/rules/Appkb.ch.xml diff --git a/src/chrome/content/rules/Appkb.ch.xml b/src/chrome/content/rules/Appkb.ch.xml new file mode 100644 index 000000000000..5000f150158d --- /dev/null +++ b/src/chrome/content/rules/Appkb.ch.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/kantonalbanken.xml b/src/chrome/content/rules/kantonalbanken.xml index f7097827f044..0741e42d28c3 100644 --- a/src/chrome/content/rules/kantonalbanken.xml +++ b/src/chrome/content/rules/kantonalbanken.xml @@ -21,8 +21,6 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - newhome.ch --> - - @@ -72,10 +70,6 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - - - - @@ -190,16 +184,16 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - + - + - Date: Mon, 18 Dec 2017 21:56:05 +0300 Subject: [PATCH 201/844] Add valerietarico.com (#14002) --- src/chrome/content/rules/ValerieTarico.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/ValerieTarico.com.xml diff --git a/src/chrome/content/rules/ValerieTarico.com.xml b/src/chrome/content/rules/ValerieTarico.com.xml new file mode 100644 index 000000000000..412eed73b4dd --- /dev/null +++ b/src/chrome/content/rules/ValerieTarico.com.xml @@ -0,0 +1,6 @@ + + + + + + From 94175edeed333d1ac49ecc69684b38c8b5b21eb6 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 19 Dec 2017 06:09:08 +1030 Subject: [PATCH 202/844] [pbebank.com] Update domains and rename ruleset (#13961) * [pbebank.com] Update domains * Add PublicInvestBank.com.xml reference * Remove 'uattds2' --- src/chrome/content/rules/PBeBank.com.xml | 61 +++++++++++++++++++ .../content/rules/Public-Bank-Malaysia.xml | 28 --------- 2 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 src/chrome/content/rules/PBeBank.com.xml delete mode 100644 src/chrome/content/rules/Public-Bank-Malaysia.xml diff --git a/src/chrome/content/rules/PBeBank.com.xml b/src/chrome/content/rules/PBeBank.com.xml new file mode 100644 index 000000000000..093911bf477a --- /dev/null +++ b/src/chrome/content/rules/PBeBank.com.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Public-Bank-Malaysia.xml b/src/chrome/content/rules/Public-Bank-Malaysia.xml deleted file mode 100644 index 721cb755d062..000000000000 --- a/src/chrome/content/rules/Public-Bank-Malaysia.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - From b0414561d6a70417eb466f2443aa56088e2a59cb Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 19 Dec 2017 06:09:32 +1030 Subject: [PATCH 203/844] [Cellarmasters.com.au] New ruleset (#13923) * [Cellarmasters.com.au] New ruleset * Add 'm' subdomain --- .../content/rules/Cellarmasters.com.au.xml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/chrome/content/rules/Cellarmasters.com.au.xml diff --git a/src/chrome/content/rules/Cellarmasters.com.au.xml b/src/chrome/content/rules/Cellarmasters.com.au.xml new file mode 100644 index 000000000000..98f0cc1bac06 --- /dev/null +++ b/src/chrome/content/rules/Cellarmasters.com.au.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + From a44bb3f406d4cd6b65fca1e73ba814ba36b71f45 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Mon, 18 Dec 2017 14:44:22 -0500 Subject: [PATCH 204/844] Add Ptt.cc.xml (#14012) --- src/chrome/content/rules/Ptt.cc.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/chrome/content/rules/Ptt.cc.xml diff --git a/src/chrome/content/rules/Ptt.cc.xml b/src/chrome/content/rules/Ptt.cc.xml new file mode 100644 index 000000000000..1d1db0ee2a74 --- /dev/null +++ b/src/chrome/content/rules/Ptt.cc.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + From c29d8f2cb3652edc05204852d3632767710325d1 Mon Sep 17 00:00:00 2001 From: Folant Date: Mon, 18 Dec 2017 23:48:09 +0200 Subject: [PATCH 205/844] Create Focloir.ie.xml (#14000) --- src/chrome/content/rules/Focloir.ie.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Focloir.ie.xml diff --git a/src/chrome/content/rules/Focloir.ie.xml b/src/chrome/content/rules/Focloir.ie.xml new file mode 100644 index 000000000000..68972517b9c0 --- /dev/null +++ b/src/chrome/content/rules/Focloir.ie.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file From 637d1f6cb7df0ba4a60183f84c62e74258edd669 Mon Sep 17 00:00:00 2001 From: Valentine Anderson Date: Tue, 19 Dec 2017 00:59:14 +0300 Subject: [PATCH 206/844] Add martyklein.com (#13999) --- src/chrome/content/rules/MartyKlein.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/MartyKlein.com.xml diff --git a/src/chrome/content/rules/MartyKlein.com.xml b/src/chrome/content/rules/MartyKlein.com.xml new file mode 100644 index 000000000000..d4799808de3b --- /dev/null +++ b/src/chrome/content/rules/MartyKlein.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 5ca91448902d589bb4f97f0f470429c58d8b3a47 Mon Sep 17 00:00:00 2001 From: Kate Chapman Date: Tue, 19 Dec 2017 16:53:38 -0800 Subject: [PATCH 207/844] add tripbaa.com ruleset (#14015) --- src/chrome/content/rules/Tripbaa.com.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/Tripbaa.com.xml diff --git a/src/chrome/content/rules/Tripbaa.com.xml b/src/chrome/content/rules/Tripbaa.com.xml new file mode 100644 index 000000000000..2a80ff0240f3 --- /dev/null +++ b/src/chrome/content/rules/Tripbaa.com.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + From c6eb2e42f43922043427b715feb5a5a97964fb0a Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 20 Dec 2017 17:31:18 +0100 Subject: [PATCH 208/844] Create ResistanceReport.com.xml (#14025) --- src/chrome/content/rules/ResistanceReport.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ResistanceReport.com.xml diff --git a/src/chrome/content/rules/ResistanceReport.com.xml b/src/chrome/content/rules/ResistanceReport.com.xml new file mode 100644 index 000000000000..35814aaa53d8 --- /dev/null +++ b/src/chrome/content/rules/ResistanceReport.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 7b0d7171f62f772ed49ba3c1a0e59f152e8bbde4 Mon Sep 17 00:00:00 2001 From: Shell Chen Date: Thu, 21 Dec 2017 00:38:42 +0800 Subject: [PATCH 209/844] Add rule for you.163.com (#14014) --- src/chrome/content/rules/163.com.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/content/rules/163.com.xml b/src/chrome/content/rules/163.com.xml index ddf5322468af..e15099e2334a 100644 --- a/src/chrome/content/rules/163.com.xml +++ b/src/chrome/content/rules/163.com.xml @@ -62,6 +62,7 @@ - qiye ᵐ - sitemap ᵐ - api.t ᵉ + - b.you ˣ ᵉ Expired ᵐ Mismatched ˣ Mixed css or iframe @@ -131,6 +132,10 @@ + + + + From cc160115fb3761edcff3114a31545c4b91f0b2a8 Mon Sep 17 00:00:00 2001 From: stlwvikx Date: Thu, 21 Dec 2017 01:06:20 +0800 Subject: [PATCH 210/844] Create mtlbss.com.xml (#8098) --- src/chrome/content/rules/mtlbss.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/mtlbss.com.xml diff --git a/src/chrome/content/rules/mtlbss.com.xml b/src/chrome/content/rules/mtlbss.com.xml new file mode 100644 index 000000000000..4b0c6a00be6e --- /dev/null +++ b/src/chrome/content/rules/mtlbss.com.xml @@ -0,0 +1,6 @@ + + + + + + From add11ce64ececf017edb8674d41ae1698df27728 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Fri, 22 Dec 2017 16:56:00 +0000 Subject: [PATCH 211/844] Update 3FM.xml (#12243) --- src/chrome/content/rules/3FM.nl.xml | 24 ++++++++++++++++++++++++ src/chrome/content/rules/3FM.xml | 6 ------ src/chrome/content/rules/NPO3FM.nl.xml | 13 +++++++++++++ 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/chrome/content/rules/3FM.nl.xml delete mode 100644 src/chrome/content/rules/3FM.xml create mode 100644 src/chrome/content/rules/NPO3FM.nl.xml diff --git a/src/chrome/content/rules/3FM.nl.xml b/src/chrome/content/rules/3FM.nl.xml new file mode 100644 index 000000000000..785cbc402f14 --- /dev/null +++ b/src/chrome/content/rules/3FM.nl.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/3FM.xml b/src/chrome/content/rules/3FM.xml deleted file mode 100644 index 6260a1a11601..000000000000 --- a/src/chrome/content/rules/3FM.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/src/chrome/content/rules/NPO3FM.nl.xml b/src/chrome/content/rules/NPO3FM.nl.xml new file mode 100644 index 000000000000..6f57573175be --- /dev/null +++ b/src/chrome/content/rules/NPO3FM.nl.xml @@ -0,0 +1,13 @@ + + + + + + + From 489d30f479d4c887ab620a8225153b64e535a3f4 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 23 Dec 2017 01:27:44 +0800 Subject: [PATCH 212/844] Update UST.hk.xml (#14036) --- src/chrome/content/rules/UST.hk.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/UST.hk.xml b/src/chrome/content/rules/UST.hk.xml index c122ade7ac6f..287bfa0bdf08 100644 --- a/src/chrome/content/rules/UST.hk.xml +++ b/src/chrome/content/rules/UST.hk.xml @@ -48,6 +48,7 @@ + From bc17bfc557d682389576202021206b07a4426460 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Fri, 22 Dec 2017 14:22:47 -0500 Subject: [PATCH 213/844] Add SHAttered.io.xml (#14027) --- src/chrome/content/rules/SHAttered.io.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/SHAttered.io.xml diff --git a/src/chrome/content/rules/SHAttered.io.xml b/src/chrome/content/rules/SHAttered.io.xml new file mode 100644 index 000000000000..ba6d6b1e3156 --- /dev/null +++ b/src/chrome/content/rules/SHAttered.io.xml @@ -0,0 +1,10 @@ + + + + + + From 35101d8c4a9ade9a93f2feb859e7ad592a8aadcb Mon Sep 17 00:00:00 2001 From: "/\\/es" <5124946+wesdawg@users.noreply.github.com> Date: Fri, 22 Dec 2017 14:36:05 -0500 Subject: [PATCH 214/844] Update Google.xml (#13467) * Fix #4078 Remove unnecessary rules and exclusions * Update securecookie * Re-add complex tests --- src/chrome/content/rules/Google.xml | 520 ++++++---------------------- 1 file changed, 98 insertions(+), 422 deletions(-) diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml index 5f028883d78d..8d4ec11a172e 100644 --- a/src/chrome/content/rules/Google.xml +++ b/src/chrome/content/rules/Google.xml @@ -4,14 +4,12 @@ *** Google Images related paths are covered in GoogleImages.xml *** - Nonfunctional google.com paths: - - - analytics * - - imgres * - - u/ (404) - - * Redirects to http + Problematic domains: + - google.cn * + + * Redirects to HTTP outside CN (https://github.com/EFForg/https-everywhere/issues/2747) --> + @@ -19,422 +17,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - From a5610225822ce818bdffe8ae97417a057cb09f29 Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Fri, 22 Dec 2017 20:39:51 +0100 Subject: [PATCH 215/844] Create SONGLYRICS.com.xml (#13983) * Create SONGLYRICS.com.xml * Add more MCB resources, remove subdomains gone from DNS, mark as mixed content --- src/chrome/content/rules/SONGLYRICS.com.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/SONGLYRICS.com.xml diff --git a/src/chrome/content/rules/SONGLYRICS.com.xml b/src/chrome/content/rules/SONGLYRICS.com.xml new file mode 100644 index 000000000000..0185e6576596 --- /dev/null +++ b/src/chrome/content/rules/SONGLYRICS.com.xml @@ -0,0 +1,19 @@ + + + + + + + + + From 638011f390c81d98790f0b1797019baeef8dcaa1 Mon Sep 17 00:00:00 2001 From: "/\\/es" <5124946+wesdawg@users.noreply.github.com> Date: Fri, 22 Dec 2017 14:56:28 -0500 Subject: [PATCH 216/844] Update LeaseWeb.com.xml (#13349) * Update and rename LeaseWeb.com.xml to LeaseWeb.xml Add mirror targets * Added tests * Remove wildcard * Add comment for non-functional .net hosts --- src/chrome/content/rules/LeaseWeb.com.xml | 31 -------------- src/chrome/content/rules/LeaseWeb.xml | 49 +++++++++++++++++++++++ 2 files changed, 49 insertions(+), 31 deletions(-) delete mode 100644 src/chrome/content/rules/LeaseWeb.com.xml create mode 100644 src/chrome/content/rules/LeaseWeb.xml diff --git a/src/chrome/content/rules/LeaseWeb.com.xml b/src/chrome/content/rules/LeaseWeb.com.xml deleted file mode 100644 index a3e89b3967b4..000000000000 --- a/src/chrome/content/rules/LeaseWeb.com.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/LeaseWeb.xml b/src/chrome/content/rules/LeaseWeb.xml new file mode 100644 index 000000000000..be742f4f1cd1 --- /dev/null +++ b/src/chrome/content/rules/LeaseWeb.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e6245090dccb22bf079b5adafdd27583fe657def Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Fri, 22 Dec 2017 15:09:43 -0500 Subject: [PATCH 217/844] Update University-of-Waterloo.xml (#13845) * Update University-of-Waterloo.xml * Update top comment in University-of-Waterloo.xml --- .../content/rules/University-of-Waterloo.xml | 79 ++++++------------- 1 file changed, 22 insertions(+), 57 deletions(-) diff --git a/src/chrome/content/rules/University-of-Waterloo.xml b/src/chrome/content/rules/University-of-Waterloo.xml index a0b67a48fe37..de717dd56a27 100644 --- a/src/chrome/content/rules/University-of-Waterloo.xml +++ b/src/chrome/content/rules/University-of-Waterloo.xml @@ -1,64 +1,29 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + From 26faed8600415fe36a2b962a90c24ef107454f74 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 23 Dec 2017 04:10:15 +0800 Subject: [PATCH 218/844] Split WelcomeCottages.com from Wyndham.xml (#13996) * Split WelcomeCottages.com from Wyndham.xml * Update WelcomeCottages.com.xml, Fix Travis error --- .../content/rules/WelcomeCottages.com.xml | 18 ++++++++++++++++++ src/chrome/content/rules/Wyndham.xml | 5 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src/chrome/content/rules/WelcomeCottages.com.xml diff --git a/src/chrome/content/rules/WelcomeCottages.com.xml b/src/chrome/content/rules/WelcomeCottages.com.xml new file mode 100644 index 000000000000..55859db9dc47 --- /dev/null +++ b/src/chrome/content/rules/WelcomeCottages.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index d5bf952d713c..1bc8860af2a9 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -14,6 +14,7 @@ + Ovscruise.com.xml + RCITravelStore.co.uk.xml + Scottish-Country-Cottages.co.uk.xml + + WelcomeCottages.com.xml + Welsh-Country-Cottages.co.uk.xml + WyndhamJobs.com.xml + Wyndhamvrap.com.xml @@ -71,8 +72,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - @@ -88,7 +87,7 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - From e57ee15207c7d77ac43737b0d29da47dc0d40d5c Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 23 Dec 2017 06:42:42 +1030 Subject: [PATCH 219/844] [trvl-px.com] New ruleset (#13978) * [trvl-px.com] New ruleset * Add reference --- src/chrome/content/rules/trvl-px.com.xml | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/trvl-px.com.xml diff --git a/src/chrome/content/rules/trvl-px.com.xml b/src/chrome/content/rules/trvl-px.com.xml new file mode 100644 index 000000000000..64da1dc14e46 --- /dev/null +++ b/src/chrome/content/rules/trvl-px.com.xml @@ -0,0 +1,26 @@ + + + + + + + + From 2cfb5cd80b7b79f85d8e84f7acd0459be5212fb7 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 23 Dec 2017 06:42:57 +1030 Subject: [PATCH 220/844] [travel-assets.com] New ruleset (#13976) * [travel-assets.com] New ruleset * Add reference --- src/chrome/content/rules/travel-assets.com.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/travel-assets.com.xml diff --git a/src/chrome/content/rules/travel-assets.com.xml b/src/chrome/content/rules/travel-assets.com.xml new file mode 100644 index 000000000000..9bc882c4d22a --- /dev/null +++ b/src/chrome/content/rules/travel-assets.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + From d9d182454076633f4850cd5ffbab1d3b2ac0d4f4 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 23 Dec 2017 06:43:11 +1030 Subject: [PATCH 221/844] [trvl-media.com] New ruleset (#13977) * [trvl-media.com] New ruleset * Add reference --- src/chrome/content/rules/trvl-media.com.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/trvl-media.com.xml diff --git a/src/chrome/content/rules/trvl-media.com.xml b/src/chrome/content/rules/trvl-media.com.xml new file mode 100644 index 000000000000..5a42186ed3b6 --- /dev/null +++ b/src/chrome/content/rules/trvl-media.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + + From f3c6c8e88ae974a3fff7f95beecacbdd810a91dc Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Fri, 22 Dec 2017 20:19:51 +0000 Subject: [PATCH 222/844] Update Firefox.com.xml (#14038) * Update Firefox.com.xml * Update Firefox.com.xml --- src/chrome/content/rules/Firefox.com.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Firefox.com.xml b/src/chrome/content/rules/Firefox.com.xml index 0e14dd32ff18..ab4ece3baff9 100644 --- a/src/chrome/content/rules/Firefox.com.xml +++ b/src/chrome/content/rules/Firefox.com.xml @@ -15,11 +15,12 @@ + + - From 7d5b783eb90d67f1c75e4c6b16d60744605805a8 Mon Sep 17 00:00:00 2001 From: HTTPSNowhere <83bhjy+6qr00pkce7u50@sharklasers.com> Date: Fri, 22 Dec 2017 20:24:56 +0000 Subject: [PATCH 223/844] Create fackforbunden.se.xml (#11946) --- src/chrome/content/rules/fackforbunden.se.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/fackforbunden.se.xml diff --git a/src/chrome/content/rules/fackforbunden.se.xml b/src/chrome/content/rules/fackforbunden.se.xml new file mode 100644 index 000000000000..c70845258da3 --- /dev/null +++ b/src/chrome/content/rules/fackforbunden.se.xml @@ -0,0 +1,8 @@ + + + + + + + + From b5012228c3b868a9b12b4e1f697beec227659a03 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Fri, 22 Dec 2017 15:25:50 -0500 Subject: [PATCH 224/844] Add X86.fr.xml (#14044) --- src/chrome/content/rules/X86.fr.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/X86.fr.xml diff --git a/src/chrome/content/rules/X86.fr.xml b/src/chrome/content/rules/X86.fr.xml new file mode 100644 index 000000000000..e4aac6a8c586 --- /dev/null +++ b/src/chrome/content/rules/X86.fr.xml @@ -0,0 +1,11 @@ + + + + + + + From 71ffab612ccb0c14879b24d85cadd278d1d3f39b Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Fri, 22 Dec 2017 15:27:12 -0500 Subject: [PATCH 225/844] Add ExamService.com.tw.xml (#14013) * Add ExamService.com.tw.xml * Remove target for group.examservice.com.tw --- src/chrome/content/rules/ExamService.com.tw.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/ExamService.com.tw.xml diff --git a/src/chrome/content/rules/ExamService.com.tw.xml b/src/chrome/content/rules/ExamService.com.tw.xml new file mode 100644 index 000000000000..b57295367f5d --- /dev/null +++ b/src/chrome/content/rules/ExamService.com.tw.xml @@ -0,0 +1,11 @@ + + + + + + + From 3350372fe98c07e4454f3a2119aace68e8f213a1 Mon Sep 17 00:00:00 2001 From: Apply55gx Date: Fri, 22 Dec 2017 21:29:59 +0100 Subject: [PATCH 226/844] Create apply55gx.com.xml (#14017) --- src/chrome/content/rules/apply55gx.com.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/apply55gx.com.xml diff --git a/src/chrome/content/rules/apply55gx.com.xml b/src/chrome/content/rules/apply55gx.com.xml new file mode 100644 index 000000000000..f1c7208489ac --- /dev/null +++ b/src/chrome/content/rules/apply55gx.com.xml @@ -0,0 +1,9 @@ + + + + + + + + From 32b5bbde7f1f36e69084030e3f55778bfa27d546 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 22 Dec 2017 21:31:32 +0100 Subject: [PATCH 227/844] Create DataHub.io.xml (#14031) --- src/chrome/content/rules/DataHub.io.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/DataHub.io.xml diff --git a/src/chrome/content/rules/DataHub.io.xml b/src/chrome/content/rules/DataHub.io.xml new file mode 100644 index 000000000000..67631a75fa40 --- /dev/null +++ b/src/chrome/content/rules/DataHub.io.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + From 6d179a650bd94430cdf9f27e205f63000bf2c0bb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 22 Dec 2017 22:21:09 +0100 Subject: [PATCH 228/844] [ownCloud.org] Reactivate ruleset (#14033) * [ownCloud.org] Reactivate ruleset * Rename OwnCloud.xml to ownCloud.org.xml --- src/chrome/content/rules/OwnCloud.xml | 46 ----------------------- src/chrome/content/rules/ownCloud.org.xml | 17 +++++++++ 2 files changed, 17 insertions(+), 46 deletions(-) delete mode 100644 src/chrome/content/rules/OwnCloud.xml create mode 100644 src/chrome/content/rules/ownCloud.org.xml diff --git a/src/chrome/content/rules/OwnCloud.xml b/src/chrome/content/rules/OwnCloud.xml deleted file mode 100644 index 79db3fb3ff2b..000000000000 --- a/src/chrome/content/rules/OwnCloud.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/ownCloud.org.xml b/src/chrome/content/rules/ownCloud.org.xml new file mode 100644 index 000000000000..d64e5dcc24f5 --- /dev/null +++ b/src/chrome/content/rules/ownCloud.org.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + From 3e4b37d2e8299d9617c4c8fa998a534d4cf21c51 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Fri, 22 Dec 2017 23:52:29 +0000 Subject: [PATCH 229/844] Create NCatLab.org.xml (#14048) --- src/chrome/content/rules/NCatLab.org.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/NCatLab.org.xml diff --git a/src/chrome/content/rules/NCatLab.org.xml b/src/chrome/content/rules/NCatLab.org.xml new file mode 100644 index 000000000000..461aa69bb078 --- /dev/null +++ b/src/chrome/content/rules/NCatLab.org.xml @@ -0,0 +1,9 @@ + + + + + + + + + From ecc667a7bbc036453f467a48b7d72dbea918bd93 Mon Sep 17 00:00:00 2001 From: Coxxs Date: Mon, 25 Dec 2017 01:48:29 +0800 Subject: [PATCH 230/844] Create bgm.tv.xml (#14043) --- src/chrome/content/rules/Bgm.tv.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Bgm.tv.xml diff --git a/src/chrome/content/rules/Bgm.tv.xml b/src/chrome/content/rules/Bgm.tv.xml new file mode 100644 index 000000000000..33b567f3ff18 --- /dev/null +++ b/src/chrome/content/rules/Bgm.tv.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From 180d1b105357066829dc37a9f396306cf2ce9e64 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:04:43 +1030 Subject: [PATCH 231/844] [Expedia.co.jp] New ruleset (#14091) --- src/chrome/content/rules/Expedia.co.jp.xml | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.jp.xml diff --git a/src/chrome/content/rules/Expedia.co.jp.xml b/src/chrome/content/rules/Expedia.co.jp.xml new file mode 100644 index 000000000000..f1e320755b4d --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.jp.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + From b05606e93b65d1e9a81f5c7dc5730417618b93c2 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:06:08 +1030 Subject: [PATCH 232/844] [Expedia.ca] New ruleset (#14096) --- src/chrome/content/rules/Expedia.ca.xml | 62 +++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.ca.xml diff --git a/src/chrome/content/rules/Expedia.ca.xml b/src/chrome/content/rules/Expedia.ca.xml new file mode 100644 index 000000000000..cad52f8fc7cc --- /dev/null +++ b/src/chrome/content/rules/Expedia.ca.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2a35f5da4cfc5c9931487f450d5f75198c692a0a Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:07:17 +1030 Subject: [PATCH 233/844] [Expedia.co.nz] New ruleset (#14092) --- src/chrome/content/rules/Expedia.co.nz.xml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.nz.xml diff --git a/src/chrome/content/rules/Expedia.co.nz.xml b/src/chrome/content/rules/Expedia.co.nz.xml new file mode 100644 index 000000000000..acceeb09615f --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.nz.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + \ No newline at end of file From ccb1b8967b367fefc56a641cea6d190fc0a2d239 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:09:31 +1030 Subject: [PATCH 234/844] [Expedia.co.in] New ruleset (#14099) --- src/chrome/content/rules/Expedia.co.in.xml | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.in.xml diff --git a/src/chrome/content/rules/Expedia.co.in.xml b/src/chrome/content/rules/Expedia.co.in.xml new file mode 100644 index 000000000000..0caa42647cec --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.in.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + From 83da18005ac2d05a03f6c5dafaa485cf52b73250 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 26 Dec 2017 17:41:21 +0100 Subject: [PATCH 235/844] Create RateMyProfessors.com.xml (#14085) --- .../content/rules/RateMyProfessors.com.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/chrome/content/rules/RateMyProfessors.com.xml diff --git a/src/chrome/content/rules/RateMyProfessors.com.xml b/src/chrome/content/rules/RateMyProfessors.com.xml new file mode 100644 index 000000000000..bf9f41acb358 --- /dev/null +++ b/src/chrome/content/rules/RateMyProfessors.com.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + From 0b6e54b22d370da773639ca183e520b23c72c776 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:12:32 +1030 Subject: [PATCH 236/844] [Expedia.co.th] New ruleset (#14093) --- src/chrome/content/rules/Expedia.co.th.xml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.th.xml diff --git a/src/chrome/content/rules/Expedia.co.th.xml b/src/chrome/content/rules/Expedia.co.th.xml new file mode 100644 index 000000000000..21f2a4f29a40 --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.th.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + From 2595808e8499a9f5a2024168ca1a99ac772b61ea Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:12:40 +1030 Subject: [PATCH 237/844] [Expedia.co.kr] New ruleset (#14090) --- src/chrome/content/rules/Expedia.co.kr.xml | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.kr.xml diff --git a/src/chrome/content/rules/Expedia.co.kr.xml b/src/chrome/content/rules/Expedia.co.kr.xml new file mode 100644 index 000000000000..904b4ba08437 --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.kr.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + From 254bbb228b02ab9095522ad21e86df0d000af63d Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:14:06 +1030 Subject: [PATCH 238/844] [Expedia.cn] New ruleset (#14097) --- src/chrome/content/rules/Expedia.cn.xml | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.cn.xml diff --git a/src/chrome/content/rules/Expedia.cn.xml b/src/chrome/content/rules/Expedia.cn.xml new file mode 100644 index 000000000000..382eac4cb424 --- /dev/null +++ b/src/chrome/content/rules/Expedia.cn.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + From c5613efb21a2558776572ab5a67d03d0c4a24d9a Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:16:15 +1030 Subject: [PATCH 239/844] [Expedia.ch] New ruleset (#14089) --- src/chrome/content/rules/Expedia.ch.xml | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.ch.xml diff --git a/src/chrome/content/rules/Expedia.ch.xml b/src/chrome/content/rules/Expedia.ch.xml new file mode 100644 index 000000000000..ea099e5f56c6 --- /dev/null +++ b/src/chrome/content/rules/Expedia.ch.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + From 708e37b38553dd08dd6017d8af8cf809d4c29aa4 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:17:28 +1030 Subject: [PATCH 240/844] [Expedia.at] New ruleset (#14094) --- src/chrome/content/rules/Expedia.at.xml | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.at.xml diff --git a/src/chrome/content/rules/Expedia.at.xml b/src/chrome/content/rules/Expedia.at.xml new file mode 100644 index 000000000000..9fd11e75a24d --- /dev/null +++ b/src/chrome/content/rules/Expedia.at.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + From db8645370ee1246091ae266c6557729a8ab891d6 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:19:28 +1030 Subject: [PATCH 241/844] [Expedia.com.au] New ruleset (#14024) --- src/chrome/content/rules/Expedia.com.au.xml | 67 +++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.au.xml diff --git a/src/chrome/content/rules/Expedia.com.au.xml b/src/chrome/content/rules/Expedia.com.au.xml new file mode 100644 index 000000000000..6c0eeb8f4cf7 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.au.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From e3056fad0f5548c0c8d7eb2d70dafd6ee62228f2 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:20:17 +1030 Subject: [PATCH 242/844] [Expedia.be] New ruleset (#14095) --- src/chrome/content/rules/Expedia.be.xml | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.be.xml diff --git a/src/chrome/content/rules/Expedia.be.xml b/src/chrome/content/rules/Expedia.be.xml new file mode 100644 index 000000000000..6b1271f7a663 --- /dev/null +++ b/src/chrome/content/rules/Expedia.be.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + From b4d2d58547a9fa8b8006efe5ce6958937f69572b Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 03:20:59 +1030 Subject: [PATCH 243/844] [Expedia.co.id] New ruleset (#14098) --- src/chrome/content/rules/Expedia.co.id.xml | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.id.xml diff --git a/src/chrome/content/rules/Expedia.co.id.xml b/src/chrome/content/rules/Expedia.co.id.xml new file mode 100644 index 000000000000..62de44a8c15d --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.id.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + From 80c626732f1cc0af2cb3e6beebad8be33f8350dd Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Tue, 26 Dec 2017 17:16:14 +0000 Subject: [PATCH 244/844] Create BetterExplained.com.xml (#14087) --- src/chrome/content/rules/BetterExplained.com.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/BetterExplained.com.xml diff --git a/src/chrome/content/rules/BetterExplained.com.xml b/src/chrome/content/rules/BetterExplained.com.xml new file mode 100644 index 000000000000..c59ab72981a5 --- /dev/null +++ b/src/chrome/content/rules/BetterExplained.com.xml @@ -0,0 +1,9 @@ + + + + + + + + + From c837e20de4e56d10b0bd9a0afe0648e92a7fb90b Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 27 Dec 2017 01:18:07 +0800 Subject: [PATCH 245/844] Remove Secureholidays.com from Wyndham.xml (#14059) --- src/chrome/content/rules/Wyndham.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 1bc8860af2a9..9a317f403198 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -28,15 +28,11 @@ + landalskilife.nl.xml Disabled by https-everywhere-checker because: -Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') -Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 20000 milliseconds') Fetch error: http://wyndham.com/ => https://www.wyndham.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received') Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') Disabled by https-everywhere-checker because: -Fetch error: http://secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 10001 milliseconds') -Fetch error: http://www.secureholidays.com/ => https://www.secureholidays.com/: (28, 'Connection timed out after 10000 milliseconds') Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') Buckets: d2bae186y49u92.cloudfront.net (used on landal.(com|nl), landalskilife.com) @@ -68,8 +64,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - @@ -87,7 +81,7 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - From cb163ea58beb9f3a3152d0a2b4dc42bc142ba06f Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 27 Dec 2017 01:20:52 +0800 Subject: [PATCH 246/844] Remove left-wildcard from TicketsNow.xml (#14058) * Remove left-wildcard from TicketsNow.xml * Update TicketsNow.xml --- src/chrome/content/rules/TicketsNow.xml | 86 ++++++++++++++----------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/src/chrome/content/rules/TicketsNow.xml b/src/chrome/content/rules/TicketsNow.xml index eff5444f218d..321afcc4f042 100644 --- a/src/chrome/content/rules/TicketsNow.xml +++ b/src/chrome/content/rules/TicketsNow.xml @@ -1,43 +1,51 @@ - - - - - - - - - - - - + + + + + + + + + + From f67051a426aff4199e69eb518110724279f3801d Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 27 Dec 2017 01:28:11 +0800 Subject: [PATCH 247/844] Remove obsolete ruleset references (manual) (#14065) * Update Adform.xml * Update Adformdsp.net.xml * Update Adform.net.xml * Update Intevation-GmbH.xml * Update LeMonde.fr.xml * Update Logilab.org.xml * Update Nativo.net.xml * Update Ntv.io.xml * Update uptodown.net.xml * Update uptodown.net.xml --- src/chrome/content/rules/Adform.net.xml | 7 ++----- src/chrome/content/rules/Adform.xml | 6 +++--- src/chrome/content/rules/Adformdsp.net.xml | 4 +--- src/chrome/content/rules/Intevation-GmbH.xml | 4 ++-- src/chrome/content/rules/LeMonde.fr.xml | 2 +- src/chrome/content/rules/Logilab.org.xml | 2 +- src/chrome/content/rules/Nativo.net.xml | 3 +-- src/chrome/content/rules/Ntv.io.xml | 3 +-- src/chrome/content/rules/uptodown.net.xml | 11 +++++++---- 9 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/rules/Adform.net.xml b/src/chrome/content/rules/Adform.net.xml index 635f178071e0..5a09e14c47e3 100644 --- a/src/chrome/content/rules/Adform.net.xml +++ b/src/chrome/content/rules/Adform.net.xml @@ -1,4 +1,6 @@ diff --git a/src/chrome/content/rules/Adform.xml b/src/chrome/content/rules/Adform.xml index bab5d438e125..6a10b351e238 100644 --- a/src/chrome/content/rules/Adform.xml +++ b/src/chrome/content/rules/Adform.xml @@ -1,7 +1,7 @@ diff --git a/src/chrome/content/rules/Adformdsp.net.xml b/src/chrome/content/rules/Adformdsp.net.xml index e4c66582f1ee..0758197847e4 100644 --- a/src/chrome/content/rules/Adformdsp.net.xml +++ b/src/chrome/content/rules/Adformdsp.net.xml @@ -1,7 +1,5 @@ @@ -27,8 +30,8 @@ - - + From 3a595f0657439ae3f4b38c324de9f77c6a753ce5 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 26 Dec 2017 18:31:41 +0100 Subject: [PATCH 248/844] Create FreePascal.org.xml (#14063) --- src/chrome/content/rules/FreePascal.org.xml | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/chrome/content/rules/FreePascal.org.xml diff --git a/src/chrome/content/rules/FreePascal.org.xml b/src/chrome/content/rules/FreePascal.org.xml new file mode 100644 index 000000000000..9370596527c1 --- /dev/null +++ b/src/chrome/content/rules/FreePascal.org.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + From d1dc8e6cd86893110ab677aa546438cbe5ebcbf4 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Tue, 26 Dec 2017 12:46:05 -0500 Subject: [PATCH 249/844] Update and rename osnews.com.xml to OSNews.com.xml (#14045) --- src/chrome/content/rules/OSNews.com.xml | 11 +++++++++++ src/chrome/content/rules/osnews.com.xml | 6 ------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 src/chrome/content/rules/OSNews.com.xml delete mode 100644 src/chrome/content/rules/osnews.com.xml diff --git a/src/chrome/content/rules/OSNews.com.xml b/src/chrome/content/rules/OSNews.com.xml new file mode 100644 index 000000000000..e28d33b04371 --- /dev/null +++ b/src/chrome/content/rules/OSNews.com.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/chrome/content/rules/osnews.com.xml b/src/chrome/content/rules/osnews.com.xml deleted file mode 100644 index f26dd71fe4b5..000000000000 --- a/src/chrome/content/rules/osnews.com.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From 66599889c8dcdc7ac54b395c9ed5d15b68f2cbdc Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Tue, 26 Dec 2017 12:47:14 -0500 Subject: [PATCH 250/844] Update and rename mathjax.xml to MathJax.org.xml (#14028) --- src/chrome/content/rules/MathJax.org.xml | 13 +++++++++++++ src/chrome/content/rules/mathjax.xml | 22 ---------------------- 2 files changed, 13 insertions(+), 22 deletions(-) create mode 100644 src/chrome/content/rules/MathJax.org.xml delete mode 100644 src/chrome/content/rules/mathjax.xml diff --git a/src/chrome/content/rules/MathJax.org.xml b/src/chrome/content/rules/MathJax.org.xml new file mode 100644 index 000000000000..916023b7c654 --- /dev/null +++ b/src/chrome/content/rules/MathJax.org.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/mathjax.xml b/src/chrome/content/rules/mathjax.xml deleted file mode 100644 index 495c354f14e1..000000000000 --- a/src/chrome/content/rules/mathjax.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - From fcdea5e01a7095ca94dea8b23f83df3a53cdbfd0 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 04:28:15 +1030 Subject: [PATCH 251/844] [textfixer.com] New ruleset (#13914) --- src/chrome/content/rules/TextFixer.com.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/TextFixer.com.xml diff --git a/src/chrome/content/rules/TextFixer.com.xml b/src/chrome/content/rules/TextFixer.com.xml new file mode 100644 index 000000000000..d9bd7227061d --- /dev/null +++ b/src/chrome/content/rules/TextFixer.com.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file From 54b6f8c9d5240062b33a533d97c847d11904a835 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 04:30:14 +1030 Subject: [PATCH 252/844] [WoolworthsMobile.com.au] New ruleset (#13920) --- .../content/rules/WoolworthsMobile.com.au.xml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/WoolworthsMobile.com.au.xml diff --git a/src/chrome/content/rules/WoolworthsMobile.com.au.xml b/src/chrome/content/rules/WoolworthsMobile.com.au.xml new file mode 100644 index 000000000000..e766ed11b2a5 --- /dev/null +++ b/src/chrome/content/rules/WoolworthsMobile.com.au.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + From 516cd5857333947b6a2dd1af003b0c05fe7f2048 Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 04:35:25 +1030 Subject: [PATCH 253/844] [Countdown.co.nz] New ruleset (#13933) --- src/chrome/content/rules/Countdown.co.nz.xml | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/chrome/content/rules/Countdown.co.nz.xml diff --git a/src/chrome/content/rules/Countdown.co.nz.xml b/src/chrome/content/rules/Countdown.co.nz.xml new file mode 100644 index 000000000000..c4d2fb330993 --- /dev/null +++ b/src/chrome/content/rules/Countdown.co.nz.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + From 557fe4360690f4093cc9cb09f2ca759b0a71c31b Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 04:41:22 +1030 Subject: [PATCH 254/844] [EziBuy.com] New ruleset (#13924) --- src/chrome/content/rules/EziBuy.com.xml | 57 +++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/chrome/content/rules/EziBuy.com.xml diff --git a/src/chrome/content/rules/EziBuy.com.xml b/src/chrome/content/rules/EziBuy.com.xml new file mode 100644 index 000000000000..cea4c517a3e4 --- /dev/null +++ b/src/chrome/content/rules/EziBuy.com.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fa01d81a7d6d9445b1319e953e88a6ff65ac6c2b Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 04:50:00 +1030 Subject: [PATCH 255/844] [Macquarie.com.au] New ruleset (#14007) * [Macquarie.com.au] New ruleset * Remove hosts with expired cert, add wildcard securecookie --- src/chrome/content/rules/Macquarie.com.au.xml | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/chrome/content/rules/Macquarie.com.au.xml diff --git a/src/chrome/content/rules/Macquarie.com.au.xml b/src/chrome/content/rules/Macquarie.com.au.xml new file mode 100644 index 000000000000..f9291c49e1c4 --- /dev/null +++ b/src/chrome/content/rules/Macquarie.com.au.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b5ca6b40847db958887008bcd4bc5b4affdfe9ad Mon Sep 17 00:00:00 2001 From: youdly Date: Wed, 27 Dec 2017 11:06:25 +1030 Subject: [PATCH 256/844] [amazon.com.au] Add subdomains (#14060) * [amazon.com.au] Add subdomains * Remove preloaded 'www' --- src/chrome/content/rules/amazon.com.au.xml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/chrome/content/rules/amazon.com.au.xml b/src/chrome/content/rules/amazon.com.au.xml index a3eb79307a43..ebffa533cc57 100644 --- a/src/chrome/content/rules/amazon.com.au.xml +++ b/src/chrome/content/rules/amazon.com.au.xml @@ -2,6 +2,21 @@ For other Amazon coverage, see Amazon.xml. + Non-functional subdomains: + + - cmu-receiver-fe (t) + - kdp (r) + - kindlestore-sha-proxy (i) + + e: expired certificate + h: http redirect + i: invalid certificate chain + m: certificate mismatch + r: connection refused + s: self-signed certificate + t: timeout on https + + Insecure cookies are set for these domains: ᶜ - .amazon.com.au @@ -12,7 +27,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - diff --git a/src/chrome/content/rules/nyttips4bmquxfzw.onion.xml b/src/chrome/content/rules/nyttips4bmquxfzw.onion.xml new file mode 100644 index 000000000000..7dedf102403d --- /dev/null +++ b/src/chrome/content/rules/nyttips4bmquxfzw.onion.xml @@ -0,0 +1,16 @@ + + + + + + + + From aa55841b0fad4b3b637465e715e06f263f07d266 Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:21:49 +1030 Subject: [PATCH 258/844] [Expedia.com.sg] New ruleset (#14105) --- src/chrome/content/rules/Expedia.com.sg.xml | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.sg.xml diff --git a/src/chrome/content/rules/Expedia.com.sg.xml b/src/chrome/content/rules/Expedia.com.sg.xml new file mode 100644 index 000000000000..71ef227b3981 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.sg.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + From 485c128ac8ac0fa51250c397f57887fe514bd10b Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:22:36 +1030 Subject: [PATCH 259/844] [Expedia.com.tw] New ruleset (#14106) --- src/chrome/content/rules/Expedia.com.tw.xml | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.tw.xml diff --git a/src/chrome/content/rules/Expedia.com.tw.xml b/src/chrome/content/rules/Expedia.com.tw.xml new file mode 100644 index 000000000000..bb368bf58b41 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.tw.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + From 581f38c345cc68c35577041f63dd0593ed58795f Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:23:05 +1030 Subject: [PATCH 260/844] [Expedia.com.vn] New ruleset (#14107) --- src/chrome/content/rules/Expedia.com.vn.xml | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.vn.xml diff --git a/src/chrome/content/rules/Expedia.com.vn.xml b/src/chrome/content/rules/Expedia.com.vn.xml new file mode 100644 index 000000000000..092e80513cd9 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.vn.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + From 0055a8553b28f16c59a4f9f5234b52db0f1fa08d Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:23:32 +1030 Subject: [PATCH 261/844] [Expedia.com.ph] New ruleset (#14108) --- src/chrome/content/rules/Expedia.com.ph.xml | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.ph.xml diff --git a/src/chrome/content/rules/Expedia.com.ph.xml b/src/chrome/content/rules/Expedia.com.ph.xml new file mode 100644 index 000000000000..51eec9e3e7d8 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.ph.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + From f0c6947c0553b7f3b9005315e0dd7be0083500ba Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:26:58 +1030 Subject: [PATCH 262/844] [Gumtree.co.za] New ruleset (#14110) --- src/chrome/content/rules/Gumtree.co.za.xml | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/chrome/content/rules/Gumtree.co.za.xml diff --git a/src/chrome/content/rules/Gumtree.co.za.xml b/src/chrome/content/rules/Gumtree.co.za.xml new file mode 100644 index 000000000000..a7610a84ff34 --- /dev/null +++ b/src/chrome/content/rules/Gumtree.co.za.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + From 8de1226608e6a7aa32dca49146ccef8ea8654591 Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:30:07 +1030 Subject: [PATCH 263/844] [Gumtree.pl] New ruleset (#14114) --- src/chrome/content/rules/Gumtree.pl.xml | 50 +++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/chrome/content/rules/Gumtree.pl.xml diff --git a/src/chrome/content/rules/Gumtree.pl.xml b/src/chrome/content/rules/Gumtree.pl.xml new file mode 100644 index 000000000000..ab2b791fb2e8 --- /dev/null +++ b/src/chrome/content/rules/Gumtree.pl.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + From aef3e3d4ce7319e4a3dc8026ade3551e95c7388a Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:31:05 +1030 Subject: [PATCH 264/844] [Gumtree.ie] New ruleset (#14111) --- src/chrome/content/rules/Gumtree.ie.xml | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/Gumtree.ie.xml diff --git a/src/chrome/content/rules/Gumtree.ie.xml b/src/chrome/content/rules/Gumtree.ie.xml new file mode 100644 index 000000000000..bebe8727cdd9 --- /dev/null +++ b/src/chrome/content/rules/Gumtree.ie.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + From 3cae562df42fdf7ba9c940ea10e0d8b0052010db Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 09:32:07 +1030 Subject: [PATCH 265/844] [Gumtree.sg] New ruleset (#14113) --- src/chrome/content/rules/Gumtree.sg.xml | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/chrome/content/rules/Gumtree.sg.xml diff --git a/src/chrome/content/rules/Gumtree.sg.xml b/src/chrome/content/rules/Gumtree.sg.xml new file mode 100644 index 000000000000..9f0518035230 --- /dev/null +++ b/src/chrome/content/rules/Gumtree.sg.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + From 607d992edc8a852ff989485e1622241c47fdf70e Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 27 Dec 2017 23:06:41 +0000 Subject: [PATCH 266/844] Create RamonHarvey.com.xml (#14115) --- src/chrome/content/rules/RamonHarvey.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/RamonHarvey.com.xml diff --git a/src/chrome/content/rules/RamonHarvey.com.xml b/src/chrome/content/rules/RamonHarvey.com.xml new file mode 100644 index 000000000000..421eb5316217 --- /dev/null +++ b/src/chrome/content/rules/RamonHarvey.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From c69928e885bda76c7bc22e9cb904436598a0c485 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 27 Dec 2017 23:08:58 +0000 Subject: [PATCH 267/844] Create PineappleFund.org.xml (#14116) --- src/chrome/content/rules/PineappleFund.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/PineappleFund.org.xml diff --git a/src/chrome/content/rules/PineappleFund.org.xml b/src/chrome/content/rules/PineappleFund.org.xml new file mode 100644 index 000000000000..f85544346acf --- /dev/null +++ b/src/chrome/content/rules/PineappleFund.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From 54ea9a7f42d9bc2b82f10a3722f152756e516634 Mon Sep 17 00:00:00 2001 From: ihave100openPRs <30478887+ihave100openPRs@users.noreply.github.com> Date: Wed, 27 Dec 2017 23:10:40 +0000 Subject: [PATCH 268/844] Create Al-Maktaba.org.xml (#14118) --- src/chrome/content/rules/Al-Maktaba.org.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Al-Maktaba.org.xml diff --git a/src/chrome/content/rules/Al-Maktaba.org.xml b/src/chrome/content/rules/Al-Maktaba.org.xml new file mode 100644 index 000000000000..ed0598a21fc6 --- /dev/null +++ b/src/chrome/content/rules/Al-Maktaba.org.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + From e9e95424bbcf1458e4ad7c4f7595c48b367af351 Mon Sep 17 00:00:00 2001 From: numismatika Date: Thu, 28 Dec 2017 00:13:34 +0100 Subject: [PATCH 269/844] IDG.de: (#13858) - remove wildcard - add tap,www & ^ subdomain --- src/chrome/content/rules/Idg.de.xml | 70 +++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Idg.de.xml b/src/chrome/content/rules/Idg.de.xml index c053454132b5..eb6f143f8ccf 100644 --- a/src/chrome/content/rules/Idg.de.xml +++ b/src/chrome/content/rules/Idg.de.xml @@ -1,5 +1,69 @@ + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file From 4541cdbe4d05b2bb95f1b285cb265a5b246c2ddf Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 28 Dec 2017 01:22:49 +0200 Subject: [PATCH 270/844] Create Lingvoforum.net.xml (#14081) --- src/chrome/content/rules/Lingvoforum.net.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Lingvoforum.net.xml diff --git a/src/chrome/content/rules/Lingvoforum.net.xml b/src/chrome/content/rules/Lingvoforum.net.xml new file mode 100644 index 000000000000..4e79dc2ddec2 --- /dev/null +++ b/src/chrome/content/rules/Lingvoforum.net.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file From 9dcfe53433f41bad892b7c491f6a26cea6ae1648 Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 28 Dec 2017 01:25:16 +0200 Subject: [PATCH 271/844] Create Goldlit.ru.xml (#14082) --- src/chrome/content/rules/Goldlit.ru.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Goldlit.ru.xml diff --git a/src/chrome/content/rules/Goldlit.ru.xml b/src/chrome/content/rules/Goldlit.ru.xml new file mode 100644 index 000000000000..496af8c466e1 --- /dev/null +++ b/src/chrome/content/rules/Goldlit.ru.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file From 56af4d9c6efdc16c6805871b524f3bd9226b0f51 Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 28 Dec 2017 01:29:05 +0200 Subject: [PATCH 272/844] Update BetterFap.com.xml (#14084) --- src/chrome/content/rules/BetterFap.com.xml | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/BetterFap.com.xml b/src/chrome/content/rules/BetterFap.com.xml index c4abba61c7a8..d3c67f820d28 100644 --- a/src/chrome/content/rules/BetterFap.com.xml +++ b/src/chrome/content/rules/BetterFap.com.xml @@ -1,12 +1,16 @@ - - - - - + + + + + + + + + - - - + + \ No newline at end of file From 79b42b16d7b8440d63cde71daec7d47e1694921d Mon Sep 17 00:00:00 2001 From: Arne Schuldt Date: Thu, 28 Dec 2017 02:17:09 +0100 Subject: [PATCH 273/844] Website no longer available (#14088) --- src/chrome/content/rules/Regiochannel.com.xml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/chrome/content/rules/Regiochannel.com.xml diff --git a/src/chrome/content/rules/Regiochannel.com.xml b/src/chrome/content/rules/Regiochannel.com.xml deleted file mode 100644 index 0f97669dedc5..000000000000 --- a/src/chrome/content/rules/Regiochannel.com.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - From a0df73b96a654221f3916fa519cbf05b7ec438a5 Mon Sep 17 00:00:00 2001 From: youdly Date: Thu, 28 Dec 2017 11:55:28 +1030 Subject: [PATCH 274/844] [TaskRabbit.com] New ruleset (#13287) * [TaskRabbit.com] New ruleset * Fix typo and remove irrelevant comments * Remove 'cert' subdomain --- src/chrome/content/rules/TaskRabbit.com.xml | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/chrome/content/rules/TaskRabbit.com.xml diff --git a/src/chrome/content/rules/TaskRabbit.com.xml b/src/chrome/content/rules/TaskRabbit.com.xml new file mode 100644 index 000000000000..427a680472d5 --- /dev/null +++ b/src/chrome/content/rules/TaskRabbit.com.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + From 0c30ca3816eb08b6534d837092252f4fe323a1e7 Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 28 Dec 2017 19:48:44 +0200 Subject: [PATCH 275/844] Update and rename beeg.xml to Beeg.com.xml (#14029) --- src/chrome/content/rules/Beeg.com.xml | 33 +++++++++++++++++++++++++++ src/chrome/content/rules/beeg.xml | 17 -------------- 2 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 src/chrome/content/rules/Beeg.com.xml delete mode 100644 src/chrome/content/rules/beeg.xml diff --git a/src/chrome/content/rules/Beeg.com.xml b/src/chrome/content/rules/Beeg.com.xml new file mode 100644 index 000000000000..f255651f762c --- /dev/null +++ b/src/chrome/content/rules/Beeg.com.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/chrome/content/rules/beeg.xml b/src/chrome/content/rules/beeg.xml deleted file mode 100644 index e4991f6bda26..000000000000 --- a/src/chrome/content/rules/beeg.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - From 5ea61ed2fa36635002edc1a02bcde1f22d31556b Mon Sep 17 00:00:00 2001 From: Justin Tracey Date: Fri, 29 Dec 2017 00:44:34 +0000 Subject: [PATCH 276/844] Update University-of-Waterloo.xml (#14126) --- src/chrome/content/rules/University-of-Waterloo.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/chrome/content/rules/University-of-Waterloo.xml b/src/chrome/content/rules/University-of-Waterloo.xml index de717dd56a27..82d709229844 100644 --- a/src/chrome/content/rules/University-of-Waterloo.xml +++ b/src/chrome/content/rules/University-of-Waterloo.xml @@ -2,27 +2,35 @@ Different HTTP/HTTPS content: development.uwaterloo.ca info.uwaterloo.ca + library.uwaterloo.ca Invalid certificate: cacr.uwaterloo.ca cecs.uwaterloo.ca hr.uwaterloo.ca + bookings.lib.uwaterloo.ca (incomplete certificate chain) --> + + + + + + From f3bfe4e16a2d5cb4e173859ade56e8387ea454fe Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Sat, 30 Dec 2017 10:53:51 -0500 Subject: [PATCH 277/844] Update 444.hu.xml and add 4cdn.hu.xml (#14125) --- src/chrome/content/rules/444.hu.xml | 24 +++++++++++++++--------- src/chrome/content/rules/4cdn.hu.xml | 13 +++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 src/chrome/content/rules/4cdn.hu.xml diff --git a/src/chrome/content/rules/444.hu.xml b/src/chrome/content/rules/444.hu.xml index 86cfa71c61e7..9f4926be453d 100644 --- a/src/chrome/content/rules/444.hu.xml +++ b/src/chrome/content/rules/444.hu.xml @@ -1,16 +1,13 @@ - + + + + @@ -21,18 +18,27 @@ + + + + + + + + + + to="https:" /> diff --git a/src/chrome/content/rules/4cdn.hu.xml b/src/chrome/content/rules/4cdn.hu.xml new file mode 100644 index 000000000000..2eeb1668f53b --- /dev/null +++ b/src/chrome/content/rules/4cdn.hu.xml @@ -0,0 +1,13 @@ + + + + + + + + + From 14e565e1a41becb11ad82f09c6f911274efce86e Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 31 Dec 2017 02:35:36 +1030 Subject: [PATCH 278/844] [Expedia.com.my] New ruleset (#14123) --- src/chrome/content/rules/Expedia.com.my.xml | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.my.xml diff --git a/src/chrome/content/rules/Expedia.com.my.xml b/src/chrome/content/rules/Expedia.com.my.xml new file mode 100644 index 000000000000..853981e9e2bc --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.my.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + From aadf9d6cc1da8488a428850caeba3d6806f5f166 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 31 Dec 2017 02:36:09 +1030 Subject: [PATCH 279/844] [Expedia.com.br] New ruleset (#14121) --- src/chrome/content/rules/Expedia.com.br.xml | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.br.xml diff --git a/src/chrome/content/rules/Expedia.com.br.xml b/src/chrome/content/rules/Expedia.com.br.xml new file mode 100644 index 000000000000..f53d0db89597 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.br.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + From 412542886beb95aefec6a8f557bb1bc68a671075 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 31 Dec 2017 02:36:40 +1030 Subject: [PATCH 280/844] [Expedia.com.hk] New ruleset (#14120) --- src/chrome/content/rules/Expedia.com.hk.xml | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.hk.xml diff --git a/src/chrome/content/rules/Expedia.com.hk.xml b/src/chrome/content/rules/Expedia.com.hk.xml new file mode 100644 index 000000000000..1177abb14889 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.hk.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + From 09384dca2a1d84c2a3eaec0a73310c5805fd6660 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 30 Dec 2017 23:12:21 +0100 Subject: [PATCH 281/844] Springserve.com: (#14141) - add more subdomains --- src/chrome/content/rules/Springserve.com.xml | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/chrome/content/rules/Springserve.com.xml b/src/chrome/content/rules/Springserve.com.xml index 0171f016e427..d333ff65e474 100644 --- a/src/chrome/content/rules/Springserve.com.xml +++ b/src/chrome/content/rules/Springserve.com.xml @@ -1,6 +1,33 @@ + + + + + + + + + + + + + + + + + + + + From c5461dc8b8cbf0e60b8772dd080d3fc0f2ca3663 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 30 Dec 2017 23:14:19 +0100 Subject: [PATCH 282/844] add rule for Sekindo.com (#14131) --- src/chrome/content/rules/Sekindo.com.xml | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/Sekindo.com.xml diff --git a/src/chrome/content/rules/Sekindo.com.xml b/src/chrome/content/rules/Sekindo.com.xml new file mode 100644 index 000000000000..48201d1e97d3 --- /dev/null +++ b/src/chrome/content/rules/Sekindo.com.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + From dd5830154d34d181adadcbdbd5baf3181ccb0ecc Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 30 Dec 2017 23:14:54 +0100 Subject: [PATCH 283/844] add rule for AdNow (#14134) --- src/chrome/content/rules/AdNow.com.xml | 424 +++++++++++++++++++++++++ 1 file changed, 424 insertions(+) create mode 100644 src/chrome/content/rules/AdNow.com.xml diff --git a/src/chrome/content/rules/AdNow.com.xml b/src/chrome/content/rules/AdNow.com.xml new file mode 100644 index 000000000000..362765fb0c86 --- /dev/null +++ b/src/chrome/content/rules/AdNow.com.xml @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1463db42792b1a4ed04919a543a70f65006399f6 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 31 Dec 2017 01:00:53 +0100 Subject: [PATCH 284/844] Add Piratenkleider.de.xml (#14143) --- src/chrome/content/rules/Piratenkleider.de.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/Piratenkleider.de.xml diff --git a/src/chrome/content/rules/Piratenkleider.de.xml b/src/chrome/content/rules/Piratenkleider.de.xml new file mode 100644 index 000000000000..5e631f143ba8 --- /dev/null +++ b/src/chrome/content/rules/Piratenkleider.de.xml @@ -0,0 +1,16 @@ + + + + + + + From 0d13a47807b858f6a5bc9a92bb05d4d41d34cb8e Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 31 Dec 2017 23:29:55 +0800 Subject: [PATCH 285/844] Create RARLab.xml and Update WinRAR.xml (#14129) * Create RARLab.xml and Update WinRAR.xml * Remove hosts without HTTP service from top comments --- src/chrome/content/rules/RARLab.xml | 21 ++++++++++++++++++ src/chrome/content/rules/WinRAR.xml | 33 +++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 src/chrome/content/rules/RARLab.xml diff --git a/src/chrome/content/rules/RARLab.xml b/src/chrome/content/rules/RARLab.xml new file mode 100644 index 000000000000..dc3375a9c430 --- /dev/null +++ b/src/chrome/content/rules/RARLab.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/WinRAR.xml b/src/chrome/content/rules/WinRAR.xml index db5c865bf2da..2939192c27fc 100644 --- a/src/chrome/content/rules/WinRAR.xml +++ b/src/chrome/content/rules/WinRAR.xml @@ -1,16 +1,31 @@ - + 4xx client error: + - piwik.win-rar.com +--> + + + + + + + + - - - + From d3dcf91f2714b66822f5970fc0e9e190701ba095 Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 17:39:10 +0100 Subject: [PATCH 286/844] Add more subdomains for Serving-sys.com (#13855) --- src/chrome/content/rules/Serving-sys.com.xml | 147 ++++++++++++------- 1 file changed, 93 insertions(+), 54 deletions(-) diff --git a/src/chrome/content/rules/Serving-sys.com.xml b/src/chrome/content/rules/Serving-sys.com.xml index e1c9eda21771..30c00ac4bd5f 100644 --- a/src/chrome/content/rules/Serving-sys.com.xml +++ b/src/chrome/content/rules/Serving-sys.com.xml @@ -1,66 +1,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + From 54ac482140de03ac03c1ad724ed77fe7d1e0a790 Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 17:48:55 +0100 Subject: [PATCH 287/844] add rule for Optimatic (#14142) --- src/chrome/content/rules/Optimatic.xml | 43 ++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/Optimatic.xml diff --git a/src/chrome/content/rules/Optimatic.xml b/src/chrome/content/rules/Optimatic.xml new file mode 100644 index 000000000000..05be4cb152ba --- /dev/null +++ b/src/chrome/content/rules/Optimatic.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + From 514e8b7dae4d58d1520a548c4b6a394b6174e0df Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 17:52:40 +0100 Subject: [PATCH 288/844] add rule for Tremorhub.com (#13764) --- src/chrome/content/rules/Tremorhub.com.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/Tremorhub.com.xml diff --git a/src/chrome/content/rules/Tremorhub.com.xml b/src/chrome/content/rules/Tremorhub.com.xml new file mode 100644 index 000000000000..6071c7fec87c --- /dev/null +++ b/src/chrome/content/rules/Tremorhub.com.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + From 11a0d3d53a92db79ae6d3eb2e446d72d5e767070 Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 17:55:10 +0100 Subject: [PATCH 289/844] VisualDNA: (#14135) - add assets domains --- src/chrome/content/rules/VisualDNA.com.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/VisualDNA.com.xml b/src/chrome/content/rules/VisualDNA.com.xml index a061f7bd3330..e3e9d9d7217f 100644 --- a/src/chrome/content/rules/VisualDNA.com.xml +++ b/src/chrome/content/rules/VisualDNA.com.xml @@ -9,6 +9,7 @@ + @@ -26,7 +27,17 @@ - + + + + + + + + + + + From 7510aac8cd850b203b82bb280706a72c4eb344e5 Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 17:57:06 +0100 Subject: [PATCH 290/844] add rule for MonkeyBroker.net (#14140) --- src/chrome/content/rules/MonkeyBroker.net.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/MonkeyBroker.net.xml diff --git a/src/chrome/content/rules/MonkeyBroker.net.xml b/src/chrome/content/rules/MonkeyBroker.net.xml new file mode 100644 index 000000000000..54ee72c09254 --- /dev/null +++ b/src/chrome/content/rules/MonkeyBroker.net.xml @@ -0,0 +1,19 @@ + + + + + + + + From 9ea45e8cae49382ef3f2f1cacfac68a31dd19b9b Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 18:00:08 +0100 Subject: [PATCH 291/844] ScorecardResearch.com: (#14136) - more subdomains --- .../content/rules/ScorecardResearch.com.xml | 82 ++++++++++++++----- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/rules/ScorecardResearch.com.xml b/src/chrome/content/rules/ScorecardResearch.com.xml index c82babbd660c..ea7e096249b3 100644 --- a/src/chrome/content/rules/ScorecardResearch.com.xml +++ b/src/chrome/content/rules/ScorecardResearch.com.xml @@ -1,35 +1,75 @@ - + + + + + + + + + + + + From 49f57f99b052043ac147990c9306135ffb888e02 Mon Sep 17 00:00:00 2001 From: numismatika Date: Mon, 1 Jan 2018 18:03:25 +0100 Subject: [PATCH 292/844] Casale-Media: (#14150) - more subdomains secured --- src/chrome/content/rules/Casale-Media.xml | 57 +++++++++++------------ 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/src/chrome/content/rules/Casale-Media.xml b/src/chrome/content/rules/Casale-Media.xml index 5d9ec24977ff..32f885990cd7 100644 --- a/src/chrome/content/rules/Casale-Media.xml +++ b/src/chrome/content/rules/Casale-Media.xml @@ -1,52 +1,47 @@ + + + + + + + + + + + + + - - - - - - - + - - + From d546c19103071128b00542ad0fe0f14bbc0816d2 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 2 Jan 2018 18:16:53 +0100 Subject: [PATCH 293/844] [FactCheck.org] Add targets and remove platform (fix #14157) (#14159) --- src/chrome/content/rules/FactCheck.org.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/FactCheck.org.xml b/src/chrome/content/rules/FactCheck.org.xml index 86c9795073ed..e0b10d6ad47e 100644 --- a/src/chrome/content/rules/FactCheck.org.xml +++ b/src/chrome/content/rules/FactCheck.org.xml @@ -1,29 +1,31 @@ - + - + + - - + + + + + + + From ab80583ec7aa152935dbbd72195e26958f7e0657 Mon Sep 17 00:00:00 2001 From: MilanKral Date: Wed, 3 Jan 2018 00:42:23 +0100 Subject: [PATCH 294/844] Gramps project.org (#14119) --- src/chrome/content/rules/Gramps-project.org.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Gramps-project.org.xml diff --git a/src/chrome/content/rules/Gramps-project.org.xml b/src/chrome/content/rules/Gramps-project.org.xml new file mode 100644 index 000000000000..02d7fcca324d --- /dev/null +++ b/src/chrome/content/rules/Gramps-project.org.xml @@ -0,0 +1,13 @@ + + + + + + + + From b46c1bdfc564dbee0c93e5b4ec6c4d409f9d80a2 Mon Sep 17 00:00:00 2001 From: Riotism Date: Wed, 3 Jan 2018 08:11:36 +0800 Subject: [PATCH 295/844] [New ruleset] useremarkable.com (#9279) --- src/chrome/content/rules/UseRemarkable.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/UseRemarkable.com.xml diff --git a/src/chrome/content/rules/UseRemarkable.com.xml b/src/chrome/content/rules/UseRemarkable.com.xml new file mode 100644 index 000000000000..16b06fd48902 --- /dev/null +++ b/src/chrome/content/rules/UseRemarkable.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 176c375a753cb3896d337e0624b21ea48fb15caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20M=C3=BCller?= Date: Wed, 3 Jan 2018 03:29:01 +0100 Subject: [PATCH 296/844] [sbb.ch] Add subdomains and CDN (#14163) --- src/chrome/content/rules/Swiss-Federal-Railways.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/chrome/content/rules/Swiss-Federal-Railways.xml b/src/chrome/content/rules/Swiss-Federal-Railways.xml index 2593acf9c891..b90f1e79407b 100644 --- a/src/chrome/content/rules/Swiss-Federal-Railways.xml +++ b/src/chrome/content/rules/Swiss-Federal-Railways.xml @@ -41,6 +41,12 @@ Redirect: + + + + + + @@ -60,9 +66,11 @@ Redirect: + + From 1d7810eceba4346444d72155407df9056d8d40b6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 4 Jan 2018 01:02:43 +0100 Subject: [PATCH 297/844] Create Picsters.tv.xml (#14170) --- src/chrome/content/rules/Picsters.tv.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Picsters.tv.xml diff --git a/src/chrome/content/rules/Picsters.tv.xml b/src/chrome/content/rules/Picsters.tv.xml new file mode 100644 index 000000000000..1d6bea095b2a --- /dev/null +++ b/src/chrome/content/rules/Picsters.tv.xml @@ -0,0 +1,8 @@ + + + + + + + + From 3c75f108300ca531d87395d3edbdb88c97631e26 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 4 Jan 2018 02:12:08 +0100 Subject: [PATCH 298/844] Re-enable MIT.xml (continue from #12002) (#14169) * Re-enable MIT.xml (#12002) * Re-run Travis * Update MIT.xml * Update MIT.xml * Update MIT.xml * Update MIT.xml * Update MIT.xml * Update MIT-mismatches.xml * Update MIT.xml * Update MIT.xml * Update MIT-mismatches.xml * Update MIT.xml * Update MIT.xml * Update MIT.xml * Update MIT.xml * Update MIT.xml * Normalize securecookie rule --- src/chrome/content/rules/MIT-mismatches.xml | 5 - src/chrome/content/rules/MIT.xml | 317 +++----------------- 2 files changed, 48 insertions(+), 274 deletions(-) diff --git a/src/chrome/content/rules/MIT-mismatches.xml b/src/chrome/content/rules/MIT-mismatches.xml index 9e0bc41deb63..7d606e0ed1c6 100644 --- a/src/chrome/content/rules/MIT-mismatches.xml +++ b/src/chrome/content/rules/MIT-mismatches.xml @@ -7,21 +7,16 @@ - - - - - - - + + + - - + - + + + + + + - - - - - + + @@ -331,23 +181,22 @@ + - - - + - + @@ -361,134 +210,64 @@ - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + - - - - - - - - - + + + + + + + + - - + + - + - + - + - + - + - + - + - + + From 44701417ea2e2217941f45d8ffa9f5fcde200483 Mon Sep 17 00:00:00 2001 From: numismatika Date: Thu, 4 Jan 2018 02:35:46 +0100 Subject: [PATCH 299/844] Conde_Nast_Digital.com: (#14133) - add more subdomains --- .../content/rules/Conde_Nast_Digital.com.xml | 65 ++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Conde_Nast_Digital.com.xml b/src/chrome/content/rules/Conde_Nast_Digital.com.xml index db68808d2a03..1d88343e8cd1 100644 --- a/src/chrome/content/rules/Conde_Nast_Digital.com.xml +++ b/src/chrome/content/rules/Conde_Nast_Digital.com.xml @@ -1,15 +1,76 @@ - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + From eac072c497a046aaec56e6bd91a1a0b19dd2fe2c Mon Sep 17 00:00:00 2001 From: numismatika Date: Thu, 4 Jan 2018 02:37:41 +0100 Subject: [PATCH 300/844] add rule for Shoofle.tv (#14145) --- src/chrome/content/rules/Shoofle.tv.xml | 72 +++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/chrome/content/rules/Shoofle.tv.xml diff --git a/src/chrome/content/rules/Shoofle.tv.xml b/src/chrome/content/rules/Shoofle.tv.xml new file mode 100644 index 000000000000..5d3b2de4ce16 --- /dev/null +++ b/src/chrome/content/rules/Shoofle.tv.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e89e340cf7b9ba31839df582857a606a5c3f4656 Mon Sep 17 00:00:00 2001 From: Sumana Harihareswara Date: Wed, 3 Jan 2018 21:45:33 -0500 Subject: [PATCH 301/844] Add rule for Cox & Kings International. (#8174) --- src/chrome/content/rules/Ckgs.us.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/Ckgs.us.xml diff --git a/src/chrome/content/rules/Ckgs.us.xml b/src/chrome/content/rules/Ckgs.us.xml new file mode 100644 index 000000000000..10d7875717df --- /dev/null +++ b/src/chrome/content/rules/Ckgs.us.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + From 4ef4dc07b387b5701878b1ea730281f942fb01c5 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 4 Jan 2018 23:23:27 +0800 Subject: [PATCH 302/844] Create Meltdownattack.com.xml (#14174) --- src/chrome/content/rules/Meltdownattack.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Meltdownattack.com.xml diff --git a/src/chrome/content/rules/Meltdownattack.com.xml b/src/chrome/content/rules/Meltdownattack.com.xml new file mode 100644 index 000000000000..fb2aa94a0af3 --- /dev/null +++ b/src/chrome/content/rules/Meltdownattack.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 4bae4509f0e83d3e6556aaa0953ff236f9218dc4 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 4 Jan 2018 23:50:49 +0100 Subject: [PATCH 303/844] [Wizards.com] Fix broken redirect (#14103) * [Wizards.com] Fix broken redirect Bug reported in https://trac.torproject.org/projects/tor/ticket/24746 * Split problematic target from main ruleset * Add comments to link rulesets --- .../content/rules/Wizards.com-problematic.xml | 24 +++++++++++++++++++ src/chrome/content/rules/Wizards.com.xml | 10 ++++---- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 src/chrome/content/rules/Wizards.com-problematic.xml diff --git a/src/chrome/content/rules/Wizards.com-problematic.xml b/src/chrome/content/rules/Wizards.com-problematic.xml new file mode 100644 index 000000000000..7cb38da2fa7d --- /dev/null +++ b/src/chrome/content/rules/Wizards.com-problematic.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Wizards.com.xml b/src/chrome/content/rules/Wizards.com.xml index ae2bcadfd8e8..a09e38659461 100644 --- a/src/chrome/content/rules/Wizards.com.xml +++ b/src/chrome/content/rules/Wizards.com.xml @@ -1,4 +1,6 @@ - - - - + @@ -32,9 +32,9 @@ - + From a6c27e4941e6ab904fa8c426e6a9dc314197e66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 4 Jan 2018 23:53:20 +0100 Subject: [PATCH 304/844] Added ruleset for bvl.bund.de (#13937) * Added ruleset for bvl.bund.de * Removed opendata subdomain (SHA1 cert). --- .../content/rules/Verwaltung_Online.xml | 1 + src/chrome/content/rules/bvl.bund.de.xml | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/chrome/content/rules/bvl.bund.de.xml diff --git a/src/chrome/content/rules/Verwaltung_Online.xml b/src/chrome/content/rules/Verwaltung_Online.xml index 272c562b68a1..729377f50247 100644 --- a/src/chrome/content/rules/Verwaltung_Online.xml +++ b/src/chrome/content/rules/Verwaltung_Online.xml @@ -16,6 +16,7 @@ - bbr.bund.de.xml - bag.bund.de.xml - bfe.bund.de.xml + - bvl.bund.de.xml --> diff --git a/src/chrome/content/rules/bvl.bund.de.xml b/src/chrome/content/rules/bvl.bund.de.xml new file mode 100644 index 000000000000..951f9b0fedaa --- /dev/null +++ b/src/chrome/content/rules/bvl.bund.de.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + From b9ad10ab02681d8ef0560c6e10d7ecf93b54415d Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 6 Jan 2018 00:03:02 +1030 Subject: [PATCH 305/844] [Expedia.com.ar] New ruleset (#14122) * [Expedia.com.ar] New ruleset * Fix typo --- src/chrome/content/rules/Expedia.com.ar.xml | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.com.ar.xml diff --git a/src/chrome/content/rules/Expedia.com.ar.xml b/src/chrome/content/rules/Expedia.com.ar.xml new file mode 100644 index 000000000000..6480c8b97533 --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.ar.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + From 57ca067a816a916d58fc2eabc83842af67bf0f23 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 5 Jan 2018 14:34:28 +0100 Subject: [PATCH 306/844] Create Pokaa.fr.xml (#14086) * Create Pokaa.fr.xml * Create Pokaa.fr.xml --- src/chrome/content/rules/Pokaa.fr.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Pokaa.fr.xml diff --git a/src/chrome/content/rules/Pokaa.fr.xml b/src/chrome/content/rules/Pokaa.fr.xml new file mode 100644 index 000000000000..25029bcc8ddb --- /dev/null +++ b/src/chrome/content/rules/Pokaa.fr.xml @@ -0,0 +1,13 @@ + + + + + + + + + From e7f82e522faab64dc5bd657281ce3474c2f7510f Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 6 Jan 2018 00:25:30 +1030 Subject: [PATCH 307/844] [Macquarie.com] New ruleset (#13169) * [Macquarie.com] New ruleset * Add wildcard securecookie tag --- src/chrome/content/rules/Macquarie.com.xml | 210 +++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 src/chrome/content/rules/Macquarie.com.xml diff --git a/src/chrome/content/rules/Macquarie.com.xml b/src/chrome/content/rules/Macquarie.com.xml new file mode 100644 index 000000000000..02ebb33d1d02 --- /dev/null +++ b/src/chrome/content/rules/Macquarie.com.xml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4cfd6411e11e13fcee5f7ecd850767fd1d98fa23 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 6 Jan 2018 00:30:12 +1030 Subject: [PATCH 308/844] [Gumtree.com.au] New ruleset (#14112) * [Gumtree.com.au] New ruleset * Fix typo --- src/chrome/content/rules/Gumtree.com.au.xml | 374 ++++++++++++++++++++ 1 file changed, 374 insertions(+) create mode 100644 src/chrome/content/rules/Gumtree.com.au.xml diff --git a/src/chrome/content/rules/Gumtree.com.au.xml b/src/chrome/content/rules/Gumtree.com.au.xml new file mode 100644 index 000000000000..aabb142b557d --- /dev/null +++ b/src/chrome/content/rules/Gumtree.com.au.xml @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 438d85d4eb2f4c42e429b389c3e2100aa1918617 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 5 Jan 2018 15:12:47 +0100 Subject: [PATCH 309/844] Create CommitStrip.com.xml (#14192) --- src/chrome/content/rules/CommitStrip.com.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/CommitStrip.com.xml diff --git a/src/chrome/content/rules/CommitStrip.com.xml b/src/chrome/content/rules/CommitStrip.com.xml new file mode 100644 index 000000000000..c79ac0fb31a9 --- /dev/null +++ b/src/chrome/content/rules/CommitStrip.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + From 3e0d490e82d0b8e64f3ae3573d4032fd753d11c6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 5 Jan 2018 15:13:10 +0100 Subject: [PATCH 310/844] [Ubuntu.com] Exclude keyserver.ubuntu.com:11371 (fix #14185) (#14191) * [Ubuntu.com] Exclude keyserver.ubuntu.com:11371 (fix #14185) * [Ubuntu.com] Remove broken target --- src/chrome/content/rules/Ubuntu.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Ubuntu.xml b/src/chrome/content/rules/Ubuntu.xml index 7026eea62371..8adcab3fac6a 100644 --- a/src/chrome/content/rules/Ubuntu.xml +++ b/src/chrome/content/rules/Ubuntu.xml @@ -72,6 +72,9 @@ + + + @@ -83,7 +86,6 @@ - From 331a20a9a8142b1bc9783c6c530253881be7ec6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 15:22:14 +0100 Subject: [PATCH 311/844] Added ruleset for bg-verkehr.de (#13202) --- src/chrome/content/rules/bg-verkehr.de.xml | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/bg-verkehr.de.xml diff --git a/src/chrome/content/rules/bg-verkehr.de.xml b/src/chrome/content/rules/bg-verkehr.de.xml new file mode 100644 index 000000000000..d55bfe30bb85 --- /dev/null +++ b/src/chrome/content/rules/bg-verkehr.de.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + From 69dd838625230ad55719807dfeaa0b056b0465ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 15:23:43 +0100 Subject: [PATCH 312/844] Added ruleset for bgrci.de (#13201) --- src/chrome/content/rules/bgrci.de.xml | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/chrome/content/rules/bgrci.de.xml diff --git a/src/chrome/content/rules/bgrci.de.xml b/src/chrome/content/rules/bgrci.de.xml new file mode 100644 index 000000000000..c9bbaca81f68 --- /dev/null +++ b/src/chrome/content/rules/bgrci.de.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + From e7ed654d26d1256ce86bacfa39e8a18187f4ef7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 15:25:30 +0100 Subject: [PATCH 313/844] Added ruleset for bghw.de (#13164) --- src/chrome/content/rules/bghw.de.xml | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/bghw.de.xml diff --git a/src/chrome/content/rules/bghw.de.xml b/src/chrome/content/rules/bghw.de.xml new file mode 100644 index 000000000000..0a51875f870e --- /dev/null +++ b/src/chrome/content/rules/bghw.de.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + From ba6e3d6bb09ab177a1fd3bb34f0fa56e263f19fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 15:26:17 +0100 Subject: [PATCH 314/844] Added ruleset for bgw-online.de (#13163) --- src/chrome/content/rules/bgw-online.de.xml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/bgw-online.de.xml diff --git a/src/chrome/content/rules/bgw-online.de.xml b/src/chrome/content/rules/bgw-online.de.xml new file mode 100644 index 000000000000..90ed26861bc3 --- /dev/null +++ b/src/chrome/content/rules/bgw-online.de.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + From 5fa6eecc13c2a6c37f5e998739165e7bb597b32c Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 5 Jan 2018 15:28:56 +0100 Subject: [PATCH 315/844] [IMDB.com] Add targets (#14166) --- src/chrome/content/rules/IMDB.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/IMDB.xml b/src/chrome/content/rules/IMDB.xml index 548f83e6a99c..50e48c960259 100644 --- a/src/chrome/content/rules/IMDB.xml +++ b/src/chrome/content/rules/IMDB.xml @@ -1,17 +1,21 @@ + + + + @@ -44,6 +43,7 @@ + From 1501c92a9948f42be98a220f79aaa30b7f5b0a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 18:26:52 +0100 Subject: [PATCH 316/844] Added ruleset for bgn.de (#13199) --- src/chrome/content/rules/bgn.de.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/bgn.de.xml diff --git a/src/chrome/content/rules/bgn.de.xml b/src/chrome/content/rules/bgn.de.xml new file mode 100644 index 000000000000..f007855e843c --- /dev/null +++ b/src/chrome/content/rules/bgn.de.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + From 1861f3aefd6d214370d577553eb365472a380b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 18:29:43 +0100 Subject: [PATCH 317/844] Added ruleset for vaticannews.va (#14178) --- src/chrome/content/rules/vaticannews.va.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/vaticannews.va.xml diff --git a/src/chrome/content/rules/vaticannews.va.xml b/src/chrome/content/rules/vaticannews.va.xml new file mode 100644 index 000000000000..b55d72b43ea0 --- /dev/null +++ b/src/chrome/content/rules/vaticannews.va.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + From 63cd9034b23ea190d450bf3522b853b2f6da6fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 5 Jan 2018 18:35:28 +0100 Subject: [PATCH 318/844] Added ruleset for bundesjustizamt.de (#13788) --- src/chrome/content/rules/bundesjustizamt.de.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/bundesjustizamt.de.xml diff --git a/src/chrome/content/rules/bundesjustizamt.de.xml b/src/chrome/content/rules/bundesjustizamt.de.xml new file mode 100644 index 000000000000..59aeaef315e4 --- /dev/null +++ b/src/chrome/content/rules/bundesjustizamt.de.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + From 1c70230ba38c524cd34d4ba85adcad15c9e26b12 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 5 Jan 2018 19:21:10 +0100 Subject: [PATCH 319/844] add rule for Smartclip.net (#13743) --- src/chrome/content/rules/Smartclip.net.xml | 133 +++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 src/chrome/content/rules/Smartclip.net.xml diff --git a/src/chrome/content/rules/Smartclip.net.xml b/src/chrome/content/rules/Smartclip.net.xml new file mode 100644 index 000000000000..e8c63d0d0a1b --- /dev/null +++ b/src/chrome/content/rules/Smartclip.net.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8aff7141834885f398a144bffcd970c68c6378dd Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 5 Jan 2018 19:23:07 +0100 Subject: [PATCH 320/844] add rule for Agentbot.net (#13548) --- src/chrome/content/rules/Agentbot.net.xml | 66 +++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/chrome/content/rules/Agentbot.net.xml diff --git a/src/chrome/content/rules/Agentbot.net.xml b/src/chrome/content/rules/Agentbot.net.xml new file mode 100644 index 000000000000..875ed735452e --- /dev/null +++ b/src/chrome/content/rules/Agentbot.net.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8e2b2c93ec88eec501a3a4c0334cca28be1f417f Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Sun, 7 Jan 2018 04:08:14 +1100 Subject: [PATCH 321/844] [AFS] Add ruleset. (#13798) * [AFS] Add ruleset. * [AFS] Add more ccTLDs. --- src/chrome/content/rules/AFS.xml | 286 +++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 src/chrome/content/rules/AFS.xml diff --git a/src/chrome/content/rules/AFS.xml b/src/chrome/content/rules/AFS.xml new file mode 100644 index 000000000000..44cbe3f863d3 --- /dev/null +++ b/src/chrome/content/rules/AFS.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1df88c29559a60d8d361eff443584b882a5292ce Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Sun, 7 Jan 2018 04:09:44 +1100 Subject: [PATCH 322/844] Bulk re-enabling of default_off="refused" rulesets. (#13678) * Bulk re-enabling of default_off="refused" rulesets. * [MPort.ua] Update comments. * Update comments. --- src/chrome/content/rules/2shared.xml | 12 ++++++------ src/chrome/content/rules/APC-Magazine.xml | 8 +++----- src/chrome/content/rules/AlreadyHosting.com.xml | 8 ++++---- src/chrome/content/rules/Arisebitcoin.com.xml | 6 +----- src/chrome/content/rules/CYBERsitter.xml | 2 +- src/chrome/content/rules/ClarityRay.xml | 2 +- src/chrome/content/rules/Cuttlefish.com.xml | 10 ++++++++-- src/chrome/content/rules/Evm.dk.xml | 12 +++--------- .../content/rules/Guild_of_Master_Craftsmen.xml | 14 ++++---------- src/chrome/content/rules/HashTalk.org.xml | 4 +--- src/chrome/content/rules/MPort.ua.xml | 13 +++++++++---- src/chrome/content/rules/Rawstudio.org.xml | 16 +++++++--------- src/chrome/content/rules/SlideDeck.xml | 3 +-- .../content/rules/Source_Conference.com.xml | 4 ++-- src/chrome/content/rules/Utopia.xml | 10 ++++++++-- src/chrome/content/rules/Vocaroo.com.xml | 14 ++++++++++++-- src/chrome/content/rules/YUI_Library.xml | 6 +----- src/chrome/content/rules/hosting.com.xml | 2 +- src/chrome/content/rules/marksdailyapple.xml | 8 ++++---- 19 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/chrome/content/rules/2shared.xml b/src/chrome/content/rules/2shared.xml index 3280b5323b61..5fa1a3b29161 100644 --- a/src/chrome/content/rules/2shared.xml +++ b/src/chrome/content/rules/2shared.xml @@ -1,11 +1,11 @@ - + - - + + - + - + diff --git a/src/chrome/content/rules/APC-Magazine.xml b/src/chrome/content/rules/APC-Magazine.xml index 5c92c495162c..ff649f12f6af 100644 --- a/src/chrome/content/rules/APC-Magazine.xml +++ b/src/chrome/content/rules/APC-Magazine.xml @@ -1,4 +1,4 @@ - + @@ -7,9 +7,7 @@ - - + diff --git a/src/chrome/content/rules/AlreadyHosting.com.xml b/src/chrome/content/rules/AlreadyHosting.com.xml index c3db6b9e9056..53cde3c5f3df 100644 --- a/src/chrome/content/rules/AlreadyHosting.com.xml +++ b/src/chrome/content/rules/AlreadyHosting.com.xml @@ -1,9 +1,9 @@ - + - - + + - + diff --git a/src/chrome/content/rules/Arisebitcoin.com.xml b/src/chrome/content/rules/Arisebitcoin.com.xml index a67a31c8b5db..132c79772668 100644 --- a/src/chrome/content/rules/Arisebitcoin.com.xml +++ b/src/chrome/content/rules/Arisebitcoin.com.xml @@ -1,8 +1,4 @@ - - + diff --git a/src/chrome/content/rules/CYBERsitter.xml b/src/chrome/content/rules/CYBERsitter.xml index a061796e3031..3a231c22c128 100644 --- a/src/chrome/content/rules/CYBERsitter.xml +++ b/src/chrome/content/rules/CYBERsitter.xml @@ -2,7 +2,7 @@ Note: This website blocks Tor users. --> - + diff --git a/src/chrome/content/rules/ClarityRay.xml b/src/chrome/content/rules/ClarityRay.xml index c4a605e1b197..9457a8ec84bc 100644 --- a/src/chrome/content/rules/ClarityRay.xml +++ b/src/chrome/content/rules/ClarityRay.xml @@ -9,7 +9,7 @@ - wredint.com --> - + diff --git a/src/chrome/content/rules/Cuttlefish.com.xml b/src/chrome/content/rules/Cuttlefish.com.xml index 9f6bacb84a2d..fdcaa66be752 100644 --- a/src/chrome/content/rules/Cuttlefish.com.xml +++ b/src/chrome/content/rules/Cuttlefish.com.xml @@ -1,7 +1,13 @@ - + + - diff --git a/src/chrome/content/rules/Evm.dk.xml b/src/chrome/content/rules/Evm.dk.xml index dfddd3a3e15c..db8fd70673f8 100644 --- a/src/chrome/content/rules/Evm.dk.xml +++ b/src/chrome/content/rules/Evm.dk.xml @@ -1,13 +1,7 @@ - - + - + diff --git a/src/chrome/content/rules/Guild_of_Master_Craftsmen.xml b/src/chrome/content/rules/Guild_of_Master_Craftsmen.xml index 419167878b6e..a72c6d3aed62 100644 --- a/src/chrome/content/rules/Guild_of_Master_Craftsmen.xml +++ b/src/chrome/content/rules/Guild_of_Master_Craftsmen.xml @@ -1,19 +1,13 @@ - - + - + - + diff --git a/src/chrome/content/rules/HashTalk.org.xml b/src/chrome/content/rules/HashTalk.org.xml index 144eaf362451..9304079ec2ff 100644 --- a/src/chrome/content/rules/HashTalk.org.xml +++ b/src/chrome/content/rules/HashTalk.org.xml @@ -1,7 +1,5 @@ - + - diff --git a/src/chrome/content/rules/MPort.ua.xml b/src/chrome/content/rules/MPort.ua.xml index 014b93bad6b9..914c73420f66 100644 --- a/src/chrome/content/rules/MPort.ua.xml +++ b/src/chrome/content/rules/MPort.ua.xml @@ -1,17 +1,22 @@ - + - - + + + diff --git a/src/chrome/content/rules/Rawstudio.org.xml b/src/chrome/content/rules/Rawstudio.org.xml index 3c64159a6aef..65d32bcd3821 100644 --- a/src/chrome/content/rules/Rawstudio.org.xml +++ b/src/chrome/content/rules/Rawstudio.org.xml @@ -1,25 +1,23 @@ - + - - + + diff --git a/src/chrome/content/rules/SlideDeck.xml b/src/chrome/content/rules/SlideDeck.xml index ec247254b452..fbff90b4dfe1 100644 --- a/src/chrome/content/rules/SlideDeck.xml +++ b/src/chrome/content/rules/SlideDeck.xml @@ -16,13 +16,12 @@ - exclusive (works; mismatched, CN: *.unbounce.com) --> - + - diff --git a/src/chrome/content/rules/Source_Conference.com.xml b/src/chrome/content/rules/Source_Conference.com.xml index 4edd9bf621b9..54696e48df9e 100644 --- a/src/chrome/content/rules/Source_Conference.com.xml +++ b/src/chrome/content/rules/Source_Conference.com.xml @@ -1,10 +1,10 @@ - + - + - + @@ -11,6 +14,9 @@ + + diff --git a/src/chrome/content/rules/Vocaroo.com.xml b/src/chrome/content/rules/Vocaroo.com.xml index 7e8315a3be07..32c519e8b2de 100644 --- a/src/chrome/content/rules/Vocaroo.com.xml +++ b/src/chrome/content/rules/Vocaroo.com.xml @@ -1,9 +1,19 @@ - + + + - + diff --git a/src/chrome/content/rules/YUI_Library.xml b/src/chrome/content/rules/YUI_Library.xml index 1c219194b1dd..598b0b4bb30e 100644 --- a/src/chrome/content/rules/YUI_Library.xml +++ b/src/chrome/content/rules/YUI_Library.xml @@ -1,16 +1,12 @@ - + - - - diff --git a/src/chrome/content/rules/hosting.com.xml b/src/chrome/content/rules/hosting.com.xml index 8329d6fef64f..dc38248c55db 100644 --- a/src/chrome/content/rules/hosting.com.xml +++ b/src/chrome/content/rules/hosting.com.xml @@ -1,4 +1,4 @@ - + diff --git a/src/chrome/content/rules/marksdailyapple.xml b/src/chrome/content/rules/marksdailyapple.xml index 0d31f9e8f1d9..c5fd9057fa19 100644 --- a/src/chrome/content/rules/marksdailyapple.xml +++ b/src/chrome/content/rules/marksdailyapple.xml @@ -1,9 +1,9 @@ - + - + - + From 7a1dc014cf4dbef663616244e9e458fb1ac90435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20M=C3=BCller?= Date: Sat, 6 Jan 2018 18:10:04 +0100 Subject: [PATCH 323/844] [abs.ch] Add rule (#14162) * Add rule for Alternative Bank Switzerland (ABS) * [Abs.ch] Add www.bancaalternativasvizzera.ch --- src/chrome/content/rules/Abs.ch.xml | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/chrome/content/rules/Abs.ch.xml diff --git a/src/chrome/content/rules/Abs.ch.xml b/src/chrome/content/rules/Abs.ch.xml new file mode 100644 index 000000000000..e3eba99dfafd --- /dev/null +++ b/src/chrome/content/rules/Abs.ch.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + From fd201bd4268763897a3f725379f2c773c831c551 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 7 Jan 2018 01:39:39 +0800 Subject: [PATCH 324/844] Re-activate and Update aylesburyvaledc.gov.uk.xml (#14167) * Re-activate and Update aylesburyvaledc.gov.uk.xml * Update aylesburyvaledc.gov.uk.xml * Update aylesburyvaledc.gov.uk.xml * Update aylesburyvaledc.gov.uk.xml --- .../content/rules/aylesburyvaledc.gov.uk.xml | 79 +++++-------------- 1 file changed, 18 insertions(+), 61 deletions(-) diff --git a/src/chrome/content/rules/aylesburyvaledc.gov.uk.xml b/src/chrome/content/rules/aylesburyvaledc.gov.uk.xml index af7f24fa1e4e..b5085985d508 100644 --- a/src/chrome/content/rules/aylesburyvaledc.gov.uk.xml +++ b/src/chrome/content/rules/aylesburyvaledc.gov.uk.xml @@ -1,71 +1,28 @@ - - - - - - - - + + - - + + + + + + + - - - - - - - - - - - - - - + From 7c5525929b7b978e1305a2d43e0466cb56ed8381 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 6 Jan 2018 18:40:46 +0100 Subject: [PATCH 325/844] BR: (#13908) - add ticket domain --- src/chrome/content/rules/BR.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/chrome/content/rules/BR.xml b/src/chrome/content/rules/BR.xml index f4ad5dab0c48..8dec414b0ef5 100644 --- a/src/chrome/content/rules/BR.xml +++ b/src/chrome/content/rules/BR.xml @@ -5,7 +5,20 @@ + + + + + + + + + + + + From 9cd3f34bcd1adae85f03d8eedf4e0598821002eb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 6 Jan 2018 18:43:36 +0100 Subject: [PATCH 326/844] [Merproject.org] Merge and update rulesets (#14208) * Delete Mer-Project.xml * [MerProject.org] Remove wildcard * [MerProject.org] Update securecookie * Rename Mer_Project.org.xml to MerProject.org.xml --- src/chrome/content/rules/Mer-Project.xml | 8 ---- src/chrome/content/rules/MerProject.org.xml | 25 ++++++++++++ src/chrome/content/rules/Mer_Project.org.xml | 41 -------------------- 3 files changed, 25 insertions(+), 49 deletions(-) delete mode 100644 src/chrome/content/rules/Mer-Project.xml create mode 100644 src/chrome/content/rules/MerProject.org.xml delete mode 100644 src/chrome/content/rules/Mer_Project.org.xml diff --git a/src/chrome/content/rules/Mer-Project.xml b/src/chrome/content/rules/Mer-Project.xml deleted file mode 100644 index 4f4422da00f9..000000000000 --- a/src/chrome/content/rules/Mer-Project.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/chrome/content/rules/MerProject.org.xml b/src/chrome/content/rules/MerProject.org.xml new file mode 100644 index 000000000000..3e7abfcd02d9 --- /dev/null +++ b/src/chrome/content/rules/MerProject.org.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Mer_Project.org.xml b/src/chrome/content/rules/Mer_Project.org.xml deleted file mode 100644 index ecd94331bdb5..000000000000 --- a/src/chrome/content/rules/Mer_Project.org.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From e1f6b624183d7389dc388ef070d5753173e33c6d Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:14:59 +1030 Subject: [PATCH 327/844] [Expedia.nl] New ruleset (#14198) --- src/chrome/content/rules/Expedia.nl.xml | 43 +++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.nl.xml diff --git a/src/chrome/content/rules/Expedia.nl.xml b/src/chrome/content/rules/Expedia.nl.xml new file mode 100644 index 000000000000..9af71240b318 --- /dev/null +++ b/src/chrome/content/rules/Expedia.nl.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + From f4a1681568e319cc201b79b953e7726d2ec9ff70 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:16:40 +1030 Subject: [PATCH 328/844] [Expedia.se] New ruleset (#14199) --- src/chrome/content/rules/Expedia.se.xml | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.se.xml diff --git a/src/chrome/content/rules/Expedia.se.xml b/src/chrome/content/rules/Expedia.se.xml new file mode 100644 index 000000000000..471459537469 --- /dev/null +++ b/src/chrome/content/rules/Expedia.se.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + From 92964e35c40fb0b6c850f48c477987f09e3d5a3b Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:17:33 +1030 Subject: [PATCH 329/844] [Expedia.fi] New ruleset (#14200) --- src/chrome/content/rules/Expedia.fi.xml | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.fi.xml diff --git a/src/chrome/content/rules/Expedia.fi.xml b/src/chrome/content/rules/Expedia.fi.xml new file mode 100644 index 000000000000..07d96a6eaad6 --- /dev/null +++ b/src/chrome/content/rules/Expedia.fi.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + From 46655403a3bce8bc812afa0c36d523b468766fa4 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:18:48 +1030 Subject: [PATCH 330/844] [Expedia.dk] New ruleset (#14202) * [Expedia.dk] New ruleset * Remove 'deals' subdomain --- src/chrome/content/rules/Expedia.dk.xml | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.dk.xml diff --git a/src/chrome/content/rules/Expedia.dk.xml b/src/chrome/content/rules/Expedia.dk.xml new file mode 100644 index 000000000000..daf7b4ae946e --- /dev/null +++ b/src/chrome/content/rules/Expedia.dk.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + From c6f677f941ed705ba71465fb903430fbbe266d3b Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:19:39 +1030 Subject: [PATCH 331/844] [Expedia.it] New ruleset (#14206) --- src/chrome/content/rules/Expedia.it.xml | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.it.xml diff --git a/src/chrome/content/rules/Expedia.it.xml b/src/chrome/content/rules/Expedia.it.xml new file mode 100644 index 000000000000..0ec376973cfb --- /dev/null +++ b/src/chrome/content/rules/Expedia.it.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + From 594d431b83cc67f7d7d08490389a0d8020b2fa13 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:21:04 +1030 Subject: [PATCH 332/844] [Expedia.es] New ruleset (#14197) --- src/chrome/content/rules/Expedia.es.xml | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.es.xml diff --git a/src/chrome/content/rules/Expedia.es.xml b/src/chrome/content/rules/Expedia.es.xml new file mode 100644 index 000000000000..85ebc043a4f2 --- /dev/null +++ b/src/chrome/content/rules/Expedia.es.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + From e863fb6e81c062a190d70107e3dc265b42947247 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:25:27 +1030 Subject: [PATCH 333/844] [Expedia.fr] New ruleset (#14207) --- src/chrome/content/rules/Expedia.fr.xml | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.fr.xml diff --git a/src/chrome/content/rules/Expedia.fr.xml b/src/chrome/content/rules/Expedia.fr.xml new file mode 100644 index 000000000000..de52d961f8db --- /dev/null +++ b/src/chrome/content/rules/Expedia.fr.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + From ac3b021abace6f08207c23237cbbba928429a407 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:27:38 +1030 Subject: [PATCH 334/844] [Expedia.no] New ruleset (#14209) --- src/chrome/content/rules/Expedia.no.xml | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.no.xml diff --git a/src/chrome/content/rules/Expedia.no.xml b/src/chrome/content/rules/Expedia.no.xml new file mode 100644 index 000000000000..2e5191968789 --- /dev/null +++ b/src/chrome/content/rules/Expedia.no.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + From 898fb9876af5f1bc31f0bf665e487ee3235e709b Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 6 Jan 2018 19:02:22 +0100 Subject: [PATCH 335/844] add rule for Visualcapitalist.com (#14214) --- src/chrome/content/rules/Visualcapitalist.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Visualcapitalist.xml diff --git a/src/chrome/content/rules/Visualcapitalist.xml b/src/chrome/content/rules/Visualcapitalist.xml new file mode 100644 index 000000000000..0c76c36fa370 --- /dev/null +++ b/src/chrome/content/rules/Visualcapitalist.xml @@ -0,0 +1,11 @@ + + + + + + + + + + From 303cf4bb7e303c98b283bc6aa9915763be0a28ab Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 04:33:38 +1030 Subject: [PATCH 336/844] [Expedia.mx] New ruleset (#14205) --- src/chrome/content/rules/Expedia.mx.xml | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.mx.xml diff --git a/src/chrome/content/rules/Expedia.mx.xml b/src/chrome/content/rules/Expedia.mx.xml new file mode 100644 index 000000000000..00f45f1bc5be --- /dev/null +++ b/src/chrome/content/rules/Expedia.mx.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + From 501084b46ac3089322b809d1c9118c01b76eae60 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 07:59:56 +1030 Subject: [PATCH 337/844] [Expedia.de] New ruleset (#14201) --- src/chrome/content/rules/Expedia.de.xml | 78 +++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.de.xml diff --git a/src/chrome/content/rules/Expedia.de.xml b/src/chrome/content/rules/Expedia.de.xml new file mode 100644 index 000000000000..31bbbbf78e8f --- /dev/null +++ b/src/chrome/content/rules/Expedia.de.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a7eba7c0f50cd2673c99fe87440b8a74e8c7c459 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 7 Jan 2018 08:24:49 +1030 Subject: [PATCH 338/844] [Expedia.ie] New ruleset (#14210) --- src/chrome/content/rules/Expedia.ie.xml | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.ie.xml diff --git a/src/chrome/content/rules/Expedia.ie.xml b/src/chrome/content/rules/Expedia.ie.xml new file mode 100644 index 000000000000..e52afd602dc7 --- /dev/null +++ b/src/chrome/content/rules/Expedia.ie.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + From c716064d3922db8d4eb512b402dfcca8b7ff9e1a Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 6 Jan 2018 22:59:55 +0100 Subject: [PATCH 339/844] added rule for Nordkurier (#13905) --- src/chrome/content/rules/Nordkurier.xml | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/Nordkurier.xml diff --git a/src/chrome/content/rules/Nordkurier.xml b/src/chrome/content/rules/Nordkurier.xml new file mode 100644 index 000000000000..f805806dd2fa --- /dev/null +++ b/src/chrome/content/rules/Nordkurier.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + From c7ae0c6baa5a00494d84c9a4f5565764b13bf4d4 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 6 Jan 2018 23:04:48 +0100 Subject: [PATCH 340/844] add rule for Urban-Media (#13744) --- src/chrome/content/rules/Urban-Media.xml | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/chrome/content/rules/Urban-Media.xml diff --git a/src/chrome/content/rules/Urban-Media.xml b/src/chrome/content/rules/Urban-Media.xml new file mode 100644 index 000000000000..ffc8f1804304 --- /dev/null +++ b/src/chrome/content/rules/Urban-Media.xml @@ -0,0 +1,45 @@ + + + + + + + + + + From 65d072ebcba0b9d80107a119ce582d148cda6fb4 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 6 Jan 2018 23:36:29 +0100 Subject: [PATCH 341/844] add rule for RadioTamazuj (#11254) --- src/chrome/content/rules/RadioTamazuj.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/RadioTamazuj.xml diff --git a/src/chrome/content/rules/RadioTamazuj.xml b/src/chrome/content/rules/RadioTamazuj.xml new file mode 100644 index 000000000000..21eefde36e95 --- /dev/null +++ b/src/chrome/content/rules/RadioTamazuj.xml @@ -0,0 +1,16 @@ + + + + + + + + + From b293bec0fe14ad660ec6986ba313808b7d9da9c7 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 7 Jan 2018 01:04:41 +0100 Subject: [PATCH 342/844] Fedorainfracloud.org.xml (#14147) --- .../content/rules/Fedora_Project.org.xml | 47 ++++++++++--------- .../content/rules/Fedorainfracloud.org.xml | 27 +++++++++++ 2 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 src/chrome/content/rules/Fedorainfracloud.org.xml diff --git a/src/chrome/content/rules/Fedora_Project.org.xml b/src/chrome/content/rules/Fedora_Project.org.xml index 9b0ddbad63a7..6e24633f6075 100644 --- a/src/chrome/content/rules/Fedora_Project.org.xml +++ b/src/chrome/content/rules/Fedora_Project.org.xml @@ -1,36 +1,41 @@ @@ -38,6 +43,8 @@ + + @@ -47,8 +54,6 @@ - - diff --git a/src/chrome/content/rules/Fedorainfracloud.org.xml b/src/chrome/content/rules/Fedorainfracloud.org.xml new file mode 100644 index 000000000000..1a7fcc30cb8f --- /dev/null +++ b/src/chrome/content/rules/Fedorainfracloud.org.xml @@ -0,0 +1,27 @@ + + + + + + + + + From d278e46229831e3e6c2cf445f54a1cce4401c580 Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 8 Jan 2018 00:48:11 +1030 Subject: [PATCH 343/844] [CIMB Singapore] Update domains (#13947) * [CIMB Singapore] Update domains * Add secure.eforms, add comment for invalid subdomains * Add exclusion --- src/chrome/content/rules/CIMB-Singapore.xml | 55 +++++++++------------ 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/src/chrome/content/rules/CIMB-Singapore.xml b/src/chrome/content/rules/CIMB-Singapore.xml index ba73484a7a40..bac63fa63ccf 100644 --- a/src/chrome/content/rules/CIMB-Singapore.xml +++ b/src/chrome/content/rules/CIMB-Singapore.xml @@ -1,45 +1,38 @@ - - + + + + + + + + - + - - - - - - - + + - - - - - - - + - + to="https:" /> From 4cb09f29a244ae24228d1fdfee420bc003cf5bfb Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 8 Jan 2018 01:13:02 +1030 Subject: [PATCH 344/844] [Woolworths.com.au] Add subdomains and rename ruleset (#13338) * [Woolworths.com.au] Update subdomains * Remove non-functional subdomains * Temporarily remove 'WoolworthsRewards' to resolve conflict --- src/chrome/content/rules/Woolworths-AU.xml | 37 ---- .../content/rules/Woolworths.com.au.xml | 171 ++++++++++++++++++ 2 files changed, 171 insertions(+), 37 deletions(-) delete mode 100644 src/chrome/content/rules/Woolworths-AU.xml create mode 100644 src/chrome/content/rules/Woolworths.com.au.xml diff --git a/src/chrome/content/rules/Woolworths-AU.xml b/src/chrome/content/rules/Woolworths-AU.xml deleted file mode 100644 index ede6f4bef16c..000000000000 --- a/src/chrome/content/rules/Woolworths-AU.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Woolworths.com.au.xml b/src/chrome/content/rules/Woolworths.com.au.xml new file mode 100644 index 000000000000..c948da0c4ce9 --- /dev/null +++ b/src/chrome/content/rules/Woolworths.com.au.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c2aa05d466271cbc0f64c0b1d1f1983f1da7135c Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 8 Jan 2018 01:37:28 +1030 Subject: [PATCH 345/844] [WoolworthsRewards.com.au] New ruleset (#13919) --- .../rules/WoolworthsRewards.com.au.xml | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/chrome/content/rules/WoolworthsRewards.com.au.xml diff --git a/src/chrome/content/rules/WoolworthsRewards.com.au.xml b/src/chrome/content/rules/WoolworthsRewards.com.au.xml new file mode 100644 index 000000000000..41ee08a583c1 --- /dev/null +++ b/src/chrome/content/rules/WoolworthsRewards.com.au.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 39869ea5758664c28164e5296be603509334c104 Mon Sep 17 00:00:00 2001 From: numismatika Date: Sun, 7 Jan 2018 17:51:48 +0100 Subject: [PATCH 346/844] add rule for ORF.at (#13454) --- src/chrome/content/rules/ORF.at.xml | 253 ++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) create mode 100644 src/chrome/content/rules/ORF.at.xml diff --git a/src/chrome/content/rules/ORF.at.xml b/src/chrome/content/rules/ORF.at.xml new file mode 100644 index 000000000000..be09d338452d --- /dev/null +++ b/src/chrome/content/rules/ORF.at.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4fb4fba5611f6d2571c83184d239b14a3d801f90 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Mon, 8 Jan 2018 01:06:46 +0800 Subject: [PATCH 347/844] Delete Reed_Business_Information_Australia.xml (#14219) --- .../rules/Reed_Business_Information_Australia.xml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/chrome/content/rules/Reed_Business_Information_Australia.xml diff --git a/src/chrome/content/rules/Reed_Business_Information_Australia.xml b/src/chrome/content/rules/Reed_Business_Information_Australia.xml deleted file mode 100644 index 4deea9503f81..000000000000 --- a/src/chrome/content/rules/Reed_Business_Information_Australia.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file From bf879c031035ab4ca5bc30c29750495e4a47f6e0 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Mon, 8 Jan 2018 01:25:51 +0800 Subject: [PATCH 348/844] Re-activate and Update stockport.gov.uk.xml (#14221) --- src/chrome/content/rules/stockport.gov.uk.xml | 101 +++++++++++------- 1 file changed, 62 insertions(+), 39 deletions(-) diff --git a/src/chrome/content/rules/stockport.gov.uk.xml b/src/chrome/content/rules/stockport.gov.uk.xml index c7c45c075911..3c05f9ee3002 100644 --- a/src/chrome/content/rules/stockport.gov.uk.xml +++ b/src/chrome/content/rules/stockport.gov.uk.xml @@ -1,51 +1,74 @@ - - - + + + + + + + + + + - - + + + + + + + + - - - - - - - - - - - + + From 0dc447a04ca21bf2369280fb621c6385dba1fe19 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Mon, 8 Jan 2018 01:37:57 +0800 Subject: [PATCH 349/844] Re-activate and Update maldon.gov.uk.xml (#14220) --- src/chrome/content/rules/maldon.gov.uk.xml | 52 ++++++++-------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/src/chrome/content/rules/maldon.gov.uk.xml b/src/chrome/content/rules/maldon.gov.uk.xml index ebc2ff4037f4..9d04f2e30bee 100644 --- a/src/chrome/content/rules/maldon.gov.uk.xml +++ b/src/chrome/content/rules/maldon.gov.uk.xml @@ -1,43 +1,29 @@ - - + Incomplete certificate chain error: + - ssl2.maldon.gov.uk + 4xx client error: + - mdcmaps.maldon.gov.uk +--> + - - - - - - - - - - - - + + + + + + From 8eca91e7a33db01ff3e444e378ca3505e8d65f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 7 Jan 2018 21:28:35 +0100 Subject: [PATCH 350/844] Added ruleset for bghm.de (#13165) * Added ruleset for bghm.de * Replaced exclusions by valid targets. --- src/chrome/content/rules/bghm.de.xml | 72 ++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/chrome/content/rules/bghm.de.xml diff --git a/src/chrome/content/rules/bghm.de.xml b/src/chrome/content/rules/bghm.de.xml new file mode 100644 index 000000000000..8d8974af22b2 --- /dev/null +++ b/src/chrome/content/rules/bghm.de.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From dba6f224344f5948de2b6864cd2674bff0c30b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 7 Jan 2018 21:30:49 +0100 Subject: [PATCH 351/844] Added ruleset for bundesregierung.de (#13158) * Added ruleset for bundesregierung.de * Removed sites without DNS records; added redirects. --- .../content/rules/bundesregierung.de.xml | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/chrome/content/rules/bundesregierung.de.xml diff --git a/src/chrome/content/rules/bundesregierung.de.xml b/src/chrome/content/rules/bundesregierung.de.xml new file mode 100644 index 000000000000..877461b1a303 --- /dev/null +++ b/src/chrome/content/rules/bundesregierung.de.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2aa44dcde39419f932c22e0593f6ecb4a1fb83ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 7 Jan 2018 21:31:13 +0100 Subject: [PATCH 352/844] Added ruleset for bgetem.de (#13161) * Added ruleset for bgetem.de * -typo --- src/chrome/content/rules/bgetem.de.xml | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/chrome/content/rules/bgetem.de.xml diff --git a/src/chrome/content/rules/bgetem.de.xml b/src/chrome/content/rules/bgetem.de.xml new file mode 100644 index 000000000000..943228c06b2d --- /dev/null +++ b/src/chrome/content/rules/bgetem.de.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ed3c253ca583660c8c25d83eee36e0345297ec0b Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 7 Jan 2018 22:14:08 +0100 Subject: [PATCH 353/844] [Libravatar.org] Remove wildcard (#14216) --- src/chrome/content/rules/Libravatar.org.xml | 38 ++++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/rules/Libravatar.org.xml b/src/chrome/content/rules/Libravatar.org.xml index 8172515c417d..d97acfdb4cd6 100644 --- a/src/chrome/content/rules/Libravatar.org.xml +++ b/src/chrome/content/rules/Libravatar.org.xml @@ -1,26 +1,30 @@ - - + + + + + + + + + + - + - + - \ No newline at end of file + From 54462f87b22186ab85e02d8c495b0ca6eab172bb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 7 Jan 2018 23:29:43 +0100 Subject: [PATCH 354/844] Remove preloaded targets (#14203) --- .../content/rules/Advocate-Europe.eu.xml | 25 ------------------- .../rules/Bitly_branded_short_domains.xml | 1 - src/chrome/content/rules/EFF.xml | 2 +- src/chrome/content/rules/EPay.bg.xml | 6 ----- .../content/rules/Hack_This_Site.org.xml | 16 ------------ src/chrome/content/rules/Indybay.xml | 10 -------- .../content/rules/TrollingEffects.org.xml | 12 --------- .../content/rules/Vagrant_Cloud.com.xml | 23 ----------------- src/chrome/content/rules/funoverip.net.xml | 14 ----------- src/chrome/content/rules/segurosocial.gov.xml | 4 --- src/chrome/content/rules/test.xml | 5 ---- 11 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 src/chrome/content/rules/Advocate-Europe.eu.xml delete mode 100644 src/chrome/content/rules/EPay.bg.xml delete mode 100644 src/chrome/content/rules/Hack_This_Site.org.xml delete mode 100644 src/chrome/content/rules/Indybay.xml delete mode 100644 src/chrome/content/rules/TrollingEffects.org.xml delete mode 100644 src/chrome/content/rules/Vagrant_Cloud.com.xml delete mode 100644 src/chrome/content/rules/funoverip.net.xml delete mode 100644 src/chrome/content/rules/test.xml diff --git a/src/chrome/content/rules/Advocate-Europe.eu.xml b/src/chrome/content/rules/Advocate-Europe.eu.xml deleted file mode 100644 index b58af25390d6..000000000000 --- a/src/chrome/content/rules/Advocate-Europe.eu.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Bitly_branded_short_domains.xml b/src/chrome/content/rules/Bitly_branded_short_domains.xml index a6b529b8f340..a8175509a53a 100644 --- a/src/chrome/content/rules/Bitly_branded_short_domains.xml +++ b/src/chrome/content/rules/Bitly_branded_short_domains.xml @@ -2838,7 +2838,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - diff --git a/src/chrome/content/rules/EFF.xml b/src/chrome/content/rules/EFF.xml index 379651b02959..ae5b280738f1 100644 --- a/src/chrome/content/rules/EFF.xml +++ b/src/chrome/content/rules/EFF.xml @@ -4,7 +4,7 @@ - IFightSurveillance.org.xml - ManilaPrinciples.org.xml - Panopticlick.com.xml - - TrollingEffects.org.xml + --> diff --git a/src/chrome/content/rules/EPay.bg.xml b/src/chrome/content/rules/EPay.bg.xml deleted file mode 100644 index 828e087aff94..000000000000 --- a/src/chrome/content/rules/EPay.bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/chrome/content/rules/Hack_This_Site.org.xml b/src/chrome/content/rules/Hack_This_Site.org.xml deleted file mode 100644 index 93c3a04697e5..000000000000 --- a/src/chrome/content/rules/Hack_This_Site.org.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Indybay.xml b/src/chrome/content/rules/Indybay.xml deleted file mode 100644 index 4b49f7505564..000000000000 --- a/src/chrome/content/rules/Indybay.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/src/chrome/content/rules/TrollingEffects.org.xml b/src/chrome/content/rules/TrollingEffects.org.xml deleted file mode 100644 index b980671f6dcc..000000000000 --- a/src/chrome/content/rules/TrollingEffects.org.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Vagrant_Cloud.com.xml b/src/chrome/content/rules/Vagrant_Cloud.com.xml deleted file mode 100644 index 8a83c2f180ba..000000000000 --- a/src/chrome/content/rules/Vagrant_Cloud.com.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/funoverip.net.xml b/src/chrome/content/rules/funoverip.net.xml deleted file mode 100644 index 5bdb1a01c62e..000000000000 --- a/src/chrome/content/rules/funoverip.net.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/segurosocial.gov.xml b/src/chrome/content/rules/segurosocial.gov.xml index ce61bc6d782e..b972d811d7b3 100644 --- a/src/chrome/content/rules/segurosocial.gov.xml +++ b/src/chrome/content/rules/segurosocial.gov.xml @@ -1,9 +1,5 @@ - - diff --git a/src/chrome/content/rules/test.xml b/src/chrome/content/rules/test.xml deleted file mode 100644 index 48bdd7679441..000000000000 --- a/src/chrome/content/rules/test.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 64ee7483dd554d8010710e920ea676e5129a2917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20M=C3=BCller?= Date: Mon, 8 Jan 2018 02:07:01 +0100 Subject: [PATCH 355/844] [Switch.ch] Add rules for domains and subdomains (#14213) * [Switch.ch] Add rules for domains and subdomains * [Switch.ch] Add subdomain webcam.switch.ch * [Switch.ch] Add more targets * [EduId.ch] Add more targets * [Switch.ch] Fix rules * [Switch.ch] Document and apply coding style * [Switch.ch] Add tube to secure cookies * [EduId.ch] Add comment * [Switch.ch] Add new target * [Switch.ch] Replace specific with wildcard target to exlude autogenrated rule * [Switch.ch] Use specific targets with exclusion * [Switch.ch] Add tests and targets Also add $ at the end of exclusion --- src/chrome/content/rules/EduId.ch.xml | 26 +++ src/chrome/content/rules/Switch.ch.xml | 223 ++++++++++++++++++++++++- 2 files changed, 241 insertions(+), 8 deletions(-) create mode 100644 src/chrome/content/rules/EduId.ch.xml diff --git a/src/chrome/content/rules/EduId.ch.xml b/src/chrome/content/rules/EduId.ch.xml new file mode 100644 index 000000000000..e919faf13ada --- /dev/null +++ b/src/chrome/content/rules/EduId.ch.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Switch.ch.xml b/src/chrome/content/rules/Switch.ch.xml index bab3b9d25b92..5b7a5e9ae7a7 100644 --- a/src/chrome/content/rules/Switch.ch.xml +++ b/src/chrome/content/rules/Switch.ch.xml @@ -3,30 +3,237 @@ - Switchie.ch.xml - Switchplus.ch.xml + - EduId.ch.xml + Refused: + - cam.switch.ch + - ndt.switch.ch + - cavari.switch.ch + - cavari-test.switch.ch + - landingpage.cert.switch.ch + - spludes.cert.switch.ch + - spluli.cert.switch.ch + - spluma.cert.switch.ch + - splunk.cert.switch.ch + - splunk-test.cert.switch.ch + - spindex1.zh.cert.switch.ch + - splufex.zh.cert.switch.ch + - splufo1.zh.cert.switch.ch + - certsplunk.switch.ch + - chapel.switch.ch + - fl-0-10.unil.cloud.switch.ch + - cvs.switch.ch - Nonfunctional subdomains: + Time out: + - frisal.switch.ch + - mirror.switch.ch + - gitlab.cloud.switch.ch + - cr.gitlab.cloud.switch.ch + - pages.gitlab.cloud.switch.ch + - prometheus.gitlab.cloud.switch.ch + - node.prometheus.gitlab.cloud.switch.ch + - mattermost.cloud.switch.ch + - fl-0-42.unil.cloud.switch.ch + - fl-0-44.unil.cloud.switch.ch + - fl-2-13.unil.cloud.switch.ch + - fl-2-14.unil.cloud.switch.ch + - docker.drive.switch.ch - - mirror (dropped) + Invalid certificate: + - kb.pert.switch.ch + - aai.switch.ch + - metadata.aai.switch.ch + - drive-backup.switch.ch (expired) + - [a01-a20].drive-backup.switch.ch (expired) + - ca.aai.switch.ch + - crl.aai.switch.ch + - webdav-demo.aai.switch.ch + - bresaola.switch.ch + - annotations.cast.switch.ch + - cast-staging.switch.ch + - annotations.cast-test.switch.ch + - api.cast-test.switch.ch + - keystone.cloud.switch.ch + - dashboard.unil.cloud.switch.ch + - fl-0-11.unil.cloud.switch.ch + - os-0.unil.cloud.switch.ch + - comal.switch.ch + - tandikat.switch.ch + - teramac.switch.ch + - teruel.switch.ch + Too many redirects: + - presentation.cast-test.switch.ch --> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - - + + - From 286f75f4805b40abe4f2975a3a7eb95a94ca5e6b Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 8 Jan 2018 16:27:16 +0100 Subject: [PATCH 356/844] Create BehavEcol.com.xml (#14230) --- src/chrome/content/rules/BehavEcol.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/BehavEcol.com.xml diff --git a/src/chrome/content/rules/BehavEcol.com.xml b/src/chrome/content/rules/BehavEcol.com.xml new file mode 100644 index 000000000000..56567f4fdb82 --- /dev/null +++ b/src/chrome/content/rules/BehavEcol.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 4581dbf1ff942c32713078dfc75ebce257d74064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 8 Jan 2018 22:51:53 +0100 Subject: [PATCH 357/844] Updated baden-wuerttemberg.de ruleset. (#14177) * Updated baden-wuerttemberg.de ruleset. * Removed tests; added target. * Added targets. * Removed duplicate target. --- src/chrome/content/rules/baden-wuerttemberg.de.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/rules/baden-wuerttemberg.de.xml b/src/chrome/content/rules/baden-wuerttemberg.de.xml index cacd3093bb75..1a4a9a445bd7 100644 --- a/src/chrome/content/rules/baden-wuerttemberg.de.xml +++ b/src/chrome/content/rules/baden-wuerttemberg.de.xml @@ -8,7 +8,6 @@ www.energie.baden-wuerttemberg.de www.finanzministerium.baden-wuerttemberg.de www.haw.baden-wuerttemberg.de - hvz.baden-wuerttemberg.de immobilien.baden-wuerttemberg.de www.innenministerium.baden-wuerttemberg.de jum.baden-wuerttemberg.de @@ -79,16 +78,14 @@ www.xfaweb.baden-wuerttemberg.de Wrong content: - www.hvz.baden-wuerttemberg.de taluftwiki-leitfaden.lubw.baden-wuerttemberg.de - - Mismatch on ^ --> + @@ -98,6 +95,8 @@ + + @@ -123,6 +122,7 @@ + @@ -145,10 +145,6 @@ - - - - Date: Tue, 9 Jan 2018 08:22:34 +1030 Subject: [PATCH 358/844] [EAN.com] New ruleset (#14218) * [EAN.com] New ruleset * Remove 'Expedia_affiliate.com.xml' and 'Ian.com.xml' * Mention non-functional "rapid" subdomain --- src/chrome/content/rules/EAN.com.xml | 74 +++++++++++++++++++ .../content/rules/Expedia_affiliate.com.xml | 20 ----- src/chrome/content/rules/Ian.com.xml | 34 --------- 3 files changed, 74 insertions(+), 54 deletions(-) create mode 100644 src/chrome/content/rules/EAN.com.xml delete mode 100644 src/chrome/content/rules/Expedia_affiliate.com.xml delete mode 100644 src/chrome/content/rules/Ian.com.xml diff --git a/src/chrome/content/rules/EAN.com.xml b/src/chrome/content/rules/EAN.com.xml new file mode 100644 index 000000000000..2a6b1475fb33 --- /dev/null +++ b/src/chrome/content/rules/EAN.com.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Expedia_affiliate.com.xml b/src/chrome/content/rules/Expedia_affiliate.com.xml deleted file mode 100644 index b1e9cf9005e8..000000000000 --- a/src/chrome/content/rules/Expedia_affiliate.com.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Ian.com.xml b/src/chrome/content/rules/Ian.com.xml deleted file mode 100644 index 81af884a2604..000000000000 --- a/src/chrome/content/rules/Ian.com.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - From 4b2f6afbb0cece014d94a7ff9d829be0eb161420 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 9 Jan 2018 05:53:33 +0800 Subject: [PATCH 359/844] Re-activate and Update ashford.gov.uk.xml (#13651) * Re-activate and Update ashford.gov.uk.xml * Update ashford.gov.uk.xml * Update ashford.gov.uk.xml --- src/chrome/content/rules/ashford.gov.uk.xml | 64 ++++++++------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/src/chrome/content/rules/ashford.gov.uk.xml b/src/chrome/content/rules/ashford.gov.uk.xml index 5c258389bd03..d4548731f009 100644 --- a/src/chrome/content/rules/ashford.gov.uk.xml +++ b/src/chrome/content/rules/ashford.gov.uk.xml @@ -1,52 +1,34 @@ - - - - - - - - - - + Status code mismatch: + - houserepairs.ashford.gov.uk + - licensing.ashford.gov.uk + - planning.ashford.gov.uk + 4xx client error: + - ashford.gov.uk + - pgc.ashford.gov.uk +--> + + + + - + + From 2a3070b55826b4823cc31c1054b455c58181db5a Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 9 Jan 2018 10:09:44 +1030 Subject: [PATCH 360/844] [Expedia.com] Update subdomains and rename ruleset (#14023) * [Expedia.com] Update subdomains and rename ruleset * Remove cctoken subdomain * Temporarily remove 'Expedia.co.uk.xml' reference * Remove non-functional subdomains --- src/chrome/content/rules/Expedia.com.xml | 240 +++++++++++++++++++++++ src/chrome/content/rules/Expedia.xml | 24 --- 2 files changed, 240 insertions(+), 24 deletions(-) create mode 100644 src/chrome/content/rules/Expedia.com.xml delete mode 100644 src/chrome/content/rules/Expedia.xml diff --git a/src/chrome/content/rules/Expedia.com.xml b/src/chrome/content/rules/Expedia.com.xml new file mode 100644 index 000000000000..168bb146b48f --- /dev/null +++ b/src/chrome/content/rules/Expedia.com.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Expedia.xml b/src/chrome/content/rules/Expedia.xml deleted file mode 100644 index 3b1390171078..000000000000 --- a/src/chrome/content/rules/Expedia.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - From f74496269d4a85d2178b7f46f5eb807595d34c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Tue, 9 Jan 2018 00:45:09 +0100 Subject: [PATCH 361/844] Updated taboola.com ruleset. (#14236) --- src/chrome/content/rules/Taboola.xml | 66 ++++++++++++++++++---------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/rules/Taboola.xml b/src/chrome/content/rules/Taboola.xml index beb002985bf0..88cb121af500 100644 --- a/src/chrome/content/rules/Taboola.xml +++ b/src/chrome/content/rules/Taboola.xml @@ -1,48 +1,68 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + From f4bc292f081ac3f0a2827f9a0d97bf6f4f428853 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 00:52:46 +0100 Subject: [PATCH 362/844] [Printrbot.com] Trivialize and rename ruleset (#14217) --- src/chrome/content/rules/Printrbot.com.xml | 16 +++++++++++++ src/chrome/content/rules/Printrbot.xml | 27 ---------------------- 2 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 src/chrome/content/rules/Printrbot.com.xml delete mode 100644 src/chrome/content/rules/Printrbot.xml diff --git a/src/chrome/content/rules/Printrbot.com.xml b/src/chrome/content/rules/Printrbot.com.xml new file mode 100644 index 000000000000..da80f3ed21f1 --- /dev/null +++ b/src/chrome/content/rules/Printrbot.com.xml @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Printrbot.xml b/src/chrome/content/rules/Printrbot.xml deleted file mode 100644 index a95c70803f8f..000000000000 --- a/src/chrome/content/rules/Printrbot.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file From 09d9a54da7b52e9916eca6ee730480f38bf29d7a Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 00:56:45 +0100 Subject: [PATCH 363/844] Create Undeadly.org.xml (#14237) --- src/chrome/content/rules/Undeadly.org.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/Undeadly.org.xml diff --git a/src/chrome/content/rules/Undeadly.org.xml b/src/chrome/content/rules/Undeadly.org.xml new file mode 100644 index 000000000000..8a1ffe207001 --- /dev/null +++ b/src/chrome/content/rules/Undeadly.org.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 7267dc122b12bcaa9e3cb79142dc17bacb193129 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 9 Jan 2018 10:59:49 +1030 Subject: [PATCH 364/844] [Lowyat.NET] Add subdomains (#14222) --- src/chrome/content/rules/Lowyat.NET.xml | 46 ++++++++++++++----------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/rules/Lowyat.NET.xml b/src/chrome/content/rules/Lowyat.NET.xml index 4d222948155f..c59d7004f6e6 100644 --- a/src/chrome/content/rules/Lowyat.NET.xml +++ b/src/chrome/content/rules/Lowyat.NET.xml @@ -1,30 +1,34 @@ - + + + + + + + + - - - - - - - + + + - From 589bf0fb92653d6c6633cf974bb350c4af706f22 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 9 Jan 2018 11:19:49 +1030 Subject: [PATCH 365/844] [11street.my] New ruleset (#14225) --- src/chrome/content/rules/11street.my.xml | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/chrome/content/rules/11street.my.xml diff --git a/src/chrome/content/rules/11street.my.xml b/src/chrome/content/rules/11street.my.xml new file mode 100644 index 000000000000..1672cbf1f5e2 --- /dev/null +++ b/src/chrome/content/rules/11street.my.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + From 19726a9d65093e8e1561bb5a80408f2f4c4e2e74 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 9 Jan 2018 11:27:56 +1030 Subject: [PATCH 366/844] [Lazada.com.my] New ruleset (#14226) --- src/chrome/content/rules/Lazada.com.my.xml | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/chrome/content/rules/Lazada.com.my.xml diff --git a/src/chrome/content/rules/Lazada.com.my.xml b/src/chrome/content/rules/Lazada.com.my.xml new file mode 100644 index 000000000000..087f1947622c --- /dev/null +++ b/src/chrome/content/rules/Lazada.com.my.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8218c10587b3a00c0c918059fcf063b71812975b Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 9 Jan 2018 11:31:09 +1030 Subject: [PATCH 367/844] [bilibili.com] Add 'search' subdomain (#14161) * [bilibili.com] Add 'search' subdomain * Remove 'planet2017' subdomain --- src/chrome/content/rules/Bilibili.com.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Bilibili.com.xml b/src/chrome/content/rules/Bilibili.com.xml index f5c523ddb713..391ea8359138 100644 --- a/src/chrome/content/rules/Bilibili.com.xml +++ b/src/chrome/content/rules/Bilibili.com.xml @@ -17,7 +17,6 @@ - bmall.bilibili.com ( css from static.hdslb.com , seems no Broken.) - bml.bilibili.com - h.bilibili.com - - search.bilibili.com * Test in https://big.bilibili.com/site/big.html , click the blue button "积分兑换大会员", requested an insecure resource 'http://vip.bilibili.com/site/vip-exchange-plugin.html?'. This request has been blocked, and now all buttons in the page are broken. Mismatch: @@ -95,7 +94,7 @@ - + From 910f2d0fb6a0e741bf439e1fadfb4353cfa5d44a Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 9 Jan 2018 09:09:05 +0800 Subject: [PATCH 368/844] Split GETMEIN.com from Live-Nation.xml (#14057) * Split GETMEIN.com from Live-Nation.xml * Create GETMEIN.com.xml * Update Live-Nation.xml * Whitelist Live-Nation.xml from rules-test --- src/chrome/content/rules/GETMEIN.com.xml | 35 ++++++++++++++++++++++++ src/chrome/content/rules/Live-Nation.xml | 21 +------------- utils/ruleset-whitelist.csv | 2 +- 3 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 src/chrome/content/rules/GETMEIN.com.xml diff --git a/src/chrome/content/rules/GETMEIN.com.xml b/src/chrome/content/rules/GETMEIN.com.xml new file mode 100644 index 000000000000..b814d52a7c0f --- /dev/null +++ b/src/chrome/content/rules/GETMEIN.com.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Live-Nation.xml b/src/chrome/content/rules/Live-Nation.xml index 7d591c7846c8..e12845d4d302 100644 --- a/src/chrome/content/rules/Live-Nation.xml +++ b/src/chrome/content/rules/Live-Nation.xml @@ -1,6 +1,7 @@ - - @@ -76,27 +75,9 @@ - - - - - - - - - diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 771a5efb476e..865d788ebf1f 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -1895,7 +1895,7 @@ fe52803da1f703cfe9990e08d740aaba64f6d59c459653376356b5ecce922a7e,0,1,Littlesvr.c fbeaf8dbd06fc62fb6217d020e5d4401df8539e62b29c3d1af073ff07d52ae00,1,0,LiveAgent.xml 4df0e6a98068a7e8df85af4cb7248c048fbe6b5fd0bcbffadc7d155d8ce52610,1,0,Live_filestore.com.xml e3d7781eb8af6d39d6b9ce237e46688f6615aec94f65cb2a54a87e167b0c2236,1,0,LiveJasmin.xml -594504bbdf2ed0d8ac1e795d826ddd6a37c2bb65aa9ba26d6b3bf09d1cb9dcc1,1,1,Live-Nation.xml +55209764f2c017642baaf0bb12a26fb24f4fd5d3e23a4ca5e21f507d887e41f8,1,1,Live-Nation.xml 657622e6f0195b2dfe3210112b7ab0e1e31a00717ffb3d40d8659fa04b74d5b0,0,1,Livermores-Centennial-Light-Live-Cam.xml 70ffd66c918dddc6e24325ef9851aab98064bc9054887498b0b1ee96ee1c57c6,1,1,Livestatserver.com.xml 42955f3e20090e82cebb057f5b3834f31c28d0a05cea87cb1ebd75cac55e7d32,1,0,Livestream.xml From 20c715e85e71e2198be90d7519ccf6bea1b10a61 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 9 Jan 2018 09:13:11 +0800 Subject: [PATCH 369/844] Create Snopes.com.xml, Fix #14001 (#14010) --- src/chrome/content/rules/Snopes.com.xml | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/Snopes.com.xml diff --git a/src/chrome/content/rules/Snopes.com.xml b/src/chrome/content/rules/Snopes.com.xml new file mode 100644 index 000000000000..3421941cd1e5 --- /dev/null +++ b/src/chrome/content/rules/Snopes.com.xml @@ -0,0 +1,30 @@ + + + + + + + + From 37ba9f47962e59f838ded3f85696ff60d0bef446 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 9 Jan 2018 09:35:58 +0800 Subject: [PATCH 370/844] Update Marketwatch.com.xml (#14037) * Update Marketwatch.com.xml * Update Marketwatch.com.xml --- src/chrome/content/rules/Marketwatch.com.xml | 56 ++++++++++---------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/chrome/content/rules/Marketwatch.com.xml b/src/chrome/content/rules/Marketwatch.com.xml index 840b16d3d110..a7010dc3201e 100644 --- a/src/chrome/content/rules/Marketwatch.com.xml +++ b/src/chrome/content/rules/Marketwatch.com.xml @@ -1,37 +1,38 @@ - - + + + + + @@ -39,9 +40,10 @@ - - - - - + + + + From c5c3725b1bd4c280b8938ee73fb4f5be7ca2bbbb Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Tue, 9 Jan 2018 02:39:27 +0100 Subject: [PATCH 371/844] Create Quizly.co.xml (#13993) --- src/chrome/content/rules/Quizly.co.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/Quizly.co.xml diff --git a/src/chrome/content/rules/Quizly.co.xml b/src/chrome/content/rules/Quizly.co.xml new file mode 100644 index 000000000000..09b0dd08c432 --- /dev/null +++ b/src/chrome/content/rules/Quizly.co.xml @@ -0,0 +1,16 @@ + + + + + + + From fe231629cfe4c5f765bc1118b1871ddd97397d31 Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Tue, 9 Jan 2018 02:42:20 +0100 Subject: [PATCH 372/844] Create What_Is_My_Spirit_Animal.com.xml (#13995) --- src/chrome/content/rules/What_Is_My_Spirit_Animal.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/What_Is_My_Spirit_Animal.com.xml diff --git a/src/chrome/content/rules/What_Is_My_Spirit_Animal.com.xml b/src/chrome/content/rules/What_Is_My_Spirit_Animal.com.xml new file mode 100644 index 000000000000..67c91b2c30f9 --- /dev/null +++ b/src/chrome/content/rules/What_Is_My_Spirit_Animal.com.xml @@ -0,0 +1,6 @@ + + + + + + From 4391ac5cf47d5d7c29079e82138266ccb70991bb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 02:53:16 +0100 Subject: [PATCH 373/844] Create LAlsace.fr.xml (#14102) --- src/chrome/content/rules/LAlsace.fr.xml | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/chrome/content/rules/LAlsace.fr.xml diff --git a/src/chrome/content/rules/LAlsace.fr.xml b/src/chrome/content/rules/LAlsace.fr.xml new file mode 100644 index 000000000000..6e615c5b1632 --- /dev/null +++ b/src/chrome/content/rules/LAlsace.fr.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + From 811be80c294a23f777eaf3a71ca2c3ce387dd241 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 02:56:55 +0100 Subject: [PATCH 374/844] [TPG.com] Update, rename and reactivate ruleset (#14193) * [TPG.com] Update and reactivate ruleset * Rename TPG-Capital-mismatches.xml to TPG.com.xml --- .../content/rules/TPG-Capital-mismatches.xml | 9 --------- src/chrome/content/rules/TPG.com.xml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 src/chrome/content/rules/TPG-Capital-mismatches.xml create mode 100644 src/chrome/content/rules/TPG.com.xml diff --git a/src/chrome/content/rules/TPG-Capital-mismatches.xml b/src/chrome/content/rules/TPG-Capital-mismatches.xml deleted file mode 100644 index 60d76944cdc8..000000000000 --- a/src/chrome/content/rules/TPG-Capital-mismatches.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/src/chrome/content/rules/TPG.com.xml b/src/chrome/content/rules/TPG.com.xml new file mode 100644 index 000000000000..6f737acbacda --- /dev/null +++ b/src/chrome/content/rules/TPG.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + From c99ab7a65db63a99976886d598eb081d9bcc8e34 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 02:58:33 +0100 Subject: [PATCH 375/844] [Onion.to] Add target and test urls (#13523) * [Onion.to] Add test url * [Onion.to] Add target * [Onion.to] Add ruleset to ruleset-whitelist.csv --- src/chrome/content/rules/Onion.to.xml | 10 ++++++++++ utils/ruleset-whitelist.csv | 1 + 2 files changed, 11 insertions(+) diff --git a/src/chrome/content/rules/Onion.to.xml b/src/chrome/content/rules/Onion.to.xml index 123c4d5cf59b..5363b0efe1e5 100644 --- a/src/chrome/content/rules/Onion.to.xml +++ b/src/chrome/content/rules/Onion.to.xml @@ -1,9 +1,19 @@ + + + + + + diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 865d788ebf1f..8d9fe4a12075 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -3859,3 +3859,4 @@ f76e810891c9301354123b801ace36ba307fff5ae323fb9bb608d8c2757efb36,1,0,Zissousecur 0a43f73ea001dcef9e970232e3d8d3123f0a4eb163e1d69b23498bff60a735c9,1,1,Zopim.xml 6750e29d302751af08e3cbe82647eb8a652fba4be1efbed4bb63473ec6ed40c2,1,1,Zorpia.xml 54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml +20c6fcb2955fbc55f711d50ac5e82b05b6103e0adc66ed06d2c981b5d6997765,0,1,Onion.to.xml From bb2ade6e90e2d81e771f1db61cc99415c4a540c5 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 9 Jan 2018 12:31:28 +1030 Subject: [PATCH 376/844] [cimbsecurities.com] New ruleset (#14054) --- .../content/rules/CIMBSecurities.com.xml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/CIMBSecurities.com.xml diff --git a/src/chrome/content/rules/CIMBSecurities.com.xml b/src/chrome/content/rules/CIMBSecurities.com.xml new file mode 100644 index 000000000000..f93bb2dad412 --- /dev/null +++ b/src/chrome/content/rules/CIMBSecurities.com.xml @@ -0,0 +1,29 @@ + + + + + + + + + From aca53d64306ea4fd2749b694a6a479ad5961a067 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 15:53:05 +0100 Subject: [PATCH 377/844] [ST.org] Trivialize ruleset (#14195) --- src/chrome/content/rules/ST.org.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/ST.org.xml b/src/chrome/content/rules/ST.org.xml index ace1024ea017..99c92ad291a5 100644 --- a/src/chrome/content/rules/ST.org.xml +++ b/src/chrome/content/rules/ST.org.xml @@ -1,8 +1,17 @@ - + + - - + + + + From 58439efe6fb429ace04aa59d8daec67cd773dfda Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 9 Jan 2018 15:56:38 +0100 Subject: [PATCH 378/844] Create Makery.info.xml (#14238) --- src/chrome/content/rules/Makery.info.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/Makery.info.xml diff --git a/src/chrome/content/rules/Makery.info.xml b/src/chrome/content/rules/Makery.info.xml new file mode 100644 index 000000000000..e8eacaa5c3b3 --- /dev/null +++ b/src/chrome/content/rules/Makery.info.xml @@ -0,0 +1,19 @@ + + + + + + + + + From a7e33599c52f31d1e41fd418183d9e1cbb4d4070 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 10 Jan 2018 14:47:09 +0100 Subject: [PATCH 379/844] Create DejaLu.me.xml (#14252) --- src/chrome/content/rules/DejaLu.me.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/DejaLu.me.xml diff --git a/src/chrome/content/rules/DejaLu.me.xml b/src/chrome/content/rules/DejaLu.me.xml new file mode 100644 index 000000000000..b396bb166620 --- /dev/null +++ b/src/chrome/content/rules/DejaLu.me.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From daa8e4a9bb975f50c5eb8d6a7e0d47f592d6a294 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 10 Jan 2018 17:07:35 +0100 Subject: [PATCH 380/844] Add Raiffeisen.at.xml (#10486) --- src/chrome/content/rules/Raiffeisen.at.xml | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/Raiffeisen.at.xml diff --git a/src/chrome/content/rules/Raiffeisen.at.xml b/src/chrome/content/rules/Raiffeisen.at.xml new file mode 100644 index 000000000000..e6a65e931a90 --- /dev/null +++ b/src/chrome/content/rules/Raiffeisen.at.xml @@ -0,0 +1,29 @@ + + + + + + + + From 02e07e3e90878b47b3b44f7494742496f995d638 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 10 Jan 2018 21:28:44 +0100 Subject: [PATCH 381/844] [Ticketmaster] Move admission.com to its own ruleset (#14256) --- src/chrome/content/rules/Admission.com.xml | 23 ++++++++++++++++++++++ src/chrome/content/rules/Ticketmaster.xml | 6 ------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 src/chrome/content/rules/Admission.com.xml diff --git a/src/chrome/content/rules/Admission.com.xml b/src/chrome/content/rules/Admission.com.xml new file mode 100644 index 000000000000..06baeed2265b --- /dev/null +++ b/src/chrome/content/rules/Admission.com.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/Ticketmaster.xml b/src/chrome/content/rules/Ticketmaster.xml index edbad66a422d..0b10666920ab 100644 --- a/src/chrome/content/rules/Ticketmaster.xml +++ b/src/chrome/content/rules/Ticketmaster.xml @@ -69,8 +69,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio --> - - @@ -104,10 +102,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio to="https://tm-$1prod.112.2o7.net/" /> - - - From 630cda07e902ada092f42968c3c2add4feeede88 Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Thu, 11 Jan 2018 16:58:40 +0100 Subject: [PATCH 382/844] Create Chronicled.org.xml (#14186) --- src/chrome/content/rules/Chronicled.org.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/Chronicled.org.xml diff --git a/src/chrome/content/rules/Chronicled.org.xml b/src/chrome/content/rules/Chronicled.org.xml new file mode 100644 index 000000000000..126ffac14230 --- /dev/null +++ b/src/chrome/content/rules/Chronicled.org.xml @@ -0,0 +1,17 @@ + + + + + + + + From f824c3c6bad2465cccea3bc42af7e7a524441fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 11 Jan 2018 18:26:27 +0100 Subject: [PATCH 383/844] Added ruleset for baua.de (#14233) --- src/chrome/content/rules/BAuA.de.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/BAuA.de.xml diff --git a/src/chrome/content/rules/BAuA.de.xml b/src/chrome/content/rules/BAuA.de.xml new file mode 100644 index 000000000000..c8f65da0f63e --- /dev/null +++ b/src/chrome/content/rules/BAuA.de.xml @@ -0,0 +1,15 @@ + + + + + + + + + + From 91e7d340777fee27979ddff79a2de646b81ad9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 11 Jan 2018 18:49:27 +0100 Subject: [PATCH 384/844] Added duden.de ruleset. (#13955) * Added duden.de ruleset. * Removed not existing hosts. --- src/chrome/content/rules/Duden.de.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/Duden.de.xml diff --git a/src/chrome/content/rules/Duden.de.xml b/src/chrome/content/rules/Duden.de.xml new file mode 100644 index 000000000000..7bee19055a21 --- /dev/null +++ b/src/chrome/content/rules/Duden.de.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + From a859c30f26a5d216b8bab9179e385fa77424eb7b Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 12 Jan 2018 04:20:35 +1030 Subject: [PATCH 385/844] [ebay.com.my] New ruleset (#13879) * [ebay.com.my] New ruleset * Fix ruleset name * Remove invalid 'postorder' & 'selling' subdomains. --- src/chrome/content/rules/ebay.com.my.xml | 180 +++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 src/chrome/content/rules/ebay.com.my.xml diff --git a/src/chrome/content/rules/ebay.com.my.xml b/src/chrome/content/rules/ebay.com.my.xml new file mode 100644 index 000000000000..23110b014593 --- /dev/null +++ b/src/chrome/content/rules/ebay.com.my.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 785dd4d906f9c0820a06b67d7835bdd116d567ef Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 12 Jan 2018 04:23:26 +1030 Subject: [PATCH 386/844] [WoolworthsFlowers.com.au] New ruleset (#14228) * [WoolworthsFlowers.com.au] New ruleset * Update reference #13919 * Add test url for 'ssmt.intdns.woolworths.com.au' --- .../content/rules/Woolworths.com.au.xml | 4 ++++ .../rules/WoolworthsFlowers.com.au.xml | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/WoolworthsFlowers.com.au.xml diff --git a/src/chrome/content/rules/Woolworths.com.au.xml b/src/chrome/content/rules/Woolworths.com.au.xml index c948da0c4ce9..2c8cd0881b8a 100644 --- a/src/chrome/content/rules/Woolworths.com.au.xml +++ b/src/chrome/content/rules/Woolworths.com.au.xml @@ -11,9 +11,11 @@ - LastStopShop.com.au.xml - Masters.com.au.xml - nzwinesociety.co.nz.xml + - WoolworthsFlowers.com.au.xml - WoolworthsMobile.com.au.xml - WoolworthsPetrol.com.au.xml - WoolworthsPay.com.au.xml + - WoolworthsRewards.com.au.xml Non-functional domains: @@ -107,6 +109,8 @@ + + diff --git a/src/chrome/content/rules/WoolworthsFlowers.com.au.xml b/src/chrome/content/rules/WoolworthsFlowers.com.au.xml new file mode 100644 index 000000000000..503fd19bb24b --- /dev/null +++ b/src/chrome/content/rules/WoolworthsFlowers.com.au.xml @@ -0,0 +1,19 @@ + + + + + + + + + + From 48538add0aa6adfda64dfb76cd5b143168adaaaa Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 11 Jan 2018 18:54:27 +0100 Subject: [PATCH 387/844] [Sci-hub] Update TLDs (#13911) * [Sci-hub] Update TLDs * [Sci-hub] Add sci-hub.hk * [Sci-Hub] Add subdomain and test url * [Sci-Hub] Add sci-hub.tv * [Sci-Hub] Remove broken chain domains * [Sci-Hub] Add targets * [Sci-Hub] Rename rulesets * Rename Sci-hub.xml to Sci-Hub.xml * [Sci-Hub] Update top comment * [Sci-Hub] Add subdomains * [Sci-Hub] Remove moscow subdomains --- src/chrome/content/rules/Sci-Hub.xml | 59 +++++++++++++++++++++ src/chrome/content/rules/Sci-hub.xml | 79 ---------------------------- 2 files changed, 59 insertions(+), 79 deletions(-) create mode 100644 src/chrome/content/rules/Sci-Hub.xml delete mode 100644 src/chrome/content/rules/Sci-hub.xml diff --git a/src/chrome/content/rules/Sci-Hub.xml b/src/chrome/content/rules/Sci-Hub.xml new file mode 100644 index 000000000000..ea7b6f97bba5 --- /dev/null +++ b/src/chrome/content/rules/Sci-Hub.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Sci-hub.xml b/src/chrome/content/rules/Sci-hub.xml deleted file mode 100644 index 469265be6075..000000000000 --- a/src/chrome/content/rules/Sci-hub.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From de5db112dbc8bfa284a976a1b6955c292ccb8d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20M=C3=BCller?= Date: Thu, 11 Jan 2018 18:58:53 +0100 Subject: [PATCH 388/844] [DuckDuckGo] Update targets (#14231) * [DuckDuckGo] Update targets * [DuckDuckGo] Remove exclusion for *icon index page --- src/chrome/content/rules/DuckDuckGo.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/DuckDuckGo.xml b/src/chrome/content/rules/DuckDuckGo.xml index fd19d25c77b5..751da9ce14ad 100644 --- a/src/chrome/content/rules/DuckDuckGo.xml +++ b/src/chrome/content/rules/DuckDuckGo.xml @@ -20,17 +20,10 @@ - va-ddgc-staging-web1.duckduckgo.com Peer certificate cannot be authenticated with given CA certificates: - - blog.duckduckgo.com - - help.duckduckgo.com - - meme.duckduckgo.com - - settings.duckduckgo.com - - shop.duckduckgo.com - - wiki.duckduckgo.com - www.ddg.gg - 5xx server error: - - favicons.duckduckgo.com - - icons.duckduckgo.com + Couldn't resolve host: + - va-l1.duckduckgo.com --> @@ -41,13 +34,20 @@ + + + + + + + @@ -55,10 +55,12 @@ + + - + From edf800d1cee7c71c91fac4255b43eb99c5ae5a44 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 12 Jan 2018 01:59:08 +0800 Subject: [PATCH 389/844] Update Scotland.gov.uk.xml and Create gov.scot.xml (#13760) * Update Scotland.gov.uk.xml and Create gov.scot.xml * Delete scotland.gov.uk.xml * Add aquaculture.scotland.gov.uk --- src/chrome/content/rules/GOV.UK.xml | 2 +- src/chrome/content/rules/Scotland.gov.uk.xml | 33 ++++++ src/chrome/content/rules/gov.scot.xml | 95 ++++++++++++++++++ src/chrome/content/rules/scotland.gov.uk.xml | 100 ------------------- utils/ruleset-whitelist.csv | 2 +- 5 files changed, 130 insertions(+), 102 deletions(-) create mode 100644 src/chrome/content/rules/Scotland.gov.uk.xml create mode 100644 src/chrome/content/rules/gov.scot.xml delete mode 100644 src/chrome/content/rules/scotland.gov.uk.xml diff --git a/src/chrome/content/rules/GOV.UK.xml b/src/chrome/content/rules/GOV.UK.xml index 1acb9547d950..2acbe9ad54f3 100644 --- a/src/chrome/content/rules/GOV.UK.xml +++ b/src/chrome/content/rules/GOV.UK.xml @@ -259,7 +259,7 @@ - scambs.gov.uk.xml - scarborough.gov.uk.xml - Scot_Borders.gov.uk.xml - - scotland.gov.uk.xml + - Scotland.gov.uk.xml - scotland.police.uk.xml - Secret_Intelligence_Service.xml - sepa.org.uk.xml diff --git a/src/chrome/content/rules/Scotland.gov.uk.xml b/src/chrome/content/rules/Scotland.gov.uk.xml new file mode 100644 index 000000000000..c1a3a2fffc16 --- /dev/null +++ b/src/chrome/content/rules/Scotland.gov.uk.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/gov.scot.xml b/src/chrome/content/rules/gov.scot.xml new file mode 100644 index 000000000000..5cc9509ec747 --- /dev/null +++ b/src/chrome/content/rules/gov.scot.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/scotland.gov.uk.xml b/src/chrome/content/rules/scotland.gov.uk.xml deleted file mode 100644 index d53278c064e7..000000000000 --- a/src/chrome/content/rules/scotland.gov.uk.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 8d9fe4a12075..cacc5fa2fea2 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -1366,7 +1366,7 @@ dbc8f2862e1855fd07a89a7d842b4ff03b2a93340d912a1f321e8a2c9a0840a8,1,1,GO_Transit. 73cc7eb8fa700154372dbc586aaa1adc8d0c0b86d17f2efcc14b7e9843a09004,1,1,Got_Vape.net.xml b2ee2374e3bdc3d03f5d60bd4b00bec95592a38b54a32a8b3097d1ec6cf1c86b,1,1,GourmetGiftBaskets.com.xml 38ea979b7f650765d00622f7919e2589f093c8f0df62b005e1ee37f97e821289,1,1,Government-Security-News.xml -d260b4da347c8b65d83536ac0d29c64485a22f36ce6ff03541ad6274ec7a532b,1,0,GOV.UK.xml +4fb6c41a0baf5d2a91ab39618b57d963f6a8052b57c6cd91ffb2585133da7fec,1,0,GOV.UK.xml b4741f899272079753bb0118f166d0130bbedf31d16434e9b8127821fcc41f50,1,0,GoWork.pl.xml 0ee8f20c7adbecd195a0b332aaeb6fa49a1b97192c94840236733f0a29dd5d75,1,0,GQ-magazine.co.uk.xml b4936c9408ab836adc37b0b41551860a35d85bd2adb24c2df60cc8fc04084e55,0,1,Grab_Media.xml From 5e16f610cebfef6df56211a54387fc27f68add5d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 11 Jan 2018 19:00:52 +0100 Subject: [PATCH 390/844] [Kodi.tv] Add targets (#14204) * [Kodi.tv] Add targets [Kodi.tv] Update securecookie * [Kodi.tv] Update top comment --- src/chrome/content/rules/Kodi.tv.xml | 41 ++++++++++++---------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/rules/Kodi.tv.xml b/src/chrome/content/rules/Kodi.tv.xml index 8bc9ab1de2f8..bfba6ea48970 100644 --- a/src/chrome/content/rules/Kodi.tv.xml +++ b/src/chrome/content/rules/Kodi.tv.xml @@ -1,34 +1,29 @@ + + + + - - + Date: Thu, 11 Jan 2018 19:01:42 +0100 Subject: [PATCH 391/844] Added rules for stadtwiki.net. (#10049) * Added rules for stadtwiki.net. * Added targets. --- src/chrome/content/rules/stadtwiki.net.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/chrome/content/rules/stadtwiki.net.xml diff --git a/src/chrome/content/rules/stadtwiki.net.xml b/src/chrome/content/rules/stadtwiki.net.xml new file mode 100644 index 000000000000..3588877b7189 --- /dev/null +++ b/src/chrome/content/rules/stadtwiki.net.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + From c7e3d9a5c761e104515ad32fe5c765aecb594e71 Mon Sep 17 00:00:00 2001 From: MilanKral Date: Thu, 11 Jan 2018 19:02:15 +0100 Subject: [PATCH 392/844] IEEE Computer Society's Technical Committee on Security and Privacy (#14253) --- src/chrome/content/rules/IEEE-Security.org.xml | 11 +++++++++++ src/chrome/content/rules/IEEE.xml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/chrome/content/rules/IEEE-Security.org.xml diff --git a/src/chrome/content/rules/IEEE-Security.org.xml b/src/chrome/content/rules/IEEE-Security.org.xml new file mode 100644 index 000000000000..39ac21b06ec8 --- /dev/null +++ b/src/chrome/content/rules/IEEE-Security.org.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/IEEE.xml b/src/chrome/content/rules/IEEE.xml index 5eb03998c7cf..5bd1a9811708 100644 --- a/src/chrome/content/rules/IEEE.xml +++ b/src/chrome/content/rules/IEEE.xml @@ -3,7 +3,7 @@ For rules causing false/broken MCB, see IEEE.org-falsemixed.xml. For problematic rules, see IEEE-mismatches.xml. - + For ieee-security.org rules see IEEE-Security.org.xml Other IEEE rulesets: From 7bd196a18b1c3a424e3adaa8edd85cc070431520 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 11 Jan 2018 19:02:20 +0100 Subject: [PATCH 393/844] Create kiro7.com.xml (#14182) --- src/chrome/content/rules/kiro7.com.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/chrome/content/rules/kiro7.com.xml diff --git a/src/chrome/content/rules/kiro7.com.xml b/src/chrome/content/rules/kiro7.com.xml new file mode 100644 index 000000000000..62785cbd81f3 --- /dev/null +++ b/src/chrome/content/rules/kiro7.com.xml @@ -0,0 +1,20 @@ + + + + + + + + + From 478b544675da06f33c272f621888bff66c98fa28 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 11 Jan 2018 15:21:56 -0800 Subject: [PATCH 394/844] Update translations. --- translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations b/translations index e08c45bb20d2..3f8e68527e1a 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e08c45bb20d251e961dba8157520d3bdb469a0c7 +Subproject commit 3f8e68527e1a8c79882501d3360916bddcf2c6c4 From 3596db380b1b392a9533d335672a85e0880820d5 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 11 Jan 2018 15:35:31 -0800 Subject: [PATCH 395/844] Release: 2018.1.11 --- chromium/manifest.json | 2 +- src/Changelog | 3 +++ utils/ruleset-whitelist.csv | 18 +----------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/chromium/manifest.json b/chromium/manifest.json index 9afddbd5c5c9..20c7b20eb264 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -47,5 +47,5 @@ "storage", "*://*/*" ], - "version": "2017.12.6" + "version": "2018.1.11" } \ No newline at end of file diff --git a/src/Changelog b/src/Changelog index 73a296374d53..e03bacaebfa4 100644 --- a/src/Changelog +++ b/src/Changelog @@ -1,3 +1,6 @@ +2018.1.11 + * Ruleset updates + 2017.12.6 * Remove unnecessary files from release * Ruleset updates diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index cacc5fa2fea2..ee4b470dc922 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -244,7 +244,6 @@ ad363158e17c58965ddb34609fb859789bc8f6a49ae9dd7380376f044578140f,1,1,ATandT.xml d5a8e7314df63bd5e8864a2956c21f792ebfa3ef6b969e398f98c8215383e3b4,1,1,AtariAge.xml 47849a15006089e082e0568edac0d3b0be633e4dae443fba442ddf54167fa363,1,1,ATG_Web_Commerce.xml ac5a54b2ad0e2ef5b7e15c485b7b55e0c6f39db0c92f5786ca8a565e32e243b5,1,1,Atipso.com.xml -8f640669f44b6482e83f48877ee5414ac32a1bdb979a62ffb5b2337a843a9e97,1,1,Atlantic-Metro-Communications.xml 9306e9e08bee07af69b076ebc4f8f3e79c73433fe43734800db41716959b8894,1,1,Atlantic.net.xml 1c4a668517afeab5af2dcd413c022e0f5651f4daca8f320679cc10c184ddf053,0,1,ATNAME.xml 222ff7fbdfb781f3ca1853286935bfacae935873462c81165500ecd9604fb476,1,1,Atos.net.xml @@ -1359,7 +1358,6 @@ ae0c17b4f9b2118b92c083f5b024f659a2b5bed3501b6fcfecc889f139b07c95,1,0,GolfLink.co 4e34d2d1ae795f5f1f4967dc035fea1bffe66c10b9be5c480ef5c479c0e97e18,1,0,GoogleAPIs.xml 894a38a1bfa54c3a04c42e941902cca0f0710f90f7775aef31e5c27ea9fac6fc,1,0,Google_App_Engine.xml 0c725c221c4a8e11d3bce46b3913dcc855ff0d8155a559d7dedcb06179079d4b,1,0,Google.tld_Subdomains.xml -331aacbfaf0f42be1c9656bac81a40e4f90a9d06df8dac7bcf9107b6ed519df1,1,0,Google.xml b6f212028d6d4c769e74c2a583a04e9387edf79312d44599a8e9a699554f6f20,1,1,Gotmerchant.com.xml 8c2e217fca6c4f32665fceb124225f04edc9b8c01a403aedafd871a33c9d79ce,1,1,Gotraffic.net.xml dbc8f2862e1855fd07a89a7d842b4ff03b2a93340d912a1f321e8a2c9a0840a8,1,1,GO_Transit.xml @@ -1547,7 +1545,6 @@ f18922a305bc3be951a93339bd0045ab5ca5b9741009636154eea681291cfcee,1,1,ICommons.xm 9cd416d67882d8ca5a6a85768c1e9efe5851c8547886e0a5ef64f3537d9bd5d1,1,1,Idea_Fit.com.xml 047c2947f163b74bcfa7c71e4cbaf7b19e2c4fb951dc2bf975446720dd35fb3d,0,1,Ideas_on_board.com.xml 201db5adb55514cb0d85c5312456f1e1aae6e433e9831a3ef712d9dd524186f5,1,1,IDG.com.au.xml -5f0a48986e4e1bb77c06b3864ae90ccdc23934c6d689cdb3044268178cb42899,0,1,Idg.de.xml 068471ee0af35f0b5f19a2fbce1c23d98772d18b84d8c2f3ca2de29249535c68,0,1,I-Do-Foundation.xml 9186c7a3d33d3e8c9b84ef577fdaebbb7036679efd20a6f499c1bb54f1c870c2,1,1,iEntry.xml cb088854b0d354c353d1a9d42563206b86ae3f1bfe59fc44bf13a6d1bfcd11aa,1,1,IET.xml @@ -1604,7 +1601,6 @@ cad2b10fe0161e74f2301a13c05b8d772df9cf00cb27e9a79ee57252ac2d644e,0,1,Infinity_Tr 80cec67f64924c4aa283209f631550d6181bc868b8762c22b13dd0a9a1aaf5ef,1,1,InfoJobs.net.xml b9f548ee8e7918ad26faf3926404d6aa68e13dfd092ab8435127ab975dee2f28,1,1,Infolinks.xml f4c83a13d0fd8f8e1248e83706d7426b8d5d39543fc0bab2f054bee91240fe66,1,1,Infomaniak-Network.xml -d293c6a6a4da5508794de746cb7e8854446cad7cf5ee54d75a3ee8c52b180d3b,0,1,Infopackets.xml f1c3666f04ae859c18c7bde24a595c493cee78f72121a2985a4d81a862b0fb83,1,1,Infopaginas.xml ff0dd4bb477d5c2b96ce3ca9edc86f4f449b5ad0688c3961ec8fe048f4c7f832,1,1,InfoQ.xml 25891dc59b340e346a4a2e2e4a23e78b43ea8eaa67eda1c232173700188989d7,1,1,InformIT.xml @@ -1740,7 +1736,6 @@ c621d4ba25d54b2ac74584129f4234f43b52d2bb00a11b49ef04dc15848169d7,1,1,Journal-of- ce1f1dfa4ffbe1de9185c4d5bf81e07ffa6afd0c0b3c16bceaadaa8194659a77,0,1,JSConf.us.xml 878f0efcd4fda30f3821e5362986a41446a368b644fffa970eaadde331595bfa,0,1,Jubii.dk-problematic.xml 65d10d09f2078c9271d6437eae33d9e7d6ecae9a2b2364670ad60d98d0279f83,1,1,Jubii.dk.xml -0269cb62516dd5ed9fc97426001622483c695b418e3b277d676115b851f913ba,1,1,Judiciary_of_England_and_Wales.xml 71b79ae041f784ef340990b3a3a1a16a07f041a87b95f9d6f235eedb89a75a08,0,1,Jugendschutzprogramm.de.xml b31ea973c4bb7c2d240cb7dff9a5a13174e7e473cee758844d9cf827dfafad13,1,1,Jugger.ru.xml 21937f0fd2a36647290096e83c0db7202e391611c11760e4cd68edb237a4f7b5,1,1,Jumptap.xml @@ -1852,7 +1847,6 @@ eedbe4c1b73b659f65c1b47b6b0a0b08e5e4ce32c8c96b82fa8b6e4ad2f5ead5,1,0,LibCal.com. 82d91c9bfd424f34898c9435240f08ba68083edf2a2f14eeaab224ebf245a606,0,1,Libdrc.org.xml ca3651e464527f1cda0d1059fdc27e8bc7ec56c6cc326d8ba5be30aa145a3751,1,1,Liberal_America.org-falsemixed.xml 4da6941625e8c737ccf9de80aadd671b78aab17d09bb0830557256dd8f3a6ca3,1,1,Liberal_America.org.xml -a20d349004139502a74eb21d3053e9b46da8d6c2a6836c2bbb90469a9a363d6f,1,1,Libravatar.org.xml e4a1a55017bcb0b601ea15d91bc0011eb184e17d1dbb802fb6cd5108882c4442,1,0,libregamewiki.org.xml 2024f5bf8b3fc81e834b022b2c34f31669e1dd151a163c304d135218ac2fb74a,0,1,Libre_Graphics_World.org.xml feb248073503e6b89a199631eeb2f81de397fbe8033003f7c16aa4219b3d4663,1,1,Libri.de.xml @@ -2007,7 +2001,6 @@ c5dbfd25c948f08f782ca4e9f6122fa389c6648c836933e17b32275d95a7b10e,1,1,Markit.xml dc2d529ddeeda9cf9a007f2ffaac310105626c1af7c1e72455cbf4f75436054b,0,1,MarkMail.xml 2ae425c78980cfd9132d6589c13a154bea8cf0b44036d78a1e61c301a2049ea3,1,1,Mark-Monitor.xml bf7cbed17ad5c7fbf32749386ebf39fd4a33dd4a049ebd991f17beea5da040bf,1,1,MarkRuler.xml -cfc03d659e321e9e100b4c55efdba4112f5ca5eefa16f6c62835d5c6dee6860e,1,1,MarsHut.net.xml 122a211832b9a5584f9367eb69489c8ee7323ba094af5a6a9b180971aabe7869,0,1,Mars_One.xml 6a87d0a4f45f3df6dbeadd66865e6a5493419079f1f9c73c69f607eb9e1a123d,0,1,Marsupi.org.xml 3808030ee7f2c64ec5a0e3ab47b44c3895bdc3555f223357127614a0e1373877,0,1,Martha-Stewart-mismatches.xml @@ -2079,7 +2072,6 @@ e036d076a66acf5d8e573b652b5e6ff6639d9ae0972240aae7676cf90e06181b,1,1,Merchant_Ci f58930610ba69fbf26cbe4dba6e1cad5cf652b7c6458747d16a81a53810b3b91,1,1,Meritrust_CU.org.xml 30a1773b432db408705a3a3b1a5aec86d29006d7dfe739785beecee7b32a5c55,1,0,Merlinbreaks.co.uk.xml 0b56c064295b03dec2f3dc1af92546c87ea03a06b6c5e753299e85472284ca71,0,1,Merlinux.xml -9d0fe26d56c89ae00a02419978c91b7f519de7f81e0793b282a395a65e5b893d,1,1,Mer_Project.org.xml 0b8ca11675436a12840843509bb920731eebb1cf9966122143c0423e93c5e209,1,1,Mesh-Internet.xml 7c1cdd78f922226f062a491726c2899cff4d9cb136293cae3f70adfaea4e1ee0,1,1,Messagingengine.com.xml 46f31409aa718eb62a9d2d208bbd65bb5e6419929c17b15f2fdc33c4afb82c4a,1,1,MetaPress.com.xml @@ -2419,7 +2411,7 @@ f633eda70bf6a833c1b0f34d615bac9af7dde4e6611be3256dddf73293ad073b,0,1,One_in_3_Ca d6085737afde36c4be842c941f607237028ef8aa700604a9d19425e6f4b1d5a5,1,1,ONEsite.xml 6dc92cee48556d89af4e82ce71e74ac9f797208689b7f351b93f2925f1a6529c,1,1,OneTaste.us.xml 0a3d44381e241385148df130a14beeb2b5bf3363441a7fb3f7edd82e4b313915,0,1,ONEweb.xml -ea7c07d5c5a69a12affb5b1c6ec55c1dacfeed90ca00bb2199b239768f94f991,1,1,Onion.to.xml +20c6fcb2955fbc55f711d50ac5e82b05b6103e0adc66ed06d2c981b5d6997765,0,1,Onion.to.xml 2788b4c9876a9915dbd3ac3f42d6ff8b87f8d874118c22806a6051a093187c18,1,1,Online-convert.com.xml 090726845bf1a7336dcf4b17cc5fd367393dc83cd61cb47480c05e9443fa6053,0,1,Onlinecreditcenter6.com.xml eba9cf6de0668533759ecd0c36f82a6c449930302e3fb4e801ea327b491f3362,1,1,Online.nl.xml @@ -2660,7 +2652,6 @@ f18bc789e6e2be483cf21a6e3d87792904f8bf4ddbc6ef59bd608ed84438cc19,1,1,Pragmatic_M 302da6e9ef8981e7c9fc640d28274768775d2dcf4e6db959d02538d6b7d061ef,1,1,Priceonomics.com.xml 65f6f65113526347d5525105773a7579d9301a6d87adf13fa18499373b18db13,1,1,PriceRunner.xml a1023dd10e11b82db899a2b1cadad54c2f6ac3e51a4e056c58afc1efb67047d7,1,0,Printfection.com.xml -870728bddab08f9ca08874e781a3f972f18d036259a25649c4cb1db371e89579,1,1,Printrbot.xml 44b5f33ecdb9f0c492366882955ceb80db6fab8976dcb2946ab853e344c73062,1,0,Prisma-IT.com.xml bfc3c3c917777780e10a197d260a120acc3614a32577402968a480fd5b42c106,1,0,privacyintyqcroe.onion.xml e0519f9b99fd87886edb3fc154d3fc1bb145333aa536966d417433030cd82eda,0,1,Privacy_Not_Prism.org.xml @@ -2686,7 +2677,6 @@ ff6cfba26a607be1269e2823c57e5fb5e5c4735d85954762fa935239600e8aed,1,1,ProVenue.ne 05c868c1c858abd8e57044f301b234c281562fb4e81b4b95d3102e61e9eae0da,1,1,PRWeb.xml f5a7ecd99e9368048750e1de2badf731fd32eb5b21fd471651dd12d33c400e34,1,1,PRX.xml 7529864ddad3be2820b1392717c117aac200b5cbc51f3233089a2d53cd46e498,0,1,PS3Crunch.xml -d822a2b6a71b5ab3696a7046dab34c7dd9777e7d8bc7b0c2173d5222404260c5,1,1,PSSL.com.xml 2cb55093e265bb1a2c345613e293ba44500cc31603bd713c6dbe301fde49654b,0,1,Pss.sk.xml 4165710cf8b6760a43eb078fd0356fe1ef7285687e1c23205c829ab8c0eb8ed0,0,1,PSX-Extreme.xml fca579bef6575b699d2f3239f2aa31a80efc1c780a771e3eabdbd3b67d87d594,1,1,PSZAF.xml @@ -2773,7 +2763,6 @@ def99e9c52843ab97071e7c51143321c1bc97dc6b2395b2619b4f9ff7d197f2e,1,1,Red_Cross.o 520f55fa37450f41727427b048bfe020b5a1da2fee5f4123e3279c77806aafa8,0,1,Rednerd.com.xml f53f48cc8819321f46aed9c297b688b9993d6a9de165e8763d0f37c8ebb26381,1,1,Red-Pill.eu.xml 022f64e1fd961e6dddd0b67103a9bfb71b2750a20f5f80cdc08c5f3c40d386ad,1,1,RedState.xml -a2310e3723817db0a64b29881ded303934c0902996e66fd54266c8fcb01acc43,1,1,Reed_Business_Information_Australia.xml 1bc93887c36392e422e57cf7b8352bd344b1d034cbd78d09da67704520b5ee37,0,1,Reed_Business_Information.xml 49f413717d683b1902cdc262e5a77d4ac119e9b2c2bd4f19b0139c0298fe0c40,1,1,Reed-Exhibitions.xml 9367d9ee8b8400372e7835f87118ef96688a260d514b8f8a520517d7eb83f792,1,1,Reef_Builders.xml @@ -3140,7 +3129,6 @@ af088ec57a0a58dcc709653e7bc7c388fb2ec11901bdaddf44b6a9eb56cfc09c,1,1,Storage-Bin 2f4835be761a19b7ecc69d772d7c194ac2ef0b064e0fcba4d2889f87334ce6b9,0,1,Storebrand.no.xml b3ae4b6850a307c9433da62f014e0867e66069ff2f3884f4aae6b16ed3ca8747,1,1,Storenvy.xml d64ce19ebfba74d32cafef6a02305b8aa5f95e7b4711d7dc988d46b5e2d217a4,1,1,StoreSecured.com.xml -421a3c1e506386c490ffd7f086ece19c8c1ab336f8f6f6ce5e2380657e379fba,0,1,ST.org.xml 7403a5757527d035874e48069484b155e1c23a5d8087481ce356b2ff7ddc8666,1,1,Storywrite.xml 12588f5afc97dd86b5084a913cfedb08bcca50fbb06428f5a21f2d1f45353f87,0,1,Stratum_0.xml 796a57d9c1b84c656d28bf399cfb683c83437ec69fdd2eee0c2f83712755d53c,0,1,Stroeerdigitalmedia.xml @@ -3311,7 +3299,6 @@ c572a5c33cd5817863bcea276085297977e5d272aec438c1c73c00d1c85efc35,1,1,TIBCO.com.x 5c7384430e2a8498ee7650c8045cb2ced1f24318f6fafb4aa5795efd075615e4,1,1,Ticketnet.fr.xml df293463db93d5dc463389a7df8fa0780fbce66adf464f1c1a0c60b428469662,0,1,Ticketportal.sk.xml 22c5dc554eff33120154420db28400e7a9175540628808fcab68127ceaa53846,1,1,Tickets.com.xml -2ef27d20398c4c8e17c84f3cafb29b8d9f756036d533734bdce48a4334672e82,1,1,TicketsNow.xml 712dddaccf05631bfed526e1399aef6f227c79d7a1119e96b541a8011da420a9,1,1,Tictail.com.xml 41988eca7e169dae42c7fccbbd264d521110b7614836be80ddbd275ee14b39c1,1,1,Tidal_HiFi.com.xml 298330bca9f99c55c045c6aaacc513f9435fd9b0080ffed0e11618cf2fb8325f,0,1,Tid.al.xml @@ -3353,7 +3340,6 @@ d87cdcb3d834b578712903370180da19f04204d5362c9a8164b772b55a18037b,1,1,TouchCommer 24758ddd0781ba99a1a9a29e03011c29687c1b5f67dd207daa8d811ea75a4615,1,1,TownNews.com.xml 32aec643ca2d71d6f9b43c8ba58b37481cd2a55c76968565a60f8c6621fdc5fe,1,0,toxstats.com.xml f6d6a14f6e730ee446729955986056e9a930783180f0dec99991bc4109622951,1,1,Toys_R_Us.com.xml -cbc02e62c624a6495a57ade988c18385c83355a4d1cccc23f01c2a325740eeba,0,1,TPG-Capital-mismatches.xml 2917eb742e4f7f15db7b7566a266e73ba37df2d9e6a64de292ebbfa4ee904707,1,1,TPG-Capital.xml 7259305af6c4290ae46de7c834ca0762784aab4962d66ab98641d750a83ed803,0,1,TracFone.com.xml 087f60834326225dc58d57d93e7c6bf7227792865bdecd91cb5b2a6ea8a2ede2,0,1,Trachtenshop24.de.xml @@ -3527,7 +3513,6 @@ bd8ac3d00a5c2dad7c95051d88787288e4da87f7060a07667fd02ad3e657f482,0,1,University_ 5271bdc47d196a50d523472c3ba3697315cc4c4b479292a05633ea7220861395,1,1,University-of-Virginia.xml 6e8e81f563f6c50e976dd1ae1db5b503c26104a75885e97918201b45854dcd52,1,1,University_of_Waikato.xml 02408ea5408aaa7adf7869ff7c78bac86d09985ee8a0213155a69b386037fe25,1,1,University_of_Warwick.xml -22d64ac86c0f98e08e70eb1cff742fb838bc5e9a3553286f149a4572e433af33,1,1,University-of-Waterloo.xml 6d3ec302fd6822f515d5cd489c4c5cea3f6da3e437e4d5760b30558c0e9fb055,1,1,Univie.ac.at.xml 187c1e105e934ff0a29bb9c458fdd622e27178e97e11d2d4d7ae9566342284c9,1,1,Uni-Wuerzburg.de.xml 04f4e0a5aa2958d5f9d095cc0148d118aeede6fe8b452d0ce04deb2d05b6ac38,1,0,Unix4lyfe.org.xml @@ -3859,4 +3844,3 @@ f76e810891c9301354123b801ace36ba307fff5ae323fb9bb608d8c2757efb36,1,0,Zissousecur 0a43f73ea001dcef9e970232e3d8d3123f0a4eb163e1d69b23498bff60a735c9,1,1,Zopim.xml 6750e29d302751af08e3cbe82647eb8a652fba4be1efbed4bb63473ec6ed40c2,1,1,Zorpia.xml 54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml -20c6fcb2955fbc55f711d50ac5e82b05b6103e0adc66ed06d2c981b5d6997765,0,1,Onion.to.xml From 0b73229246c59f7f06f3b53ce324e5658e1b9283 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 11 Jan 2018 15:42:01 -0800 Subject: [PATCH 396/844] Signing data from AMO. --- src/META-INF/manifest.mf | 78 +++++++++++++++++---------------------- src/META-INF/mozilla.rsa | Bin 4185 -> 4185 bytes src/META-INF/mozilla.sf | 4 +- 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/src/META-INF/manifest.mf b/src/META-INF/manifest.mf index 0732d6d349fa..9e69ac1d8545 100644 --- a/src/META-INF/manifest.mf +++ b/src/META-INF/manifest.mf @@ -27,8 +27,8 @@ SHA1-Digest: hAn8WW97FT95OOQeyLV3oSoRSR4= Name: devtools-panel.html Digest-Algorithms: MD5 SHA1 -MD5-Digest: D/JN2Lms3Ct7RNeyXFPn3Q== -SHA1-Digest: yKgzeZMeQdNaG//vQWQK8N4/PGM= +MD5-Digest: yergqhQQNsUBK/TdQBvoIw== +SHA1-Digest: KywHu0c7ciaB3C+NJTXLvuP8qFk= Name: devtools-panel.js Digest-Algorithms: MD5 SHA1 @@ -52,8 +52,8 @@ SHA1-Digest: yb8hDRKxyRv4VfPLW3qXO+PxkWA= Name: manifest.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: vwOc0O2CxMd6jldOUDbtfw== -SHA1-Digest: 2J/5hN+/PbPFdYnPI17RfbcOzXM= +MD5-Digest: UfPxWlY4VQkHGYnut3+74Q== +SHA1-Digest: 0F+4KEjrCemfgpgsC5xpT5Emtbs= Name: options.css Digest-Algorithms: MD5 SHA1 @@ -77,18 +77,18 @@ SHA1-Digest: KnghD9Y8ZIw4rji19UNOZS8SI08= Name: popup.css Digest-Algorithms: MD5 SHA1 -MD5-Digest: Cp6CdtA7XYxxnjJ9PZO1Tg== -SHA1-Digest: KLixM3OZOt1k54k95r87ua+PvtM= +MD5-Digest: Tm5iH1K+/kaJk3kNQT9xkQ== +SHA1-Digest: azlA1n+vJnigl7qrFPlFoOB1tII= Name: popup.html Digest-Algorithms: MD5 SHA1 -MD5-Digest: p7BS7lLtTpPddwTnGrQtTA== -SHA1-Digest: xYuDM3edLAIiNe7ZQAfR9+gyk30= +MD5-Digest: xOGR+mYxFDRs+CkHCXDwRw== +SHA1-Digest: IwxDUDsW/rcGQUfYLbrSUtsSiFI= Name: popup.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: ETPZmz1YqEF5pAt8BvEgYA== -SHA1-Digest: 51Lz8/bR4FrP+zaGGXN+ByRO1y8= +MD5-Digest: rpqnrEmp2w9brb4o1gBhCw== +SHA1-Digest: nGqFLZ4y51lfdMabaxOP2ySKYQc= Name: remove.png Digest-Algorithms: MD5 SHA1 @@ -97,8 +97,8 @@ SHA1-Digest: Pn9f97i3AIFlAMf420qZNzvA7DY= Name: rules.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: W3+8CW7wOdtVD2KfBelk8A== -SHA1-Digest: +A9efNSfbR+qmUm2dFp78SByL14= +MD5-Digest: Bz0MnQxembuTb+wRqu89tQ== +SHA1-Digest: N7QeKrLGibRCy43GTd2Sp/wIy5c= Name: send-message.js Digest-Algorithms: MD5 SHA1 @@ -217,8 +217,8 @@ SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw= Name: _locales/bn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: zgQI7ZWd5emZ1l1ajH4LHA== -SHA1-Digest: djh15R7rRKVEwdutPdce9NaJvRk= +MD5-Digest: qmBLnnEoDavEelOkIbq8NA== +SHA1-Digest: rtf2CDbvsyDkEvYqtJks3dj9O4s= Name: _locales/bn_BD/messages.json Digest-Algorithms: MD5 SHA1 @@ -255,11 +255,6 @@ Digest-Algorithms: MD5 SHA1 MD5-Digest: lUqlkznSO7atQrHXUwtMgA== SHA1-Digest: tpGAgpc1SFNY/AhWzX8G301zEmM= -Name: _locales/ca@valencia/messages.json -Digest-Algorithms: MD5 SHA1 -MD5-Digest: jMhLmj6EAEI1zQ+psOqPjg== -SHA1-Digest: bK4cjrPGz8wM/CFaFxmg//91Dx4= - Name: _locales/ca_ES/messages.json Digest-Algorithms: MD5 SHA1 MD5-Digest: xg1eQj0qTl0n/MtyCIAzVA== @@ -352,8 +347,8 @@ SHA1-Digest: PThPaz9dWyCm5kral7kNX52iMe4= Name: _locales/es/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: yxX/j8K/5Peu39pAFFbVnA== -SHA1-Digest: 6hlUBmpEJkTv9rGAO3Vn+DL3ckc= +MD5-Digest: TP7LwQDo02Y6AKOfmaNWQA== +SHA1-Digest: oOcr98qUOknShf286kzOScvedhc= Name: _locales/es_AR/messages.json Digest-Algorithms: MD5 SHA1 @@ -442,8 +437,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/gl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 9YDmqQV0UvP3IKuruho0GQ== -SHA1-Digest: kQKHateFto+RT9x50mRYC0Mvpe0= +MD5-Digest: 154o38YQOMC6B1c1IaKDiQ== +SHA1-Digest: moUaisv4vuHp1KfLFD/nEN9oi8U= Name: _locales/gu/messages.json Digest-Algorithms: MD5 SHA1 @@ -467,8 +462,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/he/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: uLK+EU+5vyA6btcSXb7+4A== -SHA1-Digest: uYLkSsjvpaVFyEHCmzmIwsYjCY4= +MD5-Digest: 8oFkK7LbN8RRBEM1+IfWRA== +SHA1-Digest: D/jE57J/+0+fhsBPjvPHF0Dw6tA= Name: _locales/hi/messages.json Digest-Algorithms: MD5 SHA1 @@ -492,8 +487,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/hu/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 2JI7fZzhR4N2ZXZ66V9KQA== -SHA1-Digest: jItQ3PjpvQ7YanJT7FO69RHq/G4= +MD5-Digest: s/Tbsyll/JcjI0LF8bVNdA== +SHA1-Digest: xSr0fnT9J6WtfLcvDbqcLyhM7ig= Name: _locales/hy/messages.json Digest-Algorithms: MD5 SHA1 @@ -637,8 +632,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/mk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 7bk3onT/euCBb4cvW+Uxdw== -SHA1-Digest: 7XNVRTMaM+E5UAj1F6xXJ+S8trE= +MD5-Digest: yWcyDDJmhrTl8MN1qVVYrA== +SHA1-Digest: k1O86/NY7fx2fF7n7psJhFQdfOo= Name: _locales/ml/messages.json Digest-Algorithms: MD5 SHA1 @@ -777,8 +772,8 @@ SHA1-Digest: vJhTPFjHLs7UGMoT/P1LXzyDlTQ= Name: _locales/ro/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: yBK36NgNHYk3ISD2VkekuQ== -SHA1-Digest: UaRhyA2c5RU5g3AuVgeX0/Ec5W8= +MD5-Digest: 88+3ifHcBeiSAn8XR3VIfw== +SHA1-Digest: Lvc7H7Vo+0QZ5Ib0Vp6d1BZJbT0= Name: _locales/ru/messages.json Digest-Algorithms: MD5 SHA1 @@ -885,11 +880,6 @@ Digest-Algorithms: MD5 SHA1 MD5-Digest: G8sDIND8G5pgmDsLOddtOw== SHA1-Digest: 9/ZvfXAMpvEZvrZNNAxnRxJrZcc= -Name: _locales/sv_SE/messages.json -Digest-Algorithms: MD5 SHA1 -MD5-Digest: nncMdJtLDd94XtqIXeKqZA== -SHA1-Digest: CvaJH1jojZgUrS5YxQ0OH+6Y7og= - Name: _locales/sw/messages.json Digest-Algorithms: MD5 SHA1 MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== @@ -902,8 +892,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/ta/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: tkFRaW42tamysceZe2P+Aw== -SHA1-Digest: xCg74RKreBw7nkDGSoOSOSRI15E= +MD5-Digest: 8txHJO2eiftfXVPSXb/V1w== +SHA1-Digest: Cf7BpBNQv4U06LOoBnwgdAP4JGQ= Name: _locales/te/messages.json Digest-Algorithms: MD5 SHA1 @@ -927,8 +917,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/th/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: VUDR9sHYiKs9W9G4VLMzCw== -SHA1-Digest: 0D6oit0l+KtAjmTlgAKlCU/Luv4= +MD5-Digest: nhEbvFcAMGm6E2fcO6/ubw== +SHA1-Digest: RI1UzNi090sWDc5w4PK9wfW3iSg= Name: _locales/ti/messages.json Digest-Algorithms: MD5 SHA1 @@ -1027,8 +1017,8 @@ SHA1-Digest: UsgWmWANv7RSL5ubk9SFg7kUvwU= Name: _locales/zh_TW/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 4zLE2ghO4/4V3IBqh4ugCw== -SHA1-Digest: LCUt994GdwpkdEp4W5adtRfdGf8= +MD5-Digest: frIXkXkah+8b/VRiPzv/9g== +SHA1-Digest: Ott9FKJ3g9lVTAJNJZt2dZPqEpw= Name: _locales/zu/messages.json Digest-Algorithms: MD5 SHA1 @@ -1082,8 +1072,8 @@ SHA1-Digest: PJqzR54BFgNofExLbYn8DMEyvzE= Name: rules/default.rulesets Digest-Algorithms: MD5 SHA1 -MD5-Digest: rGY3d1X8M9Wnb+2QX8PxGA== -SHA1-Digest: oY2zVD1leFdA201JT46AtuoUN2c= +MD5-Digest: Tp3PyBWuhjCfu+3XybLR+g== +SHA1-Digest: gMRFzM2y59MPg+78nSyEJpgsNJA= Name: test/.eslintrc Digest-Algorithms: MD5 SHA1 diff --git a/src/META-INF/mozilla.rsa b/src/META-INF/mozilla.rsa index 965f8d2152fca7ed85731a3b28e41ed342a386c7..92036e280df5d9ec847fa92c63291687c3f9ecb9 100644 GIT binary patch delta 1702 zcmV;X23h&pAlV?0Nd)JP{=<n|wuuMAm~1@e7HMWq^a%B$|2MH|QE;LeZ+u?|&RBq7Qd=RW{tzSg!4g za^rY0#^PS;m>{8e2vY?e=1-&ZI{OsLf1e-$cmMX=F ztw+)$frU+)goL98T;gTkMaot%AwRjh6z-O0=n7MRNh_%iL0$usv*+}WrSOeN&^|hm z4_c{Z^+re(QlLSsXIa=X?-7*ygon&71jN((W=35^(_auyGkE^fyv4(85T)_Re@>z{ z4AowI(0I*)lwcjZ9{R+)YvT!={yb}uQSm2l+F0ZqV8H58#~fI(y7QQnbhwBGA`>XX zJHSx4pXgHYSF9ts$De>i%}!e*L%;asMaiQ!B&-A4o~ww1K2JmFeH+@Hb&v?$5xo9O zlkB@8!w0jiBfdQzVmy2|0Hfl_e|->QeqxfQae|KB#79=@>>yS?iib59K=9JpKCoh{ z1#W_Hl57c&uz~%1`li*=xuU0lfuPL;a%?}ZeU4eMHH)4&GCoqHz_&MzGk$H~J`OWP zdH4yn*1T@V+T1crXuFktLq&N3Y^Fc2(Hg(JA;3+TboaaPjD59|F9e(qf0=fWZvq1W z00A%!1_>&LNQUhcxKBX#5#eocLq|keLJU0F zdhF=0@Sh1tlj{qnlAZ*)vqu&3v5l;T*vDT$)jZ}5RUg&?NG*%Mk=~}|3FDA3aexHJ zdTv%ZXOY#Z`^0g%;g;#je*i+}C%}K&ylVAkj`+gAS80wMez1`&dRe|2vo^TAVSOATZkc*XwV^(R$iac?Gff2arQ29aupC#t_} zM>E}JS>g6$8)+%5w1DrwEF^`lq$j{O%wsgQP|vNpX-xyBQA4FFfPZN0PHg#o;Xj5x zYHY_rD9*iuihC7(Vh9-C&t>rupa=o-jk2J3_`7^|RH=*p4^#C#s#y4%Ada9;$ekLH zDvBSiLRe1kXzi3sf2NBkK^{4HavjiuKNb?BbfOFZF~*Tn6#JGdnMw!cK~^STst7Jb zg47rt`!POCY#H{8(!PT5mu%v&30?@7xEue`>}QPdcVcGdj0?AsZW#BRiSt~RsSuHR zqZ(Pdq$a4(*0su0aP{nCj0zq`Awp-v1Sco>#*NLv;;mWPA&;{|!cZmVg8AjYOa;dQ zjiIP;F+xy@zJNv`+<*?kUlz0f1=$A#=Z^lvliUqCe>gBPF)=bTGC4IiS}-F92`Yw2 zhW8Bt2?Q|~1QZxX$^{S{kZUb;UHtjtss)Aj&l@le1_>&LNQUp05@o) z9*)Ntz9~t1p^v3i{}=@~u{v=5pZR(x(q$-roJCyHbYdj*O!lF|F@~1Qvm`ZifL#TF zZhEtUe-;xZd+-QS4j0jxR0l%B{AgBPE@`Uo^gg~TJ8TEsdpba=Gi*r`qC#Ske_Sf2 zReusd>0i6X?9Sxq>98L+WogxsgcO)C0(gU&_#@ndeAAWUGQrem;u%tb_VA=n}CCfLYXVzjY5S$6Lq7 ze)`EBTg78BMPWkHiZR`ecka<}d^DBthN%Quy~_Ch#0?AoR7veGXj@ z<5lF~SeoruBT-c!bK6%T(}m5>_P>fo9?3zpnp@*LY6_l!?MSS_PLx9VuRF1btbRv% z$qKjkpup>ekqjE6q{gZNdF~`c6?-ueNJUbWAi;~`YNaC-X6CYtjAx$c=KKaaM%a}4 wcIry8KA1RmF*6go6;FZ~7r6gxwP!pdIt)|-qlwW=>CIJ!&Xh(#$WXfe3Jn+08{}sg>ueet|sO`d6F99ZiB+6 z{Ho%KTRJ>joCGAV&0C>}qIFJF=|f+`Dr=!`z9Ui9XmvIm*d;i3A57mYTQqNChM(K4 z-)zshmx}x4rmOM)G~sWhP*IsGf9RvhAq=ydnB!QKxCNE_6bpd~C$=8esb_Hie!efS z6qVzQWdHE-RaiWGpaTMwSJ8|(2?*!5$Dgt_5%Sq*z@qdDu%SPA3kC!jU5Gg1cB00I zYzbegPYf8irg2m9-HlCmd&{#Ywy}Z%9|tqpSkLtYk&K*pXQH7^U|R^cf2vqmdjbOi z00A%!1_>&LNQUsId-bUs@x)v?tMUtY4TAb~EfbohAkEgm*AY3teujY1pTP;Tjj}hbHz7 zIX1#~v6Ey?E6hkr4C8c-eV^gx?Xm=f7Ib;h%i=AHZ8b z%$W@j=UF8~v)RdI9V6$UuQw;&_3-#d42DzWF4tTe;DO*jL;-X{e}mxMkt69D_jgHx zU7ep+<5>%j)Saf`kBV#xIv(-|bBEX*=2O{j{y|*?L?0IeV3z2I=fRI-f|}F)D>bUi z25JoMx?q!0)j@B9r=T+YjhRuyR~ZDFCPpO83HXaq%fp;XZsx`|+9>|ZyO+Ey5~EBi zFBCTa?zL@hapH;=e>z(+Hr2zBW?>2AOyLx<-b55PvlbEc#F`RAL+TN7VPbv)BiXk} ziSX&25t{L!-n=d~u>ws>xii(Ey}?k`xp9&v-D(2fe$etFgdUyW4mSe_^ml9fV`KIXb4W~#XH4A>)=kurr}O9AqrKtP-xn}C`^90=f2Lf zL^KgPVL@*O{mC=I4WpCiMOU-`1=$A#ExhnUliUqCe>X8QFg7wVGcYtYS}-F92`Yw2 zhW8Bt2?Q|~1Qglq$pHcd9%cBkdyxM2gLIFG|1vNQ1_>&LNQUp065&? zBgbWyh01qWs1BOujH0o`&Ynx5aX14VwG3bWHld(u!B07nsJH%PG`z!oFTu&}H$?xJ zJ1+@Te-P&1Lp5Don`$F(FJrG7SQtwO7B*fU*0ETt0SR)VFaEauXcfxsHg(bX{=aJh z%qju}ZU~;zXv@#FfcJA00Xi*zMojCRj*{4yx`dwtD%Uwb$^^Rz?sFJuL}vW3@M4R| zEHxPavQoioFm-Q}8%q@wyHH#ZOk!S-XVD_ROnR)$pk{$yX9GCedtEr>TO$XhfltsjI?sC_6Z&b(2-jZV zlRRMK7Pg8FDGA8(eVZ!dD^gW*J|ETd#NOBNm=3mWLmz&t3X$`aJ3lKGAx-lH2^`MW ze|$_#N8&!Gh2e-$@YZo`l=0J%G2Z%e5liD2P#V+rsr z@r{0tth>w2<7emMwPihrh_&Hy-_X?hFJvCNJUtU1ZJoNQ))Qtv!W08et%@w;gVX3} zXj!omn8v=x4s`pxW#!V>)9cv-vV%ihNX Date: Fri, 12 Jan 2018 08:39:34 +0800 Subject: [PATCH 397/844] Update Washington_Times.xml (#14039) * Update Washington_Times.xml * Update Washington_Times.xml and Create Washtimes.com.xml * Add references to each rulesets --- src/chrome/content/rules/Washington_Times.xml | 86 ++++++++++++++----- src/chrome/content/rules/Washtimes.com.xml | 23 +++++ 2 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 src/chrome/content/rules/Washtimes.com.xml diff --git a/src/chrome/content/rules/Washington_Times.xml b/src/chrome/content/rules/Washington_Times.xml index 417b8ced3a72..eef1da0b12de 100644 --- a/src/chrome/content/rules/Washington_Times.xml +++ b/src/chrome/content/rules/Washington_Times.xml @@ -1,29 +1,73 @@ - - - + SSL peer certificate was not OK: + - iservicestest.washingtontimes.com + - stat.washingtontimes.com + - video.washingtontimes.com + - weekly-ads.washingtontimes.com + Peer certificate cannot be authenticated with given CA certificates: + - affinity.washingtontimes.com + - payment.affinity.washingtontimes.com + - constitution.washingtontimes.com + - payway.washingtontimes.com + - subscription.washingtontimes.com - - - - + Self-signed certificate chain error: + - paywaytest.washingtontimes.com +--> + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + diff --git a/src/chrome/content/rules/Washtimes.com.xml b/src/chrome/content/rules/Washtimes.com.xml new file mode 100644 index 000000000000..9021e94f5323 --- /dev/null +++ b/src/chrome/content/rules/Washtimes.com.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + From 2eab1d7dc49733c7bf2e76798bcdfa33670ed1cb Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 12 Jan 2018 11:18:19 +1030 Subject: [PATCH 398/844] [Expedia.co.uk] Separate ruleset and add subdomains (#14257) --- src/chrome/content/rules/Expedia.co.uk.xml | 94 ++++++++++++++++++++++ src/chrome/content/rules/Expedia.com.xml | 1 + 2 files changed, 95 insertions(+) create mode 100644 src/chrome/content/rules/Expedia.co.uk.xml diff --git a/src/chrome/content/rules/Expedia.co.uk.xml b/src/chrome/content/rules/Expedia.co.uk.xml new file mode 100644 index 000000000000..eafe8f7f5b55 --- /dev/null +++ b/src/chrome/content/rules/Expedia.co.uk.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Expedia.com.xml b/src/chrome/content/rules/Expedia.com.xml index 168bb146b48f..d8b1003edcb3 100644 --- a/src/chrome/content/rules/Expedia.com.xml +++ b/src/chrome/content/rules/Expedia.com.xml @@ -12,6 +12,7 @@ - Expedia.co.kr.xml - Expedia.co.nz.xml - Expedia.co.th.xml + - Expedia.co.uk.xml - Expedia.com.ar.xml - Expedia.com.au.xml - Expedia.com.br.xml From 1f0b6144b5f3c739257820eb80e4adea902ea33a Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 13 Jan 2018 00:23:48 +1030 Subject: [PATCH 399/844] Delete CSdata1.com.xml (#14258) --- src/chrome/content/rules/CSdata1.com.xml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 src/chrome/content/rules/CSdata1.com.xml diff --git a/src/chrome/content/rules/CSdata1.com.xml b/src/chrome/content/rules/CSdata1.com.xml deleted file mode 100644 index 46def7930925..000000000000 --- a/src/chrome/content/rules/CSdata1.com.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - From 284ec00543b1d8235ebb2fc0ff6a9b42b625e282 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 13 Jan 2018 06:33:20 +1030 Subject: [PATCH 400/844] [Mudah.my] New ruleset (#14223) * [Mudah.my] New ruleset * Add 'www2' and remove irrelevant comments. * Add comment on wildcard DNS --- src/chrome/content/rules/Mudah.my.xml | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/chrome/content/rules/Mudah.my.xml diff --git a/src/chrome/content/rules/Mudah.my.xml b/src/chrome/content/rules/Mudah.my.xml new file mode 100644 index 000000000000..fd576ef339ea --- /dev/null +++ b/src/chrome/content/rules/Mudah.my.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + From d36ea408818d865966b8cd632b065a1f1b5a88fc Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 12 Jan 2018 18:08:08 -0800 Subject: [PATCH 401/844] Create new initializeAllRules() function in background --- chromium/background.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/chromium/background.js b/chromium/background.js index d0c6d5b4cfdb..b04fc1829a39 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -14,11 +14,17 @@ async function initialize() { await store.initialize(); await store.performMigrations(); await initializeStoredGlobals(); - await all_rules.loadFromBrowserStorage(store); + await initializeAllRules(); await incognito.onIncognitoDestruction(destroy_caches); } initialize(); +async function initializeAllRules() { + const r = new rules.RuleSets(); + await r.loadFromBrowserStorage(store); + Object.assign(all_rules, r); +} + /** * Load preferences. Structure is: * { @@ -66,9 +72,7 @@ chrome.storage.onChanged.addListener(async function(changes, areaName) { updateState(); } if ('debugging_rulesets' in changes) { - const r = new rules.RuleSets(); - await r.loadFromBrowserStorage(store); - Object.assign(all_rules, r); + initializeAllRules(); } } }); @@ -618,9 +622,7 @@ async function import_settings(settings) { }, resolve); }); - Object.assign(all_rules, new rules.RuleSets()); - await all_rules.loadFromBrowserStorage(store); - + initializeAllRules(); } } From 6dcd3b1672dbc1fabc928d09d0f88505d7138a8f Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Sun, 14 Jan 2018 09:40:23 -0500 Subject: [PATCH 402/844] Revert "Delete CSdata1.com.xml (#14258)" (#14277) This reverts commit 1f0b6144b5f3c739257820eb80e4adea902ea33a. --- src/chrome/content/rules/CSdata1.com.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/CSdata1.com.xml diff --git a/src/chrome/content/rules/CSdata1.com.xml b/src/chrome/content/rules/CSdata1.com.xml new file mode 100644 index 000000000000..46def7930925 --- /dev/null +++ b/src/chrome/content/rules/CSdata1.com.xml @@ -0,0 +1,14 @@ + + + + + + + + + From 7f4fe7c8547aa7dabb0762c268b8b67857b91182 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 16 Jan 2018 15:58:26 -0800 Subject: [PATCH 403/844] Partial reversion of d36ea408818d865966b8cd632b065a1f1b5a88fc (no need to initialize twice upon startup) --- chromium/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/background.js b/chromium/background.js index b04fc1829a39..7b77731f6a65 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -14,7 +14,7 @@ async function initialize() { await store.initialize(); await store.performMigrations(); await initializeStoredGlobals(); - await initializeAllRules(); + await all_rules.loadFromBrowserStorage(store); await incognito.onIncognitoDestruction(destroy_caches); } initialize(); From 10cc0241846252a6d80a9ec8ae6daeaaa094b556 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 17 Jan 2018 15:58:49 +0100 Subject: [PATCH 404/844] Delete GoogleVideos.xml (#14283) All paths are already secured in Google.xml. The rules are overly complex and do not reflect the current server redirects. --- src/chrome/content/rules/GoogleVideos.xml | 70 ----------------------- 1 file changed, 70 deletions(-) delete mode 100644 src/chrome/content/rules/GoogleVideos.xml diff --git a/src/chrome/content/rules/GoogleVideos.xml b/src/chrome/content/rules/GoogleVideos.xml deleted file mode 100644 index ee8c0626427f..000000000000 --- a/src/chrome/content/rules/GoogleVideos.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1f30d4dfd2a0c914098d4a3dad3a3bca9914b6b6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 17 Jan 2018 16:02:45 +0100 Subject: [PATCH 405/844] [CrossRef.org] Add targets (#14294) --- src/chrome/content/rules/CrossRef.org.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/CrossRef.org.xml b/src/chrome/content/rules/CrossRef.org.xml index 40c3c52eddce..93d09ac3f4ce 100644 --- a/src/chrome/content/rules/CrossRef.org.xml +++ b/src/chrome/content/rules/CrossRef.org.xml @@ -17,7 +17,6 @@ dx.crossref.org eventdata.crossref.org hdl.crossref.org - help.crossref.org labs.crossref.org api.labs.crossref.org www.citation.labs.crossref.org @@ -32,10 +31,6 @@ oxford.crossref.org prospect.crossref.org - Redirects to *.crosscite: - data.crossref.org - id.crossref.org - No working URL known: api.eventdata.crossref.org (503) archive.eventdata.crossref.org (503) @@ -43,7 +38,6 @@ mailserv.crossref.org pix_active.crossref.org pix_standby.crossref.org - help.crossref.org --> @@ -56,10 +50,16 @@ + + + + + + From 862e9dd7fda075dec83a0b3e66a1a7b8c643eac4 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 17 Jan 2018 23:05:12 +0800 Subject: [PATCH 406/844] Update uptodown.net.xml (#14296) * Update uptodown.net.xml * Remove unused trivial rules --- src/chrome/content/rules/uptodown.net.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/uptodown.net.xml b/src/chrome/content/rules/uptodown.net.xml index 76a35078a262..98c0d05f3ea8 100644 --- a/src/chrome/content/rules/uptodown.net.xml +++ b/src/chrome/content/rules/uptodown.net.xml @@ -23,8 +23,8 @@ - - + + @@ -33,5 +33,4 @@ - From 9ddaa79b486654e0227786481cd135e8831c388d Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 17 Jan 2018 23:06:25 +0800 Subject: [PATCH 407/844] Update General-anzeiger-bonn.de.xml (#14300) --- src/chrome/content/rules/General-anzeiger-bonn.de.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/rules/General-anzeiger-bonn.de.xml b/src/chrome/content/rules/General-anzeiger-bonn.de.xml index 28dbaadefb2c..986073ea2fa8 100644 --- a/src/chrome/content/rules/General-anzeiger-bonn.de.xml +++ b/src/chrome/content/rules/General-anzeiger-bonn.de.xml @@ -1,12 +1,13 @@ - + + - + to="https://epaper.ga-bonn.de/" /> - + From 9176f5ef98e984054994f2b3ee5600df519d734e Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 17 Jan 2018 23:09:46 +0800 Subject: [PATCH 408/844] Update centrum.cz.xml (#14299) --- src/chrome/content/rules/centrum.cz.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/centrum.cz.xml b/src/chrome/content/rules/centrum.cz.xml index b4d9679d14bb..ef874b8f5035 100644 --- a/src/chrome/content/rules/centrum.cz.xml +++ b/src/chrome/content/rules/centrum.cz.xml @@ -38,10 +38,12 @@ + + @@ -54,14 +56,9 @@ + - - - - - - From 83ae7c6c05d795ede055b17aeba78d0ef5c1e956 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 17 Jan 2018 16:11:44 +0100 Subject: [PATCH 409/844] [OpenStreetMap.org] Add targets (#14308) * [OpenStreetMap.org] Add targets * [OpenStreetMap.org] Add target * [OpenStreetMap.org] Add target * [OpenStreetMap.org] Add target * [OpenStreetMap.org] Reorder targets --- src/chrome/content/rules/OpenStreetMap.org.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/rules/OpenStreetMap.org.xml b/src/chrome/content/rules/OpenStreetMap.org.xml index 2a87500bad93..e7f9b980f844 100644 --- a/src/chrome/content/rules/OpenStreetMap.org.xml +++ b/src/chrome/content/rules/OpenStreetMap.org.xml @@ -1,22 +1,31 @@ + + + + + + + + + @@ -28,4 +37,5 @@ + From 26ac469bff719d9650d59ef0bb31ce810f974a87 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 17 Jan 2018 16:14:42 +0100 Subject: [PATCH 410/844] [LibriVox.org] Remove broken redirect (#14307) * [LibriVox.org] Remove broken redirect * [LibriVox.org] Rename ruleset * Rename LibriVox.xml to LibriVox.org.xml --- src/chrome/content/rules/LibriVox.org.xml | 14 +++++++++++++ src/chrome/content/rules/LibriVox.xml | 24 ----------------------- 2 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 src/chrome/content/rules/LibriVox.org.xml delete mode 100644 src/chrome/content/rules/LibriVox.xml diff --git a/src/chrome/content/rules/LibriVox.org.xml b/src/chrome/content/rules/LibriVox.org.xml new file mode 100644 index 000000000000..90041e47034f --- /dev/null +++ b/src/chrome/content/rules/LibriVox.org.xml @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/LibriVox.xml b/src/chrome/content/rules/LibriVox.xml deleted file mode 100644 index 2e3ffff2e183..000000000000 --- a/src/chrome/content/rules/LibriVox.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - From 6a839663b2728e07e1b4ed6e127f38c07624f4c3 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 17 Jan 2018 16:16:13 +0100 Subject: [PATCH 411/844] [UptimeRobot.com] Add targets (#14311) * [UptimeRobot.com] Add targets * [UptimeRobot.com] Trivialize securecookie * Rename uptimerobot.xml to UptimeRobot.com.xml * [UptimeRobot.com] Remove extra * --- src/chrome/content/rules/UptimeRobot.com.xml | 24 ++++++++++++++++++++ src/chrome/content/rules/uptimerobot.xml | 7 ------ 2 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 src/chrome/content/rules/UptimeRobot.com.xml delete mode 100644 src/chrome/content/rules/uptimerobot.xml diff --git a/src/chrome/content/rules/UptimeRobot.com.xml b/src/chrome/content/rules/UptimeRobot.com.xml new file mode 100644 index 000000000000..d55001bb8808 --- /dev/null +++ b/src/chrome/content/rules/UptimeRobot.com.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/uptimerobot.xml b/src/chrome/content/rules/uptimerobot.xml deleted file mode 100644 index 040c90cd4c4e..000000000000 --- a/src/chrome/content/rules/uptimerobot.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From 46d5034a150c165b0828a9aac44d4006450110ba Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 00:28:28 +0100 Subject: [PATCH 412/844] [LibreGameWiki.org] Trivialize ruleset (#14276) --- .../content/rules/Libregamewiki.org.xml | 11 ++++++ .../content/rules/libregamewiki.org.xml | 34 ------------------- 2 files changed, 11 insertions(+), 34 deletions(-) create mode 100644 src/chrome/content/rules/Libregamewiki.org.xml delete mode 100644 src/chrome/content/rules/libregamewiki.org.xml diff --git a/src/chrome/content/rules/Libregamewiki.org.xml b/src/chrome/content/rules/Libregamewiki.org.xml new file mode 100644 index 000000000000..538b1cb337c6 --- /dev/null +++ b/src/chrome/content/rules/Libregamewiki.org.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/libregamewiki.org.xml b/src/chrome/content/rules/libregamewiki.org.xml deleted file mode 100644 index 28b3a13dfc55..000000000000 --- a/src/chrome/content/rules/libregamewiki.org.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - From 40ec1a7ac53f24d7a69e1bbf18f9671a941142da Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 18 Jan 2018 19:37:26 +0800 Subject: [PATCH 413/844] Update LiveJournal.com.xml (#14301) * Update LiveJournal.com.xml * Update LiveJournal.com.xml --- src/chrome/content/rules/LiveJournal.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/LiveJournal.com.xml b/src/chrome/content/rules/LiveJournal.com.xml index 7ba1751eb7a9..5dec01d72841 100644 --- a/src/chrome/content/rules/LiveJournal.com.xml +++ b/src/chrome/content/rules/LiveJournal.com.xml @@ -14,7 +14,7 @@ - + From 80854175448af31fc7fd98432042cf42ee29b05e Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 12:40:05 +0100 Subject: [PATCH 414/844] [BuildItBreakIt.org] Reactivate ruleset (#14325) * [BuildItBreakIt.org] Reactivate ruleset * Rename Build_it_Break_it.org.xml to BuildItBreakIt.org.xml --- .../content/rules/BuildItBreakIt.org.xml | 13 ++++++++++ .../content/rules/Build_it_Break_it.org.xml | 26 ------------------- 2 files changed, 13 insertions(+), 26 deletions(-) create mode 100644 src/chrome/content/rules/BuildItBreakIt.org.xml delete mode 100644 src/chrome/content/rules/Build_it_Break_it.org.xml diff --git a/src/chrome/content/rules/BuildItBreakIt.org.xml b/src/chrome/content/rules/BuildItBreakIt.org.xml new file mode 100644 index 000000000000..26205ac2ad2a --- /dev/null +++ b/src/chrome/content/rules/BuildItBreakIt.org.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/src/chrome/content/rules/Build_it_Break_it.org.xml b/src/chrome/content/rules/Build_it_Break_it.org.xml deleted file mode 100644 index 8ce0c739a7a4..000000000000 --- a/src/chrome/content/rules/Build_it_Break_it.org.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - From ccc036e640418a11f29cdad37c2077cc4a17e9a4 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 12:42:25 +0100 Subject: [PATCH 415/844] [AreWeCompressedYet.com] Reactivate ruleset (#14324) * [AreWeCompressedYet.com] Reactivate ruleset * Rename Are_Wecompressed_Yet.com.xml to AreWeCompressedYet.com.xml * [Xiph.org] Update reference in top comment --- .../content/rules/AreWeCompressedYet.com.xml | 16 ++++++++++++++++ .../content/rules/Are_Wecompressed_Yet.com.xml | 17 ----------------- src/chrome/content/rules/Xiph.org.xml | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 src/chrome/content/rules/AreWeCompressedYet.com.xml delete mode 100644 src/chrome/content/rules/Are_Wecompressed_Yet.com.xml diff --git a/src/chrome/content/rules/AreWeCompressedYet.com.xml b/src/chrome/content/rules/AreWeCompressedYet.com.xml new file mode 100644 index 000000000000..eb91705ce62b --- /dev/null +++ b/src/chrome/content/rules/AreWeCompressedYet.com.xml @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/Are_Wecompressed_Yet.com.xml b/src/chrome/content/rules/Are_Wecompressed_Yet.com.xml deleted file mode 100644 index 0bd5d285049f..000000000000 --- a/src/chrome/content/rules/Are_Wecompressed_Yet.com.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/Xiph.org.xml b/src/chrome/content/rules/Xiph.org.xml index bd8ca6bf075d..89ce7d8ecf1b 100644 --- a/src/chrome/content/rules/Xiph.org.xml +++ b/src/chrome/content/rules/Xiph.org.xml @@ -1,7 +1,7 @@ - + - - + + @@ -42,14 +20,12 @@ Fetch error: http://benchmarkdevelopment.mitre.org/ => https://benchmarkdevelopm - + - - From 7f7da565e9fc10ede045caf6e891c619119b34e4 Mon Sep 17 00:00:00 2001 From: Folant Date: Thu, 18 Jan 2018 13:49:21 +0200 Subject: [PATCH 417/844] Create Mirrorcreator.com.xml (#14288) --- src/chrome/content/rules/Mirrorcreator.com.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Mirrorcreator.com.xml diff --git a/src/chrome/content/rules/Mirrorcreator.com.xml b/src/chrome/content/rules/Mirrorcreator.com.xml new file mode 100644 index 000000000000..5aacc166cf61 --- /dev/null +++ b/src/chrome/content/rules/Mirrorcreator.com.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file From b16c1e638030114c482ea7dd9aa975b0db9b330b Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 18 Jan 2018 19:51:18 +0800 Subject: [PATCH 418/844] Update lofter.com.xml (#14297) --- src/chrome/content/rules/{lofter.xml => lofter.com.xml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/chrome/content/rules/{lofter.xml => lofter.com.xml} (90%) diff --git a/src/chrome/content/rules/lofter.xml b/src/chrome/content/rules/lofter.com.xml similarity index 90% rename from src/chrome/content/rules/lofter.xml rename to src/chrome/content/rules/lofter.com.xml index 812b5a34c27e..e51562d4a842 100644 --- a/src/chrome/content/rules/lofter.xml +++ b/src/chrome/content/rules/lofter.com.xml @@ -8,7 +8,7 @@ MCB: --> - + @@ -21,7 +21,7 @@ MCB: - + From 539d33e75269715c594b4e5cc382dc4b66b61b19 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 18 Jan 2018 19:52:11 +0800 Subject: [PATCH 419/844] Update Massengeschmack.tv.xml (#14302) --- src/chrome/content/rules/Massengeschmack.tv.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/Massengeschmack.tv.xml b/src/chrome/content/rules/Massengeschmack.tv.xml index 811d829aeea4..3274eff000dd 100644 --- a/src/chrome/content/rules/Massengeschmack.tv.xml +++ b/src/chrome/content/rules/Massengeschmack.tv.xml @@ -14,6 +14,7 @@ + From 16ece9874dd3b4e89f9e28e8a35fc3455230c561 Mon Sep 17 00:00:00 2001 From: bn4t <17193640+bn4t@users.noreply.github.com> Date: Thu, 18 Jan 2018 13:03:57 +0100 Subject: [PATCH 420/844] [searx.pw] add ruleset (#14292) * Create searx.pw.xml * Update searx.pw.xml --- src/chrome/content/rules/searx.pw.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/searx.pw.xml diff --git a/src/chrome/content/rules/searx.pw.xml b/src/chrome/content/rules/searx.pw.xml new file mode 100644 index 000000000000..08ebb701a3b8 --- /dev/null +++ b/src/chrome/content/rules/searx.pw.xml @@ -0,0 +1,8 @@ + + + + + + + From c6abf703b3acec156ebf9fd633a6e79401f23e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 18 Jan 2018 13:05:25 +0100 Subject: [PATCH 421/844] Added ruleset for jetphotos.com (#14316) --- src/chrome/content/rules/JetPhotos.com.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/JetPhotos.com.xml diff --git a/src/chrome/content/rules/JetPhotos.com.xml b/src/chrome/content/rules/JetPhotos.com.xml new file mode 100644 index 000000000000..8ce8a92a7775 --- /dev/null +++ b/src/chrome/content/rules/JetPhotos.com.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 2620c3cc99068536bbd80e18bb947c576defa43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 18 Jan 2018 13:08:13 +0100 Subject: [PATCH 422/844] Updated disqus.com ruleset. (#14318) --- src/chrome/content/rules/Disqus.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Disqus.xml b/src/chrome/content/rules/Disqus.xml index a0f479740671..2f8e74ec6fb7 100644 --- a/src/chrome/content/rules/Disqus.xml +++ b/src/chrome/content/rules/Disqus.xml @@ -1,26 +1,24 @@ - + + + + - From 80e62c7054a9c6c88e9707674338d2624dc6b7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 18 Jan 2018 13:08:27 +0100 Subject: [PATCH 423/844] Added ruleset for pureos.net (#14315) --- src/chrome/content/rules/pureos.net.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/pureos.net.xml diff --git a/src/chrome/content/rules/pureos.net.xml b/src/chrome/content/rules/pureos.net.xml new file mode 100644 index 000000000000..e0c9c79c84c1 --- /dev/null +++ b/src/chrome/content/rules/pureos.net.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + From 78c142bedcffc8a20851924e836378387baa61fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Thu, 18 Jan 2018 15:24:27 +0100 Subject: [PATCH 424/844] Added ruleset for puri.sm (#14314) --- src/chrome/content/rules/puri.sm.xml | 75 ++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 src/chrome/content/rules/puri.sm.xml diff --git a/src/chrome/content/rules/puri.sm.xml b/src/chrome/content/rules/puri.sm.xml new file mode 100644 index 000000000000..87b87cee0e68 --- /dev/null +++ b/src/chrome/content/rules/puri.sm.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ebee9c87d58e905247ca691ef22e443079fb1c89 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 15:52:09 +0100 Subject: [PATCH 425/844] [Zenodo.org] Add targets (#14310) * [Zenodo.org] Add targets * [Zenodo.org] Trivialize securecookie * Rename zenodo.org.xml to Zenodo.org.xml --- src/chrome/content/rules/Zenodo.org.xml | 21 +++++++++++++++++++++ src/chrome/content/rules/zenodo.org.xml | 13 ------------- 2 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 src/chrome/content/rules/Zenodo.org.xml delete mode 100644 src/chrome/content/rules/zenodo.org.xml diff --git a/src/chrome/content/rules/Zenodo.org.xml b/src/chrome/content/rules/Zenodo.org.xml new file mode 100644 index 000000000000..a524d7f1456f --- /dev/null +++ b/src/chrome/content/rules/Zenodo.org.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/zenodo.org.xml b/src/chrome/content/rules/zenodo.org.xml deleted file mode 100644 index 57577172471f..000000000000 --- a/src/chrome/content/rules/zenodo.org.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - From da46bb8c5b3b7d8c7cdffae56d1e5ec612e586b4 Mon Sep 17 00:00:00 2001 From: Riotism Date: Thu, 18 Jan 2018 18:51:43 +0000 Subject: [PATCH 426/844] [New ruleset] mingpao.com.xml (#9324) --- src/chrome/content/rules/MingPao.com.xml | 82 ++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 src/chrome/content/rules/MingPao.com.xml diff --git a/src/chrome/content/rules/MingPao.com.xml b/src/chrome/content/rules/MingPao.com.xml new file mode 100644 index 000000000000..db4867108ef6 --- /dev/null +++ b/src/chrome/content/rules/MingPao.com.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8882b3e62926f19365a6e5eb84cfbd419c912bb5 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 19:54:10 +0100 Subject: [PATCH 427/844] Create EarthEnv.org.xml (#14333) --- src/chrome/content/rules/EarthEnv.org.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/EarthEnv.org.xml diff --git a/src/chrome/content/rules/EarthEnv.org.xml b/src/chrome/content/rules/EarthEnv.org.xml new file mode 100644 index 000000000000..5cfbfb6b5e32 --- /dev/null +++ b/src/chrome/content/rules/EarthEnv.org.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 0c763e7cb28f483373fa29ae67f657ee0b54ea58 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 19:57:12 +0100 Subject: [PATCH 428/844] Create RingForce.org.xml (#14323) --- src/chrome/content/rules/RingForce.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/RingForce.org.xml diff --git a/src/chrome/content/rules/RingForce.org.xml b/src/chrome/content/rules/RingForce.org.xml new file mode 100644 index 000000000000..a429c059712b --- /dev/null +++ b/src/chrome/content/rules/RingForce.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From 1c77a79fdfc0a745b8e1f36426b2c3b2eaba8232 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 20:00:43 +0100 Subject: [PATCH 429/844] Create Spektrum.de.xml (#14329) --- src/chrome/content/rules/Spektrum.de.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Spektrum.de.xml diff --git a/src/chrome/content/rules/Spektrum.de.xml b/src/chrome/content/rules/Spektrum.de.xml new file mode 100644 index 000000000000..164ff68272a3 --- /dev/null +++ b/src/chrome/content/rules/Spektrum.de.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + From a228a5521fdfa00076ed3ec34faa7ba9100c7121 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 20:05:04 +0100 Subject: [PATCH 430/844] Create BDOCodex.com.xml (#14321) --- src/chrome/content/rules/BDOCodex.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/BDOCodex.com.xml diff --git a/src/chrome/content/rules/BDOCodex.com.xml b/src/chrome/content/rules/BDOCodex.com.xml new file mode 100644 index 000000000000..f3cfef8dc94b --- /dev/null +++ b/src/chrome/content/rules/BDOCodex.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 5413850847b21c4bff9348211b2816f6b5cf4bee Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 20:08:40 +0100 Subject: [PATCH 431/844] Create La-Trouvaille.org.xml (#14305) --- src/chrome/content/rules/La-Trouvaille.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/La-Trouvaille.org.xml diff --git a/src/chrome/content/rules/La-Trouvaille.org.xml b/src/chrome/content/rules/La-Trouvaille.org.xml new file mode 100644 index 000000000000..75f4c34157dc --- /dev/null +++ b/src/chrome/content/rules/La-Trouvaille.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From 88d3de5ae85b3e1d04c8e8b84a01fef2b739351d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 18 Jan 2018 20:11:05 +0100 Subject: [PATCH 432/844] Create ScopLePave.org.xml (#14304) --- src/chrome/content/rules/ScopLePave.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ScopLePave.org.xml diff --git a/src/chrome/content/rules/ScopLePave.org.xml b/src/chrome/content/rules/ScopLePave.org.xml new file mode 100644 index 000000000000..57054393cc45 --- /dev/null +++ b/src/chrome/content/rules/ScopLePave.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From 28eed4c9da0f6866922af18cda03dd415d92a5be Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 19 Jan 2018 07:10:11 +0800 Subject: [PATCH 433/844] Remove preloaded test URLs from Amazon rulesets (#14327) * Remove preloaded test URLs from Amazon rulesets * pda-bes.amazon.com timeout over HTTPS --- src/chrome/content/rules/Amazon.xml | 25 +++---------------- src/chrome/content/rules/amazon.ca.xml | 13 ---------- src/chrome/content/rules/amazon.co.jp.xml | 11 -------- src/chrome/content/rules/amazon.co.uk.xml | 29 ---------------------- src/chrome/content/rules/amazon.com.au.xml | 11 -------- src/chrome/content/rules/amazon.com.br.xml | 11 -------- src/chrome/content/rules/amazon.com.mx.xml | 10 -------- src/chrome/content/rules/amazon.de.xml | 19 -------------- src/chrome/content/rules/amazon.es.xml | 12 --------- src/chrome/content/rules/amazon.fr.xml | 19 -------------- src/chrome/content/rules/amazon.it.xml | 13 ---------- src/chrome/content/rules/amazon.nl.xml | 11 -------- 12 files changed, 3 insertions(+), 181 deletions(-) diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml index 83811d3dbd71..ad8090987551 100644 --- a/src/chrome/content/rules/Amazon.xml +++ b/src/chrome/content/rules/Amazon.xml @@ -48,6 +48,9 @@ - wag.com.xml - yoyo.com.xml + Non-functional hosts + Timeout was reached: + - pda-bes.amazon.com Amazon appears to operate in 7 countries, and does not hold the domains for some others, like .se or .be. In other cases there is an http-only site @@ -75,7 +78,6 @@ - @@ -89,30 +91,9 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.ca.xml b/src/chrome/content/rules/amazon.ca.xml index 5c1672a7b374..0ef3e80e99b2 100644 --- a/src/chrome/content/rules/amazon.ca.xml +++ b/src/chrome/content/rules/amazon.ca.xml @@ -22,19 +22,6 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.co.jp.xml b/src/chrome/content/rules/amazon.co.jp.xml index f13f8405b2bf..294c65cee02f 100644 --- a/src/chrome/content/rules/amazon.co.jp.xml +++ b/src/chrome/content/rules/amazon.co.jp.xml @@ -30,17 +30,6 @@ - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.co.uk.xml b/src/chrome/content/rules/amazon.co.uk.xml index 0ec54dc805c9..e3be90ac7a6f 100644 --- a/src/chrome/content/rules/amazon.co.uk.xml +++ b/src/chrome/content/rules/amazon.co.uk.xml @@ -41,35 +41,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.com.au.xml b/src/chrome/content/rules/amazon.com.au.xml index ebffa533cc57..b12d9f5fc8c1 100644 --- a/src/chrome/content/rules/amazon.com.au.xml +++ b/src/chrome/content/rules/amazon.com.au.xml @@ -54,17 +54,6 @@ - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.com.br.xml b/src/chrome/content/rules/amazon.com.br.xml index bdd33242862a..9a4eb3c24e03 100644 --- a/src/chrome/content/rules/amazon.com.br.xml +++ b/src/chrome/content/rules/amazon.com.br.xml @@ -15,17 +15,6 @@ - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.com.mx.xml b/src/chrome/content/rules/amazon.com.mx.xml index c1b6a80d60f6..d9a173955d25 100644 --- a/src/chrome/content/rules/amazon.com.mx.xml +++ b/src/chrome/content/rules/amazon.com.mx.xml @@ -17,16 +17,6 @@ - - - - - - - - diff --git a/src/chrome/content/rules/amazon.de.xml b/src/chrome/content/rules/amazon.de.xml index cae9308da3de..752c15e78514 100644 --- a/src/chrome/content/rules/amazon.de.xml +++ b/src/chrome/content/rules/amazon.de.xml @@ -46,25 +46,6 @@ - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.es.xml b/src/chrome/content/rules/amazon.es.xml index e304c2634366..7cb3758e0644 100644 --- a/src/chrome/content/rules/amazon.es.xml +++ b/src/chrome/content/rules/amazon.es.xml @@ -22,18 +22,6 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.fr.xml b/src/chrome/content/rules/amazon.fr.xml index b7c0bd4acc99..c6d648bbaed1 100644 --- a/src/chrome/content/rules/amazon.fr.xml +++ b/src/chrome/content/rules/amazon.fr.xml @@ -29,25 +29,6 @@ - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.it.xml b/src/chrome/content/rules/amazon.it.xml index fe623d84b9ec..b7207e781cfc 100644 --- a/src/chrome/content/rules/amazon.it.xml +++ b/src/chrome/content/rules/amazon.it.xml @@ -18,22 +18,9 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/amazon.nl.xml b/src/chrome/content/rules/amazon.nl.xml index f7aa416783e7..3f1d1ac4ba24 100644 --- a/src/chrome/content/rules/amazon.nl.xml +++ b/src/chrome/content/rules/amazon.nl.xml @@ -13,17 +13,6 @@ - - - - - - - - - From 04d12adb0527721c8505214ceb00bd733b1bd263 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 00:53:03 +0100 Subject: [PATCH 434/844] add rule for LKQD.net (#14137) --- src/chrome/content/rules/LKQD.net.xml | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/LKQD.net.xml diff --git a/src/chrome/content/rules/LKQD.net.xml b/src/chrome/content/rules/LKQD.net.xml new file mode 100644 index 000000000000..405cf6e86254 --- /dev/null +++ b/src/chrome/content/rules/LKQD.net.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + From 80ff1c03c4eef9a48bae2871f66f83336ad070ef Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 10:28:28 +1030 Subject: [PATCH 435/844] [Maybank2u.com.my] New ruleset (#14079) --- src/chrome/content/rules/Maybank2u.com.my.xml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/chrome/content/rules/Maybank2u.com.my.xml diff --git a/src/chrome/content/rules/Maybank2u.com.my.xml b/src/chrome/content/rules/Maybank2u.com.my.xml new file mode 100644 index 000000000000..93eb9097a766 --- /dev/null +++ b/src/chrome/content/rules/Maybank2u.com.my.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + From 98a9e53b8f2708af128ed6364db54ddf4f29d6a5 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 10:29:17 +1030 Subject: [PATCH 436/844] [Maybank2e.net] New ruleset (#14067) --- src/chrome/content/rules/Maybank2e.net.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Maybank2e.net.xml diff --git a/src/chrome/content/rules/Maybank2e.net.xml b/src/chrome/content/rules/Maybank2e.net.xml new file mode 100644 index 000000000000..d8ecf02aa5cb --- /dev/null +++ b/src/chrome/content/rules/Maybank2e.net.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 6d2a3e130956fc73684272fc08d05d41122ac72c Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 10:37:46 +1030 Subject: [PATCH 437/844] [MaybankHeart.com] New ruleset (#14073) --- src/chrome/content/rules/MaybankHeart.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/MaybankHeart.com.xml diff --git a/src/chrome/content/rules/MaybankHeart.com.xml b/src/chrome/content/rules/MaybankHeart.com.xml new file mode 100644 index 000000000000..a568f93996d5 --- /dev/null +++ b/src/chrome/content/rules/MaybankHeart.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From f7c53868eec312bdca0dcead19bc0a1c58fe28aa Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 10:38:40 +1030 Subject: [PATCH 438/844] [Maybank2u.com.kh] New ruleset (#14074) --- src/chrome/content/rules/Maybank2u.com.kh.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Maybank2u.com.kh.xml diff --git a/src/chrome/content/rules/Maybank2u.com.kh.xml b/src/chrome/content/rules/Maybank2u.com.kh.xml new file mode 100644 index 000000000000..1d417eba1e77 --- /dev/null +++ b/src/chrome/content/rules/Maybank2u.com.kh.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 5594fed14151a3526f13950c5cbd38c690cf77d7 Mon Sep 17 00:00:00 2001 From: Folant Date: Fri, 19 Jan 2018 02:22:36 +0200 Subject: [PATCH 439/844] Create Ixbt.com.xml (#14289) --- src/chrome/content/rules/Ixbt.com.xml | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/Ixbt.com.xml diff --git a/src/chrome/content/rules/Ixbt.com.xml b/src/chrome/content/rules/Ixbt.com.xml new file mode 100644 index 000000000000..8a761e0634ce --- /dev/null +++ b/src/chrome/content/rules/Ixbt.com.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + \ No newline at end of file From ce5c89a2facc9317416abf0faca59bd8cee534f9 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 01:24:05 +0100 Subject: [PATCH 440/844] Outbrain: (#14287) - add amplify subdomain --- src/chrome/content/rules/Outbrain.com.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/chrome/content/rules/Outbrain.com.xml b/src/chrome/content/rules/Outbrain.com.xml index e3e3f5866366..1c3f785dae1b 100644 --- a/src/chrome/content/rules/Outbrain.com.xml +++ b/src/chrome/content/rules/Outbrain.com.xml @@ -58,6 +58,7 @@ + @@ -107,6 +108,7 @@ + From 56733326db6405da8fae4a513d21ae585ecbf5bb Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 11:00:19 +1030 Subject: [PATCH 441/844] [FreshFlowers.com.au] New ruleset (#14229) * [FreshFlowers.com.au] New ruleset * Add 'cdn' --- src/chrome/content/rules/FreshFlowers.com.au.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/FreshFlowers.com.au.xml diff --git a/src/chrome/content/rules/FreshFlowers.com.au.xml b/src/chrome/content/rules/FreshFlowers.com.au.xml new file mode 100644 index 000000000000..a0ee36224b1c --- /dev/null +++ b/src/chrome/content/rules/FreshFlowers.com.au.xml @@ -0,0 +1,11 @@ + + + + + + + + + + From b3891bd2f9b9a0d7b69c5c64b03566243ce47525 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 11:02:38 +1030 Subject: [PATCH 442/844] [Kijijiblog.ca] New ruleset (#14250) --- src/chrome/content/rules/Kijijiblog.ca.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Kijijiblog.ca.xml diff --git a/src/chrome/content/rules/Kijijiblog.ca.xml b/src/chrome/content/rules/Kijijiblog.ca.xml new file mode 100644 index 000000000000..672a178e8c74 --- /dev/null +++ b/src/chrome/content/rules/Kijijiblog.ca.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 8cfca6159482399f820a4fe8cc0dfb80dbdc0244 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 11:11:27 +1030 Subject: [PATCH 443/844] [automobile.fr] New ruleset (#14245) --- src/chrome/content/rules/automobile.fr.xml | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/chrome/content/rules/automobile.fr.xml diff --git a/src/chrome/content/rules/automobile.fr.xml b/src/chrome/content/rules/automobile.fr.xml new file mode 100644 index 000000000000..9140d95903bb --- /dev/null +++ b/src/chrome/content/rules/automobile.fr.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + From b2ac5ed8af58f6b7d31488abeed9298417784aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 19 Jan 2018 01:53:55 +0100 Subject: [PATCH 444/844] Added ruleset for wegenwiki.nl (#14334) --- src/chrome/content/rules/Wegenwiki.nl.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Wegenwiki.nl.xml diff --git a/src/chrome/content/rules/Wegenwiki.nl.xml b/src/chrome/content/rules/Wegenwiki.nl.xml new file mode 100644 index 000000000000..3b75a333a3ca --- /dev/null +++ b/src/chrome/content/rules/Wegenwiki.nl.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 2e48bf74f61c3dc7024bb035335da95bd2ee5c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 19 Jan 2018 02:06:25 +0100 Subject: [PATCH 445/844] Added ruleset for artikel5ev.de (#14313) --- src/chrome/content/rules/artikel5ev.de.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/artikel5ev.de.xml diff --git a/src/chrome/content/rules/artikel5ev.de.xml b/src/chrome/content/rules/artikel5ev.de.xml new file mode 100644 index 000000000000..9d91469854b8 --- /dev/null +++ b/src/chrome/content/rules/artikel5ev.de.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + From ed429d73baf866f9c0da16b6028d22345459515f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 19 Jan 2018 02:07:59 +0100 Subject: [PATCH 446/844] Added ruleset for babator.com (#14239) --- src/chrome/content/rules/babator.com.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/babator.com.xml diff --git a/src/chrome/content/rules/babator.com.xml b/src/chrome/content/rules/babator.com.xml new file mode 100644 index 000000000000..7a84bcaba543 --- /dev/null +++ b/src/chrome/content/rules/babator.com.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + From 33354cf489998ad4a1d3e292a640470625b7446d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 19 Jan 2018 02:10:44 +0100 Subject: [PATCH 447/844] Added ruleset for weareone.fm (#14235) --- src/chrome/content/rules/weareone.fm.xml | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/chrome/content/rules/weareone.fm.xml diff --git a/src/chrome/content/rules/weareone.fm.xml b/src/chrome/content/rules/weareone.fm.xml new file mode 100644 index 000000000000..e290899c0711 --- /dev/null +++ b/src/chrome/content/rules/weareone.fm.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f575834e58fe92e1d9c07595e462f11cfe4dd0b1 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 19 Jan 2018 02:13:42 +0100 Subject: [PATCH 448/844] [Billboard.com] Simplify ruleset (#14146) --- src/chrome/content/rules/Billboard.com.xml | 85 ++++++++-------------- 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/src/chrome/content/rules/Billboard.com.xml b/src/chrome/content/rules/Billboard.com.xml index c9371457b868..a8070adec7de 100644 --- a/src/chrome/content/rules/Billboard.com.xml +++ b/src/chrome/content/rules/Billboard.com.xml @@ -1,63 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + From ffbab7c3fb3f18391385e1e95aedc656c7bc9b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 19 Jan 2018 02:17:09 +0100 Subject: [PATCH 449/844] Added ruleset for ultimedia.com (#14240) --- src/chrome/content/rules/ultimedia.com.xml | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 src/chrome/content/rules/ultimedia.com.xml diff --git a/src/chrome/content/rules/ultimedia.com.xml b/src/chrome/content/rules/ultimedia.com.xml new file mode 100644 index 000000000000..e69454c4acfa --- /dev/null +++ b/src/chrome/content/rules/ultimedia.com.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fea651953656cff46e41578558a32725e11c42be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 19 Jan 2018 02:26:09 +0100 Subject: [PATCH 450/844] Added ruleset for badv.bund.de (#14232) --- src/chrome/content/rules/Verwaltung_Online.xml | 1 + src/chrome/content/rules/badv.bund.de.xml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/badv.bund.de.xml diff --git a/src/chrome/content/rules/Verwaltung_Online.xml b/src/chrome/content/rules/Verwaltung_Online.xml index 729377f50247..b82bc495109a 100644 --- a/src/chrome/content/rules/Verwaltung_Online.xml +++ b/src/chrome/content/rules/Verwaltung_Online.xml @@ -17,6 +17,7 @@ - bag.bund.de.xml - bfe.bund.de.xml - bvl.bund.de.xml + - badv.bund.de.xml --> diff --git a/src/chrome/content/rules/badv.bund.de.xml b/src/chrome/content/rules/badv.bund.de.xml new file mode 100644 index 000000000000..872c51b61480 --- /dev/null +++ b/src/chrome/content/rules/badv.bund.de.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + From a42d73465fce475c1a2322387e6cc3cb47f026e7 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 12:04:54 +1030 Subject: [PATCH 451/844] [Marktplaatsjournaal.nl] New ruleset (#14247) --- src/chrome/content/rules/Marktplaatsjournaal.nl.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Marktplaatsjournaal.nl.xml diff --git a/src/chrome/content/rules/Marktplaatsjournaal.nl.xml b/src/chrome/content/rules/Marktplaatsjournaal.nl.xml new file mode 100644 index 000000000000..53d7b1c9d652 --- /dev/null +++ b/src/chrome/content/rules/Marktplaatsjournaal.nl.xml @@ -0,0 +1,11 @@ + + + + + + + + From 8096b10cd15b6e48904acc4096505bab89721f17 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 12:37:13 +1030 Subject: [PATCH 452/844] [Marktplaatsautojournaal.nl] New ruleset (#14246) --- .../content/rules/Marktplaatsautojournaal.nl.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Marktplaatsautojournaal.nl.xml diff --git a/src/chrome/content/rules/Marktplaatsautojournaal.nl.xml b/src/chrome/content/rules/Marktplaatsautojournaal.nl.xml new file mode 100644 index 000000000000..7c1c2f2d4430 --- /dev/null +++ b/src/chrome/content/rules/Marktplaatsautojournaal.nl.xml @@ -0,0 +1,11 @@ + + + + + + + + From 16e3d349e7e19d53c7acd63d20fd9e0501045311 Mon Sep 17 00:00:00 2001 From: Parker Higgins Date: Thu, 18 Jan 2018 21:10:38 -0500 Subject: [PATCH 453/844] [Hollywood-Reporter] reactived rule for bare and www domains (#14263) * reactived hollywood reporter rule for bare and www domains * Update Hollywood-Reporter.xml fixed a stupid typo --- src/chrome/content/rules/Hollywood-Reporter.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Hollywood-Reporter.xml b/src/chrome/content/rules/Hollywood-Reporter.xml index e3218c5c5977..f159b315c33f 100644 --- a/src/chrome/content/rules/Hollywood-Reporter.xml +++ b/src/chrome/content/rules/Hollywood-Reporter.xml @@ -2,8 +2,6 @@ Problematic hosts in *hollywoodreporter.com: - - ^ (redirects to http) - - www (redirects to http) - awards ᵐ - edit (redirects to http) - features ᵐ @@ -31,6 +29,9 @@ --> + + + From 327b2fe7047cd843b81b3b2ed2b0c4f77cc87c6d Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 03:12:26 +0100 Subject: [PATCH 454/844] Webtrekk: (#14285) - more related domains added --- src/chrome/content/rules/Webtrekk.net.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/chrome/content/rules/Webtrekk.net.xml b/src/chrome/content/rules/Webtrekk.net.xml index 37f6b9896eb8..22c811c2745d 100644 --- a/src/chrome/content/rules/Webtrekk.net.xml +++ b/src/chrome/content/rules/Webtrekk.net.xml @@ -8,12 +8,25 @@ * Clients have unique subdomains, which serve web bugs. + Cert expired: + - rtx.wbtrk.net + --> + + + + + + + + + + @@ -21,6 +34,9 @@ + + + - - - + - - diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index ee4b470dc922..4078c860df3e 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -2242,7 +2242,7 @@ ebcc8d760dad213f091f650b11dbd48341e8039af99e39d0e1ea98115899e204,0,1,NatMonitor. d6c033cb1812b3eb35f78584497ebc3e7ba242d128036064f93cb32fbd54c5d9,1,1,Nature_Shop.xml 5fa991b9e337ffa71bfe80e49dcb48b46deac649f5bc33ea192903e0b44e7ca5,0,1,Naturvardsverket.se.xml 92305d7d6923ab049957e8eda6b1a3145f480f0f7c1a26f25e40df7ec06cbb0a,1,1,Nautil.us.xml -fc8c9de3784c5be89653da894ccedcae656c1017eb9a9afe599acc86b2902dfe,1,1,Naver.com.xml +6f7d7a37ac11fcb1be6e29f4d1b0f049754ea7e64beec41ada9c54ef6dd6c939,1,1,Naver.com.xml cca9679d08747b3a6f8f2ba6a4075140929b47237347a3c6703c51e22846f71c,1,1,Naver.net.xml a06696fc40595b3cde47899254b84ec14c5e2a2209a07205aaafee889961886f,1,1,Navigant_Research.com.xml bceb342f096bc915324ab7926b62ae2039efebd5f1655264a42e5499bfa890dc,0,1,NAVTEQ-problematic.xml From 4b6865479ce03be99e095309efaa3e7e8b79ffe6 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 12:52:32 +0100 Subject: [PATCH 456/844] add rule for the Gameplorer.de Network (#8099) --- src/chrome/content/rules/Gameplorer.de.xml | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/chrome/content/rules/Gameplorer.de.xml diff --git a/src/chrome/content/rules/Gameplorer.de.xml b/src/chrome/content/rules/Gameplorer.de.xml new file mode 100644 index 000000000000..16ec851e0768 --- /dev/null +++ b/src/chrome/content/rules/Gameplorer.de.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + From 52ca3e7bd9d1c09fe81c0c252e0a05a2beebaa16 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 13:24:38 +0100 Subject: [PATCH 457/844] TagCommander: (#6593) - more subdomains added - ^ and www subdomains redirect to http --- src/chrome/content/rules/TagCommander.com.xml | 49 ++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/TagCommander.com.xml b/src/chrome/content/rules/TagCommander.com.xml index 1f5b5d12e963..cd49c1215d38 100644 --- a/src/chrome/content/rules/TagCommander.com.xml +++ b/src/chrome/content/rules/TagCommander.com.xml @@ -1,27 +1,64 @@ - + + + + - + + + + + + + + + + - + + + + From a98e83cdf72b0f6c0f0b9671ca32a2c2cf24b206 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 13:29:13 +0100 Subject: [PATCH 458/844] add rule for NowYouKnow.eu (#13665) --- src/chrome/content/rules/NYK.eu.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/NYK.eu.xml diff --git a/src/chrome/content/rules/NYK.eu.xml b/src/chrome/content/rules/NYK.eu.xml new file mode 100644 index 000000000000..4240cf33335a --- /dev/null +++ b/src/chrome/content/rules/NYK.eu.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + From ae4506562c8c3c8be1b68614ac5c0cd043108062 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 19 Jan 2018 23:08:03 +1030 Subject: [PATCH 459/844] [Stubhub.fr] New ruleset (#14270) --- src/chrome/content/rules/Stubhub.fr.xml | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/Stubhub.fr.xml diff --git a/src/chrome/content/rules/Stubhub.fr.xml b/src/chrome/content/rules/Stubhub.fr.xml new file mode 100644 index 000000000000..2754e2a8b933 --- /dev/null +++ b/src/chrome/content/rules/Stubhub.fr.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + From 7e4cb4430592c6635be738818dc6ba23c04f24be Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 19 Jan 2018 20:44:41 +0800 Subject: [PATCH 460/844] Update Qpic.cn.xml (#14337) --- src/chrome/content/rules/Qpic.cn.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Qpic.cn.xml b/src/chrome/content/rules/Qpic.cn.xml index 3494b1fea940..cf1f292d5544 100644 --- a/src/chrome/content/rules/Qpic.cn.xml +++ b/src/chrome/content/rules/Qpic.cn.xml @@ -11,7 +11,7 @@ - + From d21215e1fc79f3f23530df58f0bba61b5ace7c34 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 19 Jan 2018 20:45:01 +0800 Subject: [PATCH 461/844] Update OpenNIC.org.xml (#14309) * Update OpenNIC.org.xml * Update OpenNIC.org.xml --- src/chrome/content/rules/OpenNIC.org.xml | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/rules/OpenNIC.org.xml b/src/chrome/content/rules/OpenNIC.org.xml index 2da7566a3319..664771c20f39 100644 --- a/src/chrome/content/rules/OpenNIC.org.xml +++ b/src/chrome/content/rules/OpenNIC.org.xml @@ -1,34 +1,34 @@ - - + - + + - - - - + - + From 2b1589f96c41e0cc9ce6c9638bdeaceacd0b52f2 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 14:17:03 +0100 Subject: [PATCH 462/844] add rule for None of your business (#13854) --- src/chrome/content/rules/NOYB.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/NOYB.xml diff --git a/src/chrome/content/rules/NOYB.xml b/src/chrome/content/rules/NOYB.xml new file mode 100644 index 000000000000..315cbf58f1fc --- /dev/null +++ b/src/chrome/content/rules/NOYB.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + From a209b4369294bea61a11249050b6b6e3811a7371 Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 20 Jan 2018 00:01:55 +1030 Subject: [PATCH 463/844] [Stubhub.ca] New ruleset (#14272) --- src/chrome/content/rules/Stubhub.ca.xml | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/chrome/content/rules/Stubhub.ca.xml diff --git a/src/chrome/content/rules/Stubhub.ca.xml b/src/chrome/content/rules/Stubhub.ca.xml new file mode 100644 index 000000000000..73e82ccfb435 --- /dev/null +++ b/src/chrome/content/rules/Stubhub.ca.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + From 61f2a5c09b036d0fd27083e5219fdb3d207d9e5d Mon Sep 17 00:00:00 2001 From: youdly Date: Sat, 20 Jan 2018 00:21:32 +1030 Subject: [PATCH 464/844] [AerisWeather.com] New ruleset (#13831) * [AerisWeather.com] New ruleset * Add aerisapi.com --- src/chrome/content/rules/AerisWeather.com.xml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 src/chrome/content/rules/AerisWeather.com.xml diff --git a/src/chrome/content/rules/AerisWeather.com.xml b/src/chrome/content/rules/AerisWeather.com.xml new file mode 100644 index 000000000000..b8c51898a0c3 --- /dev/null +++ b/src/chrome/content/rules/AerisWeather.com.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0d04a501ae1bfcb2b6359635663b43b30138fbde Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 19 Jan 2018 16:25:06 +0100 Subject: [PATCH 465/844] Update Doodle.xml (#9249) --- src/chrome/content/rules/Doodle.xml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Doodle.xml b/src/chrome/content/rules/Doodle.xml index 291b599a30ec..11eca1cf289a 100644 --- a/src/chrome/content/rules/Doodle.xml +++ b/src/chrome/content/rules/Doodle.xml @@ -1,14 +1,25 @@ - + + + + + + + + - - - \ No newline at end of file + From 243814c6980ba16c7309e315a093759d26eca608 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 00:44:35 +0800 Subject: [PATCH 466/844] Update XVideos.com.xml (#14341) --- src/chrome/content/rules/XVideos-cdn.com.xml | 3 ++- src/chrome/content/rules/XVideos.com.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/XVideos-cdn.com.xml b/src/chrome/content/rules/XVideos-cdn.com.xml index 082d139cc5f2..7d097f7ec662 100644 --- a/src/chrome/content/rules/XVideos-cdn.com.xml +++ b/src/chrome/content/rules/XVideos-cdn.com.xml @@ -10,6 +10,7 @@ + @@ -19,4 +20,4 @@ - \ No newline at end of file + diff --git a/src/chrome/content/rules/XVideos.com.xml b/src/chrome/content/rules/XVideos.com.xml index 0c3f4eaf9c7f..c017cd01e472 100644 --- a/src/chrome/content/rules/XVideos.com.xml +++ b/src/chrome/content/rules/XVideos.com.xml @@ -35,7 +35,7 @@ - + From f7fdd648bf40daeff5650eedf9ae2528d1d216a5 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 01:10:09 +0800 Subject: [PATCH 467/844] Update Migros-Bank.xml (#14340) --- src/chrome/content/rules/Migros-Bank.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/chrome/content/rules/Migros-Bank.xml b/src/chrome/content/rules/Migros-Bank.xml index b036fc1bea76..f2951fe84d2e 100644 --- a/src/chrome/content/rules/Migros-Bank.xml +++ b/src/chrome/content/rules/Migros-Bank.xml @@ -8,7 +8,6 @@ - @@ -23,17 +22,5 @@ - - - - - - - - - - From 985ec24bd318190e5895ae490387613bae6f43af Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 01:13:15 +0800 Subject: [PATCH 468/844] Update polyvoreimg.com.xml (#14343) --- src/chrome/content/rules/polyvoreimg.com.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/chrome/content/rules/polyvoreimg.com.xml b/src/chrome/content/rules/polyvoreimg.com.xml index 805d2eb17227..f4af9485ab18 100644 --- a/src/chrome/content/rules/polyvoreimg.com.xml +++ b/src/chrome/content/rules/polyvoreimg.com.xml @@ -5,7 +5,6 @@ Problematic hosts in *polyvoreimg.com: - ak[12] ᴬ - - akwww ᴬ - cfc ᴬ ᴬ Akamai / mismatched @@ -24,8 +23,6 @@ - - @@ -35,7 +32,6 @@ - Date: Sat, 20 Jan 2018 02:27:10 +0800 Subject: [PATCH 469/844] Update Sohu.com.xml (#14339) --- src/chrome/content/rules/Sohu.com.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/Sohu.com.xml b/src/chrome/content/rules/Sohu.com.xml index 34cc78b58a5b..3d38f73ec86d 100644 --- a/src/chrome/content/rules/Sohu.com.xml +++ b/src/chrome/content/rules/Sohu.com.xml @@ -103,6 +103,7 @@ + From 9b0ad5cc5aa655c24d2ab3eca3ab53733dd864f2 Mon Sep 17 00:00:00 2001 From: Folant Date: Fri, 19 Jan 2018 20:48:30 +0200 Subject: [PATCH 470/844] Create Vajehyab.com.xml (#14332) --- src/chrome/content/rules/Vajehyab.com.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/Vajehyab.com.xml diff --git a/src/chrome/content/rules/Vajehyab.com.xml b/src/chrome/content/rules/Vajehyab.com.xml new file mode 100644 index 000000000000..4863d14d4773 --- /dev/null +++ b/src/chrome/content/rules/Vajehyab.com.xml @@ -0,0 +1,9 @@ + + + + + + + From 4f844ec58e0e4be42c9a4e7bdef61e1d35375919 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 02:49:09 +0800 Subject: [PATCH 471/844] Delete Wyndham-mismatches.xml (#14064) --- src/chrome/content/rules/Wyndham-mismatches.xml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/chrome/content/rules/Wyndham-mismatches.xml diff --git a/src/chrome/content/rules/Wyndham-mismatches.xml b/src/chrome/content/rules/Wyndham-mismatches.xml deleted file mode 100644 index 41f7dde3c0e1..000000000000 --- a/src/chrome/content/rules/Wyndham-mismatches.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - From 05df30888adc5d004507723cc4d8a90b4e4fd715 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 19 Jan 2018 21:33:07 +0100 Subject: [PATCH 472/844] [GetPocketbook.com] Remove wildcard (#14322) --- src/chrome/content/rules/GetPocketbook.com.xml | 16 ++++++++++++++++ src/chrome/content/rules/Pocketbook.xml | 11 ----------- 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 src/chrome/content/rules/GetPocketbook.com.xml delete mode 100644 src/chrome/content/rules/Pocketbook.xml diff --git a/src/chrome/content/rules/GetPocketbook.com.xml b/src/chrome/content/rules/GetPocketbook.com.xml new file mode 100644 index 000000000000..8a14ae227bcb --- /dev/null +++ b/src/chrome/content/rules/GetPocketbook.com.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/Pocketbook.xml b/src/chrome/content/rules/Pocketbook.xml deleted file mode 100644 index ce199a84b071..000000000000 --- a/src/chrome/content/rules/Pocketbook.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file From 3a2dc58f34f5ef5fa39b35c45a60b70b0abbd198 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 19 Jan 2018 21:37:13 +0100 Subject: [PATCH 473/844] Create LeContrepied.org.xml (#14306) --- src/chrome/content/rules/LeContrepied.org.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/LeContrepied.org.xml diff --git a/src/chrome/content/rules/LeContrepied.org.xml b/src/chrome/content/rules/LeContrepied.org.xml new file mode 100644 index 000000000000..44d07ad927c3 --- /dev/null +++ b/src/chrome/content/rules/LeContrepied.org.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + From 9439ce078aab38f1d29a363196d7cdc4136cf432 Mon Sep 17 00:00:00 2001 From: numismatika Date: Fri, 19 Jan 2018 22:33:58 +0100 Subject: [PATCH 474/844] Sys4.de: (#13763) - add more Subdomains --- src/chrome/content/rules/Sys4.de.xml | 46 +++++++++++++++++++--------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/Sys4.de.xml b/src/chrome/content/rules/Sys4.de.xml index e1390c9a31ad..fc799bd1f95d 100644 --- a/src/chrome/content/rules/Sys4.de.xml +++ b/src/chrome/content/rules/Sys4.de.xml @@ -3,28 +3,46 @@ - Automx.org.xml - - Problematic hosts in *sys4.de: - - - blog * - - * Mismatched + Cert expired: + - bravo.sys4.de + - mon.sys4.de + - secmail.sys4.de + + Cert mismatch: + - golf.sys4.de + - mike.sys4.de + - romeo.sys4.de + - stats.sys4.de + + Chain issues: + - download.sys4.de + - files.sys4.de + - foxtrot.sys4.de + - ml.oss.sys4.de + - ml.srv.sys4.de + - ns-v.sys4.de --> + - - - - - - + + + + + + + + + + + + + From cbfa31fe9b406438d976a1116d53484c34ff4123 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 19 Jan 2018 23:06:19 +0100 Subject: [PATCH 475/844] Create BritishEcologicalSociety.org.xml (#13910) * Create BritishEcologicalSociety.org.xml * [BritishEcologicalSociety.org] Fix closing tag * [BritishEcologicalSociety.org] Add subdomains --- .../rules/BritishEcologicalSociety.org.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/chrome/content/rules/BritishEcologicalSociety.org.xml diff --git a/src/chrome/content/rules/BritishEcologicalSociety.org.xml b/src/chrome/content/rules/BritishEcologicalSociety.org.xml new file mode 100644 index 000000000000..ec9ca4946cbf --- /dev/null +++ b/src/chrome/content/rules/BritishEcologicalSociety.org.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + From 8ec5bd6a7eae7c1ac0c7e206ccc56ad41ee6b316 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 19 Jan 2018 23:21:53 +0100 Subject: [PATCH 476/844] Update ning.com rulesets (#9536) --- src/chrome/content/rules/Ning-falsemixed.xml | 45 ++++-- src/chrome/content/rules/Ning.xml | 136 +++---------------- 2 files changed, 56 insertions(+), 125 deletions(-) diff --git a/src/chrome/content/rules/Ning-falsemixed.xml b/src/chrome/content/rules/Ning-falsemixed.xml index 64a8963aae80..36a156849b68 100644 --- a/src/chrome/content/rules/Ning-falsemixed.xml +++ b/src/chrome/content/rules/Ning-falsemixed.xml @@ -1,18 +1,45 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/src/chrome/content/rules/Ning.xml b/src/chrome/content/rules/Ning.xml index 53cd0e2b4da9..710e61cda61a 100644 --- a/src/chrome/content/rules/Ning.xml +++ b/src/chrome/content/rules/Ning.xml @@ -1,127 +1,31 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + From 5f28021035c4e76a591002c58c234102c3ef734d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 20 Jan 2018 00:02:51 +0100 Subject: [PATCH 477/844] [Cvent.com] Add warning and test url (#14335) --- src/chrome/content/rules/Cvent.com.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/rules/Cvent.com.xml b/src/chrome/content/rules/Cvent.com.xml index 780f2d187d00..c38994261679 100644 --- a/src/chrome/content/rules/Cvent.com.xml +++ b/src/chrome/content/rules/Cvent.com.xml @@ -25,9 +25,13 @@ + + From 368eeb82b0d0d7528173aeeda46e8d21a2c50118 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 10:41:18 +0800 Subject: [PATCH 478/844] Update Zwame.pt.xml (#14342) * Update Zwame.pt.xml * Update Zwame.pt.xml * Update Zwame.pt.xml --- src/chrome/content/rules/Zwame.pt.xml | 100 +++++--------------------- 1 file changed, 17 insertions(+), 83 deletions(-) diff --git a/src/chrome/content/rules/Zwame.pt.xml b/src/chrome/content/rules/Zwame.pt.xml index 197d53bf30d2..a6be8a6191a3 100644 --- a/src/chrome/content/rules/Zwame.pt.xml +++ b/src/chrome/content/rules/Zwame.pt.xml @@ -1,94 +1,28 @@ - - - - + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + From 6fb8acb591ebe99676beab73cf0dac6342050dfd Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 20 Jan 2018 13:21:38 +0100 Subject: [PATCH 479/844] [Ticketmaster] Move eticketing.co.uk to its own ruleset (#14282) * Create ETicketing.co.uk.xml * [Ticketmaster] Remove eticketing.co.uk * Add references in top comments --- src/chrome/content/rules/ETicketing.co.uk.xml | 15 +++++++++++++++ src/chrome/content/rules/Ticketmaster.xml | 10 ++-------- 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/chrome/content/rules/ETicketing.co.uk.xml diff --git a/src/chrome/content/rules/ETicketing.co.uk.xml b/src/chrome/content/rules/ETicketing.co.uk.xml new file mode 100644 index 000000000000..7563b1a0e13e --- /dev/null +++ b/src/chrome/content/rules/ETicketing.co.uk.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Ticketmaster.xml b/src/chrome/content/rules/Ticketmaster.xml index 0b10666920ab..13d0333ef2ef 100644 --- a/src/chrome/content/rules/Ticketmaster.xml +++ b/src/chrome/content/rules/Ticketmaster.xml @@ -5,6 +5,8 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio For other Live Nation coverage, see Live-Nation.xml + Other ticketmaster rulesets: + ETicketing.co.uk.xml CDN buckets: @@ -26,7 +28,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio - (www.)billetnet.es (redirects to billetnet.fr) - (www.)billetnet.fr (shows default Parallels Panel page) - - eticketing.co.uk *** - ticketmaster.com (only matches www) - media.ticketmaster.com * - media.ticketmaster.co.uk * @@ -60,7 +61,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio Fully covered domains: - - (www.)eticketing.co.uk (^ → www) - (www.)ticketmaster.co.uk (^ → www) - secure.store.ticketmaster.com - de.ticketmaster.com @@ -74,8 +74,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio - - @@ -88,7 +86,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio - @@ -105,9 +102,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio - - From c351a25bd4e9cbbad8901919f937e3ff7ccb4ef5 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 20:32:04 +0800 Subject: [PATCH 480/844] Split Cottagesdirect.co.uk from Wyndham.xml (#14351) * Split Cottagesdirect.co.uk from Wyndham.xml * Update Wyndham.xml --- .../content/rules/Cottagesdirect.co.uk.xml | 17 +++++++++++++++++ src/chrome/content/rules/Wyndham.xml | 12 +++--------- 2 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 src/chrome/content/rules/Cottagesdirect.co.uk.xml diff --git a/src/chrome/content/rules/Cottagesdirect.co.uk.xml b/src/chrome/content/rules/Cottagesdirect.co.uk.xml new file mode 100644 index 000000000000..3e29dac8e59e --- /dev/null +++ b/src/chrome/content/rules/Cottagesdirect.co.uk.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 9a317f403198..4442fd0744d9 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -5,6 +5,7 @@ + CompetitionsByWyndham.com.au.xml + Cottages.com.xml + Cottages4you.co.uk.xml + + Cottagesdirect.co.uk.xml + English-Country-Cottages.co.uk.xml + French-Country-Cottages.co.uk.xml + Hoseasons.co.uk.xml @@ -57,8 +58,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: --> - - @@ -73,13 +72,8 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - - - - + From dfc2d4a3996dd3179e0b5f4628536bf5631a3163 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 20:42:10 +0800 Subject: [PATCH 481/844] Update Amazon-Adsystem.com.xml (#14357) --- src/chrome/content/rules/Amazon-Adsystem.com.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/Amazon-Adsystem.com.xml b/src/chrome/content/rules/Amazon-Adsystem.com.xml index b20b0b2640ba..593c23039293 100644 --- a/src/chrome/content/rules/Amazon-Adsystem.com.xml +++ b/src/chrome/content/rules/Amazon-Adsystem.com.xml @@ -42,6 +42,7 @@ + - - - - + - - - + From c08394bf4c1cd310319cb4741042da5caf304c61 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Sat, 20 Jan 2018 20:54:34 +0800 Subject: [PATCH 483/844] Update 163.com.xml (#14355) * Update 163.com-problematic.xml * Update 163.com.xml * Update 163.com.xml * Update 163.com.xml --- .../content/rules/163.com-problematic.xml | 11 ++++---- src/chrome/content/rules/163.com.xml | 27 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/rules/163.com-problematic.xml b/src/chrome/content/rules/163.com-problematic.xml index 7414b1ab2690..b7a9ecc40e71 100644 --- a/src/chrome/content/rules/163.com-problematic.xml +++ b/src/chrome/content/rules/163.com-problematic.xml @@ -2,26 +2,27 @@ For rules not causing problems, see 163.com.xml. --> - - - - + + + + + + diff --git a/src/chrome/content/rules/163.com.xml b/src/chrome/content/rules/163.com.xml index e15099e2334a..50c9f2d32431 100644 --- a/src/chrome/content/rules/163.com.xml +++ b/src/chrome/content/rules/163.com.xml @@ -13,7 +13,6 @@ - developer - digi ʳ - e ʳ - - email2 ʳ - emarketing ʳ - ent ʳ - fankui ² @@ -23,7 +22,6 @@ - help ⁵ - home ʳ - lady ⁵ - - count.mail ʳ - mall ᵇ - money ⁵ - men ʳ @@ -35,7 +33,6 @@ - v ʳ - vhouse ʳ - view ʳ - - vipmail ʳ - www ⁵ - yuehui ʳ - zh ⁵ @@ -48,45 +45,41 @@ Problematic hosts in *163.com: - ^ - - 3g ˣ + - 1 ᵉ - cc ˣ - support.dun ᵐ - - email ( Failed in China while OK by Tor. ) - fa ˣ - - 18.mail ᵐ - - help.mail ᵐ - - pstat.mail ᵐ + - fm ᵉ - res.nie ᵐ - piao ˣ - pimg ᵐ https://pimg.163.com/urs/img/mistakertu.gif - qiye ᵐ - sitemap ᵐ - api.t ᵉ + - you ᵉ - b.you ˣ ᵉ Expired ᵐ Mismatched ˣ Mixed css or iframe Mixed content: - - iframe on mail from $self * （ http://mail.163.com/preload6.htm ） - - favicons, on: - - mail from $self * - Bugs, on: - - mail from pstat.mail.163.com - i.money from 163.wrating.com - i.money from developer.163.com + - help.mail (Only break ads) * Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/ --> - + - + + @@ -119,6 +112,10 @@ + + + + @@ -132,7 +129,7 @@ - + From d9fa172cfcd21d0df5e74816134cf0990ce8fbdd Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 20 Jan 2018 14:02:23 +0100 Subject: [PATCH 484/844] ZAM: (#11860) - comment about another subdomain with invalid cert --- src/chrome/content/rules/Zam.xml | 82 +++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/Zam.xml b/src/chrome/content/rules/Zam.xml index 944a5ed7b9b7..ad93507ec483 100644 --- a/src/chrome/content/rules/Zam.xml +++ b/src/chrome/content/rules/Zam.xml @@ -1,30 +1,88 @@ - - + + + + + + + + + + + + + + - + - - - + + + + + + + + + From b17c92dd81838999139055450e2a33831a9806ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20M=C3=BCller?= Date: Sat, 20 Jan 2018 14:39:32 +0100 Subject: [PATCH 485/844] [Zhaw.ch] New ruleset (#14212) --- src/chrome/content/rules/Zhaw.ch.xml | 88 ++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/chrome/content/rules/Zhaw.ch.xml diff --git a/src/chrome/content/rules/Zhaw.ch.xml b/src/chrome/content/rules/Zhaw.ch.xml new file mode 100644 index 000000000000..98429860610d --- /dev/null +++ b/src/chrome/content/rules/Zhaw.ch.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a82b8280cfc0e3598ab32f081b32ae2bb8729e8b Mon Sep 17 00:00:00 2001 From: ivysrono Date: Sat, 20 Jan 2018 21:45:27 +0800 Subject: [PATCH 486/844] Update 126.com.xml (#14353) * Update 126.com.xml * Update 126.com.xml * Update 126.com.xml * Update 126.com.xml --- src/chrome/content/rules/126.com.xml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/126.com.xml b/src/chrome/content/rules/126.com.xml index 7b7dd31e2e20..2f6a976019ad 100644 --- a/src/chrome/content/rules/126.com.xml +++ b/src/chrome/content/rules/126.com.xml @@ -1,13 +1,21 @@ + - + + + + + - - - - - - From 9180c40097675189302158449ce3fcbbf4b3a143 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 22:10:45 +0800 Subject: [PATCH 487/844] Split WorldMarkByWyndham.com from Wyndham.xml (#14363) --- .../content/rules/WorldMarkByWyndham.com.xml | 17 +++++++++++++++++ src/chrome/content/rules/Wyndham.xml | 6 ++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 src/chrome/content/rules/WorldMarkByWyndham.com.xml diff --git a/src/chrome/content/rules/WorldMarkByWyndham.com.xml b/src/chrome/content/rules/WorldMarkByWyndham.com.xml new file mode 100644 index 000000000000..806456f090f3 --- /dev/null +++ b/src/chrome/content/rules/WorldMarkByWyndham.com.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 4442fd0744d9..62f8da0aefef 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -65,8 +65,6 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - @@ -75,8 +73,8 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - + Date: Sat, 20 Jan 2018 22:44:05 +0800 Subject: [PATCH 488/844] Create u51.com (#14362) * Create u51.com * Rename u51.com to u51.com.xml * Update u51.com.xml --- src/chrome/content/rules/u51.com.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/u51.com.xml diff --git a/src/chrome/content/rules/u51.com.xml b/src/chrome/content/rules/u51.com.xml new file mode 100644 index 000000000000..39be8d3d42e9 --- /dev/null +++ b/src/chrome/content/rules/u51.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + From 1f19cd097d23cbc675acacac590e100f9345c835 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 20 Jan 2018 16:21:02 +0100 Subject: [PATCH 489/844] Fix #13953 (#14345) --- src/chrome/content/rules/tutti.ch.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/tutti.ch.xml b/src/chrome/content/rules/tutti.ch.xml index 885e5e3550bb..51e9f6cb9e15 100644 --- a/src/chrome/content/rules/tutti.ch.xml +++ b/src/chrome/content/rules/tutti.ch.xml @@ -13,10 +13,16 @@ - + + + + + + + From 68be83035820c0df5ef3faaa1e4e2fd8b3fd67cb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 20 Jan 2018 16:21:53 +0100 Subject: [PATCH 490/844] [FranceTVInfo.fr] Add targets (#13900) --- src/chrome/content/rules/FranceTVInfo.fr.xml | 46 ++++++++++++ src/chrome/content/rules/francetvinfo.fr.xml | 76 -------------------- 2 files changed, 46 insertions(+), 76 deletions(-) create mode 100644 src/chrome/content/rules/FranceTVInfo.fr.xml delete mode 100644 src/chrome/content/rules/francetvinfo.fr.xml diff --git a/src/chrome/content/rules/FranceTVInfo.fr.xml b/src/chrome/content/rules/FranceTVInfo.fr.xml new file mode 100644 index 000000000000..d749afdf425a --- /dev/null +++ b/src/chrome/content/rules/FranceTVInfo.fr.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/francetvinfo.fr.xml b/src/chrome/content/rules/francetvinfo.fr.xml deleted file mode 100644 index aef86972adaf..000000000000 --- a/src/chrome/content/rules/francetvinfo.fr.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0187b6598584e398915b0cb426355be3154bd93a Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 20 Jan 2018 23:22:55 +0800 Subject: [PATCH 491/844] Update Sikur.xml (#14338) --- src/chrome/content/rules/Sikur.xml | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/rules/Sikur.xml b/src/chrome/content/rules/Sikur.xml index eb1eef5a69da..87506302a8be 100644 --- a/src/chrome/content/rules/Sikur.xml +++ b/src/chrome/content/rules/Sikur.xml @@ -1,30 +1,31 @@ - - - - - - - - - + + - + + + - - + - + to="https:" /> From d5c54c4ecb9dcab1789903990b57c0cfc53795ba Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 21 Jan 2018 00:09:32 +0800 Subject: [PATCH 492/844] Update ArmyTimes.com.xml (#13980) --- src/chrome/content/rules/ArmyTimes.com.xml | 48 ++++++++++++++++++++ src/chrome/content/rules/Army_Times.xml | 29 ------------ src/chrome/content/rules/Gannett-Company.xml | 2 +- utils/ruleset-whitelist.csv | 2 +- 4 files changed, 50 insertions(+), 31 deletions(-) create mode 100644 src/chrome/content/rules/ArmyTimes.com.xml delete mode 100644 src/chrome/content/rules/Army_Times.xml diff --git a/src/chrome/content/rules/ArmyTimes.com.xml b/src/chrome/content/rules/ArmyTimes.com.xml new file mode 100644 index 000000000000..d8df93eb2168 --- /dev/null +++ b/src/chrome/content/rules/ArmyTimes.com.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Army_Times.xml b/src/chrome/content/rules/Army_Times.xml deleted file mode 100644 index cc031f62103a..000000000000 --- a/src/chrome/content/rules/Army_Times.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/chrome/content/rules/Gannett-Company.xml b/src/chrome/content/rules/Gannett-Company.xml index f83a9ea39a13..fed1b6bad96c 100644 --- a/src/chrome/content/rules/Gannett-Company.xml +++ b/src/chrome/content/rules/Gannett-Company.xml @@ -9,7 +9,7 @@ Fetch error: http://ssl1.gmti.com/ => https://ssl1.gmti.com/: (7, 'Failed to con Fetch error: http://deals.montomeryadvertiser.com/ => http://deals.montomeryadvertiser.com/: (6, 'Could not resolve host: deals.montomeryadvertiser.com') Other Gannett Company rulesets: - - Army_Times.xml + - ArmyTimes.com.xml - Asbury_Park_Press.xml - Asheville_Citizen-Times.xml - Bucyrus_Telegraph_Forum.xml diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 4078c860df3e..ebd0b91d8e7a 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -210,7 +210,7 @@ d8e76464d628f155de649ab36ed52ab3cefcfc493c3873271a9cdf661b6f522a,1,1,Ariejan.net b7da8eb71bac9196944afa62279d4f6c1143b87a1ba2090b301c1f760164bead,0,1,Arizona_State_University-problematic.xml 007251111fd27a7b448f1cb45893cba99e144e7f9014020b1f41d0c65009df3c,1,1,ARM.xml cda60d257787e7061e709192d5cf0a94a4984b46985afa9f3b0cfd0dcef90cee,0,1,Armyoutlet.de.xml -1a0d68ae1344a84a3f284fdcb44ef5887482d4b8e4504b5b54b95d6eba36a278,1,1,Army_Times.xml +35b8bcb9a8c7ca87094f12b24aba2343a5087db4abc52cf267ca2303b36c2af8,0,1,ArmyTimes.com.xml 7882aeef7076ea7fb22daabb09500f52d3b89a68d9694c5d1254c7052768e218,1,1,ARPNetworks.com.xml 8a49cb29d21a368156693ed53b1980f3da2d23f43b5aca1311b92173d3a23810,0,1,Array.is.xml 12a54fdd75f8a200b6da25d78514f8ed3e3a3bc516307e3729b9220792921514,1,1,ARRL.xml From 1b188bd07a58a60efe2b5385d6349c08e85d8f95 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Sat, 20 Jan 2018 12:11:06 -0500 Subject: [PATCH 493/844] Update MegaGlest.org.xml (#14104) --- src/chrome/content/rules/MegaGlest.org.xml | 40 +++++++++------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/rules/MegaGlest.org.xml b/src/chrome/content/rules/MegaGlest.org.xml index 25c583b03039..f9ec4fbb6c42 100644 --- a/src/chrome/content/rules/MegaGlest.org.xml +++ b/src/chrome/content/rules/MegaGlest.org.xml @@ -1,33 +1,27 @@ + + + - - - - - - - - - - - - - + From d9e87d5e4e46ecc7958d163beba57a0d112f473a Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 20 Jan 2018 23:05:39 +0100 Subject: [PATCH 494/844] add MCB rule for 20min.ch (#12513) --- .../content/rules/20min.ch-mixedcontent.xml | 18 ++++++++++++++++++ src/chrome/content/rules/20min.ch.xml | 18 +++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 src/chrome/content/rules/20min.ch-mixedcontent.xml diff --git a/src/chrome/content/rules/20min.ch-mixedcontent.xml b/src/chrome/content/rules/20min.ch-mixedcontent.xml new file mode 100644 index 000000000000..1a73adb858b7 --- /dev/null +++ b/src/chrome/content/rules/20min.ch-mixedcontent.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/20min.ch.xml b/src/chrome/content/rules/20min.ch.xml index e32f1767010f..b42393283f49 100644 --- a/src/chrome/content/rules/20min.ch.xml +++ b/src/chrome/content/rules/20min.ch.xml @@ -1,6 +1,7 @@ @@ -27,21 +32,20 @@ - - - + + - - + + - From 0fdea119144244ab6c09ee43aeb60a485e043e67 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 21 Jan 2018 00:00:38 +0100 Subject: [PATCH 495/844] Update DHgate.com.xml (fix #4508) (#9328) --- src/chrome/content/rules/DHgate.com.xml | 115 +++++++++++++++--------- 1 file changed, 72 insertions(+), 43 deletions(-) diff --git a/src/chrome/content/rules/DHgate.com.xml b/src/chrome/content/rules/DHgate.com.xml index b6c384d9ba56..2636ec0aff37 100644 --- a/src/chrome/content/rules/DHgate.com.xml +++ b/src/chrome/content/rules/DHgate.com.xml @@ -1,47 +1,76 @@ - + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8010c46c91854c476643f4e3798665532070e937 Mon Sep 17 00:00:00 2001 From: ekeelore <35633197+ekeelore@users.noreply.github.com> Date: Sun, 21 Jan 2018 06:23:06 +0700 Subject: [PATCH 496/844] Iichan.hk.xml (#14366) --- src/chrome/content/rules/Iichan.hk.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Iichan.hk.xml diff --git a/src/chrome/content/rules/Iichan.hk.xml b/src/chrome/content/rules/Iichan.hk.xml new file mode 100644 index 000000000000..37fff9870cb8 --- /dev/null +++ b/src/chrome/content/rules/Iichan.hk.xml @@ -0,0 +1,8 @@ + + + + + + From 13be32de08132e2091191ebf243817691be33922 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 21 Jan 2018 21:28:50 +0800 Subject: [PATCH 497/844] Update Greek-various.xml (#14352) * Re-activate and Update Greek-various.xml * Split Greek-various.xml into individual rulesets * Update dei.gr.xml, dionyziz.com.xml and eydap.gr.xml * Update dei.gr.xml --- src/chrome/content/rules/Greek-various.xml | 29 ---------------------- src/chrome/content/rules/dei.gr.xml | 9 +++++++ src/chrome/content/rules/dionyziz.com.xml | 8 ++++++ src/chrome/content/rules/eydap.gr.xml | 7 ++++++ 4 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 src/chrome/content/rules/Greek-various.xml create mode 100644 src/chrome/content/rules/dei.gr.xml create mode 100644 src/chrome/content/rules/dionyziz.com.xml create mode 100644 src/chrome/content/rules/eydap.gr.xml diff --git a/src/chrome/content/rules/Greek-various.xml b/src/chrome/content/rules/Greek-various.xml deleted file mode 100644 index 594a3ffe89b0..000000000000 --- a/src/chrome/content/rules/Greek-various.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/dei.gr.xml b/src/chrome/content/rules/dei.gr.xml new file mode 100644 index 000000000000..8378494414c1 --- /dev/null +++ b/src/chrome/content/rules/dei.gr.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/dionyziz.com.xml b/src/chrome/content/rules/dionyziz.com.xml new file mode 100644 index 000000000000..9cf3f32288be --- /dev/null +++ b/src/chrome/content/rules/dionyziz.com.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/chrome/content/rules/eydap.gr.xml b/src/chrome/content/rules/eydap.gr.xml new file mode 100644 index 000000000000..307d262fc7b4 --- /dev/null +++ b/src/chrome/content/rules/eydap.gr.xml @@ -0,0 +1,7 @@ + + + + + + + From e45d24859c1c03ea0f51b1d25c20bf2c95666bfb Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Sun, 21 Jan 2018 14:29:38 +0100 Subject: [PATCH 498/844] Add cacti.net (#14350) * Add cacti.net * Update cacti.net * Update cacti.net --- src/chrome/content/rules/cacti.net.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/cacti.net.xml diff --git a/src/chrome/content/rules/cacti.net.xml b/src/chrome/content/rules/cacti.net.xml new file mode 100644 index 000000000000..67bd7eb0e507 --- /dev/null +++ b/src/chrome/content/rules/cacti.net.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 1c1dade4f4c9fe4c4d5e997a27fda9fed5860519 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 21 Jan 2018 17:21:36 +0100 Subject: [PATCH 499/844] Add PCtipp.ch.xml (#14331) --- src/chrome/content/rules/PCtipp.ch.xml | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/chrome/content/rules/PCtipp.ch.xml diff --git a/src/chrome/content/rules/PCtipp.ch.xml b/src/chrome/content/rules/PCtipp.ch.xml new file mode 100644 index 000000000000..d17ec651e5cd --- /dev/null +++ b/src/chrome/content/rules/PCtipp.ch.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + From 2760ea851e838fa338bf481e48015c922a52bc79 Mon Sep 17 00:00:00 2001 From: lievedido <35643921+lievedido@users.noreply.github.com> Date: Mon, 22 Jan 2018 00:23:22 +0700 Subject: [PATCH 500/844] Add Hbrowse.com.xml (#14369) --- src/chrome/content/rules/Hbrowse.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Hbrowse.com.xml diff --git a/src/chrome/content/rules/Hbrowse.com.xml b/src/chrome/content/rules/Hbrowse.com.xml new file mode 100644 index 000000000000..d4a57da02990 --- /dev/null +++ b/src/chrome/content/rules/Hbrowse.com.xml @@ -0,0 +1,6 @@ + + + + + + From 4c3112ead8d4c4f6ecb411725824494be09dd9dd Mon Sep 17 00:00:00 2001 From: lievedido <35643921+lievedido@users.noreply.github.com> Date: Mon, 22 Jan 2018 02:01:37 +0700 Subject: [PATCH 501/844] Add Pururin.us.xml (#14370) --- src/chrome/content/rules/Pururin.us.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/Pururin.us.xml diff --git a/src/chrome/content/rules/Pururin.us.xml b/src/chrome/content/rules/Pururin.us.xml new file mode 100644 index 000000000000..9087fc47886a --- /dev/null +++ b/src/chrome/content/rules/Pururin.us.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + From ac14db5e88797dd6e55ebc59348a77086919ddc8 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Sun, 21 Jan 2018 21:10:25 +0100 Subject: [PATCH 502/844] Add mannheim.de (#14348) --- src/chrome/content/rules/Mannheim.de.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/Mannheim.de.xml diff --git a/src/chrome/content/rules/Mannheim.de.xml b/src/chrome/content/rules/Mannheim.de.xml new file mode 100644 index 000000000000..732da331c164 --- /dev/null +++ b/src/chrome/content/rules/Mannheim.de.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + From 9c714b0060f36567adda3df65de98231ad1d1c41 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Mon, 22 Jan 2018 13:30:34 +0100 Subject: [PATCH 503/844] Add hs-mannheim.de (#14349) * Add hs-mannheim.de * Update hs-mannheim.de * Update hs-mannheim.de * Update hs-mannheim.de Remove whitespaces * Add www. to domains * Fix domains * Add cert mismatch comment --- src/chrome/content/rules/hs-mannheim.de.xml | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 src/chrome/content/rules/hs-mannheim.de.xml diff --git a/src/chrome/content/rules/hs-mannheim.de.xml b/src/chrome/content/rules/hs-mannheim.de.xml new file mode 100644 index 000000000000..eb54aaa6a71f --- /dev/null +++ b/src/chrome/content/rules/hs-mannheim.de.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 171292d8732a08224c67ce532f697072815ce323 Mon Sep 17 00:00:00 2001 From: lievedido <35643921+lievedido@users.noreply.github.com> Date: Mon, 22 Jan 2018 21:39:12 +0700 Subject: [PATCH 504/844] Add Deb-multimedia.org.xml (#14371) --- src/chrome/content/rules/Deb-multimedia.org.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Deb-multimedia.org.xml diff --git a/src/chrome/content/rules/Deb-multimedia.org.xml b/src/chrome/content/rules/Deb-multimedia.org.xml new file mode 100644 index 000000000000..c9ec4f241b38 --- /dev/null +++ b/src/chrome/content/rules/Deb-multimedia.org.xml @@ -0,0 +1,10 @@ + + + + + + + From 299427fa3b0e2d3568c1cb2aee46d1936c53e091 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Mon, 22 Jan 2018 22:45:34 +0800 Subject: [PATCH 505/844] Rename and Update PornBB.org.xml (#14359) --- src/chrome/content/rules/PornBB.org.xml | 11 +++++++++++ src/chrome/content/rules/pornBB.xml | 14 -------------- 2 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 src/chrome/content/rules/PornBB.org.xml delete mode 100644 src/chrome/content/rules/pornBB.xml diff --git a/src/chrome/content/rules/PornBB.org.xml b/src/chrome/content/rules/PornBB.org.xml new file mode 100644 index 000000000000..2f9823a7adef --- /dev/null +++ b/src/chrome/content/rules/PornBB.org.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/pornBB.xml b/src/chrome/content/rules/pornBB.xml deleted file mode 100644 index 0b6a16009fe4..000000000000 --- a/src/chrome/content/rules/pornBB.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - From 997dff447701d99f6037173d3909b9b6cc61411e Mon Sep 17 00:00:00 2001 From: ivysrono Date: Mon, 22 Jan 2018 22:46:21 +0800 Subject: [PATCH 506/844] Update apprcn.com.xml (#13629) --- src/chrome/content/rules/apprcn.com.xml | 27 ------------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/chrome/content/rules/apprcn.com.xml diff --git a/src/chrome/content/rules/apprcn.com.xml b/src/chrome/content/rules/apprcn.com.xml deleted file mode 100644 index d012783927b2..000000000000 --- a/src/chrome/content/rules/apprcn.com.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - From e134209901b4a720d52f289bed57d918d5a854da Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 22 Jan 2018 16:40:12 +0100 Subject: [PATCH 507/844] Create Journal-Officiel.gouv.fr.xml (#14377) --- .../rules/Journal-Officiel.gouv.fr.xml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/chrome/content/rules/Journal-Officiel.gouv.fr.xml diff --git a/src/chrome/content/rules/Journal-Officiel.gouv.fr.xml b/src/chrome/content/rules/Journal-Officiel.gouv.fr.xml new file mode 100644 index 000000000000..41311ab6d325 --- /dev/null +++ b/src/chrome/content/rules/Journal-Officiel.gouv.fr.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + From 6bfb80cc7e78fd2552eb919ec93e449b077a8271 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 22 Jan 2018 18:07:45 +0100 Subject: [PATCH 508/844] [Levo.com] Update targets (#14378) --- src/chrome/content/rules/Levo.com.xml | 49 ++++++--------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/src/chrome/content/rules/Levo.com.xml b/src/chrome/content/rules/Levo.com.xml index b7a4d3027448..15351da7d1e7 100644 --- a/src/chrome/content/rules/Levo.com.xml +++ b/src/chrome/content/rules/Levo.com.xml @@ -3,52 +3,25 @@ - Levo_League.com.xml + Invalid certificate: + horizon.levo.com + link.levo.com - These altnames don't exist: + Login required: + leaders.levo.com - - www.pages.levo.com + Time out: + ttd.levo.com - - Insecure cookies are set for these domains and hosts: - - - .levo.com - - pages.levo.com - - - Mixed content: - - - Images, on: - - - www from maps.googleapis.com * - - www from levoleague-wordpress.s3.amazonaws.com * - - * Secured by us + Redirect to HTTP: + pages.levo.com ( https://pages.levo.com/guides/ , https://pages.levo.com/jetset/ ) --> - - - - - - - - - - - - - - - - - + + From c9af3282872288d822f255ae3620de20db37c2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 22 Jan 2018 18:36:06 +0100 Subject: [PATCH 509/844] Added ruleset for bundeswehrentdecken.de (#13660) --- src/chrome/content/rules/BundeswehrEntdecken.de.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/BundeswehrEntdecken.de.xml diff --git a/src/chrome/content/rules/BundeswehrEntdecken.de.xml b/src/chrome/content/rules/BundeswehrEntdecken.de.xml new file mode 100644 index 000000000000..b005845dfc32 --- /dev/null +++ b/src/chrome/content/rules/BundeswehrEntdecken.de.xml @@ -0,0 +1,8 @@ + + + + + + + + From 2e03ee768acba6195e90a5778717253d9e0529fc Mon Sep 17 00:00:00 2001 From: lievedido <35643921+lievedido@users.noreply.github.com> Date: Tue, 23 Jan 2018 01:07:56 +0700 Subject: [PATCH 510/844] Add Ahegao.online.xml (#14374) --- src/chrome/content/rules/Ahegao.online.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Ahegao.online.xml diff --git a/src/chrome/content/rules/Ahegao.online.xml b/src/chrome/content/rules/Ahegao.online.xml new file mode 100644 index 000000000000..79a538440c6a --- /dev/null +++ b/src/chrome/content/rules/Ahegao.online.xml @@ -0,0 +1,6 @@ + + + + + + From b527730bb4eaa4b551b7b36ec6ce98c838b3cbe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 22 Jan 2018 20:05:56 +0100 Subject: [PATCH 511/844] Added ruleset for bundeswehrkarriere.de (#12925) --- .../content/rules/Bundeswehr-Karriere.de.xml | 15 +++++++++++++++ .../content/rules/BundeswehrKarriere.de.xml | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/Bundeswehr-Karriere.de.xml create mode 100644 src/chrome/content/rules/BundeswehrKarriere.de.xml diff --git a/src/chrome/content/rules/Bundeswehr-Karriere.de.xml b/src/chrome/content/rules/Bundeswehr-Karriere.de.xml new file mode 100644 index 000000000000..e7f483f73039 --- /dev/null +++ b/src/chrome/content/rules/Bundeswehr-Karriere.de.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/BundeswehrKarriere.de.xml b/src/chrome/content/rules/BundeswehrKarriere.de.xml new file mode 100644 index 000000000000..d690f6bcc18e --- /dev/null +++ b/src/chrome/content/rules/BundeswehrKarriere.de.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + From 43e3ce5e66617884ff506cba8e61c4ccf3491a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 22 Jan 2018 20:11:28 +0100 Subject: [PATCH 512/844] Added ruleset for bdbos.bund.de (#14380) --- src/chrome/content/rules/BDBOS.bund.de.xml | 12 ++++++++++++ src/chrome/content/rules/Verwaltung_Online.xml | 1 + 2 files changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/BDBOS.bund.de.xml diff --git a/src/chrome/content/rules/BDBOS.bund.de.xml b/src/chrome/content/rules/BDBOS.bund.de.xml new file mode 100644 index 000000000000..8d7adbd79d74 --- /dev/null +++ b/src/chrome/content/rules/BDBOS.bund.de.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/Verwaltung_Online.xml b/src/chrome/content/rules/Verwaltung_Online.xml index b82bc495109a..24ffe97b7b26 100644 --- a/src/chrome/content/rules/Verwaltung_Online.xml +++ b/src/chrome/content/rules/Verwaltung_Online.xml @@ -18,6 +18,7 @@ - bfe.bund.de.xml - bvl.bund.de.xml - badv.bund.de.xml + - BDBOS.bund.de.xml --> From 3d7968574a1a1768c323f9f37107d864503397e3 Mon Sep 17 00:00:00 2001 From: flynn16 Date: Mon, 22 Jan 2018 13:29:44 -0800 Subject: [PATCH 513/844] Update UW.edu.xml - iSchool redirection (#14180) --- src/chrome/content/rules/UW.edu.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/UW.edu.xml b/src/chrome/content/rules/UW.edu.xml index 70ba671f769b..fddfebee557d 100644 --- a/src/chrome/content/rules/UW.edu.xml +++ b/src/chrome/content/rules/UW.edu.xml @@ -24,10 +24,11 @@ - expd ᵐ - www.healthinformationmanagement ᵐ - honors ᵖ + - www.ischool ᵐ - guides.lib ᵐ - www.pce ᵐ - tacoma ᵐ - + ᵐ Mismatched ᵖ Shows default page @@ -35,7 +36,7 @@ Mixed content: - Images, on: - + - (www.)?grad from depts.washington.edu * - www.pce from www.washington.edu * @@ -61,6 +62,8 @@ + + @@ -95,6 +98,11 @@ + + + + From d93a2e4066d6eacb431737d9ced352aefe4c06ac Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 22 Jan 2018 22:50:06 +0100 Subject: [PATCH 514/844] [MercyShips.org] Reactivate ruleset (#14383) --- src/chrome/content/rules/MercyShips.org.xml | 19 ++++++++++++++++ src/chrome/content/rules/Mercy_Ships.xml | 24 --------------------- 2 files changed, 19 insertions(+), 24 deletions(-) create mode 100644 src/chrome/content/rules/MercyShips.org.xml delete mode 100644 src/chrome/content/rules/Mercy_Ships.xml diff --git a/src/chrome/content/rules/MercyShips.org.xml b/src/chrome/content/rules/MercyShips.org.xml new file mode 100644 index 000000000000..4c064868702e --- /dev/null +++ b/src/chrome/content/rules/MercyShips.org.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Mercy_Ships.xml b/src/chrome/content/rules/Mercy_Ships.xml deleted file mode 100644 index e52703548ce0..000000000000 --- a/src/chrome/content/rules/Mercy_Ships.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - From f5bb16ae34276fad8ba8d8b14ca207afbe98aa3d Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Tue, 23 Jan 2018 00:22:47 +0100 Subject: [PATCH 515/844] Create The_FADER.com.xml (#14188) --- src/chrome/content/rules/The_FADER.com.xml | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/The_FADER.com.xml diff --git a/src/chrome/content/rules/The_FADER.com.xml b/src/chrome/content/rules/The_FADER.com.xml new file mode 100644 index 000000000000..83cc0fcc9822 --- /dev/null +++ b/src/chrome/content/rules/The_FADER.com.xml @@ -0,0 +1,26 @@ + + + + + + + + + From 8cf054071c8461bcd7cbbb1bb7adba9e4d47b185 Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Tue, 23 Jan 2018 00:24:58 +0100 Subject: [PATCH 516/844] Create Zoo.org.xml (#14189) --- src/chrome/content/rules/Zoo.org.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/chrome/content/rules/Zoo.org.xml diff --git a/src/chrome/content/rules/Zoo.org.xml b/src/chrome/content/rules/Zoo.org.xml new file mode 100644 index 000000000000..c54939739388 --- /dev/null +++ b/src/chrome/content/rules/Zoo.org.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + From 94c675839bbd8d87a427a670909925ab30b36456 Mon Sep 17 00:00:00 2001 From: irykoon Date: Mon, 22 Jan 2018 23:26:06 +0000 Subject: [PATCH 517/844] HTTPSEverywhereUserRules is no longer supported For details, see the issue here: https://github.com/EFForg/https-everywhere/issues/14375 --- docs/en_US/rulesets.md | 100 ++--------------------------------------- 1 file changed, 3 insertions(+), 97 deletions(-) diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md index 0ebde024a717..8181a522a657 100644 --- a/docs/en_US/rulesets.md +++ b/docs/en_US/rulesets.md @@ -1,103 +1,9 @@ ## HTTPS Everywhere Rulesets -This page describes how to write rulesets for [HTTPS Everywhere](https://eff.org/https-everywhere), a browser extension that switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that tell HTTPS Everywhere which sites it should switch to HTTPS and how. If there is a site that offers HTTPS and is not handled by the extension, this guide will explain how to add that site. +This page introduces the rulessets for [HTTPS Everywhere](https://eff.org/https-everywhere), a browser extension that switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that tell HTTPS Everywhere which sites it should switch to HTTPS and how. #### [Rulesets](#rulesets) -A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file describing behavior for a site or group of sites. A ruleset contains one or more `rules`. For example, here is [`RabbitMQ.xml`](https://github.com/efforg/https-everywhere/blob/master/src/chrome/content/rules/RabbitMQ.xml), from the addon distribution: +Previously, one can manually create and test the ruleset by placing it in the `HTTPSEverywhereUserRules/` subdirectory in [the Firefox profile directory](http://kb.mozillazine.org/Profile_folder_-_Firefox), and then restarting Firefox. However, this feature is no longer supported and will not be supported with the HTTPS Everywhere WebExtensions. This is because there is no longer any way to do arbitrary file reads from within WebExtensions. -```xml - - - - - - -``` - -The `target` tag specifies which web sites the ruleset applies to. The `rule` tag specifies how URLs on those web sites should be rewritten. This rule says that any URLs on `rabbitmq.com` and `www.rabbitmq.com` should be modified by replacing "http:" with "https:". - -When the browser loads a URL, HTTPS Everywhere takes the host name (e.g. www.rabbitmq.com) and searches its ruleset database for rulesets that match that host name. - -HTTPS Everywhere then tries each rule in those rulesets against the full URL. If the [Regular Expression](http://www.regular-expressions.info/quickstart.html), or regexp, in one of those rules matches, HTTPS Everywhere [rewrites the URL](#rules-and-regular-expressions) according the `to` attribute of the rule. - -#### [Wildcard Targets](#wildcard-targets) - -To cover all of a domain's subdomains, you may want to specify a wildcard target like `*.twitter.com`. Specifying this type of left-side wildcard matches any host name with `.twitter.com` as a suffix, e.g. `www.twitter.com` or `urls.api.twitter.com`. You can also specify a right-side wildcard like `www.google.*`. Right-side wildcards, unlike left-side wildcards, apply only one level deep. So if you want to cover all countries you'll generally need to specify `www.google.*`, `www.google.co.*`, and `www.google.com.*` to cover domains like `www.google.co.uk` or `www.google.com.au`. You should use wildcard targets only when you have rules that apply to the entire wildcard space. If your rules only apply to specific hosts, you should list each host as a separate target. - -#### [Rules and Regular Expressions](#rules-and-regular-expressions) - -The `rule` tags do the actual rewriting work. The `from` attribute of each rule is a [regular expression](http://www.regular-expressions.info/quickstart.html) matched against a full URL. You can use rules to rewrite URLs in simple or complicated ways. Here's a simplified (and now obsolete) example for Wikipedia: - -```xml - - - - - -``` - -The `to` attribute replaces the text matched by the `from` attribute. It can contain placeholders like `$1` that are replaced with the text matched inside the parentheses. - -This rule rewrites a URL like `http://fr.wikipedia.org/wiki/Chose` to `https://secure.wikimedia.org/wikipedia/fr/wiki/Chose`. Notice, again, that the target is allowed to contain (just one) * as a wildcard meaning "any". - -Rules are applied in the order they are listed within each ruleset. Order between rulesets is unspecified. Only the first rule or exception matching a given URL is applied. - -Rules are evaluated using [Javascript regular expressions](http://www.regular-expressions.info/javascript.html), which are similar but not identical to [Perl-style regular expressions.](http://www.regular-expressions.info/pcre.html) Note that if your rules include ampersands (&), they need to be appropriately XML-encoded: replace each occurrence of **&** with **&#x26;**. - -#### [Exclusions](#exclusions) - -An exclusion specifies a pattern, using a regular expression, for URLs where the rule should **not** be applied. The Stack Exchange rule contains an exclusion for the OpenID login path, which breaks logins if it is rewritten: - -```xml - -``` - -Exclusions are always evaluated before rules in a given ruleset. Matching any exclusion means that a URL won't match any rules within the same ruleset. However, if other rulesets match the same target hosts, the rules in those rulesets will still be tried. - -#### [Style Guide](#style-guide) - -There are many different ways you can write a ruleset, or regular expression within the ruleset. It's easier for everyone to understand the rulesets if they follow similar practices. You should read and follow the [Ruleset style guide](https://github.com/EFForg/https-everywhere/blob/master/CONTRIBUTING.md#ruleset-style-guide). Some of the guidelines in that document are intended to make [Ruleset testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) less cumbersome. - -#### [Secure Cookies](#secure-cookies) - -Many HTTPS websites fail to correctly set the [secure flag](https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_cookie#Secure_and_HttpOnly) on authentication and/or tracking cookies. HTTPS Everywhere provides a facility for turning this flag on. For instance: - -```xml - -``` - -The "host" parameter is a regexp specifying which domains should have their cookies secured; the "name" parameter is a regexp specifying which cookies should be secured. For a cookie to be secured, it must be sent by a target host for that ruleset. It must also be sent over HTTPS and match the name regexp. For cookies set by Javascript in a web page, the Firefox extension can't tell which host set the cookie and instead uses the domain attribute of the cookie to check against target hosts. A cookie whose domain attribute starts with a "." (the default, if not specified by Javascript) will be matched as if it was sent from a host name made by stripping the leading dot. - -#### [Testing](#testing) - -We use an [automated checker](https://github.com/hiviah/https-everywhere-checker) to run some basic tests on all rulesets. This is described in more detail in our [Ruleset Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) document, but in short there are two parts: Your ruleset must have enough test URLs to cover all the various types of URL covered by your rules. And each of those test URLs must load, both before rewriting and after rewriting. Every target host tag generates an implicit test URL unless it contains a wildcard. You can add additional test URLs manually using the `` tag. The test URLs you add this way should be real pages loaded from the site, or real images, CSS, and Javascript if you have rules that specifically affect those resources. - -You should also manually test your ruleset by placing it in the `HTTPSEverywhereUserRules/` subdirectory in [your Firefox profile directory](http://kb.mozillazine.org/Profile_folder_-_Firefox), and then restarting Firefox. While using the rule, check for messages in the Firefox Error Console to see if there are any issues with the way the site supports HTTPS. - -If you've tested your rule and are sure it would be of use to the world at large, submit it as a [pull request](https://help.github.com/articles/using-pull-requests/) on our [GitHub repository](https://github.com/EFForg/https-everywhere/) or send it to the rulesets mailing list at `https-everywhere-rules AT eff.org`. Please be aware that this is a public and publicly-archived mailing list. - -#### [make-trivial-rule](#make-trivial-rule) - -As an alternative to writing rules by hand, there are scripts you can run from a Unix command line to automate the process of creating a simple rule for a specified domain. These scripts are not included with HTTPS Everywhere releases but are available in our development repository and are described in [our development documentation](https://www.eff.org/https-everywhere/development). - -#### [Disabling a ruleset by default](#disabling-a-ruleset-by-default) - -Sometimes rulesets are useful or interesting, but cause problems that make them unsuitable for being enabled by default in everyone's browsers. Typically when a ruleset has problems we will disable it by default until someone has time to fix it. You can do this by adding a `default_off` attribute to the ruleset element, with a value explaining why the rule is off. - -```xml - - - - -``` - -You can add more details, like a link to a bug report, in the comments for the file. - -#### [Mixed Content Blocking (MCB)](#mixed-content-blocking-mcb) - -Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP instead of HTTPS). This type of mixed content is blocked in both [Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox, before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version. This generally breaks the site. However, the Tor Browser doesn't block mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs to an HTTPS version. - -To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. +For customized rules, one can still use the User Interface of HTTPS Everywhere, specifically, by clicking on the HTTPS Everywhere icon and then click `Add a rule for this site`. \ No newline at end of file From 1163a93f1ee4ecab9010cfe897d618873f2ff15d Mon Sep 17 00:00:00 2001 From: irykoon Date: Tue, 23 Jan 2018 04:28:38 +0000 Subject: [PATCH 518/844] Update the doc according to the feedback --- docs/en_US/rulesets.md | 104 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md index 8181a522a657..9544a0cab29b 100644 --- a/docs/en_US/rulesets.md +++ b/docs/en_US/rulesets.md @@ -1,9 +1,109 @@ ## HTTPS Everywhere Rulesets -This page introduces the rulessets for [HTTPS Everywhere](https://eff.org/https-everywhere), a browser extension that switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that tell HTTPS Everywhere which sites it should switch to HTTPS and how. +This page describes how to write rulesets for [HTTPS Everywhere](https://eff.org/https-everywhere), a browser extension that switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that tell HTTPS Everywhere which sites it should switch to HTTPS and how. If there is a site that offers HTTPS and is not handled by the extension, this guide will explain how to add that site. #### [Rulesets](#rulesets) -Previously, one can manually create and test the ruleset by placing it in the `HTTPSEverywhereUserRules/` subdirectory in [the Firefox profile directory](http://kb.mozillazine.org/Profile_folder_-_Firefox), and then restarting Firefox. However, this feature is no longer supported and will not be supported with the HTTPS Everywhere WebExtensions. This is because there is no longer any way to do arbitrary file reads from within WebExtensions. +A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file describing behavior for a site or group of sites. A ruleset contains one or more `rules`. For example, here is [`RabbitMQ.xml`](https://github.com/efforg/https-everywhere/blob/master/src/chrome/content/rules/RabbitMQ.xml), from the addon distribution: + +```xml + + + + + + +``` + +The `target` tag specifies which web sites the ruleset applies to. The `rule` tag specifies how URLs on those web sites should be rewritten. This rule says that any URLs on `rabbitmq.com` and `www.rabbitmq.com` should be modified by replacing "http:" with "https:". + +When the browser loads a URL, HTTPS Everywhere takes the host name (e.g. www.rabbitmq.com) and searches its ruleset database for rulesets that match that host name. + +HTTPS Everywhere then tries each rule in those rulesets against the full URL. If the [Regular Expression](http://www.regular-expressions.info/quickstart.html), or regexp, in one of those rules matches, HTTPS Everywhere [rewrites the URL](#rules-and-regular-expressions) according the `to` attribute of the rule. + +#### [Wildcard Targets](#wildcard-targets) + +To cover all of a domain's subdomains, you may want to specify a wildcard target like `*.twitter.com`. Specifying this type of left-side wildcard matches any host name with `.twitter.com` as a suffix, e.g. `www.twitter.com` or `urls.api.twitter.com`. You can also specify a right-side wildcard like `www.google.*`. Right-side wildcards, unlike left-side wildcards, apply only one level deep. So if you want to cover all countries you'll generally need to specify `www.google.*`, `www.google.co.*`, and `www.google.com.*` to cover domains like `www.google.co.uk` or `www.google.com.au`. You should use wildcard targets only when you have rules that apply to the entire wildcard space. If your rules only apply to specific hosts, you should list each host as a separate target. + +#### [Rules and Regular Expressions](#rules-and-regular-expressions) + +The `rule` tags do the actual rewriting work. The `from` attribute of each rule is a [regular expression](http://www.regular-expressions.info/quickstart.html) matched against a full URL. You can use rules to rewrite URLs in simple or complicated ways. Here's a simplified (and now obsolete) example for Wikipedia: + +```xml + + + + + +``` + +The `to` attribute replaces the text matched by the `from` attribute. It can contain placeholders like `$1` that are replaced with the text matched inside the parentheses. + +This rule rewrites a URL like `http://fr.wikipedia.org/wiki/Chose` to `https://secure.wikimedia.org/wikipedia/fr/wiki/Chose`. Notice, again, that the target is allowed to contain (just one) * as a wildcard meaning "any". + +Rules are applied in the order they are listed within each ruleset. Order between rulesets is unspecified. Only the first rule or exception matching a given URL is applied. + +Rules are evaluated using [Javascript regular expressions](http://www.regular-expressions.info/javascript.html), which are similar but not identical to [Perl-style regular expressions.](http://www.regular-expressions.info/pcre.html) Note that if your rules include ampersands (&), they need to be appropriately XML-encoded: replace each occurrence of **&** with **&#x26;**. + +#### [Exclusions](#exclusions) + +An exclusion specifies a pattern, using a regular expression, for URLs where the rule should **not** be applied. The Stack Exchange rule contains an exclusion for the OpenID login path, which breaks logins if it is rewritten: + +```xml + +``` + +Exclusions are always evaluated before rules in a given ruleset. Matching any exclusion means that a URL won't match any rules within the same ruleset. However, if other rulesets match the same target hosts, the rules in those rulesets will still be tried. + +#### [Style Guide](#style-guide) + +There are many different ways you can write a ruleset, or regular expression within the ruleset. It's easier for everyone to understand the rulesets if they follow similar practices. You should read and follow the [Ruleset style guide](https://github.com/EFForg/https-everywhere/blob/master/CONTRIBUTING.md#ruleset-style-guide). Some of the guidelines in that document are intended to make [Ruleset testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) less cumbersome. + +#### [Secure Cookies](#secure-cookies) + +Many HTTPS websites fail to correctly set the [secure flag](https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_cookie#Secure_and_HttpOnly) on authentication and/or tracking cookies. HTTPS Everywhere provides a facility for turning this flag on. For instance: + +```xml + +``` + +The "host" parameter is a regexp specifying which domains should have their cookies secured; the "name" parameter is a regexp specifying which cookies should be secured. For a cookie to be secured, it must be sent by a target host for that ruleset. It must also be sent over HTTPS and match the name regexp. For cookies set by Javascript in a web page, the Firefox extension can't tell which host set the cookie and instead uses the domain attribute of the cookie to check against target hosts. A cookie whose domain attribute starts with a "." (the default, if not specified by Javascript) will be matched as if it was sent from a host name made by stripping the leading dot. + +#### [Testing](#testing) + +We use an [automated checker](https://github.com/hiviah/https-everywhere-checker) to run some basic tests on all rulesets. This is described in more detail in our [Ruleset Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) document, but in short there are two parts: Your ruleset must have enough test URLs to cover all the various types of URL covered by your rules. And each of those test URLs must load, both before rewriting and after rewriting. Every target host tag generates an implicit test URL unless it contains a wildcard. You can add additional test URLs manually using the `` tag. The test URLs you add this way should be real pages loaded from the site, or real images, CSS, and Javascript if you have rules that specifically affect those resources. + +Previously, you can manually test the ruleset by placing it in the `HTTPSEverywhereUserRules/` subdirectory in [the Firefox profile directory](http://kb.mozillazine.org/Profile_folder_-_Firefox), and then restarting Firefox. However, this feature is no longer supported and will not be supported with the HTTPS Everywhere WebExtensions. This is because there is no longer any way to do arbitrary file reads from within WebExtensions. + +Currently, you can still do the testing using a hidden debugging page, but please be aware that this approach should only be used for debugging purposes and should not be used for setting up personal custom rules. You can access the hidden debugging page in Firefox through `about:addons` > HTTPS Everywhere preferences > click under `General Settings` > press Ctrl-Z, or in Chrome by pressing Ctrl-Z in the equivalent place. It doesn't appear to work in the current version of the Tor Browser, however. + +If you've tested your rule and are sure it would be of use to the world at large, submit it as a [pull request](https://help.github.com/articles/using-pull-requests/) on our [GitHub repository](https://github.com/EFForg/https-everywhere/) or send it to the rulesets mailing list at `https-everywhere-rules AT eff.org`. Please be aware that this is a public and publicly-archived mailing list. + +#### [make-trivial-rule](#make-trivial-rule) + +As an alternative to writing rules by hand, there are scripts you can run from a Unix command line to automate the process of creating a simple rule for a specified domain. These scripts are not included with HTTPS Everywhere releases but are available in our development repository and are described in [our development documentation](https://www.eff.org/https-everywhere/development). + +#### [Disabling a ruleset by default](#disabling-a-ruleset-by-default) + +Sometimes rulesets are useful or interesting, but cause problems that make them unsuitable for being enabled by default in everyone's browsers. Typically when a ruleset has problems we will disable it by default until someone has time to fix it. You can do this by adding a `default_off` attribute to the ruleset element, with a value explaining why the rule is off. + +```xml + + + + +``` + +You can add more details, like a link to a bug report, in the comments for the file. + +#### [Mixed Content Blocking (MCB)](#mixed-content-blocking-mcb) + +Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP instead of HTTPS). This type of mixed content is blocked in both [Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox, before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version. This generally breaks the site. However, the Tor Browser doesn't block mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs to an HTTPS version. + +To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. + +#### [Rulesets](#rulesets) For customized rules, one can still use the User Interface of HTTPS Everywhere, specifically, by clicking on the HTTPS Everywhere icon and then click `Add a rule for this site`. \ No newline at end of file From e30b056639bb5c9eba15f964944198c900383f47 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 23 Jan 2018 14:17:58 +0100 Subject: [PATCH 519/844] Create XpdfReader.com.xml (#14389) --- src/chrome/content/rules/XpdfReader.com.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/XpdfReader.com.xml diff --git a/src/chrome/content/rules/XpdfReader.com.xml b/src/chrome/content/rules/XpdfReader.com.xml new file mode 100644 index 000000000000..20e8cd918768 --- /dev/null +++ b/src/chrome/content/rules/XpdfReader.com.xml @@ -0,0 +1,9 @@ + + + + + + + + + From e12be0bfb53a57bd04d60b7d2e4adcaf6f5f8e66 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 23 Jan 2018 14:19:07 +0100 Subject: [PATCH 520/844] [FacebookCoreWWWI.onion] Add test urls (#14388) * [FacebookCoreWWWI.onion] Add test urls * [FacebookCoreWWWI.onion] HTML encode & * [FacebookCoreWWWI.onion] Remove extra comments --- .../content/rules/FacebookCoreWWWi.onion.xml | 45 ++----------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/src/chrome/content/rules/FacebookCoreWWWi.onion.xml b/src/chrome/content/rules/FacebookCoreWWWi.onion.xml index f56f2e4a39ac..27e62a7d2f5c 100644 --- a/src/chrome/content/rules/FacebookCoreWWWi.onion.xml +++ b/src/chrome/content/rules/FacebookCoreWWWi.onion.xml @@ -1,47 +1,11 @@ - - @@ -49,12 +13,11 @@ - - + - - + + + From 62d5bed559b954d2d1cfa344dda326881a27c68e Mon Sep 17 00:00:00 2001 From: Christian Heinrichs Date: Tue, 23 Jan 2018 15:06:44 +0100 Subject: [PATCH 521/844] Create Freetz.org.xml (#13987) * Create Freetz.org.xml * Add redirect rule * Add target --- src/chrome/content/rules/Freetz.org.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Freetz.org.xml diff --git a/src/chrome/content/rules/Freetz.org.xml b/src/chrome/content/rules/Freetz.org.xml new file mode 100644 index 000000000000..9b2dbf572d13 --- /dev/null +++ b/src/chrome/content/rules/Freetz.org.xml @@ -0,0 +1,14 @@ + + + + + + + + + + From d71f9925f735c07f2ef8f1cee52b577ed6d0d3d5 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Tue, 23 Jan 2018 15:11:15 +0100 Subject: [PATCH 522/844] Update schuelerVZ.net (#14376) * Remove schuelerVZ.net Was closed in April 2013. * Revert "Remove schuelerVZ.net" This reverts commit daa6f12c384a810ba8fa97cb0f76287b5ef325b5. * Update SchuelerVZ.net * Update SchuelerVZ.net --- src/chrome/content/rules/SchuelerVZ.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/SchuelerVZ.xml b/src/chrome/content/rules/SchuelerVZ.xml index 7d9a874b91d7..d83c2fdfcd4a 100644 --- a/src/chrome/content/rules/SchuelerVZ.xml +++ b/src/chrome/content/rules/SchuelerVZ.xml @@ -1,7 +1,13 @@ - - - + + + - + From 6937ddfb525b5c171e6e1620f6cfd977fe31fe04 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 23 Jan 2018 15:25:34 +0100 Subject: [PATCH 523/844] [Bitly.com] Simplify ruleset (#14393) * [Bitly.com] Simplify ruleset * [Bitly.com] Add targets --- src/chrome/content/rules/Bitly.com.xml | 45 ++++---------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/src/chrome/content/rules/Bitly.com.xml b/src/chrome/content/rules/Bitly.com.xml index a917eacad10a..5e57755d9c1f 100644 --- a/src/chrome/content/rules/Bitly.com.xml +++ b/src/chrome/content/rules/Bitly.com.xml @@ -1,54 +1,23 @@ - - - - - - - - + + + - - - From 95ad66a0297cc503322a5d5c39981d1c049a3605 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 23 Jan 2018 16:08:43 +0100 Subject: [PATCH 524/844] [Disqus.com] Increase coverage (#14392) * [Disqus.com] Increase coverage * [Disqus.com] Convert redundant targets to test urls * [Disqus.com] Add targets and test urls * [Disqus.com] Simplify securecookie * [Disqus.com] Use better wording * [Disqus.com] Remove (partial) --- src/chrome/content/rules/Disqus.xml | 50 ++++++++++++++++------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/rules/Disqus.xml b/src/chrome/content/rules/Disqus.xml index 2f8e74ec6fb7..2a7deea18c3a 100644 --- a/src/chrome/content/rules/Disqus.xml +++ b/src/chrome/content/rules/Disqus.xml @@ -1,36 +1,42 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + From 41ccb110b34094fd8bc229e80a9c8094ffd2dc10 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 23 Jan 2018 16:22:11 +0100 Subject: [PATCH 525/844] [LackName.org] Reactivate ruleset (#14361) --- src/chrome/content/rules/LackName.org.xml | 7 +++++++ src/chrome/content/rules/lackname.org.xml | 12 ------------ 2 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 src/chrome/content/rules/LackName.org.xml delete mode 100644 src/chrome/content/rules/lackname.org.xml diff --git a/src/chrome/content/rules/LackName.org.xml b/src/chrome/content/rules/LackName.org.xml new file mode 100644 index 000000000000..191d58a0c02c --- /dev/null +++ b/src/chrome/content/rules/LackName.org.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/chrome/content/rules/lackname.org.xml b/src/chrome/content/rules/lackname.org.xml deleted file mode 100644 index d23d8706ee83..000000000000 --- a/src/chrome/content/rules/lackname.org.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - From e0f391ce604bd28adcbf2a2dbd7fe3ec00f3a20e Mon Sep 17 00:00:00 2001 From: numismatika Date: Tue, 23 Jan 2018 16:43:32 +0100 Subject: [PATCH 526/844] Smart-AdServer: (#14291) - re-enable ruleset --- src/chrome/content/rules/Smart-AdServer.xml | 43 +++++++-------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/src/chrome/content/rules/Smart-AdServer.xml b/src/chrome/content/rules/Smart-AdServer.xml index a12ff71d13ad..4372dbdb2671 100644 --- a/src/chrome/content/rules/Smart-AdServer.xml +++ b/src/chrome/content/rules/Smart-AdServer.xml @@ -1,11 +1,6 @@ - - + @@ -133,7 +137,7 @@ Fetch error: http://www84.smartadserver.com/ => https://www84.smartadserver.com/ - + @@ -157,7 +161,6 @@ Fetch error: http://www84.smartadserver.com/ => https://www84.smartadserver.com/ - @@ -169,7 +172,7 @@ Fetch error: http://www84.smartadserver.com/ => https://www84.smartadserver.com/ - + @@ -258,26 +261,10 @@ Fetch error: http://www84.smartadserver.com/ => https://www84.smartadserver.com/ - - - - - - - - - - - - - - - + + From 817d064dcf1ffd89a58087dcccef185fbdc6f612 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 24 Jan 2018 00:03:51 +0800 Subject: [PATCH 527/844] Update thehubpeople.com.xml (#14360) --- src/chrome/content/rules/TheHubPeople.com.xml | 30 +++++++++++ src/chrome/content/rules/hubpeople.com.xml | 2 +- src/chrome/content/rules/thehubpeople.com.xml | 51 ------------------- 3 files changed, 31 insertions(+), 52 deletions(-) create mode 100644 src/chrome/content/rules/TheHubPeople.com.xml delete mode 100644 src/chrome/content/rules/thehubpeople.com.xml diff --git a/src/chrome/content/rules/TheHubPeople.com.xml b/src/chrome/content/rules/TheHubPeople.com.xml new file mode 100644 index 000000000000..6eee9ffaa7f8 --- /dev/null +++ b/src/chrome/content/rules/TheHubPeople.com.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/hubpeople.com.xml b/src/chrome/content/rules/hubpeople.com.xml index 64ef3f284880..668aa8b89898 100644 --- a/src/chrome/content/rules/hubpeople.com.xml +++ b/src/chrome/content/rules/hubpeople.com.xml @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - From 4f9df9d3e7e5f6e5ef9f30335eb1cafa257cb58e Mon Sep 17 00:00:00 2001 From: Eric Piskorowski Date: Tue, 23 Jan 2018 16:38:20 +0000 Subject: [PATCH 528/844] Update National_Geographic.xml (#14211) * Added list of subdomains, simplified regex * Renamed file, cleaned up top comment * Added new rule, modified regex to use capturing group * Fixed new rule, added escape character * Corrected top comment * Changed channel category in comment * Added info and rules from old ruleset * Added metric to Invalid Certificate section, removed from CDN buckets * Added 502 error category for images, reordered target hosts and invalid certs sections --- .../National_Geographic.com-problematic.xml | 13 -- .../content/rules/National_Geographic.com.xml | 89 ++++++++++ .../content/rules/National_Geographic.xml | 154 ------------------ 3 files changed, 89 insertions(+), 167 deletions(-) delete mode 100644 src/chrome/content/rules/National_Geographic.com-problematic.xml create mode 100644 src/chrome/content/rules/National_Geographic.com.xml delete mode 100644 src/chrome/content/rules/National_Geographic.xml diff --git a/src/chrome/content/rules/National_Geographic.com-problematic.xml b/src/chrome/content/rules/National_Geographic.com-problematic.xml deleted file mode 100644 index 2c69fc2bef20..000000000000 --- a/src/chrome/content/rules/National_Geographic.com-problematic.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/src/chrome/content/rules/National_Geographic.com.xml b/src/chrome/content/rules/National_Geographic.com.xml new file mode 100644 index 000000000000..3ccbc7a8c068 --- /dev/null +++ b/src/chrome/content/rules/National_Geographic.com.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/National_Geographic.xml b/src/chrome/content/rules/National_Geographic.xml deleted file mode 100644 index 678895c808aa..000000000000 --- a/src/chrome/content/rules/National_Geographic.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - From a8ee7ae48ca6551c6186031e4bace5b83e1c6d93 Mon Sep 17 00:00:00 2001 From: Murray Royston-Ward <15369632+mroystonward@users.noreply.github.com> Date: Tue, 23 Jan 2018 16:56:37 +0000 Subject: [PATCH 529/844] TheHouseOrgan.xyz rule (#14139) --- src/chrome/content/rules/TheHouseOrgan.xyz.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/TheHouseOrgan.xyz.xml diff --git a/src/chrome/content/rules/TheHouseOrgan.xyz.xml b/src/chrome/content/rules/TheHouseOrgan.xyz.xml new file mode 100644 index 000000000000..6755eba75fbc --- /dev/null +++ b/src/chrome/content/rules/TheHouseOrgan.xyz.xml @@ -0,0 +1,12 @@ + + + + + + + + From c7e6646dedb2d4cec263ef88ffe8b7c37dd71502 Mon Sep 17 00:00:00 2001 From: irykoon Date: Tue, 23 Jan 2018 17:35:45 +0000 Subject: [PATCH 530/844] Update document according to jeremyn's suggestion --- docs/en_US/rulesets.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md index 9544a0cab29b..c433a70a303c 100644 --- a/docs/en_US/rulesets.md +++ b/docs/en_US/rulesets.md @@ -75,9 +75,12 @@ The "host" parameter is a regexp specifying which domains should have their cook We use an [automated checker](https://github.com/hiviah/https-everywhere-checker) to run some basic tests on all rulesets. This is described in more detail in our [Ruleset Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) document, but in short there are two parts: Your ruleset must have enough test URLs to cover all the various types of URL covered by your rules. And each of those test URLs must load, both before rewriting and after rewriting. Every target host tag generates an implicit test URL unless it contains a wildcard. You can add additional test URLs manually using the `` tag. The test URLs you add this way should be real pages loaded from the site, or real images, CSS, and Javascript if you have rules that specifically affect those resources. -Previously, you can manually test the ruleset by placing it in the `HTTPSEverywhereUserRules/` subdirectory in [the Firefox profile directory](http://kb.mozillazine.org/Profile_folder_-_Firefox), and then restarting Firefox. However, this feature is no longer supported and will not be supported with the HTTPS Everywhere WebExtensions. This is because there is no longer any way to do arbitrary file reads from within WebExtensions. +You can test rulesets in the browser using a hidden debugging page, but please be aware that this approach should only be used for debugging purposes and should not be used for setting up personal custom rules. You can access the hidden debugging page this way: -Currently, you can still do the testing using a hidden debugging page, but please be aware that this approach should only be used for debugging purposes and should not be used for setting up personal custom rules. You can access the hidden debugging page in Firefox through `about:addons` > HTTPS Everywhere preferences > click under `General Settings` > press Ctrl-Z, or in Chrome by pressing Ctrl-Z in the equivalent place. It doesn't appear to work in the current version of the Tor Browser, however. +* Firefox: `about:addons` > HTTPS Everywhere preferences > click under `General Settings` > press Ctrl-Z +* Chromium/Chrome: `chrome://extensions/` > HTTPS Everywhere options > click under `General Settings` > press Ctrl-Z + +You might need to disable popup blocking for the page to appear. Once you have you loaded the page, you might find it convenient to bookmark it for later use. If you've tested your rule and are sure it would be of use to the world at large, submit it as a [pull request](https://help.github.com/articles/using-pull-requests/) on our [GitHub repository](https://github.com/EFForg/https-everywhere/) or send it to the rulesets mailing list at `https-everywhere-rules AT eff.org`. Please be aware that this is a public and publicly-archived mailing list. @@ -102,8 +105,4 @@ You can add more details, like a link to a bug report, in the comments for the f Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP instead of HTTPS). This type of mixed content is blocked in both [Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox, before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version. This generally breaks the site. However, the Tor Browser doesn't block mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs to an HTTPS version. -To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. - -#### [Rulesets](#rulesets) - -For customized rules, one can still use the User Interface of HTTPS Everywhere, specifically, by clicking on the HTTPS Everywhere icon and then click `Add a rule for this site`. \ No newline at end of file +To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. \ No newline at end of file From eb826a7b13cc6555fd6be357b22008cd76848fd4 Mon Sep 17 00:00:00 2001 From: irykoon Date: Tue, 23 Jan 2018 17:37:28 +0000 Subject: [PATCH 531/844] Keep diff size small --- docs/en_US/rulesets.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md index c433a70a303c..87fbfc2326c7 100644 --- a/docs/en_US/rulesets.md +++ b/docs/en_US/rulesets.md @@ -13,7 +13,7 @@ A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file - + ``` The `target` tag specifies which web sites the ruleset applies to. The `rule` tag specifies how URLs on those web sites should be rewritten. This rule says that any URLs on `rabbitmq.com` and `www.rabbitmq.com` should be modified by replacing "http:" with "https:". @@ -73,7 +73,7 @@ The "host" parameter is a regexp specifying which domains should have their cook #### [Testing](#testing) -We use an [automated checker](https://github.com/hiviah/https-everywhere-checker) to run some basic tests on all rulesets. This is described in more detail in our [Ruleset Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) document, but in short there are two parts: Your ruleset must have enough test URLs to cover all the various types of URL covered by your rules. And each of those test URLs must load, both before rewriting and after rewriting. Every target host tag generates an implicit test URL unless it contains a wildcard. You can add additional test URLs manually using the `` tag. The test URLs you add this way should be real pages loaded from the site, or real images, CSS, and Javascript if you have rules that specifically affect those resources. +We use an [automated checker](https://github.com/hiviah/https-everywhere-checker) to run some basic tests on all rulesets. This is described in more detail in our [Ruleset Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) document, but in short there are two parts: Your ruleset must have enough test URLs to cover all the various types of URL covered by your rules. And each of those test URLs must load, both before rewriting and after rewriting. Every target host tag generates an implicit test URL unless it contains a wildcard. You can add additional test URLs manually using the `` tag. The test URLs you add this way should be real pages loaded from the site, or real images, CSS, and Javascript if you have rules that specifically affect those resources. You can test rulesets in the browser using a hidden debugging page, but please be aware that this approach should only be used for debugging purposes and should not be used for setting up personal custom rules. You can access the hidden debugging page this way: @@ -105,4 +105,4 @@ You can add more details, like a link to a bug report, in the comments for the f Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP instead of HTTPS). This type of mixed content is blocked in both [Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox, before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version. This generally breaks the site. However, the Tor Browser doesn't block mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs to an HTTPS version. -To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. \ No newline at end of file +To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. From 7e851e2b5d189ea0338315079262969a6b5660e7 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 23 Jan 2018 21:54:27 +0100 Subject: [PATCH 532/844] [PressLabs.com] Simplify and rename ruleset (#14194) --- src/chrome/content/rules/PressLabs.com.xml | 32 ++++++++++++++++++++++ src/chrome/content/rules/PressLabs.xml | 31 --------------------- src/chrome/content/rules/PressLabs_SSL.xml | 4 +-- 3 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 src/chrome/content/rules/PressLabs.com.xml delete mode 100644 src/chrome/content/rules/PressLabs.xml diff --git a/src/chrome/content/rules/PressLabs.com.xml b/src/chrome/content/rules/PressLabs.com.xml new file mode 100644 index 000000000000..546427583305 --- /dev/null +++ b/src/chrome/content/rules/PressLabs.com.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/PressLabs.xml b/src/chrome/content/rules/PressLabs.xml deleted file mode 100644 index 4a7a8dbec619..000000000000 --- a/src/chrome/content/rules/PressLabs.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/chrome/content/rules/PressLabs_SSL.xml b/src/chrome/content/rules/PressLabs_SSL.xml index cb2528f456ac..b8f1b9434f29 100644 --- a/src/chrome/content/rules/PressLabs_SSL.xml +++ b/src/chrome/content/rules/PressLabs_SSL.xml @@ -3,7 +3,7 @@ Disabled by https-everywhere-checker because: Fetch error: http://plssl.com/ => https://plssl.com/: (7, 'Failed to connect to plssl.com port 443: Connection refused') - For other Press Labs coverage, see PressLabs.xml. + For other Press Labs coverage, see PressLabs.com.xml. Clients have unique subdomains. @@ -18,4 +18,4 @@ Fetch error: http://plssl.com/ => https://plssl.com/: (7, 'Failed to connect to - \ No newline at end of file + From b2754c8c791e4bbcf448d8ad81c21b0859dfc61c Mon Sep 17 00:00:00 2001 From: Kate Chapman Date: Tue, 23 Jan 2018 12:55:02 -0800 Subject: [PATCH 533/844] Ruleset for SoFun.tw (#14171) --- src/chrome/content/rules/SoFun.tw.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/chrome/content/rules/SoFun.tw.xml diff --git a/src/chrome/content/rules/SoFun.tw.xml b/src/chrome/content/rules/SoFun.tw.xml new file mode 100644 index 000000000000..4de5fa09fd7b --- /dev/null +++ b/src/chrome/content/rules/SoFun.tw.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + From 7f984b7a1d64e17c632217cb2c7c6f4de409a884 Mon Sep 17 00:00:00 2001 From: Folant Date: Wed, 24 Jan 2018 00:26:16 +0200 Subject: [PATCH 534/844] Create Rvb.ru.xml (#14395) --- src/chrome/content/rules/Rvb.ru.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Rvb.ru.xml diff --git a/src/chrome/content/rules/Rvb.ru.xml b/src/chrome/content/rules/Rvb.ru.xml new file mode 100644 index 000000000000..376563a3e11a --- /dev/null +++ b/src/chrome/content/rules/Rvb.ru.xml @@ -0,0 +1,6 @@ + + + + + + From e0d35e5ef4ec41bf698f7825bfb87e06a8d546d0 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 24 Jan 2018 00:01:06 +0100 Subject: [PATCH 535/844] Create AmericanOrnithology.org.xml (#14391) --- .../content/rules/AmericanOrnithology.org.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/AmericanOrnithology.org.xml diff --git a/src/chrome/content/rules/AmericanOrnithology.org.xml b/src/chrome/content/rules/AmericanOrnithology.org.xml new file mode 100644 index 000000000000..14b533696cad --- /dev/null +++ b/src/chrome/content/rules/AmericanOrnithology.org.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + From 19468262c7a01d776371eaa7086c9f4df04099b3 Mon Sep 17 00:00:00 2001 From: irykoon Date: Wed, 24 Jan 2018 00:06:49 +0000 Subject: [PATCH 536/844] Fix typos --- docs/en_US/rulesets.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md index 87fbfc2326c7..4578299ac236 100644 --- a/docs/en_US/rulesets.md +++ b/docs/en_US/rulesets.md @@ -13,7 +13,7 @@ A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file - + ``` The `target` tag specifies which web sites the ruleset applies to. The `rule` tag specifies how URLs on those web sites should be rewritten. This rule says that any URLs on `rabbitmq.com` and `www.rabbitmq.com` should be modified by replacing "http:" with "https:". @@ -80,7 +80,7 @@ You can test rulesets in the browser using a hidden debugging page, but please b * Firefox: `about:addons` > HTTPS Everywhere preferences > click under `General Settings` > press Ctrl-Z * Chromium/Chrome: `chrome://extensions/` > HTTPS Everywhere options > click under `General Settings` > press Ctrl-Z -You might need to disable popup blocking for the page to appear. Once you have you loaded the page, you might find it convenient to bookmark it for later use. +You might need to disable popup blocking for the page to appear. Once you have loaded the page, you might find it convenient to bookmark it for later use. If you've tested your rule and are sure it would be of use to the world at large, submit it as a [pull request](https://help.github.com/articles/using-pull-requests/) on our [GitHub repository](https://github.com/EFForg/https-everywhere/) or send it to the rulesets mailing list at `https-everywhere-rules AT eff.org`. Please be aware that this is a public and publicly-archived mailing list. @@ -96,7 +96,7 @@ Sometimes rulesets are useful or interesting, but cause problems that make them - + ``` You can add more details, like a link to a bug report, in the comments for the file. From 62cfe97fa86f9d11083cee67a26c8068d078127d Mon Sep 17 00:00:00 2001 From: ivysrono Date: Thu, 25 Jan 2018 00:34:45 +0800 Subject: [PATCH 537/844] Update Wiz.cn.xml (#14373) --- src/chrome/content/rules/Wiz.cn.xml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/Wiz.cn.xml b/src/chrome/content/rules/Wiz.cn.xml index f14f38f62720..841c2350b4cd 100644 --- a/src/chrome/content/rules/Wiz.cn.xml +++ b/src/chrome/content/rules/Wiz.cn.xml @@ -1,26 +1,17 @@ - @@ -30,9 +21,16 @@ + + + + + + + From d2967a79991cc0a2e3493a3beb13abeaedd18bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 24 Jan 2018 17:43:12 +0100 Subject: [PATCH 538/844] Added rules for bmvg.de. (#9705) --- src/chrome/content/rules/BMVg.de.xml | 20 +++++++++++++ .../content/rules/Verwaltung_Online.xml | 29 ++++++++++--------- 2 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 src/chrome/content/rules/BMVg.de.xml diff --git a/src/chrome/content/rules/BMVg.de.xml b/src/chrome/content/rules/BMVg.de.xml new file mode 100644 index 000000000000..c47836be48cd --- /dev/null +++ b/src/chrome/content/rules/BMVg.de.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Verwaltung_Online.xml b/src/chrome/content/rules/Verwaltung_Online.xml index 24ffe97b7b26..957d7356d5da 100644 --- a/src/chrome/content/rules/Verwaltung_Online.xml +++ b/src/chrome/content/rules/Verwaltung_Online.xml @@ -1,24 +1,25 @@ From d9044fb6d53f4f099edc2a0e837a0b7ed5b434f3 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 24 Jan 2018 18:06:54 +0100 Subject: [PATCH 539/844] Create Ocean-Climate.org.xml (#14404) --- src/chrome/content/rules/Ocean-Climate.org.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/Ocean-Climate.org.xml diff --git a/src/chrome/content/rules/Ocean-Climate.org.xml b/src/chrome/content/rules/Ocean-Climate.org.xml new file mode 100644 index 000000000000..2ccab69482c1 --- /dev/null +++ b/src/chrome/content/rules/Ocean-Climate.org.xml @@ -0,0 +1,8 @@ + + + + + + + + From c151434f1e0011346933f1afbee1dc97c568bae6 Mon Sep 17 00:00:00 2001 From: MilanKral Date: Wed, 24 Jan 2018 19:19:13 +0100 Subject: [PATCH 540/844] separate slovensko.sk (#14168) * separate slovensko.sk * describe connection between SlovakGovernment.xml and Slovensko.sk.xml * fix dotacie.slovensko.sk --- src/chrome/content/rules/SlovakGovernment.xml | 7 ++-- src/chrome/content/rules/Slovensko.sk.xml | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 src/chrome/content/rules/Slovensko.sk.xml diff --git a/src/chrome/content/rules/SlovakGovernment.xml b/src/chrome/content/rules/SlovakGovernment.xml index a1181ca9988d..1df10d8af1cc 100644 --- a/src/chrome/content/rules/SlovakGovernment.xml +++ b/src/chrome/content/rules/SlovakGovernment.xml @@ -1,4 +1,7 @@ - - - - diff --git a/src/chrome/content/rules/Slovensko.sk.xml b/src/chrome/content/rules/Slovensko.sk.xml new file mode 100644 index 000000000000..fbb2b9c77369 --- /dev/null +++ b/src/chrome/content/rules/Slovensko.sk.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + From eb6dce0b11d56208f63c02c2c0f3ffaf7e586d15 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Thu, 25 Jan 2018 02:44:35 +0800 Subject: [PATCH 541/844] Update QQ.xml (#14356) * Update QQ.xml * Update QQ.com-mixedcontent.xml * Update QQ.xml * Update QQ.xml * Update QQ.xml * Update QQ.com-mixedcontent.xml * Update QQ.xml * Update QQ.xml * Update QQ.xml * Update QQ.com-mixedcontent.xml * Update QQ.com-mixedcontent.xml * Update QQ.xml --- .../content/rules/QQ.com-mixedcontent.xml | 7 +- src/chrome/content/rules/QQ.xml | 214 ++++++++---------- 2 files changed, 100 insertions(+), 121 deletions(-) diff --git a/src/chrome/content/rules/QQ.com-mixedcontent.xml b/src/chrome/content/rules/QQ.com-mixedcontent.xml index e43bdd80222f..d143510b70cb 100644 --- a/src/chrome/content/rules/QQ.com-mixedcontent.xml +++ b/src/chrome/content/rules/QQ.com-mixedcontent.xml @@ -1,17 +1,12 @@ - - + - diff --git a/src/chrome/content/rules/QQ.xml b/src/chrome/content/rules/QQ.xml index ebb843fccf40..237c5fc26ad2 100644 --- a/src/chrome/content/rules/QQ.xml +++ b/src/chrome/content/rules/QQ.xml @@ -6,54 +6,56 @@ - qzone.qq.com.edgesuite.net - imgcache.qq.com - Nonfunctional domains: - - qq.com subdomains: - - misc.3g 500 - - softfile.3g * - - adver * - - baobao * - - byod * - - chuangshi * - - crm2 * - - daxue * - - developer * - - discuz * - - cp.discuz * - - djt * - - appupdate.elife * - - gad * - - bbs.guanjia * - - jq * - - live * - - bbs.m * - - ptlogin2.mail * - - stockweb.mail ** - - bbs.map * - - radio.cloud.music * - - roll.news * - - bbs.open * - - op.open * - - zc.open * - - passport.pengyou * - - piao * - - pushdata 500 - - qqmusic * - - shang * - - dev.open.t * - - follow.v.t * - - bbs.vip * - - like.video.qq.com * - - ncgi.video ² - - weixiao * - - wpa * - - xg * - - yanchu * - - cgi.yanchu * - * Times out - ² Refused + 500: + - misc.3g + - pushdata + + Refused: + - trace + - ncgi.video + - wspeed + + Times out: + - softfile.3g + - adver + - baobao + - byod + - chuangshi + - crm2 + - daxue + - developer + - discuz + - cp.discuz + - djt + - appupdate.elife + - gad + - bbs.guanjia + - jq + - live + - bbs.m + - ptlogin2.mail + - stockweb.mail + - bbs.map + - radio.cloud.music + - roll.news + - bbs.open + - op.open + - zc.open + - passport.pengyou + - piao + - qqmusic + - dev.open.t + - follow.v.t + - bbs.vip + - like.video + - weixiao + - wpa + - xg + - yanchu + - cgi.yanchu + Problematic domains: - - api.pay.qplus.com (expired 2012-08-27) - in *qq.com: - ^ ᴹ - www ᴹ Akamai @@ -79,9 +81,7 @@ - cnc.exmail ᴹ - service.exmail ᴹ - tel.exmail ᴹ - - film ᶜ - finance ᴹ Akamai - - g ᴹ - bbs.g ᴹ - gaauth ᴹ - games ᴹ @@ -92,11 +92,8 @@ - heat ᴹ - lbs ᴹ - qqgameplatcdn ᴹ - - im ᴵ - img1 ᴹ - iwan ᴹ - - m ᴹ - - yun.m ᴹ - open.mail ᴹ - qzs.mail ᴹ - service.mail ᴹ @@ -107,7 +104,6 @@ - mxm ᴹ - mxv ᴹ - news ᴹ Akamai - - nr ᶜ - open ᴹ Akamai - wiki.mg.open ᴹ - wiki.open ᴹ Akamai @@ -115,7 +111,7 @@ - qqgame ᴹ - open.qqgame ᴹ - user.qzone ᴹ Akamai - - qzs ᶜʲ + - qzs ᶜ ʲ - os.qzs ᴹ Akamai - service ᴹ - soft ᴹ @@ -131,19 +127,13 @@ - vip.t ᴹ Akamai - cdn.tencentgroup ᴹ - cache.tv ᶜ - - v ᶜ - cache.v ᶜ - - m.v ᶜ - growth.video ᴹ - web ᴹ - wetest ᶜ ʲ - - cdn.wetest ᴹ - xx ᴹ - y ᶜ - y.3g ᴹ - - i.y ᴹ - - m.y ᴹ ᶜ - - p.y ᶜ - zc ᴹ Akamai ᴹ Mismatched ᴵ Incomplete certificate chain @@ -159,7 +149,6 @@ - .ui.ptlogin2.qq.com - .r.qq.com - .reader.qq.com - - mp.weixin.qq.com - .wx.qq.com - .login.wx.qq.com - .wx1.qq.com @@ -171,26 +160,13 @@ - css, on: - ac from ac.gtimg.com - act.daoju from ossweb-img.qq.com * - - cb, cache.tv, v from imgcache.qq.com * - - connect, nr, p.y from qzonestyle.gtimg.cn * + - cb, cache.tv from imgcache.qq.com * - daoju from js01.daoju.qq.com * - - film, m.v, y, m.y from imgcache.gtimg.cn - igame from i.igcdn.cn - Images, on: - ac from ac.gtimg.com - - cb, kf from imgcache.qq.com * - - connect, nr from qzonestyle.gtimg.cn * - - connect from pub.idqqimg.com * - - m.exmail from mail.qq.com - - film, v, m.v, y, m.y from imgcache.gtimg.cn * - - film, cache.tv, v, y from i.gtimg.cn * - - film, v from mat1.gtimg.com * - - film, v from puui.qpic.cn * - - cache.tv, v from img1.gtimg.com - - v from vpic.video.qq.com * - - mp.weixin from res.wx.qq.com * - - favicons, on: - - exmail from $self * + - cb from imgcache.qq.com * + - cache.tv from img1.gtimg.com * Secured by us --> @@ -238,8 +214,12 @@ + + + + @@ -255,6 +235,8 @@ + + @@ -275,6 +257,7 @@ + @@ -311,61 +294,62 @@ - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + - - - - + + + - - + + + + + From 58cc768d81d0cfa873a9c30652ae59f0652109d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 24 Jan 2018 20:05:58 +0100 Subject: [PATCH 542/844] Added rulesets for digitalfernsehen.de and digitv.de (#14234) * Added rulesets for digitalfernsehen.de and digitv.de * MC platform, linked digitv to Digitalfernsehen * Linked Digitalfernsehen to digitv --- .../content/rules/Digitalfernsehen.de.xml | 33 +++++++++++++++++++ src/chrome/content/rules/digitv.de.xml | 14 ++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/chrome/content/rules/Digitalfernsehen.de.xml create mode 100644 src/chrome/content/rules/digitv.de.xml diff --git a/src/chrome/content/rules/Digitalfernsehen.de.xml b/src/chrome/content/rules/Digitalfernsehen.de.xml new file mode 100644 index 000000000000..55767897a42d --- /dev/null +++ b/src/chrome/content/rules/Digitalfernsehen.de.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/digitv.de.xml b/src/chrome/content/rules/digitv.de.xml new file mode 100644 index 000000000000..da565ddafb3d --- /dev/null +++ b/src/chrome/content/rules/digitv.de.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + From 56045da50b52291a6dc376e2ed4673d6a2e311e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 24 Jan 2018 20:15:45 +0100 Subject: [PATCH 543/844] Added ruleset for bgr.bund.de (#14405) --- src/chrome/content/rules/BGR.bund.de.xml | 11 +++++++++++ src/chrome/content/rules/Verwaltung_Online.xml | 1 + 2 files changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/BGR.bund.de.xml diff --git a/src/chrome/content/rules/BGR.bund.de.xml b/src/chrome/content/rules/BGR.bund.de.xml new file mode 100644 index 000000000000..815468088ced --- /dev/null +++ b/src/chrome/content/rules/BGR.bund.de.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Verwaltung_Online.xml b/src/chrome/content/rules/Verwaltung_Online.xml index 957d7356d5da..52a8da2c36f9 100644 --- a/src/chrome/content/rules/Verwaltung_Online.xml +++ b/src/chrome/content/rules/Verwaltung_Online.xml @@ -10,6 +10,7 @@ - BDBOS.bund.de.xml - bescha.bund.de.xml - bfe.bund.de.xml + - BGR.bund.de.xml - BMVg.de.xml - Bundesamt_fuer_Kartographie_und_Geodaesie.xml - Bundesamt_fuer_Strahlenschutz.xml From 30c1f4c22364183c1e775bc41eb180c93f3d593e Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 24 Jan 2018 20:16:15 +0100 Subject: [PATCH 544/844] Fix #14382: Squarespace.com scripts not correctly excluded. (#14394) --- src/chrome/content/rules/Squarespace.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Squarespace.xml b/src/chrome/content/rules/Squarespace.xml index d08f5e680ba3..2a0b12c4e3d8 100644 --- a/src/chrome/content/rules/Squarespace.xml +++ b/src/chrome/content/rules/Squarespace.xml @@ -41,8 +41,12 @@ - - + + + + From 4914d46a96e37a8572bb18c5d4fba28557ebe795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 24 Jan 2018 20:17:04 +0100 Subject: [PATCH 545/844] Added ruleset for whymap.org (#14407) --- src/chrome/content/rules/WHYMAP.org.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/chrome/content/rules/WHYMAP.org.xml diff --git a/src/chrome/content/rules/WHYMAP.org.xml b/src/chrome/content/rules/WHYMAP.org.xml new file mode 100644 index 000000000000..b6eefc604420 --- /dev/null +++ b/src/chrome/content/rules/WHYMAP.org.xml @@ -0,0 +1,7 @@ + + + + + + + From 405a9e57aba442335cf83803dc336611dd6c0731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 24 Jan 2018 21:07:58 +0100 Subject: [PATCH 546/844] Added rules for bundeswehr.de. (#9704) --- .../content/rules/Bundeswehr-Karriere.de.xml | 2 + src/chrome/content/rules/Bundeswehr.de.xml | 58 +++++++++++++++++++ .../content/rules/BundeswehrEntdecken.de.xml | 3 + .../content/rules/BundeswehrKarriere.de.xml | 2 + 4 files changed, 65 insertions(+) create mode 100644 src/chrome/content/rules/Bundeswehr.de.xml diff --git a/src/chrome/content/rules/Bundeswehr-Karriere.de.xml b/src/chrome/content/rules/Bundeswehr-Karriere.de.xml index e7f483f73039..5493680ff8e0 100644 --- a/src/chrome/content/rules/Bundeswehr-Karriere.de.xml +++ b/src/chrome/content/rules/Bundeswehr-Karriere.de.xml @@ -1,4 +1,6 @@ diff --git a/src/chrome/content/rules/Bundeswehr.de.xml b/src/chrome/content/rules/Bundeswehr.de.xml new file mode 100644 index 000000000000..b22832cec612 --- /dev/null +++ b/src/chrome/content/rules/Bundeswehr.de.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/BundeswehrEntdecken.de.xml b/src/chrome/content/rules/BundeswehrEntdecken.de.xml index b005845dfc32..45d6de7e455d 100644 --- a/src/chrome/content/rules/BundeswehrEntdecken.de.xml +++ b/src/chrome/content/rules/BundeswehrEntdecken.de.xml @@ -1,3 +1,6 @@ + diff --git a/src/chrome/content/rules/BundeswehrKarriere.de.xml b/src/chrome/content/rules/BundeswehrKarriere.de.xml index d690f6bcc18e..819a14aa4f06 100644 --- a/src/chrome/content/rules/BundeswehrKarriere.de.xml +++ b/src/chrome/content/rules/BundeswehrKarriere.de.xml @@ -1,4 +1,6 @@ From ae374add36f63bbf0b9185a23b96d659e9130207 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 24 Jan 2018 22:36:41 +0100 Subject: [PATCH 547/844] [MIT.xml] fix #14397 (#14417) --- src/chrome/content/rules/MIT-complex.xml | 22 ++++++++++++++++++++++ src/chrome/content/rules/MIT.xml | 14 ++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 src/chrome/content/rules/MIT-complex.xml diff --git a/src/chrome/content/rules/MIT-complex.xml b/src/chrome/content/rules/MIT-complex.xml new file mode 100644 index 000000000000..b6ed49f3fe29 --- /dev/null +++ b/src/chrome/content/rules/MIT-complex.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/MIT.xml b/src/chrome/content/rules/MIT.xml index b9d882620a53..8cedaa06834d 100644 --- a/src/chrome/content/rules/MIT.xml +++ b/src/chrome/content/rules/MIT.xml @@ -1,6 +1,7 @@ - - @@ -228,7 +225,6 @@ - @@ -267,7 +263,5 @@ - - From 1c2f4b2ac45388cb5235caea56cfaf566fd370d3 Mon Sep 17 00:00:00 2001 From: William Budington Date: Wed, 24 Jan 2018 21:53:55 -0800 Subject: [PATCH 548/844] Add deprecated image to .travis.yml (#14425) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ae11f2065a9..5a524ec03a35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ os: linux dist: trusty language: python python: 2.7 +group: deprecated-2017Q4 services: - docker matrix: From 938f9b911ca2f1a851d13999987431d2a8b6df9e Mon Sep 17 00:00:00 2001 From: Nicolas Leger Date: Thu, 25 Jan 2018 15:07:01 +0100 Subject: [PATCH 549/844] Create cinemasgaumontpathe.com.xml (#9032) --- .../content/rules/CinemasGaumontPathe.com.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/CinemasGaumontPathe.com.xml diff --git a/src/chrome/content/rules/CinemasGaumontPathe.com.xml b/src/chrome/content/rules/CinemasGaumontPathe.com.xml new file mode 100644 index 000000000000..4b5759835e0b --- /dev/null +++ b/src/chrome/content/rules/CinemasGaumontPathe.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + From 17ad8b4a3c40b3b7feb346a77f8f9993255f15ec Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 26 Jan 2018 01:28:23 +0800 Subject: [PATCH 550/844] Create utils/check-ruleset-path.sh (#14016) --- test/travis.sh | 1 + utils/check-ruleset-path.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100755 utils/check-ruleset-path.sh diff --git a/test/travis.sh b/test/travis.sh index 9dba720c0f83..2fd15d98c235 100755 --- a/test/travis.sh +++ b/test/travis.sh @@ -39,6 +39,7 @@ set -e if [ "$TEST" == "rules" ]; then echo >&2 "Performing comprehensive coverage test." docker run --rm -ti -v $(pwd):/opt httpse python utils/ruleset_filenames_validate.py + docker run --rm -ti -v $(pwd):/opt -e RULESETFOLDER="$RULESETFOLDER" -e COMMON_BASE_COMMIT="$COMMON_BASE_COMMIT" httpse bash -c "utils/check-ruleset-path.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/remove-obsolete-references.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/validate.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/rules.sh" diff --git a/utils/check-ruleset-path.sh b/utils/check-ruleset-path.sh new file mode 100755 index 000000000000..b1250c9ee369 --- /dev/null +++ b/utils/check-ruleset-path.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +CHANGED_FILES=`git diff --name-only $COMMON_BASE_COMMIT | grep -v $RULESETFOLDER | grep '.xml'` + +EXIT_CODE=0 + +if [ "$CHANGED_FILES" != "" ]; then + while read FILE; do + # check if changed file is actually a ruleset + egrep -q "^]+>" "$FILE" + + # if file matched the RegExp + if [ $? -eq 0 ]; then + echo >&2 "ERROR: $FILE Inclusion of ruleset outside of $RULESETFOLDER" + EXIT_CODE=1 + fi + done <<< "$CHANGED_FILES" +fi + +exit $EXIT_CODE From 8c46440d89f061f2a8b666f02d590dda9af2d330 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 26 Jan 2018 05:45:11 +0800 Subject: [PATCH 551/844] Update Gtimg.cn.xml (#14358) * Update Gtimg.cn.xml to include missing targets * Update Gtimg.cn.xml * Update Gtimg.cn.xml --- src/chrome/content/rules/Gtimg.cn.xml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Gtimg.cn.xml b/src/chrome/content/rules/Gtimg.cn.xml index a68d9c4ff943..c8d5a61155f6 100644 --- a/src/chrome/content/rules/Gtimg.cn.xml +++ b/src/chrome/content/rules/Gtimg.cn.xml @@ -28,6 +28,18 @@ + + + + + + + + + + + + @@ -41,7 +53,7 @@ - + @@ -80,7 +92,7 @@ - @@ -88,4 +100,12 @@ + + + + + + + + From 6daa5976544b1b4a5851b0a2ad241f6ce33b0258 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Thu, 25 Jan 2018 22:49:56 +0100 Subject: [PATCH 552/844] Add RNZ.de (#14406) * Add RNZ.de * Update RNZ.de * Update RNZ.de * Update RNZ.de --- src/chrome/content/rules/RNZ.de.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/chrome/content/rules/RNZ.de.xml diff --git a/src/chrome/content/rules/RNZ.de.xml b/src/chrome/content/rules/RNZ.de.xml new file mode 100644 index 000000000000..caa26dce7d6f --- /dev/null +++ b/src/chrome/content/rules/RNZ.de.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + From baf501a375c854ac706507bacc298f1a926ce51a Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 25 Jan 2018 13:57:36 -0800 Subject: [PATCH 553/844] Add an update_url key to the manifest.json file (#14439) --- make.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index a6c4366d8382..f5db998cde20 100755 --- a/make.sh +++ b/make.sh @@ -68,8 +68,9 @@ cp -a pkg/crx pkg/xpi-eff cp -a src/META-INF pkg/xpi-amo cp -a src/META-INF pkg/xpi-eff -# Remove the 'applications' manifest key from the crx version of the extension and change the 'author' string to a hash -python2.7 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" +# Remove the 'applications' manifest key from the crx version of the extension, change the 'author' string to a hash, and add the "update_url" manifest key +# "update_url" needs to be present to avoid problems reported in https://bugs.chromium.org/p/chromium/issues/detail?id=805755 +python2.7 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" # Remove the 'update_url' manifest key from the xpi version of the extension delivered to AMO python2.7 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" From 88e0560eb6116af12bdbe646f7faa43a7f4089b0 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 26 Jan 2018 06:52:32 +0800 Subject: [PATCH 554/844] Update Naukri.xml and naukimg.com.xml (#14403) * Update naukimg.com.xml * Update Naukri.xml and naukimg.com.xml * Update Naukri.xml --- src/chrome/content/rules/Naukri.xml | 131 +++++------------------ src/chrome/content/rules/naukimg.com.xml | 47 +++----- 2 files changed, 45 insertions(+), 133 deletions(-) diff --git a/src/chrome/content/rules/Naukri.xml b/src/chrome/content/rules/Naukri.xml index d46bc8c795d8..df5ce5e3fa08 100644 --- a/src/chrome/content/rules/Naukri.xml +++ b/src/chrome/content/rules/Naukri.xml @@ -1,124 +1,49 @@ - - - - + + + + + + + - + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/chrome/content/rules/naukimg.com.xml b/src/chrome/content/rules/naukimg.com.xml index 4eb08b447ce2..ea4267dbd249 100644 --- a/src/chrome/content/rules/naukimg.com.xml +++ b/src/chrome/content/rules/naukimg.com.xml @@ -1,35 +1,22 @@ - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + From 4a076845ba32bd9ca874a9e0d9cf0fdbaa773b03 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 26 Jan 2018 00:06:58 +0100 Subject: [PATCH 555/844] Add Haproxy.org.xml (#14364) --- src/chrome/content/rules/Haproxy.org.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/chrome/content/rules/Haproxy.org.xml diff --git a/src/chrome/content/rules/Haproxy.org.xml b/src/chrome/content/rules/Haproxy.org.xml new file mode 100644 index 000000000000..bab249320888 --- /dev/null +++ b/src/chrome/content/rules/Haproxy.org.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + From c3a990d26084ab88600244d0ed654c9360dae92e Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 25 Jan 2018 17:08:24 -0800 Subject: [PATCH 556/844] Support the exclusion of entire paths when creating package files. Rename create_xpi.py to create_zip.py (#14440) --- .build_exclusions | 1 + make.sh | 7 ++++--- utils/{create_xpi.py => create_zip.py} | 14 +++++++------- utils/zipfile_deterministic.py | 12 ++++++++---- 4 files changed, 20 insertions(+), 14 deletions(-) rename utils/{create_xpi.py => create_zip.py} (64%) diff --git a/.build_exclusions b/.build_exclusions index dba559debd4e..b8a9d2465a61 100644 --- a/.build_exclusions +++ b/.build_exclusions @@ -16,3 +16,4 @@ webextension/chrome-resources/update-from-chrome-svn.sh .eslintrc.json webextension/.eslintrc.json .eslintignore +node_modules diff --git a/make.sh b/make.sh index f5db998cde20..b6978ecf9944 100755 --- a/make.sh +++ b/make.sh @@ -109,7 +109,8 @@ trap 'rm -f "$pub" "$sig" "$zip"' EXIT # zip up the crx dir cwd=$(pwd -P) -(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .) +(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) +echo >&2 "CWS crx package has sha1sum: `sha1sum "$cwd/$zip"`" # signature openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig" @@ -147,7 +148,7 @@ dir=pkg/xpi-amo zip="$name.zip" cwd=$(pwd -P) -(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .) +(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) echo >&2 "AMO xpi package has sha1sum: `sha1sum "$cwd/$zip"`" cp $zip $xpi_amo @@ -160,7 +161,7 @@ dir=pkg/xpi-eff zip="$name.zip" cwd=$(pwd -P) -(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .) +(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) echo >&2 "EFF xpi package has sha1sum: `sha1sum "$cwd/$zip"`" cp $zip $xpi_eff diff --git a/utils/create_xpi.py b/utils/create_zip.py similarity index 64% rename from utils/create_xpi.py rename to utils/create_zip.py index ba7b5790533f..e9fd4602d894 100755 --- a/utils/create_xpi.py +++ b/utils/create_zip.py @@ -1,10 +1,10 @@ #!/usr/bin/env python2.7 -# Uses the Python zip implementation to create deterministic XPI's +# Uses the Python zip implementation to create deterministic zip's # Author: Yan Zhu, yan@mit.edu """ -Usage: python create_xpi.py -x -n +Usage: python create_zip.py -x -n """ import argparse @@ -13,12 +13,12 @@ import zipfile_deterministic as zipfile parser = argparse.ArgumentParser( - description="Deterministic XPI file creator.") + description="Deterministic zip file creator.") parser.add_argument("-x", type=str, nargs="?", dest="exclusions", metavar="File with file pattern exclusions", default=".build_exclusions", help="Excluded file patterns.") parser.add_argument("-n", type=str, - dest="xpiname", help="Name of target XPI file.") + dest="zipname", help="Name of target zip file.") parser.add_argument("directory", type=str, help="Directory to compress.") @@ -26,7 +26,7 @@ compress = zipfile.ZIP_DEFLATED -xpiFile = zipfile.ZipFile(args.xpiname, mode='w', compression=compress) +createdZipFile = zipfile.ZipFile(args.zipname, mode='w', compression=compress) f = open(args.exclusions) @@ -37,5 +37,5 @@ exclusions.extend(glob.glob(line.strip())) exclusions = map(lambda x: './'+x, exclusions) -xpiFile.write_from_directory(".", exclusions, compress_type=compress) -xpiFile.close() +createdZipFile.write_from_directory(".", exclusions, compress_type=compress) +createdZipFile.close() diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py index 46d91b26116c..d8dd11339869 100644 --- a/utils/zipfile_deterministic.py +++ b/utils/zipfile_deterministic.py @@ -1146,10 +1146,14 @@ def write_from_directory(self, directory, exclusions=None, """ file_dict = {} for root,subfolders,files in os.walk(directory): - for fi in files: - filename = os.path.join(root, fi) - if filename not in exclusions: - file_dict.update({standardize_filename(filename): filename}) + path_fragments = root.split(os.sep) + path_nested = [os.path.join(*path_fragments[:x + 1]) for x, _ in enumerate(path_fragments)] + + if not set(path_nested) & set(exclusions): + for fi in files: + filename = os.path.join(root, fi) + if filename not in exclusions: + file_dict.update({standardize_filename(filename): filename}) for new_filename, old_filename in sorted(file_dict.items()): self.write(old_filename, compress_type=compress_type, date_time=date_time) From ba35d6fe9cb4d919b2c258d2ffcf5dea0e60b213 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 26 Jan 2018 09:30:15 +0800 Subject: [PATCH 557/844] Remove utils/merge-rulesets.sh (#13867) --- make.sh | 4 ++-- utils/merge-rulesets.sh | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 utils/merge-rulesets.sh diff --git a/make.sh b/make.sh index b6978ecf9944..c88803bc4138 100755 --- a/make.sh +++ b/make.sh @@ -57,9 +57,9 @@ do_not_ship="*.py *.xml" rm -f $do_not_ship cd ../.. -. ./utils/merge-rulesets.sh || exit 1 +python2.7 ./utils/merge-rulesets.py || exit 1 -cp src/$RULESETS pkg/crx/rules/default.rulesets +cp src/chrome/content/rules/default.rulesets pkg/crx/rules/default.rulesets sed -i -e "s/VERSION/$VERSION/g" pkg/crx/manifest.json diff --git a/utils/merge-rulesets.sh b/utils/merge-rulesets.sh deleted file mode 100644 index 180306a2ee8c..000000000000 --- a/utils/merge-rulesets.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Merge all the .xml rulesets into a single "default.rulesets" file -- this -# prevents inodes from wasting disk space, but more importantly, works around -# the fact that zip does not perform well on a pile of small files. - -python2.7 ./utils/merge-rulesets.py - -RULESETS=chrome/content/rules/default.rulesets From efebf68fbafe9c2fe686b3dee7c76a545fe51f19 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 26 Jan 2018 09:35:12 +0800 Subject: [PATCH 558/844] Update README.md (#14019) * Update README.md * Update README.md --- README.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 019acae2bd26..330fc8e5d746 100644 --- a/README.md +++ b/README.md @@ -50,20 +50,18 @@ This is the source tree for HTTPS Everywhere for Firefox and Chrome. Important directories you might want to know about - src/ The Firefox source + + chromium/ WebExtension source code (for Firefox & Chromium/chrome) + chromium/external External dependencies + chromium/test Unit tests - chromium/ The Chromium/Chrome source - (not to be confused with Firefox browser "chrome" or UI) + rules/ Symbolic link to src/chrome/content/rules - src/components | - src/chrome/content | Firefox JavaScript and XUL code - src/chrome/content/code | + src/chrome/content/rules Ruleset files live here - src/chrome/content/rules The rulesets live here - - test/ The tests live here - - utils/ Various utilities + test/ Travis unit test source code live here + + utils/ Various utilities (includes some Travis test source) Hacking on the Source Code -------------------------- From ac8c4e8fa024524d0f2ecb87570294507ebb6987 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 26 Jan 2018 09:37:57 +0800 Subject: [PATCH 559/844] Forbid the creation of fallback rules (#14175) --- utils/relaxng.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/relaxng.xml b/utils/relaxng.xml index ab287512c3fa..089a4a1df1de 100644 --- a/utils/relaxng.xml +++ b/utils/relaxng.xml @@ -72,7 +72,7 @@ - (https?://[^ \\]*/[^ \\]*|https:) + (https://[^ \\]*/[^ \\]*|https:) From 69e84bddbe48e1ed0ee4f717df7b8c5ee15cb706 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 26 Jan 2018 02:46:39 +0100 Subject: [PATCH 560/844] Forbid match_rule elements (#13684) Not used since https://github.com/EFForg/https-everywhere/pull/3883 --- utils/relaxng.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/relaxng.xml b/utils/relaxng.xml index 089a4a1df1de..fdf1eb616828 100644 --- a/utils/relaxng.xml +++ b/utils/relaxng.xml @@ -1,10 +1,6 @@ - - - - From 53ee82ca9eda19d3ad7046e5f4c139264cf0a819 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 26 Jan 2018 21:41:46 +0100 Subject: [PATCH 561/844] Delete DeusM-clients.xml (#14447) --- src/chrome/content/rules/DeusM-clients.xml | 20 -------------------- src/chrome/content/rules/DeusM.xml | 3 --- 2 files changed, 23 deletions(-) delete mode 100644 src/chrome/content/rules/DeusM-clients.xml diff --git a/src/chrome/content/rules/DeusM-clients.xml b/src/chrome/content/rules/DeusM-clients.xml deleted file mode 100644 index 3fedae1d7696..000000000000 --- a/src/chrome/content/rules/DeusM-clients.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/DeusM.xml b/src/chrome/content/rules/DeusM.xml index a0e41bbbb77a..d2f152d5d689 100644 --- a/src/chrome/content/rules/DeusM.xml +++ b/src/chrome/content/rules/DeusM.xml @@ -1,9 +1,6 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/Telemetry.xml b/src/chrome/content/rules/Telemetry.xml index 0b3698392e0b..fa999a4e47af 100644 --- a/src/chrome/content/rules/Telemetry.xml +++ b/src/chrome/content/rules/Telemetry.xml @@ -1,7 +1,4 @@ + + + + + + + + + + From fb7c09cfffa09b9c38b9815f19539f2ac3d4693b Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 27 Jan 2018 23:58:38 +0800 Subject: [PATCH 566/844] Update webcaster.pro.xml to include missing targets (#14428) --- src/chrome/content/rules/webcaster.pro.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/webcaster.pro.xml b/src/chrome/content/rules/webcaster.pro.xml index 3b357fc3fb3b..4f793d7c814b 100644 --- a/src/chrome/content/rules/webcaster.pro.xml +++ b/src/chrome/content/rules/webcaster.pro.xml @@ -9,6 +9,7 @@ + @@ -17,15 +18,9 @@ - - - - - + From 6abcd9120c13581dac7bff7574d18e12f9e1b922 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 28 Jan 2018 00:01:27 +0800 Subject: [PATCH 567/844] Update Verizon.xml (#14429) * Update Verizon.xml * Update Verizon.xml --- src/chrome/content/rules/Verizon.xml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/Verizon.xml b/src/chrome/content/rules/Verizon.xml index 630e01caf526..8d08d06805e8 100644 --- a/src/chrome/content/rules/Verizon.xml +++ b/src/chrome/content/rules/Verizon.xml @@ -1,8 +1,4 @@ - @@ -168,11 +161,6 @@ - - - - From fbd71030e6122168ab090503e334ccc7082f206f Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 28 Jan 2018 00:02:27 +0800 Subject: [PATCH 568/844] Update ManageEngine.jp.xml (#14402) --- src/chrome/content/rules/ManageEngine.jp.xml | 43 ++++---------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/src/chrome/content/rules/ManageEngine.jp.xml b/src/chrome/content/rules/ManageEngine.jp.xml index b5b6efc0f9cb..e4af4e40ec86 100644 --- a/src/chrome/content/rules/ManageEngine.jp.xml +++ b/src/chrome/content/rules/ManageEngine.jp.xml @@ -1,44 +1,15 @@ - - - - - - + + - - - - - - - - - - - - + From 2db236a76fff072f8d01845c8bee844f15c96ce1 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 28 Jan 2018 04:33:50 +1030 Subject: [PATCH 569/844] [Stubhub.pt] New ruleset (#14274) --- src/chrome/content/rules/Stubhub.pt.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Stubhub.pt.xml diff --git a/src/chrome/content/rules/Stubhub.pt.xml b/src/chrome/content/rules/Stubhub.pt.xml new file mode 100644 index 000000000000..8ae101cca06e --- /dev/null +++ b/src/chrome/content/rules/Stubhub.pt.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + From fd2099455ecf5964444ccae653551a9337e8cbbc Mon Sep 17 00:00:00 2001 From: Folant Date: Sat, 27 Jan 2018 23:13:05 +0200 Subject: [PATCH 570/844] Create EuroIntegration.com.ua.xml (#14450) --- .../content/rules/EuroIntegration.com.ua.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/EuroIntegration.com.ua.xml diff --git a/src/chrome/content/rules/EuroIntegration.com.ua.xml b/src/chrome/content/rules/EuroIntegration.com.ua.xml new file mode 100644 index 000000000000..6c18f9cd14e5 --- /dev/null +++ b/src/chrome/content/rules/EuroIntegration.com.ua.xml @@ -0,0 +1,16 @@ + + + + + + + From 7f21c516a774e607544a6ecbcf5a16946336e038 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 28 Jan 2018 21:32:06 +0800 Subject: [PATCH 571/844] Simplify and Update Cloudinary.xml (#14430) * Simplify and Update Cloudinary.xml * Update Cloudinary.xml * Update Cloudinary.xml --- src/chrome/content/rules/Cloudinary.xml | 106 +++++------------------- 1 file changed, 22 insertions(+), 84 deletions(-) diff --git a/src/chrome/content/rules/Cloudinary.xml b/src/chrome/content/rules/Cloudinary.xml index 925f9b09faf5..1f1be4d7a7e0 100644 --- a/src/chrome/content/rules/Cloudinary.xml +++ b/src/chrome/content/rules/Cloudinary.xml @@ -1,101 +1,39 @@ - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - + From 7a588d487aae91450e3ddf66a1fb866f9010a898 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 28 Jan 2018 21:33:38 +0800 Subject: [PATCH 572/844] Update TIP.net.au.xml (#14446) --- src/chrome/content/rules/TIP.net.au.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/TIP.net.au.xml b/src/chrome/content/rules/TIP.net.au.xml index 69b898f79c76..e3654cdbd1b7 100644 --- a/src/chrome/content/rules/TIP.net.au.xml +++ b/src/chrome/content/rules/TIP.net.au.xml @@ -34,7 +34,7 @@ - pide.tip.net.au - webmail.tip.net.au --> - + From 7975c040c0131e6a04fa7e8324845cfb617e648d Mon Sep 17 00:00:00 2001 From: ivysrono Date: Sun, 28 Jan 2018 23:09:50 +0800 Subject: [PATCH 573/844] Update du00.cc.xml (#14458) --- src/chrome/content/rules/du00.cc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/du00.cc.xml b/src/chrome/content/rules/du00.cc.xml index c4df1fce3304..f3c9d2d992c3 100644 --- a/src/chrome/content/rules/du00.cc.xml +++ b/src/chrome/content/rules/du00.cc.xml @@ -11,7 +11,7 @@ See https://github.com/EFForg/https-everywhere/issues/8506 --> - + From 8359cdfd9c82fbd1485ad69ac047bab58a519fcb Mon Sep 17 00:00:00 2001 From: numismatika Date: Sun, 28 Jan 2018 18:29:45 +0100 Subject: [PATCH 574/844] Bild.de: (#14286) --- src/chrome/content/rules/Bild.de.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Bild.de.xml b/src/chrome/content/rules/Bild.de.xml index 552bcd3ab07c..ab8291313f16 100644 --- a/src/chrome/content/rules/Bild.de.xml +++ b/src/chrome/content/rules/Bild.de.xml @@ -14,14 +14,11 @@ ^ ¹ - epaper ³ - impressum ¹ - - wetter ⁴ - www ² ¹ Dropped ² 504, akamai ³ Redirects to http; expired 2012-06-01, mismatched, CN: shop.fussball.de - ⁴ 503, akamai - Problematic subdomains: @@ -57,6 +54,10 @@ + + + + @@ -68,5 +69,6 @@ to="https://www.fagms.net/" /> + From f72fad7b667d1da4efc364ffbc52322fb2adc4ac Mon Sep 17 00:00:00 2001 From: Folant Date: Mon, 29 Jan 2018 17:42:33 +0200 Subject: [PATCH 575/844] Create QuickSFV.org.xml (#14463) --- src/chrome/content/rules/QuickSFV.org.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/chrome/content/rules/QuickSFV.org.xml diff --git a/src/chrome/content/rules/QuickSFV.org.xml b/src/chrome/content/rules/QuickSFV.org.xml new file mode 100644 index 000000000000..af9bd7e39937 --- /dev/null +++ b/src/chrome/content/rules/QuickSFV.org.xml @@ -0,0 +1,7 @@ + + + + + + + From 1e9e4946352188dff1612c91e558c0d3592804dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 29 Jan 2018 18:22:14 +0100 Subject: [PATCH 576/844] Added ruleset for allmystery.de (#14462) --- src/chrome/content/rules/Allmystery.de.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/chrome/content/rules/Allmystery.de.xml diff --git a/src/chrome/content/rules/Allmystery.de.xml b/src/chrome/content/rules/Allmystery.de.xml new file mode 100644 index 000000000000..8c3b7f14198d --- /dev/null +++ b/src/chrome/content/rules/Allmystery.de.xml @@ -0,0 +1,10 @@ + + + + + + + + + + From 1829cb3748d539f627bc3a23fcbe302ef906d2a6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 29 Jan 2018 18:53:29 +0100 Subject: [PATCH 577/844] Create OakValleyChico.com.xml (#14426) --- src/chrome/content/rules/OakValleyChico.com.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/OakValleyChico.com.xml diff --git a/src/chrome/content/rules/OakValleyChico.com.xml b/src/chrome/content/rules/OakValleyChico.com.xml new file mode 100644 index 000000000000..e8ba5504378e --- /dev/null +++ b/src/chrome/content/rules/OakValleyChico.com.xml @@ -0,0 +1,8 @@ + + + + + + + + From 81edc2f3de703d9e7a15f7f74a8176ccec2d027e Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 29 Jan 2018 14:12:34 -0800 Subject: [PATCH 578/844] Remove HSTS preloaded domains from rulesets. Remove dangling references, update whitelist. (#14473) --- .../content/rules/BestOliveOils.com.xml | 19 ---- .../rules/Bitly_branded_short_domains.xml | 7 -- .../content/rules/BrandweerUitgeest.nl.xml | 7 -- .../content/rules/CorningCreditUnion.xml | 6 -- src/chrome/content/rules/Dashlane.com.xml | 50 ---------- src/chrome/content/rules/Dbrgn.ch.xml | 13 --- src/chrome/content/rules/EEQJ.xml | 20 ---- src/chrome/content/rules/Facebook.net.xml | 16 ---- src/chrome/content/rules/Facebook.xml | 3 - src/chrome/content/rules/Fb.me.xml | 19 ---- src/chrome/content/rules/FbCDN.net.xml | 86 ----------------- src/chrome/content/rules/GamesPlanet.xml | 10 -- src/chrome/content/rules/Gittigidiyor.xml | 10 -- src/chrome/content/rules/GuardianProject.xml | 20 ---- .../content/rules/Hak5.org-falsemixed.xml | 14 --- src/chrome/content/rules/Hak5.org.xml | 54 ----------- src/chrome/content/rules/Jazzy.id.au.xml | 12 --- src/chrome/content/rules/Mediapart.fr.xml | 50 ---------- src/chrome/content/rules/Microsoft.xml | 1 - src/chrome/content/rules/MultiVPN.xml | 49 ---------- src/chrome/content/rules/Qualtrics.xml | 95 ------------------- src/chrome/content/rules/RISI.xml | 2 - src/chrome/content/rules/Raymii.org.xml | 8 -- src/chrome/content/rules/Rows.io.xml | 20 ---- src/chrome/content/rules/Skype.xml | 41 -------- src/chrome/content/rules/SoftCreatR.de.xml | 13 --- src/chrome/content/rules/ThePirateBay.xml | 2 - src/chrome/content/rules/Tutanota.com.xml | 14 --- src/chrome/content/rules/YouTube.xml | 10 -- src/chrome/content/rules/appveyor.com.xml | 11 --- src/chrome/content/rules/lenr-forum.com.xml | 14 --- src/chrome/content/rules/nixonlibrary.gov.xml | 20 ---- src/chrome/content/rules/opengg.me.xml | 20 ---- src/chrome/content/rules/psc.gov.xml | 85 ----------------- utils/ruleset-whitelist.csv | 6 +- 35 files changed, 3 insertions(+), 824 deletions(-) delete mode 100644 src/chrome/content/rules/BestOliveOils.com.xml delete mode 100644 src/chrome/content/rules/BrandweerUitgeest.nl.xml delete mode 100644 src/chrome/content/rules/CorningCreditUnion.xml delete mode 100644 src/chrome/content/rules/Dashlane.com.xml delete mode 100644 src/chrome/content/rules/Dbrgn.ch.xml delete mode 100644 src/chrome/content/rules/EEQJ.xml delete mode 100644 src/chrome/content/rules/Facebook.net.xml delete mode 100644 src/chrome/content/rules/Fb.me.xml delete mode 100644 src/chrome/content/rules/FbCDN.net.xml delete mode 100644 src/chrome/content/rules/GamesPlanet.xml delete mode 100644 src/chrome/content/rules/GuardianProject.xml delete mode 100644 src/chrome/content/rules/Hak5.org-falsemixed.xml delete mode 100644 src/chrome/content/rules/Hak5.org.xml delete mode 100644 src/chrome/content/rules/Jazzy.id.au.xml delete mode 100644 src/chrome/content/rules/Mediapart.fr.xml delete mode 100644 src/chrome/content/rules/MultiVPN.xml delete mode 100644 src/chrome/content/rules/Qualtrics.xml delete mode 100644 src/chrome/content/rules/Raymii.org.xml delete mode 100644 src/chrome/content/rules/Rows.io.xml delete mode 100644 src/chrome/content/rules/Skype.xml delete mode 100644 src/chrome/content/rules/SoftCreatR.de.xml delete mode 100644 src/chrome/content/rules/Tutanota.com.xml delete mode 100644 src/chrome/content/rules/appveyor.com.xml delete mode 100644 src/chrome/content/rules/lenr-forum.com.xml delete mode 100644 src/chrome/content/rules/nixonlibrary.gov.xml delete mode 100644 src/chrome/content/rules/opengg.me.xml delete mode 100644 src/chrome/content/rules/psc.gov.xml diff --git a/src/chrome/content/rules/BestOliveOils.com.xml b/src/chrome/content/rules/BestOliveOils.com.xml deleted file mode 100644 index b30954e14ecd..000000000000 --- a/src/chrome/content/rules/BestOliveOils.com.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Bitly_branded_short_domains.xml b/src/chrome/content/rules/Bitly_branded_short_domains.xml index a8175509a53a..86b4b9b8c0ca 100644 --- a/src/chrome/content/rules/Bitly_branded_short_domains.xml +++ b/src/chrome/content/rules/Bitly_branded_short_domains.xml @@ -10178,7 +10178,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - @@ -17059,7 +17058,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - @@ -17753,7 +17751,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - @@ -20705,7 +20702,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - @@ -22298,7 +22294,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - @@ -26504,7 +26499,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - @@ -30826,7 +30820,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC - diff --git a/src/chrome/content/rules/BrandweerUitgeest.nl.xml b/src/chrome/content/rules/BrandweerUitgeest.nl.xml deleted file mode 100644 index cfa4a3045561..000000000000 --- a/src/chrome/content/rules/BrandweerUitgeest.nl.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/chrome/content/rules/CorningCreditUnion.xml b/src/chrome/content/rules/CorningCreditUnion.xml deleted file mode 100644 index cbe574165af0..000000000000 --- a/src/chrome/content/rules/CorningCreditUnion.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/chrome/content/rules/Dashlane.com.xml b/src/chrome/content/rules/Dashlane.com.xml deleted file mode 100644 index 56e02f14d066..000000000000 --- a/src/chrome/content/rules/Dashlane.com.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Dbrgn.ch.xml b/src/chrome/content/rules/Dbrgn.ch.xml deleted file mode 100644 index 99fbaa826f39..000000000000 --- a/src/chrome/content/rules/Dbrgn.ch.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/EEQJ.xml b/src/chrome/content/rules/EEQJ.xml deleted file mode 100644 index 04ca0d85eb06..000000000000 --- a/src/chrome/content/rules/EEQJ.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Facebook.net.xml b/src/chrome/content/rules/Facebook.net.xml deleted file mode 100644 index 27bb38e34d78..000000000000 --- a/src/chrome/content/rules/Facebook.net.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml index 40f255ebedbf..24793601c7f3 100644 --- a/src/chrome/content/rules/Facebook.xml +++ b/src/chrome/content/rules/Facebook.xml @@ -1,12 +1,9 @@ - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/FbCDN.net.xml b/src/chrome/content/rules/FbCDN.net.xml deleted file mode 100644 index ba68110e4889..000000000000 --- a/src/chrome/content/rules/FbCDN.net.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/GamesPlanet.xml b/src/chrome/content/rules/GamesPlanet.xml deleted file mode 100644 index 3a0ff4ff98ee..000000000000 --- a/src/chrome/content/rules/GamesPlanet.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Gittigidiyor.xml b/src/chrome/content/rules/Gittigidiyor.xml index ada31fc78a9f..e8afde5accc6 100644 --- a/src/chrome/content/rules/Gittigidiyor.xml +++ b/src/chrome/content/rules/Gittigidiyor.xml @@ -15,16 +15,6 @@ t: timeout on https --> - - - - - - - - - - diff --git a/src/chrome/content/rules/GuardianProject.xml b/src/chrome/content/rules/GuardianProject.xml deleted file mode 100644 index 1ff6708d926d..000000000000 --- a/src/chrome/content/rules/GuardianProject.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Hak5.org-falsemixed.xml b/src/chrome/content/rules/Hak5.org-falsemixed.xml deleted file mode 100644 index c31ddbf95b5b..000000000000 --- a/src/chrome/content/rules/Hak5.org-falsemixed.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Hak5.org.xml b/src/chrome/content/rules/Hak5.org.xml deleted file mode 100644 index d9958e2ec9d6..000000000000 --- a/src/chrome/content/rules/Hak5.org.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Jazzy.id.au.xml b/src/chrome/content/rules/Jazzy.id.au.xml deleted file mode 100644 index 2f8bd43daf47..000000000000 --- a/src/chrome/content/rules/Jazzy.id.au.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Mediapart.fr.xml b/src/chrome/content/rules/Mediapart.fr.xml deleted file mode 100644 index e6c35260b56a..000000000000 --- a/src/chrome/content/rules/Mediapart.fr.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Microsoft.xml b/src/chrome/content/rules/Microsoft.xml index 84e7f4051683..dad1e22f7efa 100644 --- a/src/chrome/content/rules/Microsoft.xml +++ b/src/chrome/content/rules/Microsoft.xml @@ -52,7 +52,6 @@ - Photosynth.xml - PowerShell_Gallery.com.xml - Sfx.ms.xml - - Skype.xml - Skype_assets.com.xml - S-Microsoft.com.xml - S-msn.com.xml diff --git a/src/chrome/content/rules/MultiVPN.xml b/src/chrome/content/rules/MultiVPN.xml deleted file mode 100644 index 18d98145b43b..000000000000 --- a/src/chrome/content/rules/MultiVPN.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Qualtrics.xml b/src/chrome/content/rules/Qualtrics.xml deleted file mode 100644 index 2948ede0fcf7..000000000000 --- a/src/chrome/content/rules/Qualtrics.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/RISI.xml b/src/chrome/content/rules/RISI.xml index 7282a36a1848..a00a57d81ae0 100644 --- a/src/chrome/content/rules/RISI.xml +++ b/src/chrome/content/rules/RISI.xml @@ -6,8 +6,6 @@ - - diff --git a/src/chrome/content/rules/Raymii.org.xml b/src/chrome/content/rules/Raymii.org.xml deleted file mode 100644 index 7f2833e97ec7..000000000000 --- a/src/chrome/content/rules/Raymii.org.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/chrome/content/rules/Rows.io.xml b/src/chrome/content/rules/Rows.io.xml deleted file mode 100644 index 05c52ac1eb79..000000000000 --- a/src/chrome/content/rules/Rows.io.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Skype.xml b/src/chrome/content/rules/Skype.xml deleted file mode 100644 index fe44c300eccf..000000000000 --- a/src/chrome/content/rules/Skype.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/SoftCreatR.de.xml b/src/chrome/content/rules/SoftCreatR.de.xml deleted file mode 100644 index 109dc7abc22f..000000000000 --- a/src/chrome/content/rules/SoftCreatR.de.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/ThePirateBay.xml b/src/chrome/content/rules/ThePirateBay.xml index 0d283a04a108..387af8db18b8 100644 --- a/src/chrome/content/rules/ThePirateBay.xml +++ b/src/chrome/content/rules/ThePirateBay.xml @@ -16,8 +16,6 @@ - www.pirates-forum.org --> - - diff --git a/src/chrome/content/rules/Tutanota.com.xml b/src/chrome/content/rules/Tutanota.com.xml deleted file mode 100644 index 9bf465d7b742..000000000000 --- a/src/chrome/content/rules/Tutanota.com.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/YouTube.xml b/src/chrome/content/rules/YouTube.xml index ae809f4a70ba..0e8cb28f031c 100644 --- a/src/chrome/content/rules/YouTube.xml +++ b/src/chrome/content/rules/YouTube.xml @@ -11,16 +11,6 @@ --> - - - - - - - - - - diff --git a/src/chrome/content/rules/appveyor.com.xml b/src/chrome/content/rules/appveyor.com.xml deleted file mode 100644 index be46e584d702..000000000000 --- a/src/chrome/content/rules/appveyor.com.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/src/chrome/content/rules/lenr-forum.com.xml b/src/chrome/content/rules/lenr-forum.com.xml deleted file mode 100644 index 024b60a71328..000000000000 --- a/src/chrome/content/rules/lenr-forum.com.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/nixonlibrary.gov.xml b/src/chrome/content/rules/nixonlibrary.gov.xml deleted file mode 100644 index f6aafd8cf2f6..000000000000 --- a/src/chrome/content/rules/nixonlibrary.gov.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/opengg.me.xml b/src/chrome/content/rules/opengg.me.xml deleted file mode 100644 index c38fc834f30e..000000000000 --- a/src/chrome/content/rules/opengg.me.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/psc.gov.xml b/src/chrome/content/rules/psc.gov.xml deleted file mode 100644 index a26e20551890..000000000000 --- a/src/chrome/content/rules/psc.gov.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 166dc235e16b..c59be0d97ef7 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -1325,7 +1325,7 @@ abb03feb83a53a9a55e398c11742e2a5d06a3ea599a82d7ec5b50f54dd2a75b1,1,1,Gigaserver. f5298b32c824990297a18e92474c36a5d1b344ce7951b529a48dd0d6c2a9e620,0,1,GigeNET_Cloud.com.xml f7bdaf4a797376040d08fb18652d7cf0eedb8ba7906904146eb43b8a358aa5d5,0,1,GIMP-foo.xml f95cfc85dc3b53b7a6d7b57d5cd9edd4c8d182f6cad0e01ab11852c9a00eab12,1,1,Girl_Scouts.xml -517ef268277aa4478517f4775b9a4822dfdecc014fa0d7a6e678d5aedae9d41e,1,0,Gittigidiyor.xml +ffd0b0d71cf481ed1ae6a00d3f7d8a6a40e39dbc6a3fb22d7728cbda325f5d00,1,0,Gittigidiyor.xml 34bb65e5d23c5f437a4b9a09e1b68de6c4f8594ff790bdc3da3aa5824fc3c7c3,1,1,Givex.xml 1d543c058797c2143e84af0016b439cef391b95b81a938a27400534400e3fc5e,0,1,GivingComfort.org.xml 256aec87f8aae80c6de962f21fa4b537b2476fec22cedb041638ab7bc5abc7f7,1,1,Gizmodo.com.xml @@ -2088,7 +2088,7 @@ aa95afb8c908b99e7c357547b29a1f19f3a93bd37683c2f68049f39ba6d9df48,1,1,MGID.com.xm b195c75b64f391be38bc74da007cb9a59fd8a1049291c5f949b5847b16097641,1,1,Micron.xml 206bb3a607259fe71f807da8d8d846aef174f1b18c220ac4871c6cf75022c4d2,1,1,Microsec.xml 61a08db1e2d9a9f6fee6d55625614ee1fcc76f3add39fb2a350a70d2971fac6e,1,0,Microsoft_Store.xml -eba95ea903d6365a8d3f2537efde2871951e6318786fe583ddb3fe1035fe0ec4,1,0,Microsoft.xml +25b79bea559bf54ad4546a28b11974228fed40fe7affb6127e28bb9e20cc57f8,1,0,Microsoft.xml 7b100b62a23d14a4e21a5f4775ce4f523326901c2464aeb6299fde517c42e32e,0,1,MicroSTER.pl.xml 932d417bf9aed6efd5b4080c9c8f7e62b7199abd4c943b07084833fc763af1aa,1,1,Microtech.xml fb9361e5f9e26090b2ca7030c712c7ea214e7a531c650819ad8d7769a2538e0e,1,1,Microtronix.xml @@ -2806,7 +2806,7 @@ ac063b2055bee50d03408a58042831dbed04f36cfe06e464a9ab053b262db8a2,1,1,RHUL.ac.uk. ee3295274e717ecaaf0d99b9b99610049b00df35e27bbd1d91b219c65a5be2e9,0,1,Riksgalden.se.xml ec0851667677ff8540dd4ea8454573e8d97df70843756980d2f1d6db93586f8b,0,1,RingtoneMatcher.com.xml bf59bcd24750fce1e1b920a8626d7ff5fb298dcb0a958e7397f9068f35214f6b,0,1,RISCOS.com.xml -9ee22571fbd530662ff282ed6696c1d16bea9cc5c777f607bff898717f964ff3,0,1,RISI.xml +40c3057198595bd588d189d5177158b4d586158746d3bc7e1e215fc7ebd553af,0,1,RISI.xml 6e88581ddeba07d75b4981e54492a29299b1f8156fd7ba4e99081b05d53288ff,1,1,River_Island.xml cb8b94399027893807adc9cefd84a64463afce56865fbe8a7cc757ceff822488,1,0,rns.online.xml 1c4ecd5ee6961bc004080667e3b8d84872a002463135edc292ff5bd8faf7d6dd,1,1,RNW.nl.xml From 2c0431d374606f078c8822a2914c3adfbb45489a Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 29 Jan 2018 14:50:20 -0800 Subject: [PATCH 579/844] Update translations. --- translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations b/translations index 3f8e68527e1a..a318dfa5a476 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3f8e68527e1a8c79882501d3360916bddcf2c6c4 +Subproject commit a318dfa5a476f063f4e2153dace1a98c9c8fa4d1 From b8b48b4346caf12ac605484274287631d6a8cfe2 Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 29 Jan 2018 15:07:56 -0800 Subject: [PATCH 580/844] Release: 2018.1.29 --- chromium/manifest.json | 2 +- src/Changelog | 3 +++ utils/duplicate-whitelist.txt | 8 -------- utils/ruleset-whitelist.csv | 15 --------------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/chromium/manifest.json b/chromium/manifest.json index 20c7b20eb264..192f44523bb3 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -47,5 +47,5 @@ "storage", "*://*/*" ], - "version": "2018.1.11" + "version": "2018.1.29" } \ No newline at end of file diff --git a/src/Changelog b/src/Changelog index e03bacaebfa4..ccbe2ce9ca18 100644 --- a/src/Changelog +++ b/src/Changelog @@ -1,3 +1,6 @@ +2018.1.29 + * Ruleset updates + 2018.1.11 * Ruleset updates diff --git a/utils/duplicate-whitelist.txt b/utils/duplicate-whitelist.txt index 1d08cc54fbd0..44d395015706 100644 --- a/utils/duplicate-whitelist.txt +++ b/utils/duplicate-whitelist.txt @@ -37,12 +37,7 @@ www.gfi.com forum.girlsoutwest.com forums.girlsoutwest.com a.abcnews.go.com -google.* -google.co.* -google.com.* gsu.edu -hak5.org -www.hak5.org code.highcharts.com hometheaterreview.com hostoople.com @@ -113,9 +108,6 @@ digitalcommons.wustl.edu openscholarship.wustl.edu www.blogsmithmedia.com www.cccure.training -www.google.* -www.google.co.* -www.google.com.* www.hostingcatalog.com zylon.net www.zylon.net diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index c59be0d97ef7..0be47bee9237 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -872,7 +872,6 @@ d3ac7da52f675d22b7fc910eb3ed3c950ac43a8ada57c767bdf2ff42bfac8ce4,1,0,Devever.net fe8912569f087a1973bb0d9035dc00ab630eefed150c06a51cd6756243af917e,1,1,DevZing.com.xml 5a3b022a658985b87a1a497348ecdca4dc3c29499681e1371f2793b0ab58bafa,1,1,DFiles.eu.xml 24e1a5389bc35d553f48e0b8f0fecc7168ff63096b9115f3e48184e62f22072b,0,1,Dgl.cx.xml -4e0574aebbe41d7157137ba4a16a7a89019025022ba1b47fdbb70bacb131be06,1,1,DHgate.com.xml 8f2ff5fe50e0b8edbb175166a44e2877df47e5951510d8650d18960527196904,0,1,DiaGrid.xml 450f88fd960579ffa22b42f6e3ce2348be724fb59ce00353d742d078e4996bac,1,0,Dial_Direct.xml 3305d9df13dc034d25ba99a814c637f0935a9801f551e418983d7fbf70bbdb63,0,1,Difference_Between.xml @@ -927,7 +926,6 @@ b4575808e4836f6bedcf6ca9541730adfa92585b28818a180376e5d8be6ee930,0,1,DomainTools b24f4ad17b97e8bfa9b40fe9399e2f5623d687f5c9c427b312c206b3c2f17031,0,1,Dominios.xml f1df4015000247c42b9be46c989b59dd51ec2a6d2e7865a3fc7c6ecede114b05,1,1,Doncaster_College.xml 36d041d4d69a225d35b12544499fe3ba3f53a861fccd2e6271483669e34d94d2,1,1,DoNotCallRegister.xml -c4daaff0668b9f2f5b928cfc3f65a73b28e31ba1af4636507197ba962eed14f7,1,1,Doodle.xml 3c447bfc4ba8601142ff1caaa8b79fd8ab02970eb414108e5ef6edcff194c3cb,1,1,Dot429.xml 73264e0180e021f87aa5b7150f02c3a74c8afca25179be5ee4306802c8f1570e,1,1,Dot5Hosting.xml cae36a66501f89c0165313a29e259f2cf36004175cde8a171a0c350bb65a25c4,1,1,DotCOM-host.xml @@ -1125,7 +1123,6 @@ c092efaf47353f6eaa1d433b2fc56eac6e8a7d59829fcc9882e1fb777c79b54e,0,1,Fass.se.xml be9a331d03034ba8a740ba7b54b20d6ccb3b852bef352cad65509db3c1e49ed6,1,1,Fasthosts.xml 9c51c5f3685da502281c46d976f7ae3bb8b9b2ac9799e41eaf7253c170fecc15,0,1,FastSoft.xml bc7bc4ce9b7b91da77c0f98905fb9d863d8a97bcb16f1bece114db0fc4b4fe3c,1,1,FatCow-Web-Hosting.xml -e01212220631549745f6f3585c334439b08ccc31a2df66d38d0c70cf979f3c7b,1,0,Fb.me.xml 1ab60453a8f85bd25292f19e45deab01a16482933e681f6f43bf43e1287d2f62,1,1,FC2.com.xml 76e1a443721c7c57e7976241d045defbd2218dee42cbdef6a13472e13d9ff63b,1,1,F-CDN.com.xml 3b9a47db267c9a3cdcbd5b4e803ceac9d44fc713e99b99169b6876e8a5ccb0af,1,1,Fdworlds.net.xml @@ -1226,7 +1223,6 @@ b6fc958980c2540d31f01eb6ede8ecf78e1430e81c407db0f84972ba310630d3,1,1,Forrester.x f0fcfab8df8d22bc08e6ee92df4f201538ace2bf944be743223cf251d26c3c46,0,1,Founding_Fathers.xml cd2bda2d38e524acf1511b0118c743cd822f7282adf50b18545d5308f2bca617,0,1,FOX-Toolkit.xml 75d0aaf013542cfe0b5752884c6f03e3c8462920eb045ca6a52b790a27f60d9f,1,1,FoxyCart.com.xml -5cc619086982bed87821431000baca94f7b648dbbfc4502fa0c460cc5887477d,1,0,francetvinfo.fr.xml 86837c3789a29dad59fe1334a80c374a588b9620a0c16e0f783476c87f4a03a4,1,1,Franken.de.xml ae74ef43038d642c2f74200ec484b36aff955a03e75315853845ca01bdaeafb6,1,1,Frank_Timis.xml 23338597645b4a3ab4ff7b8841fc3efea480fe8444de694630a0462795c8f746,0,1,Fraternal-Order-of-Locksport.xml @@ -1276,7 +1272,6 @@ ebb15ce0e092277453532fa99e2d3180532e4d70076e64e0d79809a0136a886d,1,1,Fxguide.com 7c239da3e17615d3847684526a666c43ecc45d00ec0d922fd8c276e75485cb3a,1,1,Gameological_Society.xml 5e479c67a14059e5d1d97d5c0dfa59efd46a91a731b7fa156731be0b1f9b06ab,0,1,Gamersfirst.com.xml 8426250d81f5cf4ac0d7d28b3c6506aae55186217010e055b523c7dc48639353,0,1,GAME.se.xml -019459993dc1740723b37d4496d45ab8ef218069b8cc5f76a21ae80dbb533c22,0,1,GamesPlanet.xml 6f6cf432642fe736b53e82043cd39e73b357ebfc0c1e56f25f6dc5bdb8cd1c2d,1,1,GameSports.net.xml 3d51538a88733634e8692d273367853c40373ff980e6e63d35b98f1711854c5f,0,1,Gamestar.de.xml e0b42ca86b5ce5b047eafad5b2a5ede003807cbd4ce714d4fcfd6e726a137cb7,1,1,Gamestar_Mechanic.xml @@ -1414,7 +1409,6 @@ d97fb94656263a08627931829f3707297aaad16a2780d7efbc08d9a0e240af5f,0,1,Habbo.fi.xm 922b403278bc9ae839f646bd231dd9ab11950ec5744da127a5e185b3eb1c20c6,1,1,Hackpad.xml 51b17752c74062183224769643033cc2727e3263c0af2d83072f8f4fe3d30d51,1,0,Hafner-ips.com.xml 7e463880670a9bd41e514199bc309e477beb8cd3771cbf8010fe76abacfd1dc5,1,1,Hail_Storm_Products.xml -0f3b0532256803a57e4e2a889d588b4108582bc4e04a6f7990072ec21893578f,1,0,Hak5.org.xml 7d8606707ee04231db6b0d4851ab973945fabaa28907734507adcacff32f6095,0,1,Halebop.se.xml dac5301bebe14f1ee9837b4c5a6625f8cac9103160009bb80208d40085a88c16,1,1,Halifax.xml f6db5eb6d184772ca7b3555d4e88f0a3432ec670229ff8901d31ea9fd4ec977d,1,1,Hammacher-Schlemmer.xml @@ -1847,7 +1841,6 @@ eedbe4c1b73b659f65c1b47b6b0a0b08e5e4ce32c8c96b82fa8b6e4ad2f5ead5,1,0,LibCal.com. 82d91c9bfd424f34898c9435240f08ba68083edf2a2f14eeaab224ebf245a606,0,1,Libdrc.org.xml ca3651e464527f1cda0d1059fdc27e8bc7ec56c6cc326d8ba5be30aa145a3751,1,1,Liberal_America.org-falsemixed.xml 4da6941625e8c737ccf9de80aadd671b78aab17d09bb0830557256dd8f3a6ca3,1,1,Liberal_America.org.xml -e4a1a55017bcb0b601ea15d91bc0011eb184e17d1dbb802fb6cd5108882c4442,1,0,libregamewiki.org.xml 2024f5bf8b3fc81e834b022b2c34f31669e1dd151a163c304d135218ac2fb74a,0,1,Libre_Graphics_World.org.xml feb248073503e6b89a199631eeb2f81de397fbe8033003f7c16aa4219b3d4663,1,1,Libri.de.xml 993b07ba4b30101d7b4d133239b7a03ddc0d914cde338040b53d7871bedf04b1,1,1,Life-in-the-Fast-Lane.xml @@ -2230,7 +2223,6 @@ d92c53fd75de88d409d1be6a18c1ae9f05cbbe380e8bb8b9443249c9768453f4,1,0,NASA.gov-fa b8317133e03efaee48297bdb5c09b95e33a56f9c20cd60e6edac0a1a4d86661a,1,1,NationalE-HealthTransitionAuthority.xml 0faca68701fed7d481ef2d407adb2988bb09737e4256fc13d94de4d50be29dcb,0,1,Nationale-IT-Security-Monitor.nl.xml 9bf2816c0496a7066972ea5e7225f77e2646848ad425e3082748636dfe26f41c,1,1,National-Express.xml -4fe193f720082281e8f0c48bbb17756ebd01535e06d4cf78140be8235939cbc2,1,1,National_Geographic.xml 0adab8b5195c92dd558b96a6d77403d62b64dee59bfdd95a01838d8684e32da1,1,1,NationalHealthandMedicalResearchCouncil.xml 4f3d0dc561b1d5aa8256a5c6b3836f1d624a29142b47bb7d9229916c2abc6aed,1,1,NationalLibraryofAustralia.xml 1fdbf03f38170dbf7fcc2e857edff149d2fc104f1cfe992e3346a6eaea3d9801,0,1,National_Priorities.org.xml @@ -2317,8 +2309,6 @@ d736b4403c08de43b1380fb0bb896d84478ff2254f2c4e12c579e5d175c60552,1,1,NIC.br.xml 51f9018faee4b5f25dad5c45d9d8df8a7787758c25d2251ca366c3f08f0e9120,0,1,NiKec_Solutions.xml de1c97a6ba1ece72e2b39d5bda73f089c9ae9e6e375e7b1e4370865d4ee29b31,1,1,Nimbus_Hosting.xml a0f578f005779d8470ae10f1de0613020df1cbc8fe7fc5e8631a9fbf80512b1a,1,0,Nimenhuuto.com.xml -62eac6cc2c9c2143dd0815bd24d07623dc3f97828b2d3db2f17eda2f141e68df,1,1,Ning-falsemixed.xml -b4acc275170d8cee0433cc9a5e65598a466fdafce8ec125532f335d91dbe124d,1,1,Ning.xml ec7461b5fefdbc43198d8930f6decae4c9bcc93d2473eaef2a528d1affffb111,0,1,NJ_Edge.Net.xml a326164b9ad2dd7ad25a529f70cb78f363ffb0e58a2f59ea413248aade1be980,1,1,NJIT.edu.xml fb9bea6dae32ac882a6da54f728aeb39babc12fdb1939dcac84bc3536733e69f,1,1,NMU.xml @@ -2603,7 +2593,6 @@ f8eb1c5b920d861d39f2f49cc5b1b5b781034d05a5c5970492e2ca678feefb37,0,1,Playlists.n b24301ccfdb27055ea2218f9e9ebfbfad89e7b0293b3f4ef1ec8175e7f32c945,1,1,Plus.xml 78b114e3756ec21b948939f187308f695fccbaf94f4cc8f588f262d84d44acf5,0,1,PLYmedia.com.xml 3d08fca17433ab0e7184bb76c5f404e164a09d77c2cb1f2093f7b3d9c6cf823d,1,1,PNC.xml -92ea35c6e7d831800b01c553036275c9306a0d3f1c0ca96d50d2c9a442e8c407,1,1,Pocketbook.xml ca77e2b2c075769fb2c776c97327a8a6c831244e01334d877779d6f34e0c6df4,0,1,PocketMatrix.com.xml de183d823652107d6817148ef14f0624ab67e95e1440808e1f12a41e1d52c324,1,1,Pogo.xml 865ac521a7afec106bd224887358f9e23d61c993285ec52b7b79a8a58565171a,1,0,Point.im.xml @@ -2647,7 +2636,6 @@ b0d4020ae98c0a8792a14d61af286d8da58bdf81adbd1d1e19afc749ef600bc7,0,1,Prad.de.xml f18bc789e6e2be483cf21a6e3d87792904f8bf4ddbc6ef59bd608ed84438cc19,1,1,Pragmatic_Marketing.com.xml 2b40b4e8450bec409fdb41f54f635e7e70f9ade4e37971cb92487b2aeae72499,1,1,PreCharge.net.xml 810fe9624db6579cb589bc5bf86447dc0bba88983b89c993152fd78554898224,0,1,Pressflex-mismatches.xml -0e9827cd904c25c2f99fbce5aea010a7597a53dbe9b9a2622d2377fd10b3c3f6,1,1,PressLabs.xml 26ec6458d0c71bf9419469a4ebe2762e81ca89eca106acd1f4a0d9bacfdf0111,1,1,PressPlus.xml 302da6e9ef8981e7c9fc640d28274768775d2dcf4e6db959d02538d6b7d061ef,1,1,Priceonomics.com.xml 65f6f65113526347d5525105773a7579d9301a6d87adf13fa18499373b18db13,1,1,PriceRunner.xml @@ -3051,7 +3039,6 @@ b34278b513f81f664edd8653f1bb73fb84209a9625949fcf84364b1dfc0ae9f9,1,1,Snatchly.xm 591ee3bfe6b2d0c5c3cf6363267329c82a8838ce5cae5f470214191b865d3431,0,1,Society-for-Technical-Communication.xml 1704dd273006545bd23e5c0a4a1f7f0cdd4b8ac4aae59268afd81190441f74a3,0,1,Society-of-Light-and-Lighting.xml dbfbc5e95c59ca8f5a6817ed26888960e39498fb14738f2ac049c176a530c2d3,0,1,SockShare.com-problematic.xml -e47855ace13e94fee4dd14533d9ac3ec4d95f42bfaccffb76a733a16c6776b43,1,1,SoftCreatR.de.xml 49210ac2c7f23d1ec5bdff953d0b1d716568c2c5b26f78b9385dfa830f0cd91f,0,1,SoftLayer-mismatches.xml 55a4d4cf5f34e4628304df22b8bb098a52f3828e43b2ad6efed87c95d76bfa01,0,1,Software-in-the-Public-Interest.xml 24f2f18c8774e7336eb85a921d919a8fb4cfa53eb88f19aeecaadac46b8be159,0,1,SoFurry.xml @@ -3667,7 +3654,6 @@ ba1593452425105c70c808ddffae73fc41bfc86e0709d962e65157bd81608498,1,1,Waitrose_Di 7c94dfabc1a022237d22c9a38e763f561592b7553acecd8b5aafe7717e3a7669,0,1,WAPY.xml 490f37f964fb9bd7058bb7e2f52ac06bbd076a10428097654ea263efca37f629,0,1,Warner-Artists.xml 1e26f33749735e34741aeb8c24b83694092d38f61bd183b7b901cbc4b7aa8385,0,1,Washington-Post-Company-mismatches.xml -07db83787e56296f9eaecf07ae9972ee07243c128be8e26abb915ec71d04b7c4,1,1,Washington_Times.xml b52e61298887f1a7e837d0cc6e48edd14de0d6ed0983477debb5020ce32c646a,1,1,Water-Challenge.com.xml 855ec707726db8e3579c25eaede7119ebd757579fe32a139ab7bfd60818a0380,1,1,Water.org.xml 345b6b2fae63c61a265a9f34a768f81133caa068af17f61b0a82066f02da1777,0,1,Watsi.org.xml @@ -3712,7 +3698,6 @@ cacf30b765ad68c61fa84ffd3e6db0c636f668d9254c900bbcb46de15d6e21ae,1,1,Webstat.com e0962fe4bfd0ae833241c4bc9a66106920ceb9e8756cc70167e591707bf39775,1,1,Web-Stat.net.xml 3d80a69e9d91fc2f37c66f7889675712cb9888dacab9283f99f727033181f32a,1,1,WebtraffIQ.com.xml 3b00d11eb23e281b78d953139aa17e5cda9e6e581be328d2f477795bbd85582c,0,1,Webtranslateit.xml -dee1a96cd8d9cb2ae1e4279a25b376432b6f5c1265bd03ea80ebf5acc01e920f,1,0,Webtrekk.net.xml 7b39cdcde2f5b3492cb97b2c0f9131fd5f70139f0ce9724681623b7f1f786dae,0,1,WebUrbanist.com.xml cbbbdc6fb132f2cce52e3bd5d7010ac0c6c59a5c8e1f002542b76530aa712ba6,0,1,Wego_Health.com-problematic.xml 1e44ed825125907d6cae44ff8a80367225031b54bd0149694db611e930f54ac3,1,1,Weiss-Research.xml From 6f0961c3893ece74348b8fd4a571fe8c5f180305 Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 29 Jan 2018 15:13:34 -0800 Subject: [PATCH 581/844] Signing data from AMO. --- src/META-INF/manifest.mf | 48 +++++++++++++++++++-------------------- src/META-INF/mozilla.rsa | Bin 4185 -> 4185 bytes src/META-INF/mozilla.sf | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/META-INF/manifest.mf b/src/META-INF/manifest.mf index 9e69ac1d8545..a84e08a980fa 100644 --- a/src/META-INF/manifest.mf +++ b/src/META-INF/manifest.mf @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Name: background.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: DF2v7WGsb6IkINLD84ZN2g== -SHA1-Digest: pe7rvvrrrVR0t8gj8t9BuF9zJD8= +MD5-Digest: R27Ir4kxKIWgy9yBlLC2AA== +SHA1-Digest: vZ94ALa52F6K7950Ry52JH2pXDE= Name: bootstrap.js Digest-Algorithms: MD5 SHA1 @@ -52,8 +52,8 @@ SHA1-Digest: yb8hDRKxyRv4VfPLW3qXO+PxkWA= Name: manifest.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: UfPxWlY4VQkHGYnut3+74Q== -SHA1-Digest: 0F+4KEjrCemfgpgsC5xpT5Emtbs= +MD5-Digest: x1WcixBsIHN3Sq/RlNCskg== +SHA1-Digest: fdOnj00W9u1OvMQPUak86yufIxQ= Name: options.css Digest-Algorithms: MD5 SHA1 @@ -237,8 +237,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/br/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: BUzS4WKQZswcXZg74wY8+g== -SHA1-Digest: IbcrSgGF/4QfXGQAyQ6j1wiqdeg= +MD5-Digest: TtmZdpt2wgS/gM5VguCa5Q== +SHA1-Digest: 3be8pASueWuMkqbGpWrNsKgGOnE= Name: _locales/brx/messages.json Digest-Algorithms: MD5 SHA1 @@ -312,8 +312,8 @@ SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ= Name: _locales/de/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: tFDY3Q4EHWutsjEDFGDO7A== -SHA1-Digest: +k6L/1owopyxhWFowUM3VF4D3zc= +MD5-Digest: tgZ/4eZ2RkcZeoMxFpJWEA== +SHA1-Digest: C6YGHTiDg7UUe0ePlLKU6rQ7biw= Name: _locales/dz/messages.json Digest-Algorithms: MD5 SHA1 @@ -342,8 +342,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/eo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: rWHGZQNIp2AnFZKlMMm/ig== -SHA1-Digest: PThPaz9dWyCm5kral7kNX52iMe4= +MD5-Digest: MR6vUO9Fr6VVB6FGTUUF3Q== +SHA1-Digest: A4hQgcI4uWwHv71HjeiJSi5xurI= Name: _locales/es/messages.json Digest-Algorithms: MD5 SHA1 @@ -462,8 +462,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/he/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 8oFkK7LbN8RRBEM1+IfWRA== -SHA1-Digest: D/jE57J/+0+fhsBPjvPHF0Dw6tA= +MD5-Digest: NTOHUD7r99WJfexqovtZag== +SHA1-Digest: rviNcNcf1vxGW8Mly+QAbE3B82U= Name: _locales/hi/messages.json Digest-Algorithms: MD5 SHA1 @@ -472,8 +472,8 @@ SHA1-Digest: mTlAA8ggJM9SMuUVA70fC555Gg0= Name: _locales/hr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: CQM3H/1w0nBiodcpvs1rug== -SHA1-Digest: zIxjketzlCPQE1AFtA7NjxHgA1g= +MD5-Digest: 4tLPvGdXG8e6seOf0EBOBg== +SHA1-Digest: 0iQ1pKEsZmbw92IzCYAVNjE+S7M= Name: _locales/hr_HR/messages.json Digest-Algorithms: MD5 SHA1 @@ -522,8 +522,8 @@ SHA1-Digest: /ucFdyJtKzS3Xq2k5gNhcUpXA3g= Name: _locales/ja/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: TAhFVZUDKlRj/9svcXMb8w== -SHA1-Digest: rkduS2yenEJEDjEYellaFn1tyj4= +MD5-Digest: YZIviaHbnOQsu6g9RDffvw== +SHA1-Digest: a+rOJPet+WMVb4A9HNoWANjMlF4= Name: _locales/jbo/messages.json Digest-Algorithms: MD5 SHA1 @@ -547,8 +547,8 @@ SHA1-Digest: DenWUH1joMtOLAzqdoPDF3ba9jc= Name: _locales/km/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: QgWvWPlF+YwXi0lTHtNmJw== -SHA1-Digest: Cvb0bCeRNSOAcxLoYbqfFF4jBYY= +MD5-Digest: FA6fez7nHccUQFmqkBhzEQ== +SHA1-Digest: D+TBW7Yz3OLhLM1STmUu57O1WUU= Name: _locales/kn/messages.json Digest-Algorithms: MD5 SHA1 @@ -617,8 +617,8 @@ SHA1-Digest: OxawAJIP1gqKX87GeVrMkUWKwtE= Name: _locales/lv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: S1wk9DDiIvCMkCV5RjSG7w== -SHA1-Digest: uw/w44ZmmDe6gFurP+iU0hSZo1o= +MD5-Digest: lxv3HBEJ6JIujDtuNM1ZZw== +SHA1-Digest: NGWrKHZBEm3i/fZVqgDnb9unysc= Name: _locales/mg/messages.json Digest-Algorithms: MD5 SHA1 @@ -632,8 +632,8 @@ SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= Name: _locales/mk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: yWcyDDJmhrTl8MN1qVVYrA== -SHA1-Digest: k1O86/NY7fx2fF7n7psJhFQdfOo= +MD5-Digest: WUeQgMtao5r1+qpsgWYTsA== +SHA1-Digest: bt5rIy3qge0nCZSf1dUaXHhgUEE= Name: _locales/ml/messages.json Digest-Algorithms: MD5 SHA1 @@ -1072,8 +1072,8 @@ SHA1-Digest: PJqzR54BFgNofExLbYn8DMEyvzE= Name: rules/default.rulesets Digest-Algorithms: MD5 SHA1 -MD5-Digest: Tp3PyBWuhjCfu+3XybLR+g== -SHA1-Digest: gMRFzM2y59MPg+78nSyEJpgsNJA= +MD5-Digest: uj5vcK9EAmxborR/8AmDaQ== +SHA1-Digest: Ev3cJfs0OeM4H66W2s+4UrJWCOk= Name: test/.eslintrc Digest-Algorithms: MD5 SHA1 diff --git a/src/META-INF/mozilla.rsa b/src/META-INF/mozilla.rsa index 92036e280df5d9ec847fa92c63291687c3f9ecb9..f8a7877264f4be02d5e665daa8ce2bdf75813302 100644 GIT binary patch delta 1698 zcmV;T23`5tAlV?0NCja;B!@?lP2U$XIWjUeI5IF=7Y#BqFflSXGBPzdGBA@v0i%D# zaamm6{P5R3-U~GAo!Cz;!xpAm%H= z&I%$}xjRpay^iC?N&S1%J&{$#KsR9+Jn|kyabaElyi)t|x$})Mm4&Ir*VFVVdJd_i z<{0Xdbc~rZ7hc(Xjb{7Wz`fIDxX;q#v$l##ZXco##dueO!kOy+YZ>@u# zXKE*Lktq|xKAQN}s?g&o9V++NIQ6(9L9@-xzPw|LE4XW6byuZVWl&9c1jRoJn*8-j zq}+PgPG{HJ@XMgpCrD0r!F~}Xr%Z(GgRDpx!^~iTCN`G6DkJ!^!~Y)SHCcboLdjwc zovM3hJr)&0FK2GjJ%qmzKiVFSbI;}RjJR19_R}FzUNO2ft=+s_4WrIInCu{|lDH#* z-0}W6c@{#lsryXPF2^ZVBOD+=BI5aa=*XQ@aF7eR(~5i)b+#@SmD8nZW4^@IPaCF& zRa7!GOBUYs%RACk{Ea%$*KdDx6fU;)yV{ZGbGbH zw8ue`A%ZyH1WHNH2r+{iSJ`fCNimzjZcH`^Krp)g4gqMXiC4Hq%=u+3Bv+wiptD+& z5A-iZO~Q}1Q@ExrUaNUmO1w~{aU=Cy)5O{-;TT;!iO!!H;u?iDy2gL{rWex!0|5X5 zFbxI?Duzgg_YDC73k3iJf&u{m!nrlb_T~1$08%dX;$T@HCu;1W24iFCM=W$RK9h05 zbE)e0D9rO{`IGtu;bO*3Zc?!VUB#7Z7A13h{-#}@0Mz+mVXY)tGoQ|Ahaf}u&4CDE zJGvy98=z{MlmGPbK1P4kAPZ|v<}afLiKX2+AjGxd129#wK!9NL&*ARB;zrN`^bQp1 zfkW5YyBfTU)1>G{o@Sl}!g`~sQb^`yBU-7spG=^7>)o|<9w5qZtt!hSSW+vpF}%4b z6pgbIfRz=jdgSlhYq0(E^+xDok;-DS?@=gi`q5vE?`2*AdH8<9 z%`I90+E@WG!_xOg5kXKOzq0&iB5#q3@tHYmc&Fe;NmPq>4KQGXmtIkGwB?m=da?oQ zq-4iv=vds5a z*eD7(^Sh#?1i8jenpEzjPB+8x7N}i%eGqijmzkZgE}0>ueiFRZUnyY3dR!=U%R28^ z=b4kjf=iAQt*=V9#81%+v;PIy2L)k7B!@?n+zmW`GC49bH8?UbS}-F92`Yw2hW8Bt z2?Q|~1QZD7K&C{?(U!GpkXfAC)lvm2!<{e<1_>&LNQUp0ApZwF_^~w zX4zsgdu8707PaA%J_NqhN9*D;xOBnw7ne(>hfBUZHbLOF!~a1Z>QC9|^)y`| zacOyf5_jfEr5=30mGq=VzBX%e7_K_*%SUr^x7cQhpVeVXcQ$o21Ti+t4O*IZcb=FLf)lj(YrS#Vzn5qY} z9t&%#%X%?8=bE^L1x2|ihREVzoREcL6;3>VHKRuCPzsbSlw$nRvk@470ujEOz}JYP zFM>PX2%DI{!m}q?_tROh)=+v0{gRyGeBmHge{Rp&jXCV0;yl{QUj8}A*-5vFmNTw02^Evyl^Wvfi96U}CwA!XuNwbm zRoOI8M)4dy-nk-j4s(MV6^rxQ4}qSucf8>-Gl^g^$S`m8H|9QB3CM{4QpzGt&Z`iM+GhnPS^xk5 delta 1698 zcmV;T23`5tAlV?0NCjZ$j{d`uP2U$WF)}kUIW;y~7Y#BqFflPOGBYwcH8zt&0i%Da zo7A?qXECcp(e2Ays?P6!94ev@cXm}a+|*dE?TT{a zcrnJ}Uh0@2p?C;W1sqw_lZ6v}^}Ad&fryg8lA!(NHO@VVba$kSNEA|_L9Az4*fQ@Cl>3B-%q|4P)B9#dT}0Dg5Kc3A{?ok0!)y?x@yLHpqBacG zUVPAa&4QF*9lIX-#Jg+b37q~sYmrg$CvVzVQToWSh2eEn3Qz5hy@}OD8oCz zP`97xQt?-;Be}<)fJDtsTO&ii_~b>&qc$Y01KOUeh=V>)L+E`Q+MRWf2;338{!5eW zyCK5|v#le(Jsx5_d^Z52;>dq}5Mq8}lBRKjj@`sZR_g2^Rz8Y{H5Wke(%C++VyXph zf^d>-36HRW{d@YR)zZ15r+|T=%>#05Kd*g`S+F&Wo;Wf-Qlr4PH;prXZQni)Gemj# z3ANU|ZpYf(GD~Q?m3>1+c>!#uKd;dmzq}#9O_+4|yYP&CwURFcoDYAQc93rZ0|5X5 zFbxI?Duzgg_YDC73k3iJf&u{muSA=*hgR|}fH!!5qu;nsK=u*gZE!B@fqLgpvHf7-li^=6Lv!oOE(jvRilkt}*yz8bSOxV+?l;|&~; z<`wW5BB!KRDsHbjnvX`IAdTd*0t|y9p}q-aHzy!49CklcDLxx}HS$mhzV;rIBq}fn zj40*4*g5YSms+rbeKY68ow~y;5OGTlWE^#luLi6izh)IIe2m%(1Je}5~FmY3;;34kx~@|=}y9!4QTXTt<1C-}yV&B5ZWS=k|vvqQpACFX+p<-be?#{rF@ zsBketP>H^PMj+gP4#Hm+v;PIy2L)i~j{d`w+zmW`F)=bTGC4IiS}-F92`Yw2hW8Bt z2?Q|~1QZxX$^{S{kZUb;UHtjtss)Aj&l@le1_>&LNQUp05@o)9*)Nt zz9~t1p^v3i{}=@~u{v=5pZR(x(q$-roJCyHbYdj*O!lF|F@~1Qvm`ZifL#TFZhEtU z7850Zd+-QS4j0jxR0l%B{AgBPE@`Uo^gg~TJ8TEsdpba=Gi*r`qC#Ske_Sf2Reusd z>0i6X?9Sxq>98L+WogxsgcO)C0(gU&_#@ndeAAWUGQrem;u%tb_VA=n}CCfLYXVzjY5S$6Lq7C$f@% z+>)`EBTg78BMPWkHiZR`ecka<}d^DBthN%Quy~_Ch#0?AoR7veGXj@<5lF~ zSeoruBT-c!bK6%T(}m5>_P>fo9?3zpnp@*LY6_l!?MSS_PLx9VuRF1btbRv%$qKjk zpup>ekqjE6q{gZNdF~`c6?-ueMN*YTAi;~`YNaC-X6CYtjAx$c=KKaaM%a}4cIry8 sKA1RmF*6go6;FZ~7r6gxwP!pdI Date: Tue, 30 Jan 2018 16:28:13 +0100 Subject: [PATCH 582/844] [EmergingThreats.net] Merge and simplify rulesets (#14481) --- .../content/rules/EmergingThreats.net.xml | 22 +++++++++++++ .../rules/Emerging_Threats.net-falsemixed.xml | 17 ---------- .../content/rules/Emerging_Threats.net.xml | 32 ------------------- 3 files changed, 22 insertions(+), 49 deletions(-) create mode 100644 src/chrome/content/rules/EmergingThreats.net.xml delete mode 100644 src/chrome/content/rules/Emerging_Threats.net-falsemixed.xml delete mode 100644 src/chrome/content/rules/Emerging_Threats.net.xml diff --git a/src/chrome/content/rules/EmergingThreats.net.xml b/src/chrome/content/rules/EmergingThreats.net.xml new file mode 100644 index 000000000000..eb2791589721 --- /dev/null +++ b/src/chrome/content/rules/EmergingThreats.net.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Emerging_Threats.net-falsemixed.xml b/src/chrome/content/rules/Emerging_Threats.net-falsemixed.xml deleted file mode 100644 index 67e0daf4b6e8..000000000000 --- a/src/chrome/content/rules/Emerging_Threats.net-falsemixed.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Emerging_Threats.net.xml b/src/chrome/content/rules/Emerging_Threats.net.xml deleted file mode 100644 index 17120f9b7573..000000000000 --- a/src/chrome/content/rules/Emerging_Threats.net.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - From 5438160663e6ea711fb1cf76b26dae5898f5986d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 30 Jan 2018 17:20:27 +0100 Subject: [PATCH 583/844] [BilletNet.dk] Move targets to their own ruleset (#14436) * [BilletNet.dk] Move targets to their own ruleset * [BilletNet.dk] Add subdomain --- src/chrome/content/rules/BilletNet.dk.xml | 25 +++++++++++++++++++++++ src/chrome/content/rules/Ticketmaster.xml | 11 +++------- 2 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/chrome/content/rules/BilletNet.dk.xml diff --git a/src/chrome/content/rules/BilletNet.dk.xml b/src/chrome/content/rules/BilletNet.dk.xml new file mode 100644 index 000000000000..d9cd0a86e98a --- /dev/null +++ b/src/chrome/content/rules/BilletNet.dk.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/Ticketmaster.xml b/src/chrome/content/rules/Ticketmaster.xml index 13d0333ef2ef..41ef85a66c36 100644 --- a/src/chrome/content/rules/Ticketmaster.xml +++ b/src/chrome/content/rules/Ticketmaster.xml @@ -6,6 +6,7 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio For other Live Nation coverage, see Live-Nation.xml Other ticketmaster rulesets: + BilletNet.dk.xml ETicketing.co.uk.xml CDN buckets: @@ -47,7 +48,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio Partially covered domains: - - (www.)billetnet.dk * - (www.)billettservice.no * - lippupalvelu.fi * - (www.)ticketmaster.com * @@ -69,9 +69,7 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio --> - - - + @@ -95,13 +93,10 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio - - - From 78d78553e4c45ef32764d0fe5282f80953cd8211 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Tue, 30 Jan 2018 17:23:24 +0100 Subject: [PATCH 584/844] Clean up after hsts-prune (#14475) * [Risi.com] Remove outdated rule and securecookie * [Tutanota.de] Remove outdated reference * [Youtube] Remove outdated tests, securecookie and exclusion * [YouTube] Update test urls --- src/chrome/content/rules/RISI.xml | 8 ++------ src/chrome/content/rules/Tutanota.de.xml | 3 --- src/chrome/content/rules/YouTube.xml | 23 +++++------------------ 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/src/chrome/content/rules/RISI.xml b/src/chrome/content/rules/RISI.xml index a00a57d81ae0..be65a36835f2 100644 --- a/src/chrome/content/rules/RISI.xml +++ b/src/chrome/content/rules/RISI.xml @@ -7,13 +7,9 @@ - - - - - + diff --git a/src/chrome/content/rules/Tutanota.de.xml b/src/chrome/content/rules/Tutanota.de.xml index d68431898ccd..0feb3e1cad19 100644 --- a/src/chrome/content/rules/Tutanota.de.xml +++ b/src/chrome/content/rules/Tutanota.de.xml @@ -1,6 +1,3 @@ - diff --git a/src/chrome/content/rules/YouTube.xml b/src/chrome/content/rules/YouTube.xml index 0e8cb28f031c..120d79ff0000 100644 --- a/src/chrome/content/rules/YouTube.xml +++ b/src/chrome/content/rules/YouTube.xml @@ -8,6 +8,10 @@ - .youtube.com + HSTS Preloaded: + youtube.com + *.youtube.com + --> @@ -22,8 +26,7 @@ - - + @@ -232,22 +235,6 @@ - - - - - - - - - - - From f62cda124d74a2c3dc785c7f939c2f157c536cfa Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 30 Jan 2018 18:24:42 -0800 Subject: [PATCH 585/844] Pass both type and object directly through (#14487) --- chromium/send-message.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/chromium/send-message.js b/chromium/send-message.js index 2caa4fe8cffb..da8adf5763c0 100644 --- a/chromium/send-message.js +++ b/chromium/send-message.js @@ -3,10 +3,5 @@ "use strict"; function sendMessage(type, object, callback) { - var packet = {}; - packet.type = type; - if(object){ - packet.object = object; - } - chrome.runtime.sendMessage(packet, callback); + chrome.runtime.sendMessage({ type, object }, callback); } From bc3fb453e8e22fc2c2be46000826a11425f58f47 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 31 Jan 2018 14:28:46 +0100 Subject: [PATCH 586/844] [DocumentFoundation.org] Reactivate ruleset (#14491) * [DocumentationFoundation.org] Reactivate ruleset * Rename TheDocumentFoundation.xml to DocumentFoundation.org.xml --- .../content/rules/DocumentFoundation.org.xml | 33 +++++++++ .../content/rules/TheDocumentFoundation.xml | 71 ------------------- 2 files changed, 33 insertions(+), 71 deletions(-) create mode 100644 src/chrome/content/rules/DocumentFoundation.org.xml delete mode 100644 src/chrome/content/rules/TheDocumentFoundation.xml diff --git a/src/chrome/content/rules/DocumentFoundation.org.xml b/src/chrome/content/rules/DocumentFoundation.org.xml new file mode 100644 index 000000000000..e6cde170cd35 --- /dev/null +++ b/src/chrome/content/rules/DocumentFoundation.org.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/TheDocumentFoundation.xml b/src/chrome/content/rules/TheDocumentFoundation.xml deleted file mode 100644 index 98d0014b6ec8..000000000000 --- a/src/chrome/content/rules/TheDocumentFoundation.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 694719d0c18de6f5d70eb220a9a0bc6f78b09473 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 31 Jan 2018 14:31:11 +0100 Subject: [PATCH 587/844] [Hardware.fr] Add targets (#14484) * [Hardware.fr] Add targets * [HardWare.fr] Fix mismatch * [Hardware.fr] Remove duplicated rule --- src/chrome/content/rules/hardware.fr.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/rules/hardware.fr.xml b/src/chrome/content/rules/hardware.fr.xml index c1f8bf1e1482..a9fc0514dd43 100644 --- a/src/chrome/content/rules/hardware.fr.xml +++ b/src/chrome/content/rules/hardware.fr.xml @@ -1,18 +1,28 @@ + + + + + + + + From 1d7300631a44b855a1070e1d911ce528e6e0ef9a Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 31 Jan 2018 15:06:25 +0100 Subject: [PATCH 588/844] [Haxx.se] Simplify rules and add targets (#14492) * [Haxx.se] Simplify rules and add targets * [Haxx.se] Simplify securecookie --- src/chrome/content/rules/haxx.se.xml | 57 +++++++--------------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/src/chrome/content/rules/haxx.se.xml b/src/chrome/content/rules/haxx.se.xml index ac556e481a3e..3eeeadb96fe3 100644 --- a/src/chrome/content/rules/haxx.se.xml +++ b/src/chrome/content/rules/haxx.se.xml @@ -1,57 +1,28 @@ - + - + + + - - - - - - - - - - - - - - - + + + + - + From 913323d66ce903fa97d41da5edd299018b8c53b0 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 31 Jan 2018 22:19:28 +0800 Subject: [PATCH 589/844] Split WyndhamVacationRentals.com from Wyndham.xml (#14459) --- src/chrome/content/rules/Wyndham.xml | 17 +---------- .../rules/WyndhamVacationRentals.com.xml | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 src/chrome/content/rules/WyndhamVacationRentals.com.xml diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index 62f8da0aefef..b6755b6ec191 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -18,6 +18,7 @@ + WelcomeCottages.com.xml + Welsh-Country-Cottages.co.uk.xml + WyndhamJobs.com.xml + + WyndhamVacationRentals.com.xml + Wyndhamvrap.com.xml + Landal.xml + landalskilife.be.xml @@ -28,17 +29,6 @@ + landalskilife.fr.xml + landalskilife.nl.xml -Disabled by https-everywhere-checker because: -Fetch error: http://wyndham.com/ => https://www.wyndham.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received') -Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') -Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') - -Disabled by https-everywhere-checker because: -Fetch error: http://wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') -Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: (7, 'Failed to connect to www.wyndhamrentals.com port 443: No route to host') Buckets: - d2bae186y49u92.cloudfront.net (used on landal.(com|nl), landalskilife.com) - d2yr1lcnwqnwfx.cloudfront.net (ditto) - Nonfunctional: - www.blakes.co.uk (shows howseasons.co.uk) - dales-holiday-cottages.com (404) @@ -67,15 +57,10 @@ Fetch error: http://www.wyndhamrentals.com/ => https://www.wyndhamrentals.com/: - - - - diff --git a/src/chrome/content/rules/WyndhamVacationRentals.com.xml b/src/chrome/content/rules/WyndhamVacationRentals.com.xml new file mode 100644 index 000000000000..a27699b7be0b --- /dev/null +++ b/src/chrome/content/rules/WyndhamVacationRentals.com.xml @@ -0,0 +1,29 @@ + + + + + + + From e979bf8f988f16d156f5b68557a3bd974e634409 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 31 Jan 2018 15:22:36 +0100 Subject: [PATCH 590/844] [KernelNewbies.org] Add targets (#14431) * [KernelNewbies.org] Add targets * [KernelNewbies.org] Update securecookie style * Rename kernelnewbies.org.xml to KernelNewbies.org.xml --- .../content/rules/KernelNewbies.org.xml | 22 +++++++++++++++ .../content/rules/kernelnewbies.org.xml | 27 ------------------- 2 files changed, 22 insertions(+), 27 deletions(-) create mode 100644 src/chrome/content/rules/KernelNewbies.org.xml delete mode 100644 src/chrome/content/rules/kernelnewbies.org.xml diff --git a/src/chrome/content/rules/KernelNewbies.org.xml b/src/chrome/content/rules/KernelNewbies.org.xml new file mode 100644 index 000000000000..6db0f63d1a39 --- /dev/null +++ b/src/chrome/content/rules/KernelNewbies.org.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/kernelnewbies.org.xml b/src/chrome/content/rules/kernelnewbies.org.xml deleted file mode 100644 index 8c2933dffc25..000000000000 --- a/src/chrome/content/rules/kernelnewbies.org.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - From 40b392981355fbf552c4a1c7f93fd03491bfe362 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 31 Jan 2018 15:29:56 +0100 Subject: [PATCH 591/844] [Birds-Are-Nice.me] Remove default_off (#14493) --- src/chrome/content/rules/Birds-Are-Nice.me.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Birds-Are-Nice.me.xml b/src/chrome/content/rules/Birds-Are-Nice.me.xml index 2674e3af3932..4ea302705210 100644 --- a/src/chrome/content/rules/Birds-Are-Nice.me.xml +++ b/src/chrome/content/rules/Birds-Are-Nice.me.xml @@ -1,14 +1,11 @@ - + - - - From a36bed0eef2d923bc3fa072c850cfd8a5dbb7bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 31 Jan 2018 15:31:36 +0100 Subject: [PATCH 592/844] Added ruleset for ssdev.org (#14434) --- src/chrome/content/rules/SSDeV.org.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/SSDeV.org.xml diff --git a/src/chrome/content/rules/SSDeV.org.xml b/src/chrome/content/rules/SSDeV.org.xml new file mode 100644 index 000000000000..c4ffdca864f1 --- /dev/null +++ b/src/chrome/content/rules/SSDeV.org.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + From f971d370879400e21d67d857d6e0af39ccba34a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 31 Jan 2018 15:33:52 +0100 Subject: [PATCH 593/844] Added ruleset for genesys-hannover.de (#14410) --- src/chrome/content/rules/Genesys-Hannover.de.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Genesys-Hannover.de.xml diff --git a/src/chrome/content/rules/Genesys-Hannover.de.xml b/src/chrome/content/rules/Genesys-Hannover.de.xml new file mode 100644 index 000000000000..4dd4cc26c50c --- /dev/null +++ b/src/chrome/content/rules/Genesys-Hannover.de.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + From 8fad448427c3505e8e259617125390df8f6912a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 31 Jan 2018 15:34:20 +0100 Subject: [PATCH 594/844] Added ruleset for giraf-network.org (#14412) --- src/chrome/content/rules/giraf-network.org.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/giraf-network.org.xml diff --git a/src/chrome/content/rules/giraf-network.org.xml b/src/chrome/content/rules/giraf-network.org.xml new file mode 100644 index 000000000000..ead4a43a03a7 --- /dev/null +++ b/src/chrome/content/rules/giraf-network.org.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + From fca1d621ecb069e6416ab1eed1985f323934db01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 31 Jan 2018 15:35:01 +0100 Subject: [PATCH 595/844] Added ruleset for geozentrum-hannover.de (#14411) --- src/chrome/content/rules/Geozentrum-Hannover.de.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/Geozentrum-Hannover.de.xml diff --git a/src/chrome/content/rules/Geozentrum-Hannover.de.xml b/src/chrome/content/rules/Geozentrum-Hannover.de.xml new file mode 100644 index 000000000000..6078075c565d --- /dev/null +++ b/src/chrome/content/rules/Geozentrum-Hannover.de.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 43bf06e904029260426f60ad1d3aeab7ceb780be Mon Sep 17 00:00:00 2001 From: MilanKral Date: Wed, 31 Jan 2018 15:38:24 +0100 Subject: [PATCH 596/844] Pravda.sk (#14427) --- src/chrome/content/rules/Pravda.sk.xml | 75 ++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 src/chrome/content/rules/Pravda.sk.xml diff --git a/src/chrome/content/rules/Pravda.sk.xml b/src/chrome/content/rules/Pravda.sk.xml new file mode 100644 index 000000000000..05f37a2184b7 --- /dev/null +++ b/src/chrome/content/rules/Pravda.sk.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ddcf66973c0bc41dfc45068bb3f60c0f85512378 Mon Sep 17 00:00:00 2001 From: Folant Date: Wed, 31 Jan 2018 16:43:54 +0200 Subject: [PATCH 597/844] Update JW_Platform.com.xml (#14472) #14464 --- src/chrome/content/rules/JW_Platform.com.xml | 44 +++++++------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/src/chrome/content/rules/JW_Platform.com.xml b/src/chrome/content/rules/JW_Platform.com.xml index 4f3dec29449e..fe7f9b8ba1e4 100644 --- a/src/chrome/content/rules/JW_Platform.com.xml +++ b/src/chrome/content/rules/JW_Platform.com.xml @@ -1,36 +1,22 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + From 4de3de31ac5254b42da0264ede21ed047468cb9c Mon Sep 17 00:00:00 2001 From: Arthur Edelstein Date: Wed, 31 Jan 2018 08:12:22 -0800 Subject: [PATCH 598/844] Add Aeinstein.org.xml (#14451) --- src/chrome/content/rules/Aeinstein.org.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/chrome/content/rules/Aeinstein.org.xml diff --git a/src/chrome/content/rules/Aeinstein.org.xml b/src/chrome/content/rules/Aeinstein.org.xml new file mode 100644 index 000000000000..e45c4bf9092f --- /dev/null +++ b/src/chrome/content/rules/Aeinstein.org.xml @@ -0,0 +1,6 @@ + + + + + + From 071c99a01393ad1d1c2a8f573fd74423d173eb51 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 31 Jan 2018 18:06:18 +0100 Subject: [PATCH 599/844] Delete Fishwrapper.com.xml (#14488) --- .../rules/Fishwrapper.com-falsemixed.xml | 21 --------- src/chrome/content/rules/Fishwrapper.com.xml | 43 ------------------- 2 files changed, 64 deletions(-) delete mode 100644 src/chrome/content/rules/Fishwrapper.com-falsemixed.xml delete mode 100644 src/chrome/content/rules/Fishwrapper.com.xml diff --git a/src/chrome/content/rules/Fishwrapper.com-falsemixed.xml b/src/chrome/content/rules/Fishwrapper.com-falsemixed.xml deleted file mode 100644 index dade9f91f486..000000000000 --- a/src/chrome/content/rules/Fishwrapper.com-falsemixed.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Fishwrapper.com.xml b/src/chrome/content/rules/Fishwrapper.com.xml deleted file mode 100644 index f01abfca20de..000000000000 --- a/src/chrome/content/rules/Fishwrapper.com.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - From 0a16ea232b1cff5fff27d3a595f1b06df2e7d857 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 31 Jan 2018 23:57:00 +0100 Subject: [PATCH 600/844] Add more hosts to LibreOffice.org.xml (#14495) --- src/chrome/content/rules/LibreOffice.org.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/chrome/content/rules/LibreOffice.org.xml b/src/chrome/content/rules/LibreOffice.org.xml index e81c757fbae8..b938add91162 100644 --- a/src/chrome/content/rules/LibreOffice.org.xml +++ b/src/chrome/content/rules/LibreOffice.org.xml @@ -3,22 +3,32 @@ - api.libreoffice.org - dev-builds.libreoffice.org - tinderbox.libreoffice.org + + Mixed content: + - devcentral.libreoffice.org + - perf.libreoffice.org --> + + + + + + @@ -39,14 +49,17 @@ + + + @@ -60,8 +73,10 @@ + + From 3eddda28ad25174f57eb2e938e521da7fa6c4aa1 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 2 Feb 2018 00:09:07 +0800 Subject: [PATCH 601/844] Replace utils/validate.sh with utils/validate.py, Fix #1097 (#13981) * Replace utils/validate.sh with utils/validate.py, Fix #1097 * Support for Python 2 and Python 3 Python 2.7 will not be maintained past 2020, see https://www.python.org/dev/peps/pep-0373/ --- test/travis.sh | 3 ++- utils/trivial-validate.py | 8 +++++++ utils/validate.py | 46 ++++++++++++++++++++++++++++++++++++ utils/validate.sh | 49 --------------------------------------- 4 files changed, 56 insertions(+), 50 deletions(-) create mode 100644 utils/validate.py delete mode 100755 utils/validate.sh diff --git a/test/travis.sh b/test/travis.sh index 2fd15d98c235..8086f2177a73 100755 --- a/test/travis.sh +++ b/test/travis.sh @@ -41,7 +41,8 @@ if [ "$TEST" == "rules" ]; then docker run --rm -ti -v $(pwd):/opt httpse python utils/ruleset_filenames_validate.py docker run --rm -ti -v $(pwd):/opt -e RULESETFOLDER="$RULESETFOLDER" -e COMMON_BASE_COMMIT="$COMMON_BASE_COMMIT" httpse bash -c "utils/check-ruleset-path.sh" docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/remove-obsolete-references.sh" - docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/validate.sh" + docker run --rm -ti -v $(pwd):/opt httpse python utils/validate.py + docker run --rm -ti -v $(pwd):/opt httpse python utils/trivial-validate.py --quiet docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/rules.sh" docker run --rm -ti -v $(pwd):/opt httpse python utils/normalize-securecookie.py fi diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py index 87863896a721..1b5ef5103663 100755 --- a/utils/trivial-validate.py +++ b/utils/trivial-validate.py @@ -150,6 +150,8 @@ def nomes_all(where=sys.argv[1:]): xpath_from = etree.XPath("/ruleset/rule/@from") xpath_to = etree.XPath("/ruleset/rule/@to") +print("Complex validations & assertions of rulesets using utils/trivial-validate.py begins...") + host_counter = Counter() for filename in filenames: xml_parser = etree.XMLParser(remove_blank_text=True) @@ -200,4 +202,10 @@ def nomes_all(where=sys.argv[1:]): failure = 1 fail("%s failed: %s" % (host, is_valid_target_host.__doc__)) +if failure > 0: + print("Complex validations & assertions of rulesets using utils/trivial-validate.py failed.") +else: + print("Complex validations & assertions of rulesets using utils/trivial-validate.py succeeded.") + + sys.exit(failure) diff --git a/utils/validate.py b/utils/validate.py new file mode 100644 index 000000000000..f7ad6dd2cc44 --- /dev/null +++ b/utils/validate.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python +# -*- encoding: utf-8 -*- + +import argparse +import glob +import os +import unicodedata + +from lxml import etree + +# commandline arguments parsing (nobody use it, though) +parser = argparse.ArgumentParser(description="Validate rulesets against relaxng.xml") +parser.add_argument("--source_dir", default="src/chrome/content/rules") + +args = parser.parse_args() + +# XML ruleset files +files = glob.glob(os.path.join(args.source_dir, "*.xml")) + +# read the schema file +relaxng_doc = etree.parse('utils/relaxng.xml') +relaxng = etree.RelaxNG(relaxng_doc) + +exit_code = 0 + +print("Validation of rulesets against utils/relaxng.xml begins...") + +for filename in sorted(files): + tree = etree.parse(filename) + + if not relaxng.validate(tree): + exit_code = 1 + e = relaxng.error_log.last_error + print(("%s %s:%s:%s: %s" % (e.level_name, e.filename, e.line, e.column, e.message))) + +if exit_code == 0: + message = "Validation of rulesets against utils/relaxng.xml succeeded." +else: + message = "\nTwo very common reasons for this are the following:\n" \ + " - missing caret (^) in 'from' attribute: it should be \"^http:\" and not \"http:\"\n" \ + " - missing trailing slashes in 'from' or 'to' when specifying full hostnames: \n" \ + " it should be \"https://eff.org/\" and not \"https://eff.org\"\n\n" \ + "Validation of rulesets against utils/relaxng.xml failed." + +print(message) +exit(exit_code) diff --git a/utils/validate.sh b/utils/validate.sh deleted file mode 100755 index ddad0b70710f..000000000000 --- a/utils/validate.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Validates rulesets, using both trivial-validate.py (slower, can make more -# complicated assertions) and xmllint with our custom RELAX NG grammar that -# specifies the format of ruleset XML (faster, more limited). -set -o errexit -o pipefail -cd $(dirname $0) - -# =============== BEGIN VALIDATION ================ -# Unless we're in a hurry, validate the ruleset library & locales - -die() { - echo >&2 "ERROR:" "$@" - exit 1 -} - -if python2.7 trivial-validate.py --quiet >&2 -then - echo Validation of included rulesets completed. >&2 - echo >&2 -else - die "Validation of rulesets failed." -fi - -# Check for xmllint. -type xmllint >/dev/null || die "xmllint not available" - -GRAMMAR="relaxng.xml" -# xmllint spams stderr with " validates, even with the --noout flag, -# so we capture only the results that do not contain 'validates' -validate_grammar() { - find ../src/chrome/content/rules -name "*.xml" | \ - xargs xmllint --noout --relaxng $GRAMMAR -} -grammar_errors=$(validate_grammar 2>&1 | grep -v "validates" || true) -if [ -z "$grammar_errors" ] -then - echo Validation of rulesets against $GRAMMAR succeeded. >&2 -else - echo >&2 "$grammar_errors" - # One very common error is to mess up rule attributes, so we check for - # this explicitly. - if [[ $grammar_errors == *"Element rule failed to validate attributes"* ]] - then - echo "Two very common reasons for this are the following:" - echo "- Missing caret (^) in 'from' attribute: it should be \"^http:\" and not \"http:\"." - echo "- Missing trailing slashes in 'from' or 'to' when specifying full hostnames: it should be \"https://eff.org/\" and not \"https://eff.org\"." - fi - die "Validation of rulesets against $GRAMMAR failed." -fi From d3c169716206e43ef0c06449db718fe1cb24b231 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 1 Feb 2018 17:16:11 +0100 Subject: [PATCH 602/844] Delete Owl.English.Purdue.edu.xml (#14503) --- src/chrome/content/rules/Owl.English.Purdue.edu.xml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/chrome/content/rules/Owl.English.Purdue.edu.xml diff --git a/src/chrome/content/rules/Owl.English.Purdue.edu.xml b/src/chrome/content/rules/Owl.English.Purdue.edu.xml deleted file mode 100644 index 01c3a4f88b31..000000000000 --- a/src/chrome/content/rules/Owl.English.Purdue.edu.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 5268da309721626cbee02557ed6d3a4cda78c7cf Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 1 Feb 2018 17:19:07 +0100 Subject: [PATCH 603/844] Create Scuttlebot.io.xml (#14502) --- src/chrome/content/rules/Scuttlebot.io.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/Scuttlebot.io.xml diff --git a/src/chrome/content/rules/Scuttlebot.io.xml b/src/chrome/content/rules/Scuttlebot.io.xml new file mode 100644 index 000000000000..9ca0c8c44805 --- /dev/null +++ b/src/chrome/content/rules/Scuttlebot.io.xml @@ -0,0 +1,17 @@ + + + + + + + + + From 0c33ac679a757286fc314c6f365332f5e313423e Mon Sep 17 00:00:00 2001 From: MilanKral Date: Thu, 1 Feb 2018 18:26:36 +0100 Subject: [PATCH 604/844] ProCare.sk (#14421) * ProCare.sk * www.moj.procare.sk * moj.procare.sk --- src/chrome/content/rules/ProCare.sk.xml | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/ProCare.sk.xml diff --git a/src/chrome/content/rules/ProCare.sk.xml b/src/chrome/content/rules/ProCare.sk.xml new file mode 100644 index 000000000000..8bc87e60fa8c --- /dev/null +++ b/src/chrome/content/rules/ProCare.sk.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + From 719b5d133eeb8337ed2fb4a9d48cef8ac37ee865 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 1 Feb 2018 18:27:05 +0100 Subject: [PATCH 605/844] [Stack-Exchange] Exclude problematic path (#14454) * [Stack-Exchange] Exclude problematic path * [Stack-Exchange] Add another test url * [Stack-exchange] Add link to meta in comment --- src/chrome/content/rules/Stack-Exchange.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/chrome/content/rules/Stack-Exchange.xml b/src/chrome/content/rules/Stack-Exchange.xml index a02e01019bf1..7657876dd9ac 100644 --- a/src/chrome/content/rules/Stack-Exchange.xml +++ b/src/chrome/content/rules/Stack-Exchange.xml @@ -48,6 +48,15 @@ + + + + + From a760d0afc1ec0d250a99fa374b4649f6ad7f58f1 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 1 Feb 2018 18:29:44 +0100 Subject: [PATCH 606/844] [HubSpot.com] Update targets (#14455) * [HubSpot.com] Update targets * Rename HubSpot.xml to HubSpot.com.xml * [HubSpot.com] Add subdomains --- src/chrome/content/rules/HubSpot.com.xml | 63 +++++++ src/chrome/content/rules/HubSpot.xml | 157 ------------------ .../content/rules/Uservoice-clients.xml | 1 - 3 files changed, 63 insertions(+), 158 deletions(-) create mode 100644 src/chrome/content/rules/HubSpot.com.xml delete mode 100644 src/chrome/content/rules/HubSpot.xml diff --git a/src/chrome/content/rules/HubSpot.com.xml b/src/chrome/content/rules/HubSpot.com.xml new file mode 100644 index 000000000000..20e13c12c517 --- /dev/null +++ b/src/chrome/content/rules/HubSpot.com.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/HubSpot.xml b/src/chrome/content/rules/HubSpot.xml deleted file mode 100644 index d57ecf76c2a3..000000000000 --- a/src/chrome/content/rules/HubSpot.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Uservoice-clients.xml b/src/chrome/content/rules/Uservoice-clients.xml index 615f5a9e7f39..5f96748a3b59 100644 --- a/src/chrome/content/rules/Uservoice-clients.xml +++ b/src/chrome/content/rules/Uservoice-clients.xml @@ -4,7 +4,6 @@ --> - From a852c02cb69b5068c0ecf3f7fcc67af169e80901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 2 Feb 2018 16:18:24 +0100 Subject: [PATCH 607/844] Added ruleset for wissenschaftsjahr.de (#14514) --- src/chrome/content/rules/Wissenschaftsjahr.de.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/Wissenschaftsjahr.de.xml diff --git a/src/chrome/content/rules/Wissenschaftsjahr.de.xml b/src/chrome/content/rules/Wissenschaftsjahr.de.xml new file mode 100644 index 000000000000..0e0ea7b9db8b --- /dev/null +++ b/src/chrome/content/rules/Wissenschaftsjahr.de.xml @@ -0,0 +1,9 @@ + + + + + + + + + From fbf9f653e29a00193ea9576936006f3ec7703308 Mon Sep 17 00:00:00 2001 From: modem_down Date: Fri, 2 Feb 2018 19:09:20 +0000 Subject: [PATCH 608/844] Add ruleset for Hive.co.uk.xml (#10875) --- src/chrome/content/rules/Hive.co.uk.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/chrome/content/rules/Hive.co.uk.xml diff --git a/src/chrome/content/rules/Hive.co.uk.xml b/src/chrome/content/rules/Hive.co.uk.xml new file mode 100644 index 000000000000..88d8c2dea398 --- /dev/null +++ b/src/chrome/content/rules/Hive.co.uk.xml @@ -0,0 +1,7 @@ + + + + + + + From 9305e1b7a86e7af2e74bb9c036deb9640370b267 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 2 Feb 2018 12:23:19 -0800 Subject: [PATCH 609/844] Fix rules test (#14521) --- src/chrome/content/rules/AmazonWebServices.xml | 3 +-- src/chrome/content/rules/Hatena.xml | 8 +++----- src/chrome/content/rules/Wemfbox.ch.xml | 12 +----------- src/chrome/content/rules/freetalklive.com.xml | 15 --------------- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/src/chrome/content/rules/AmazonWebServices.xml b/src/chrome/content/rules/AmazonWebServices.xml index 74d6c4721f48..1ba4d1d3224f 100644 --- a/src/chrome/content/rules/AmazonWebServices.xml +++ b/src/chrome/content/rules/AmazonWebServices.xml @@ -261,7 +261,7 @@ - - diff --git a/src/chrome/content/rules/Hatena.xml b/src/chrome/content/rules/Hatena.xml index b11387fc931a..681048e97ec6 100644 --- a/src/chrome/content/rules/Hatena.xml +++ b/src/chrome/content/rules/Hatena.xml @@ -61,16 +61,14 @@ - - - - - + + - - @@ -319,7 +317,6 @@ - @@ -330,7 +327,6 @@ - @@ -343,12 +339,6 @@ - - - - @@ -397,4 +387,4 @@ - \ No newline at end of file + diff --git a/src/chrome/content/rules/freetalklive.com.xml b/src/chrome/content/rules/freetalklive.com.xml index 646c48528e11..5d527b8a311e 100644 --- a/src/chrome/content/rules/freetalklive.com.xml +++ b/src/chrome/content/rules/freetalklive.com.xml @@ -66,21 +66,6 @@ - - - - - - - - - - Date: Sat, 3 Feb 2018 04:37:27 +0800 Subject: [PATCH 610/844] Update https_everywhere_checker/rules.py, Fix #14290 (#14293) --- .../src/https_everywhere_checker/rules.py | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/test/rules/src/https_everywhere_checker/rules.py b/test/rules/src/https_everywhere_checker/rules.py index 59426ee33c06..ea5c883055ff 100644 --- a/test/rules/src/https_everywhere_checker/rules.py +++ b/test/rules/src/https_everywhere_checker/rules.py @@ -178,7 +178,35 @@ def _determineTestApplication(self): else: self.test_application_problems.append("%s: No rule or exclusion applies to test URL %s" % ( self.filename, test.url)) - self.determine_test_application_run = True + + for test in self.tests: + urlParts = urlparse(test.url) + hostname = urlParts.hostname + + isCovered = hostname in self.targets + + if not isCovered: + parts = hostname.split('.') + + for i in range(len(parts)): + tmp = parts[i] + parts[i] = '*' + + if '.'.join(parts) in self.targets: + isCovered = True + break + + if '.'.join(parts[i:len(parts)]) in self.targets: + isCovered = True + break + + parts[i] = tmp + + if not isCovered: + self.test_application_problems.append("%s: No target applies to test URL %s" % ( + self.filename, test.url)) + + self.determine_test_application_run = True return self.test_application_problems def getTargetValidityProblems(self): From a67627170da6a1f1bdd41e60206391b6cb1670c1 Mon Sep 17 00:00:00 2001 From: modem_down Date: Fri, 2 Feb 2018 22:36:35 +0000 Subject: [PATCH 611/844] Create XBRL.org.xml (#10913) --- src/chrome/content/rules/XBRL.org.xml | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/chrome/content/rules/XBRL.org.xml diff --git a/src/chrome/content/rules/XBRL.org.xml b/src/chrome/content/rules/XBRL.org.xml new file mode 100644 index 000000000000..758b17bf4a18 --- /dev/null +++ b/src/chrome/content/rules/XBRL.org.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + From 4d723d731020d7082ff524ec9469a35b21ee10a1 Mon Sep 17 00:00:00 2001 From: aladar42 Date: Sat, 3 Feb 2018 14:54:23 +0000 Subject: [PATCH 612/844] [unitn.it] Ruleset for University of Tronto and their popular BOINC project (#13573) --- src/chrome/content/rules/Unitn.it.xml | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/chrome/content/rules/Unitn.it.xml diff --git a/src/chrome/content/rules/Unitn.it.xml b/src/chrome/content/rules/Unitn.it.xml new file mode 100644 index 000000000000..abfe5f6c0c35 --- /dev/null +++ b/src/chrome/content/rules/Unitn.it.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 93fd020dff7c60f55d549ecacf912da282ca189c Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 3 Feb 2018 17:58:56 +0100 Subject: [PATCH 613/844] add rule for Clickmatic.pl (#14347) --- src/chrome/content/rules/Clickmatic.pl.xml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/chrome/content/rules/Clickmatic.pl.xml diff --git a/src/chrome/content/rules/Clickmatic.pl.xml b/src/chrome/content/rules/Clickmatic.pl.xml new file mode 100644 index 000000000000..acbfc3d2fbd2 --- /dev/null +++ b/src/chrome/content/rules/Clickmatic.pl.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From 467f109d5e99d0748abe34b0d8d6af1c7581d500 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 15:02:12 +0100 Subject: [PATCH 614/844] [Dashpay.io] Reactivate ruleset (#14517) --- src/chrome/content/rules/Dashpay.io.xml | 30 +++++-------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/src/chrome/content/rules/Dashpay.io.xml b/src/chrome/content/rules/Dashpay.io.xml index edffad74021d..d8896302540b 100644 --- a/src/chrome/content/rules/Dashpay.io.xml +++ b/src/chrome/content/rules/Dashpay.io.xml @@ -1,35 +1,15 @@ - - + - - - - - - - + From 16bcfdc67b7da59e54716c6282ac371623f1cc43 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 15:06:24 +0100 Subject: [PATCH 615/844] [Notex.ch] Simplify ruleset (#14490) * [Notex.ch] Simplify ruleset * Rename NoTex.xml to Notex.ch.xml --- src/chrome/content/rules/NoTex.xml | 17 ----------------- src/chrome/content/rules/Notex.ch.xml | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 src/chrome/content/rules/NoTex.xml create mode 100644 src/chrome/content/rules/Notex.ch.xml diff --git a/src/chrome/content/rules/NoTex.xml b/src/chrome/content/rules/NoTex.xml deleted file mode 100644 index 71ffd70e7bff..000000000000 --- a/src/chrome/content/rules/NoTex.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/chrome/content/rules/Notex.ch.xml b/src/chrome/content/rules/Notex.ch.xml new file mode 100644 index 000000000000..11a020971497 --- /dev/null +++ b/src/chrome/content/rules/Notex.ch.xml @@ -0,0 +1,11 @@ + + + + + + + + + + From 6b523e518883c5966f7d7356c6565be8755fe827 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 15:07:39 +0100 Subject: [PATCH 616/844] [HBW.com] Remove mixedcontent platform (#14518) --- src/chrome/content/rules/HBW.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/HBW.com.xml b/src/chrome/content/rules/HBW.com.xml index f47c68bfa9c5..199ac647770b 100644 --- a/src/chrome/content/rules/HBW.com.xml +++ b/src/chrome/content/rules/HBW.com.xml @@ -3,7 +3,7 @@ ibc.hbw.com --> - + From abd6ca4be4a6b0a1a4882faa9975726486f598df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 15:08:43 +0100 Subject: [PATCH 617/844] Fixed and updated ui-portal.de ruleset. (#14483) --- src/chrome/content/rules/UI-Portal.xml | 36 +++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/rules/UI-Portal.xml b/src/chrome/content/rules/UI-Portal.xml index fabb6f73eb74..2394e645a75c 100644 --- a/src/chrome/content/rules/UI-Portal.xml +++ b/src/chrome/content/rules/UI-Portal.xml @@ -1,28 +1,34 @@ - - + - + + + + + + + + + + - - + + - + From 546b9ed8c5a91d54421b266f6d6b132f7722a022 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 15:12:27 +0100 Subject: [PATCH 618/844] Delete Eloqua-clients.xml (#14456) * Delete Eloqua-clients.xml * [Brightcove.com] Add go.brightcove.com * [Webtrends.com] Add understranding.webtrends.com * [Eloqua.com] Fix dangling reference * Whitelist Brightcove.xml * [VMWare.com] Remove dangling reference * [Brightcove.com] Remove duplicated target * Whitelist Brightcove.xml again --- src/chrome/content/rules/Brightcove.xml | 2 +- src/chrome/content/rules/Eloqua-clients.xml | 17 ----------------- src/chrome/content/rules/Eloqua.xml | 6 ------ src/chrome/content/rules/VMware.xml | 2 -- src/chrome/content/rules/Webtrends.com.xml | 1 + utils/ruleset-whitelist.csv | 2 +- 6 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 src/chrome/content/rules/Eloqua-clients.xml diff --git a/src/chrome/content/rules/Brightcove.xml b/src/chrome/content/rules/Brightcove.xml index fab0af65ddee..1509d63abe3b 100644 --- a/src/chrome/content/rules/Brightcove.xml +++ b/src/chrome/content/rules/Brightcove.xml @@ -130,7 +130,7 @@ - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Eloqua.xml b/src/chrome/content/rules/Eloqua.xml index 852757c959c2..68697f6eee17 100644 --- a/src/chrome/content/rules/Eloqua.xml +++ b/src/chrome/content/rules/Eloqua.xml @@ -7,12 +7,6 @@ Fetch error: http://cloudconnectors.eloqua.com/ => https://cloudconnectors.eloqu For other Oracle coverage, see Oracle.xml. - - Other Eloqua rulesets: - - - Eloqua-clients.xml - - CDN buckets: - now.eloqua.com.edgesuite.net diff --git a/src/chrome/content/rules/VMware.xml b/src/chrome/content/rules/VMware.xml index a4418934642a..56a7e6b96b39 100644 --- a/src/chrome/content/rules/VMware.xml +++ b/src/chrome/content/rules/VMware.xml @@ -1,6 +1,4 @@ + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Mirror_Bingo.com-falsemixed.xml b/src/chrome/content/rules/Mirror_Bingo.com-falsemixed.xml deleted file mode 100644 index 63db0799db30..000000000000 --- a/src/chrome/content/rules/Mirror_Bingo.com-falsemixed.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Mirror_Bingo.com.xml b/src/chrome/content/rules/Mirror_Bingo.com.xml deleted file mode 100644 index b45fa37945ea..000000000000 --- a/src/chrome/content/rules/Mirror_Bingo.com.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - From 7fa0a1bb9d6a3e134a571935a9026248f04075d6 Mon Sep 17 00:00:00 2001 From: modem_down Date: Sun, 4 Feb 2018 14:21:47 +0000 Subject: [PATCH 620/844] Add ruleset for Cppinstitute.org.xml (#14501) --- src/chrome/content/rules/Cppinstitute.org.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/chrome/content/rules/Cppinstitute.org.xml diff --git a/src/chrome/content/rules/Cppinstitute.org.xml b/src/chrome/content/rules/Cppinstitute.org.xml new file mode 100644 index 000000000000..e74cd9424989 --- /dev/null +++ b/src/chrome/content/rules/Cppinstitute.org.xml @@ -0,0 +1,7 @@ + + + + + + + From c90204239b21d59b0af36f6cb9c079a117c42ceb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 15:26:10 +0100 Subject: [PATCH 621/844] [CCCure.training] Merge and simplify rulesets (#14480) * [CCCure.training] Simplify ruleset * Delete CCCure.training-falsemixed.xml --- .../rules/CCCure.training-falsemixed.xml | 13 ---------- src/chrome/content/rules/CCCure.training.xml | 26 +++---------------- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 src/chrome/content/rules/CCCure.training-falsemixed.xml diff --git a/src/chrome/content/rules/CCCure.training-falsemixed.xml b/src/chrome/content/rules/CCCure.training-falsemixed.xml deleted file mode 100644 index 0e92032c34a5..000000000000 --- a/src/chrome/content/rules/CCCure.training-falsemixed.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/CCCure.training.xml b/src/chrome/content/rules/CCCure.training.xml index 67983cb6ab75..7f71006110b8 100644 --- a/src/chrome/content/rules/CCCure.training.xml +++ b/src/chrome/content/rules/CCCure.training.xml @@ -1,29 +1,9 @@ - - + - - - - + From e7feaa11f7429e841b1c291ef5d37914af815823 Mon Sep 17 00:00:00 2001 From: Justin Tracey Date: Sun, 4 Feb 2018 14:41:44 +0000 Subject: [PATCH 622/844] Update University-of-Waterloo.xml again (#14441) * Update University-of-Waterloo.xml again * remove digital.library.uwaterloo.ca * alphabetize --- src/chrome/content/rules/University-of-Waterloo.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/rules/University-of-Waterloo.xml b/src/chrome/content/rules/University-of-Waterloo.xml index 82d709229844..e5b16e5fb6e5 100644 --- a/src/chrome/content/rules/University-of-Waterloo.xml +++ b/src/chrome/content/rules/University-of-Waterloo.xml @@ -9,6 +9,7 @@ cecs.uwaterloo.ca hr.uwaterloo.ca bookings.lib.uwaterloo.ca (incomplete certificate chain) + digital.library.uwaterloo.ca (incomplete certificate chain) --> @@ -21,12 +22,15 @@ + + + From 1c4fb2ecb6843992060abd0e5389d3219767c78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 15:43:30 +0100 Subject: [PATCH 623/844] Added ruleset for bcix.de (#14470) --- src/chrome/content/rules/BCIX.de.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/BCIX.de.xml diff --git a/src/chrome/content/rules/BCIX.de.xml b/src/chrome/content/rules/BCIX.de.xml new file mode 100644 index 000000000000..be1df16f1a5f --- /dev/null +++ b/src/chrome/content/rules/BCIX.de.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From c1f45b85de566c81d58d2bb005e017f76b68e83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 16:07:32 +0100 Subject: [PATCH 624/844] Added ruleset for artfiles.org (#14500) * Added ruleset for artfiles.org * Added comment about wildcard DNS record. --- src/chrome/content/rules/artfiles.org.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/artfiles.org.xml diff --git a/src/chrome/content/rules/artfiles.org.xml b/src/chrome/content/rules/artfiles.org.xml new file mode 100644 index 000000000000..b2ebd6099286 --- /dev/null +++ b/src/chrome/content/rules/artfiles.org.xml @@ -0,0 +1,12 @@ + + + + + + + + + + From 4b7abdfeae81a4f0ebe07aad7d68b63ec4c35017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 16:08:44 +0100 Subject: [PATCH 625/844] Added ruleset for pebs-eu.de (#14413) --- src/chrome/content/rules/PEBS-EU.de.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/chrome/content/rules/PEBS-EU.de.xml diff --git a/src/chrome/content/rules/PEBS-EU.de.xml b/src/chrome/content/rules/PEBS-EU.de.xml new file mode 100644 index 000000000000..a4aa9451b9dd --- /dev/null +++ b/src/chrome/content/rules/PEBS-EU.de.xml @@ -0,0 +1,7 @@ + + + + + + + From 2f955293e33a4deff366d854bb38af3160b5aa13 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Sun, 4 Feb 2018 23:19:03 +0800 Subject: [PATCH 626/844] Create laibafile.cn.xml (#14460) * Create laibafile.cn.xml * Update laibafile.cn.xml --- src/chrome/content/rules/laibafile.cn.xml | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/chrome/content/rules/laibafile.cn.xml diff --git a/src/chrome/content/rules/laibafile.cn.xml b/src/chrome/content/rules/laibafile.cn.xml new file mode 100644 index 000000000000..24cfaeb54f4b --- /dev/null +++ b/src/chrome/content/rules/laibafile.cn.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + From c7d64f56aaf5fbc197e47b5c4bd53a591982ca0e Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 17:28:37 +0100 Subject: [PATCH 627/844] [Nature.org] Remove broken redirect (fix #14523) (#14525) --- src/chrome/content/rules/Nature.org.xml | 41 ++++++------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/src/chrome/content/rules/Nature.org.xml b/src/chrome/content/rules/Nature.org.xml index ed7aefeff089..550333ae3f85 100644 --- a/src/chrome/content/rules/Nature.org.xml +++ b/src/chrome/content/rules/Nature.org.xml @@ -1,6 +1,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - From 543e1f4b3325a8e36e81b92a5055d7733f30442f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 23:11:56 +0100 Subject: [PATCH 628/844] Added ruleset for worldsoffun.com (#13452) * Added ruleset for worldsoffun.com * Removed redirect; added comment about wildcard DNS record. --- src/chrome/content/rules/worldsoffun.com.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/worldsoffun.com.xml diff --git a/src/chrome/content/rules/worldsoffun.com.xml b/src/chrome/content/rules/worldsoffun.com.xml new file mode 100644 index 000000000000..f619bfda8a7c --- /dev/null +++ b/src/chrome/content/rules/worldsoffun.com.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + From 17f0a07aa7dd8dc1e59cf04b3391d74f2d59b050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 23:12:08 +0100 Subject: [PATCH 629/844] Added ruleset for ecix.net (#14469) * Added ruleset for ecix.net * Added mail.ecix.net --- src/chrome/content/rules/ECIX.net.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/ECIX.net.xml diff --git a/src/chrome/content/rules/ECIX.net.xml b/src/chrome/content/rules/ECIX.net.xml new file mode 100644 index 000000000000..ea11a3df2df9 --- /dev/null +++ b/src/chrome/content/rules/ECIX.net.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + From a7fc4a8ebe2d4056fe77e8b84a9129950f4c6ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 4 Feb 2018 23:12:24 +0100 Subject: [PATCH 630/844] Added ruleset for myfritz.net (#14468) * Added ruleset for myfritz.net * Added comment about customer controlled subdomains. --- src/chrome/content/rules/MyFRITZ.net.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/MyFRITZ.net.xml diff --git a/src/chrome/content/rules/MyFRITZ.net.xml b/src/chrome/content/rules/MyFRITZ.net.xml new file mode 100644 index 000000000000..7d6094d58330 --- /dev/null +++ b/src/chrome/content/rules/MyFRITZ.net.xml @@ -0,0 +1,12 @@ + + + + + + + + + + From f9c6be306b9372ffc9e59133452fb87877d54e25 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 4 Feb 2018 23:12:43 +0100 Subject: [PATCH 631/844] [Instructables.com] Fix redirect loop and CORS issues (#14526) * [Instructables.com] Fix redirect loop and CORS issues * [Instructables.com] Add rule * [Instructables.com] Exclude more subdomains * [Instructables.com] Add more test urls * [Instructables.com] Add comment about wildcard DNS --- .../content/rules/Instructables.com.xml | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/rules/Instructables.com.xml b/src/chrome/content/rules/Instructables.com.xml index 033633b40cde..1b71e04499b8 100644 --- a/src/chrome/content/rules/Instructables.com.xml +++ b/src/chrome/content/rules/Instructables.com.xml @@ -1,25 +1,8 @@ + + + + + + + + + + + + + + + + + From 7e66e1550f0e376b112e1036209a62750008aff2 Mon Sep 17 00:00:00 2001 From: Justin Su Date: Sun, 4 Feb 2018 17:14:01 -0500 Subject: [PATCH 632/844] Add ruleset for gocontigo.com (#14496) * Add ruleset for gocontigo.com * Comment out sip.gocontigo.com: Invalid cert * Comment out media.gocontigo.com: Time out --- src/chrome/content/rules/Gocontigo.com.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/chrome/content/rules/Gocontigo.com.xml diff --git a/src/chrome/content/rules/Gocontigo.com.xml b/src/chrome/content/rules/Gocontigo.com.xml new file mode 100644 index 000000000000..563c78dba9b9 --- /dev/null +++ b/src/chrome/content/rules/Gocontigo.com.xml @@ -0,0 +1,14 @@ + + + + + + + + From d8e5f8fa12e59ec6f1044d8276e3258b18feefa9 Mon Sep 17 00:00:00 2001 From: Justin Su Date: Sun, 4 Feb 2018 17:14:38 -0500 Subject: [PATCH 633/844] Add ruleset for redflagdeals.com (#14497) * Add ruleset for redflagdeals.com * Add targets to redflagdeals.com ruleset * Oops, messed up the comment * Add CDN targets to Redflagdeals.com ruleset * Fix formatting --- src/chrome/content/rules/Redflagdeals.com.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/chrome/content/rules/Redflagdeals.com.xml diff --git a/src/chrome/content/rules/Redflagdeals.com.xml b/src/chrome/content/rules/Redflagdeals.com.xml new file mode 100644 index 000000000000..d640eb13bd11 --- /dev/null +++ b/src/chrome/content/rules/Redflagdeals.com.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + From 73c41f6157287a02c42406e1b5d8115c7595f7a2 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 5 Feb 2018 22:23:04 +0100 Subject: [PATCH 634/844] Clean up AmazonWebServices.xml (#14457) * Move all amazon.com subdomains to Amazon.xml * Move all amazon.co.uk subdomains to amazon.co.uk.xml * Move amazonwebservices.com targets and rules to their own ruleset * Move images-amazon.com targets and rules to their own ruleset * [Images-Amazon.com] Fix conflicting instructions * Move SSL-images-amazon.com subdomains to their own ruleset * Whitelist Images-Amazon.com.xml * [SSL-Images-Amazon.com] Add missing test urls * Rename AmazonWebServices.xml to AmazonAWS.com.xml * [Amazon] Update reference to AmazonAWS.com.xml * [AmazonAWS.com] Fix conflicting rule * [Amazon.com] Add test urls * [Images-Amazon.com] Remove old exclusions * Revert "Whitelist Images-Amazon.com.xml" This reverts commit 265d783208d20f8a6bb9768a953bdfbfae5f99d9. * [Images-Amazon.com] Add test urls * [Amazon.co.uk] Remove broken target * Revert "[Amazon.co.uk] Remove broken target" This reverts commit 6a48f9004a4f9d975bd75c4ad6bd0111eda42589. --- src/chrome/content/rules/Amazon.xml | 26 +++++- ...mazonWebServices.xml => AmazonAWS.com.xml} | 90 +------------------ .../rules/AmazonWebServices-breakzoom.xml | 10 --- .../content/rules/AmazonWebServices.com.xml | 31 +++++++ .../content/rules/Images-Amazon.com.xml | 41 +++++++++ .../content/rules/SSL-Images-Amazon.com.xml | 24 +++++ src/chrome/content/rules/amazon.co.uk.xml | 1 + 7 files changed, 123 insertions(+), 100 deletions(-) rename src/chrome/content/rules/{AmazonWebServices.xml => AmazonAWS.com.xml} (70%) delete mode 100644 src/chrome/content/rules/AmazonWebServices-breakzoom.xml create mode 100644 src/chrome/content/rules/AmazonWebServices.com.xml create mode 100644 src/chrome/content/rules/Images-Amazon.com.xml create mode 100644 src/chrome/content/rules/SSL-Images-Amazon.com.xml diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml index ad8090987551..421226dcb454 100644 --- a/src/chrome/content/rules/Amazon.xml +++ b/src/chrome/content/rules/Amazon.xml @@ -7,7 +7,8 @@ - AbeBooks.xml - Amazon-Adsystem.com.xml - Amazon.jobs.xml - - AmazonWebServices.xml + - AmazonAWS.com.xml + - AmazonWebServices.com.xml - AmazonSupply.com.xml - Amazon_Trust.com.xml - Amazon_blogs.com.xml @@ -22,9 +23,11 @@ - ComiXology.com.xml - CreateSpace.xml - Images-CreateSpace.com.xml + - Images-Amazon.com.xml - Junglee.com.xml - MTurk.com.xml - Soap.com.xml + - SSL-Images-Amazon.com.xml - TenMarks.com.xml - amazon.ca.xml - amazon.cn.xml @@ -71,9 +74,19 @@ + + + + + + + + + + @@ -87,6 +100,8 @@ + + @@ -98,6 +113,15 @@ + + + + + + + diff --git a/src/chrome/content/rules/AmazonWebServices.xml b/src/chrome/content/rules/AmazonAWS.com.xml similarity index 70% rename from src/chrome/content/rules/AmazonWebServices.xml rename to src/chrome/content/rules/AmazonAWS.com.xml index 1ba4d1d3224f..e7bb5eda71d6 100644 --- a/src/chrome/content/rules/AmazonWebServices.xml +++ b/src/chrome/content/rules/AmazonAWS.com.xml @@ -94,20 +94,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -213,6 +168,7 @@ + @@ -252,21 +208,6 @@ - - - - - - - - - - - - - - - - @@ -302,27 +236,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -335,7 +248,6 @@ - diff --git a/src/chrome/content/rules/AmazonWebServices-breakzoom.xml b/src/chrome/content/rules/AmazonWebServices-breakzoom.xml deleted file mode 100644 index a1feca41604a..000000000000 --- a/src/chrome/content/rules/AmazonWebServices-breakzoom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/src/chrome/content/rules/AmazonWebServices.com.xml b/src/chrome/content/rules/AmazonWebServices.com.xml new file mode 100644 index 000000000000..7885f44a79c8 --- /dev/null +++ b/src/chrome/content/rules/AmazonWebServices.com.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Images-Amazon.com.xml b/src/chrome/content/rules/Images-Amazon.com.xml new file mode 100644 index 000000000000..56e4f8efefa2 --- /dev/null +++ b/src/chrome/content/rules/Images-Amazon.com.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/SSL-Images-Amazon.com.xml b/src/chrome/content/rules/SSL-Images-Amazon.com.xml new file mode 100644 index 000000000000..ec98b467fd77 --- /dev/null +++ b/src/chrome/content/rules/SSL-Images-Amazon.com.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/amazon.co.uk.xml b/src/chrome/content/rules/amazon.co.uk.xml index e3be90ac7a6f..11553ac27dfd 100644 --- a/src/chrome/content/rules/amazon.co.uk.xml +++ b/src/chrome/content/rules/amazon.co.uk.xml @@ -17,6 +17,7 @@ + From 3ce4be0bfb1e0f90215228da5ffd4b1917c64a9b Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 6 Feb 2018 23:36:26 +0800 Subject: [PATCH 635/844] Remove wildcards from Live-Nation.xml (#14255) --- src/chrome/content/rules/GETMEIN.com.xml | 2 +- src/chrome/content/rules/Live-Nation.xml | 97 ------------------- src/chrome/content/rules/LiveNation.ae.xml | 17 ++++ src/chrome/content/rules/LiveNation.asia.xml | 17 ++++ src/chrome/content/rules/LiveNation.be.xml | 16 +++ src/chrome/content/rules/LiveNation.co.jp.xml | 17 ++++ src/chrome/content/rules/LiveNation.co.uk.xml | 20 ++++ .../content/rules/LiveNation.com.au.xml | 17 ++++ src/chrome/content/rules/LiveNation.com.xml | 50 ++++++++++ src/chrome/content/rules/LiveNation.cz.xml | 17 ++++ src/chrome/content/rules/LiveNation.de.xml | 17 ++++ src/chrome/content/rules/LiveNation.dk.xml | 17 ++++ src/chrome/content/rules/LiveNation.es.xml | 17 ++++ src/chrome/content/rules/LiveNation.fi.xml | 17 ++++ src/chrome/content/rules/LiveNation.fr.xml | 17 ++++ src/chrome/content/rules/LiveNation.hu.xml | 17 ++++ src/chrome/content/rules/LiveNation.it.xml | 17 ++++ src/chrome/content/rules/LiveNation.kr.xml | 17 ++++ src/chrome/content/rules/LiveNation.nl.xml | 17 ++++ src/chrome/content/rules/LiveNation.no.xml | 17 ++++ src/chrome/content/rules/LiveNation.pl.xml | 17 ++++ src/chrome/content/rules/LiveNation.se.xml | 17 ++++ .../rules/LiveNationInternational.com.xml | 20 ++++ src/chrome/content/rules/Ticketmaster.xml | 2 +- src/chrome/content/rules/TicketsNow.xml | 2 +- utils/ruleset-whitelist.csv | 1 - 26 files changed, 398 insertions(+), 101 deletions(-) delete mode 100644 src/chrome/content/rules/Live-Nation.xml create mode 100644 src/chrome/content/rules/LiveNation.ae.xml create mode 100644 src/chrome/content/rules/LiveNation.asia.xml create mode 100644 src/chrome/content/rules/LiveNation.be.xml create mode 100644 src/chrome/content/rules/LiveNation.co.jp.xml create mode 100644 src/chrome/content/rules/LiveNation.co.uk.xml create mode 100644 src/chrome/content/rules/LiveNation.com.au.xml create mode 100644 src/chrome/content/rules/LiveNation.com.xml create mode 100644 src/chrome/content/rules/LiveNation.cz.xml create mode 100644 src/chrome/content/rules/LiveNation.de.xml create mode 100644 src/chrome/content/rules/LiveNation.dk.xml create mode 100644 src/chrome/content/rules/LiveNation.es.xml create mode 100644 src/chrome/content/rules/LiveNation.fi.xml create mode 100644 src/chrome/content/rules/LiveNation.fr.xml create mode 100644 src/chrome/content/rules/LiveNation.hu.xml create mode 100644 src/chrome/content/rules/LiveNation.it.xml create mode 100644 src/chrome/content/rules/LiveNation.kr.xml create mode 100644 src/chrome/content/rules/LiveNation.nl.xml create mode 100644 src/chrome/content/rules/LiveNation.no.xml create mode 100644 src/chrome/content/rules/LiveNation.pl.xml create mode 100644 src/chrome/content/rules/LiveNation.se.xml create mode 100644 src/chrome/content/rules/LiveNationInternational.com.xml diff --git a/src/chrome/content/rules/GETMEIN.com.xml b/src/chrome/content/rules/GETMEIN.com.xml index b814d52a7c0f..8a789cba3fd8 100644 --- a/src/chrome/content/rules/GETMEIN.com.xml +++ b/src/chrome/content/rules/GETMEIN.com.xml @@ -1,5 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/LiveNation.ae.xml b/src/chrome/content/rules/LiveNation.ae.xml new file mode 100644 index 000000000000..bd24ccd9cee2 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.ae.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.asia.xml b/src/chrome/content/rules/LiveNation.asia.xml new file mode 100644 index 000000000000..500e0d38e3a6 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.asia.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.be.xml b/src/chrome/content/rules/LiveNation.be.xml new file mode 100644 index 000000000000..4a62199c854d --- /dev/null +++ b/src/chrome/content/rules/LiveNation.be.xml @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.co.jp.xml b/src/chrome/content/rules/LiveNation.co.jp.xml new file mode 100644 index 000000000000..412b90ba195b --- /dev/null +++ b/src/chrome/content/rules/LiveNation.co.jp.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.co.uk.xml b/src/chrome/content/rules/LiveNation.co.uk.xml new file mode 100644 index 000000000000..dc2f2fd61773 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.co.uk.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.com.au.xml b/src/chrome/content/rules/LiveNation.com.au.xml new file mode 100644 index 000000000000..ed05deaad370 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.com.au.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.com.xml b/src/chrome/content/rules/LiveNation.com.xml new file mode 100644 index 000000000000..4efe1ca4c448 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.com.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.cz.xml b/src/chrome/content/rules/LiveNation.cz.xml new file mode 100644 index 000000000000..e3ddf5891416 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.cz.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.de.xml b/src/chrome/content/rules/LiveNation.de.xml new file mode 100644 index 000000000000..036801add791 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.de.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.dk.xml b/src/chrome/content/rules/LiveNation.dk.xml new file mode 100644 index 000000000000..58ff9f269008 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.dk.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.es.xml b/src/chrome/content/rules/LiveNation.es.xml new file mode 100644 index 000000000000..c07099fbcb11 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.es.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.fi.xml b/src/chrome/content/rules/LiveNation.fi.xml new file mode 100644 index 000000000000..5b3e8d14c02d --- /dev/null +++ b/src/chrome/content/rules/LiveNation.fi.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.fr.xml b/src/chrome/content/rules/LiveNation.fr.xml new file mode 100644 index 000000000000..2841327df7f7 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.fr.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.hu.xml b/src/chrome/content/rules/LiveNation.hu.xml new file mode 100644 index 000000000000..e3978c28ada0 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.hu.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.it.xml b/src/chrome/content/rules/LiveNation.it.xml new file mode 100644 index 000000000000..d1960360b3c5 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.it.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.kr.xml b/src/chrome/content/rules/LiveNation.kr.xml new file mode 100644 index 000000000000..95c526e715da --- /dev/null +++ b/src/chrome/content/rules/LiveNation.kr.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.nl.xml b/src/chrome/content/rules/LiveNation.nl.xml new file mode 100644 index 000000000000..b9a5787a9e11 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.nl.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.no.xml b/src/chrome/content/rules/LiveNation.no.xml new file mode 100644 index 000000000000..05b8a7148afb --- /dev/null +++ b/src/chrome/content/rules/LiveNation.no.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.pl.xml b/src/chrome/content/rules/LiveNation.pl.xml new file mode 100644 index 000000000000..f9f81b5f59b7 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.pl.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNation.se.xml b/src/chrome/content/rules/LiveNation.se.xml new file mode 100644 index 000000000000..c8e6327a43f1 --- /dev/null +++ b/src/chrome/content/rules/LiveNation.se.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/LiveNationInternational.com.xml b/src/chrome/content/rules/LiveNationInternational.com.xml new file mode 100644 index 000000000000..3466ab3d1be5 --- /dev/null +++ b/src/chrome/content/rules/LiveNationInternational.com.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/src/chrome/content/rules/Ticketmaster.xml b/src/chrome/content/rules/Ticketmaster.xml index 41ef85a66c36..6d6e73370328 100644 --- a/src/chrome/content/rules/Ticketmaster.xml +++ b/src/chrome/content/rules/Ticketmaster.xml @@ -3,7 +3,7 @@ Disabled by https-everywhere-checker because: Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/section/: Too many redirects while fetching 'https://www.ticketmaster.co.uk/section/' - For other Live Nation coverage, see Live-Nation.xml + For other Live Nation coverage, see LiveNation.com.xml Other ticketmaster rulesets: BilletNet.dk.xml diff --git a/src/chrome/content/rules/TicketsNow.xml b/src/chrome/content/rules/TicketsNow.xml index 321afcc4f042..1e6ef17aa3f9 100644 --- a/src/chrome/content/rules/TicketsNow.xml +++ b/src/chrome/content/rules/TicketsNow.xml @@ -1,5 +1,5 @@ - - - - - - - + From e839aac42e354a9f8292c90139e195b9f3b1c520 Mon Sep 17 00:00:00 2001 From: Justin Su Date: Tue, 6 Feb 2018 12:20:58 -0500 Subject: [PATCH 637/844] Add targets for WebAssign ruleset (#14531) * Fix target ordering * Add targets * Add targets to WebAssign ruleset --- src/chrome/content/rules/WebAssign.xml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/WebAssign.xml b/src/chrome/content/rules/WebAssign.xml index 331e65fbb24d..d4106f1d15a5 100644 --- a/src/chrome/content/rules/WebAssign.xml +++ b/src/chrome/content/rules/WebAssign.xml @@ -1,15 +1,23 @@ - - - - - - + + + + + + + + + + + - + From 3ca229bc5598487e0c056268b987490de8ce1607 Mon Sep 17 00:00:00 2001 From: lexgill <30485455+lexgill@users.noreply.github.com> Date: Tue, 6 Feb 2018 18:25:26 -0500 Subject: [PATCH 638/844] Added parl.ca to rules. (#14041) --- src/chrome/content/rules/Parl.ca.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/chrome/content/rules/Parl.ca.xml diff --git a/src/chrome/content/rules/Parl.ca.xml b/src/chrome/content/rules/Parl.ca.xml new file mode 100644 index 000000000000..0554ba5b36de --- /dev/null +++ b/src/chrome/content/rules/Parl.ca.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + From b51a19dc0349b561621b31a40eee8956fc78dd0b Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 7 Feb 2018 01:09:47 +0100 Subject: [PATCH 639/844] [fail0verflow.com] Trivialize ruleset (#14536) * [fail0verflow.com] Trivialize ruleset * Rename fail0verflow.xml to fail0verflow.com.xml --- src/chrome/content/rules/fail0verflow.com.xml | 9 +++++++++ src/chrome/content/rules/fail0verflow.xml | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 src/chrome/content/rules/fail0verflow.com.xml delete mode 100644 src/chrome/content/rules/fail0verflow.xml diff --git a/src/chrome/content/rules/fail0verflow.com.xml b/src/chrome/content/rules/fail0verflow.com.xml new file mode 100644 index 000000000000..14fa2dd26779 --- /dev/null +++ b/src/chrome/content/rules/fail0verflow.com.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/chrome/content/rules/fail0verflow.xml b/src/chrome/content/rules/fail0verflow.xml deleted file mode 100644 index bc483df4d974..000000000000 --- a/src/chrome/content/rules/fail0verflow.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - From 4ffddda54aeff09601e4b76f95ce4b81484abec1 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 7 Feb 2018 01:10:22 +0100 Subject: [PATCH 640/844] [InsideScience.org] Simplify ruleset (#14538) * [InsideScience.org] Simplify ruleset * Rename Inside_Science.xml to InsideScience.org.xml --- .../content/rules/InsideScience.org.xml | 9 ++++++++ src/chrome/content/rules/Inside_Science.xml | 22 ------------------- 2 files changed, 9 insertions(+), 22 deletions(-) create mode 100644 src/chrome/content/rules/InsideScience.org.xml delete mode 100644 src/chrome/content/rules/Inside_Science.xml diff --git a/src/chrome/content/rules/InsideScience.org.xml b/src/chrome/content/rules/InsideScience.org.xml new file mode 100644 index 000000000000..9612ed808024 --- /dev/null +++ b/src/chrome/content/rules/InsideScience.org.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/chrome/content/rules/Inside_Science.xml b/src/chrome/content/rules/Inside_Science.xml deleted file mode 100644 index 446832a3a907..000000000000 --- a/src/chrome/content/rules/Inside_Science.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - From b4ca2b2f8afd9050ce3c8a115dc789b3ca7782ab Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 7 Feb 2018 01:11:07 +0100 Subject: [PATCH 641/844] [GamingOnLinux.com] Reactivate ruleset (#14543) * [GamingOnLinux.com] Reactivate ruleset * Rename Gamingonlinux.com.xml to GamingOnLinux.com.xml --- .../content/rules/GamingOnLinux.com.xml | 11 ++++++++++ .../content/rules/Gamingonlinux.com.xml | 20 ------------------- 2 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 src/chrome/content/rules/GamingOnLinux.com.xml delete mode 100644 src/chrome/content/rules/Gamingonlinux.com.xml diff --git a/src/chrome/content/rules/GamingOnLinux.com.xml b/src/chrome/content/rules/GamingOnLinux.com.xml new file mode 100644 index 000000000000..c5a8d583c15d --- /dev/null +++ b/src/chrome/content/rules/GamingOnLinux.com.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/Gamingonlinux.com.xml b/src/chrome/content/rules/Gamingonlinux.com.xml deleted file mode 100644 index b816c2c94ec7..000000000000 --- a/src/chrome/content/rules/Gamingonlinux.com.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - From 10fb1e2e9739758a39df28a891948a419d87fd4b Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 7 Feb 2018 01:12:02 +0100 Subject: [PATCH 642/844] [Cyberciti.org] Remove broken rule (#14545) --- src/chrome/content/rules/Cyberciti.org.xml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/rules/Cyberciti.org.xml b/src/chrome/content/rules/Cyberciti.org.xml index dc02ebddf55e..4b9bedeb0aca 100644 --- a/src/chrome/content/rules/Cyberciti.org.xml +++ b/src/chrome/content/rules/Cyberciti.org.xml @@ -1,20 +1,10 @@ - - + + + - - + From 58d5b019323ca8471da3e20b9805171b17ba9d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Wed, 7 Feb 2018 01:20:03 +0100 Subject: [PATCH 643/844] Fixed and updated entropia.de ruleset. (#14433) --- src/chrome/content/rules/entropia.de.xml | 31 ++++++++++-------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/chrome/content/rules/entropia.de.xml b/src/chrome/content/rules/entropia.de.xml index 600e05f810e2..81bfb0ebb6ff 100644 --- a/src/chrome/content/rules/entropia.de.xml +++ b/src/chrome/content/rules/entropia.de.xml @@ -1,47 +1,42 @@ - - + - - - - - + + From 229efbbb6bb9df2c42c0ac60788187c6f81005ff Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Thu, 8 Feb 2018 00:42:35 +0100 Subject: [PATCH 644/844] Automatically remove trailing whitespaces (#14519) Many contributors will have this set as their default text editor config but it isn't the case on GitHub. Because GitHub natively works with editorconfig, trailing whitespaces will be trimmed even with the online editor. --- .editorconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.editorconfig b/.editorconfig index 74835044e555..e93ea3f1b6c3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,7 @@ root = true end_of_line = lf insert_final_newline = true charset = utf-8 +trim_trailing_whitespace = true [src/chrome/content/rules/*.xml] indent_style = tab From da87d112b2e8967b76297bef9d607a82fe5179c4 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 10:44:31 -0800 Subject: [PATCH 645/844] Support python 3.6 in zipfile_deterministic.py and create_zip.py (#14515) --- .travis.yml | 2 +- LICENSE.txt | 5 +- utils/create_zip.py | 4 +- utils/zipfile_deterministic.py | 2075 +++++++++++++++++++++----------- 4 files changed, 1348 insertions(+), 738 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a524ec03a35..29d23029aa2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required os: linux dist: trusty language: python -python: 2.7 +python: 3.6 group: deprecated-2017Q4 services: - docker diff --git a/LICENSE.txt b/LICENSE.txt index d305ece3fa9f..454ba6460dab 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -8,6 +8,5 @@ To the extent copyright applies to the rulesets, they can be used according to G Issue Format Bot (utils/issue-format-bot/*): Copyright © 2017 AJ Jordan, AGPLv3+ -The build system incorporates code from Python 2.6, -Copyright © 2001-2006 Python Software Foundation -Python Software Foundation License Version 2 +The build system incorporates code from Python 3.6 +Copyright © 2001-2018 Python Software Foundation; All Rights Reserved diff --git a/utils/create_zip.py b/utils/create_zip.py index e9fd4602d894..6589b44adcb0 100755 --- a/utils/create_zip.py +++ b/utils/create_zip.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 # Uses the Python zip implementation to create deterministic zip's # Author: Yan Zhu, yan@mit.edu @@ -35,7 +35,7 @@ exclusions = [] for line in f: exclusions.extend(glob.glob(line.strip())) -exclusions = map(lambda x: './'+x, exclusions) +exclusions = list(map(lambda x: './'+x, exclusions)) createdZipFile.write_from_directory(".", exclusions, compress_type=compress) createdZipFile.close() diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py index d8dd11339869..89d3fe09124b 100644 --- a/utils/zipfile_deterministic.py +++ b/utils/zipfile_deterministic.py @@ -1,18 +1,29 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 """ -A fork of the Zipfile module to read and write ZIP files from Python 2.6. -This module aims to create deterministic, byte-for-byte identical zip files. +A fork of the Python 3.6 zipfile module, modified to remove sources of entropy +and ensure bit-by-bit determinism for the output file. -Author: Yan Zhu, yan@mit.edu +Author: William Budington , derived from similar changes written +by Yan Zhu . -Derived from Python 2.6, Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 -Python Software Foundation; All Rights Reserved, License at -http://www.python.org/download/releases/2.6/license/ +Derived from Python 3.6, Copyright © 2001-2018 Python Software Foundation; All +Rights Reserved """ +import io +import os +import re +import importlib.util +import sys +import time +import stat +import shutil +import struct +import binascii -import struct, os, time, sys, shutil -import binascii, cStringIO, stat -import unicodedata +try: + import threading +except ImportError: + import dummy_threading as threading try: import zlib # We may need its compression method @@ -21,10 +32,21 @@ zlib = None crc32 = binascii.crc32 -__all__ = ["BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED", "is_zipfile", - "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile" ] +try: + import bz2 # We may need its compression method +except ImportError: + bz2 = None + +try: + import lzma # We may need its compression method +except ImportError: + lzma = None + +__all__ = ["BadZipFile", "BadZipfile", "error", + "ZIP_STORED", "ZIP_DEFLATED", "ZIP_BZIP2", "ZIP_LZMA", + "is_zipfile", "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"] -class BadZipfile(Exception): +class BadZipFile(Exception): pass @@ -34,17 +56,27 @@ class LargeZipFile(Exception): and those extensions are disabled. """ -error = BadZipfile # The exception raised by this module +error = BadZipfile = BadZipFile # Pre-3.2 compatibility names + ZIP64_LIMIT = (1 << 31) - 1 -ZIP_FILECOUNT_LIMIT = 1 << 16 +ZIP_FILECOUNT_LIMIT = (1 << 16) - 1 ZIP_MAX_COMMENT = (1 << 16) - 1 # constants for Zip file compression methods ZIP_STORED = 0 ZIP_DEFLATED = 8 +ZIP_BZIP2 = 12 +ZIP_LZMA = 14 # Other ZIP compression methods not supported +DEFAULT_VERSION = 20 +ZIP64_VERSION = 45 +BZIP2_VERSION = 46 +LZMA_VERSION = 63 +# we recognize (but not necessarily support) all features up to that version +MAX_EXTRACT_VERSION = 63 + DEFAULT_DATE = (1980,1,1,0,0,0) # hard-coded timestamp # Below are some formats and associated data for reading/writing headers using @@ -55,8 +87,8 @@ class LargeZipFile(Exception): # The "end of central directory" structure, magic number, size, and indices # (section V.I in the format document) -structEndArchive = "<4s4H2LH" -stringEndArchive = "PK\005\006" +structEndArchive = b"<4s4H2LH" +stringEndArchive = b"PK\005\006" sizeEndCentDir = struct.calcsize(structEndArchive) _ECD_SIGNATURE = 0 @@ -75,7 +107,7 @@ class LargeZipFile(Exception): # The "central directory" structure, magic number, size, and indices # of entries in the structure (section V.F in the format document) structCentralDir = "<4s4B4HL2L5H2L" -stringCentralDir = "PK\001\002" +stringCentralDir = b"PK\001\002" sizeCentralDir = struct.calcsize(structCentralDir) # indexes of entries in the central directory structure @@ -102,7 +134,7 @@ class LargeZipFile(Exception): # The "local file header" structure, magic number, size, and indices # (section V.A in the format document) structFileHeader = "<4s2B4HL2L2H" -stringFileHeader = "PK\003\004" +stringFileHeader = b"PK\003\004" sizeFileHeader = struct.calcsize(structFileHeader) _FH_SIGNATURE = 0 @@ -120,13 +152,13 @@ class LargeZipFile(Exception): # The "Zip64 end of central directory locator" structure, magic number, and size structEndArchive64Locator = "<4sLQL" -stringEndArchive64Locator = "PK\x06\x07" +stringEndArchive64Locator = b"PK\x06\x07" sizeEndCentDir64Locator = struct.calcsize(structEndArchive64Locator) # The "Zip64 end of central directory" record, magic number, size, and indices # (section V.G in the format document) structEndArchive64 = "<4sQ2H2L4Q" -stringEndArchive64 = "PK\x06\x06" +stringEndArchive64 = b"PK\x06\x06" sizeEndCentDir64 = struct.calcsize(structEndArchive64) _CD64_SIGNATURE = 0 @@ -140,50 +172,59 @@ class LargeZipFile(Exception): _CD64_DIRECTORY_SIZE = 8 _CD64_OFFSET_START_CENTDIR = 9 -def normalize_unicode(filename): - """For dealing with different unicode normalizations in filenames.""" - return unicodedata.normalize('NFC', unicode(filename, 'utf-8')).encode('utf-8') - -def standardize_filename(filename): - """Get OS-independent form of filename""" - # This is used to ensure paths in generated ZIP files always use - # forward slashes as the directory separator, as required by the - # ZIP format specification. - if os.sep != "/" and os.sep in filename: - filename = filename.replace(os.sep, "/") - return normalize_unicode(filename) +def _check_zipfile(fp): + try: + if _EndRecData(fp): + return True # file has correct magic number + except OSError: + pass + return False def is_zipfile(filename): - """Quickly see if file is a ZIP file by checking the magic number.""" + """Quickly see if a file is a ZIP file by checking the magic number. + + The filename argument may be a file or file-like object too. + """ + result = False try: - fpin = open(filename, "rb") - endrec = _EndRecData(fpin) - fpin.close() - if endrec: - return True # file has correct magic number - except IOError: + if hasattr(filename, "read"): + result = _check_zipfile(fp=filename) + else: + with open(filename, "rb") as fp: + result = _check_zipfile(fp) + except OSError: pass - return False + return result def _EndRecData64(fpin, offset, endrec): """ Read the ZIP64 end-of-archive records and use that to update endrec """ - fpin.seek(offset - sizeEndCentDir64Locator, 2) + try: + fpin.seek(offset - sizeEndCentDir64Locator, 2) + except OSError: + # If the seek fails, the file is not large enough to contain a ZIP64 + # end-of-archive record, so just return the end record we were given. + return endrec + data = fpin.read(sizeEndCentDir64Locator) + if len(data) != sizeEndCentDir64Locator: + return endrec sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data) if sig != stringEndArchive64Locator: return endrec if diskno != 0 or disks != 1: - raise BadZipfile("zipfiles that span multiple disks are not supported") + raise BadZipFile("zipfiles that span multiple disks are not supported") # Assume no 'zip64 extensible data' fpin.seek(offset - sizeEndCentDir64Locator - sizeEndCentDir64, 2) data = fpin.read(sizeEndCentDir64) + if len(data) != sizeEndCentDir64: + return endrec sig, sz, create_version, read_version, disk_num, disk_dir, \ - dircount, dircount2, dirsize, diroffset = \ - struct.unpack(structEndArchive64, data) + dircount, dircount2, dirsize, diroffset = \ + struct.unpack(structEndArchive64, data) if sig != stringEndArchive64: return endrec @@ -213,16 +254,18 @@ def _EndRecData(fpin): # file if this is the case). try: fpin.seek(-sizeEndCentDir, 2) - except IOError: + except OSError: return None data = fpin.read() - if data[0:4] == stringEndArchive and data[-2:] == "\000\000": + if (len(data) == sizeEndCentDir and + data[0:4] == stringEndArchive and + data[-2:] == b"\000\000"): # the signature is correct and there's no comment, unpack structure endrec = struct.unpack(structEndArchive, data) endrec=list(endrec) # Append a blank comment and record start offset - endrec.append("") + endrec.append(b"") endrec.append(filesize - sizeEndCentDir) # Try to read the "Zip64 end of central directory" structure @@ -240,46 +283,47 @@ def _EndRecData(fpin): if start >= 0: # found the magic number; attempt to unpack and interpret recData = data[start:start+sizeEndCentDir] + if len(recData) != sizeEndCentDir: + # Zip file is corrupted. + return None endrec = list(struct.unpack(structEndArchive, recData)) - comment = data[start+sizeEndCentDir:] - # check that comment length is correct - if endrec[_ECD_COMMENT_SIZE] == len(comment): - # Append the archive comment and start offset - endrec.append(comment) - endrec.append(maxCommentStart + start) + commentSize = endrec[_ECD_COMMENT_SIZE] #as claimed by the zip file + comment = data[start+sizeEndCentDir:start+sizeEndCentDir+commentSize] + endrec.append(comment) + endrec.append(maxCommentStart + start) - # Try to read the "Zip64 end of central directory" structure - return _EndRecData64(fpin, maxCommentStart + start - filesize, - endrec) + # Try to read the "Zip64 end of central directory" structure + return _EndRecData64(fpin, maxCommentStart + start - filesize, + endrec) # Unable to find a valid end of central directory structure - return + return None class ZipInfo (object): """Class with attributes describing each file in the ZIP archive.""" __slots__ = ( - 'orig_filename', - 'filename', - 'date_time', - 'compress_type', - 'comment', - 'extra', - 'create_system', - 'create_version', - 'extract_version', - 'reserved', - 'flag_bits', - 'volume', - 'internal_attr', - 'external_attr', - 'header_offset', - 'CRC', - 'compress_size', - 'file_size', - '_raw_time', - ) + 'orig_filename', + 'filename', + 'date_time', + 'compress_type', + 'comment', + 'extra', + 'create_system', + 'create_version', + 'extract_version', + 'reserved', + 'flag_bits', + 'volume', + 'internal_attr', + 'external_attr', + 'header_offset', + 'CRC', + 'compress_size', + 'file_size', + '_raw_time', + ) def __init__(self, filename="NoName", date_time=DEFAULT_DATE): self.orig_filename = filename # Original file name in archive @@ -292,19 +336,23 @@ def __init__(self, filename="NoName", date_time=DEFAULT_DATE): # This is used to ensure paths in generated ZIP files always use # forward slashes as the directory separator, as required by the # ZIP format specification. - self.filename = standardize_filename(filename) # Normalized file name + self.filename = filename # Normalized file name self.date_time = date_time # year, month, day, hour, min, sec + + if date_time[0] < 1980: + raise ValueError('ZIP does not support timestamps before 1980') + # Standard values: self.compress_type = ZIP_STORED # Type of compression for the file - self.comment = "" # Comment for each file - self.extra = "" # ZIP extra data + self.comment = b"" # Comment for each file + self.extra = b"" # ZIP extra data if sys.platform == 'win32': self.create_system = 0 # System which created ZIP archive else: # Assume everything else is unix-y self.create_system = 3 # System which created ZIP archive - self.create_version = 20 # Version which created ZIP archive - self.extract_version = 20 # Version needed to extract archive + self.create_version = DEFAULT_VERSION # Version which created ZIP archive + self.extract_version = DEFAULT_VERSION # Version needed to extract archive self.reserved = 0 # Must be zero self.flag_bits = 0 # ZIP flag bits self.volume = 0 # Volume number of file header @@ -316,7 +364,29 @@ def __init__(self, filename="NoName", date_time=DEFAULT_DATE): # compress_size Size of the compressed file # file_size Size of the uncompressed file - def FileHeader(self): + def __repr__(self): + result = ['<%s filename=%r' % (self.__class__.__name__, self.filename)] + if self.compress_type != ZIP_STORED: + result.append(' compress_type=%s' % + compressor_names.get(self.compress_type, + self.compress_type)) + hi = self.external_attr >> 16 + lo = self.external_attr & 0xFFFF + if hi: + result.append(' filemode=%r' % stat.filemode(hi)) + if lo: + result.append(' external_attr=%#x' % lo) + isdir = self.is_dir() + if not isdir or self.file_size: + result.append(' file_size=%r' % self.file_size) + if ((not isdir or self.compress_size) and + (self.compress_type != ZIP_STORED or + self.file_size != self.compress_size)): + result.append(' compress_size=%r' % self.compress_size) + result.append('>') + return ''.join(result) + + def FileHeader(self, zip64=None): """Return the per-file header as a string.""" dt = self.date_time dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2] @@ -331,45 +401,48 @@ def FileHeader(self): extra = self.extra + min_version = 0 + if zip64 is None: + zip64 = file_size > ZIP64_LIMIT or compress_size > ZIP64_LIMIT + if zip64: + fmt = ' ZIP64_LIMIT or compress_size > ZIP64_LIMIT: + if not zip64: + raise LargeZipFile("Filesize would require ZIP64 extensions") # File is larger than what fits into a 4 byte integer, # fall back to the ZIP64 extension - fmt = '= 4: tp, ln = unpack('= 24: @@ -381,26 +454,62 @@ def _decodeExtra(self): elif ln == 0: counts = () else: - raise RuntimeError, "Corrupt extra field %s"%(ln,) + raise BadZipFile("Corrupt extra field %04x (size=%d)" % (tp, ln)) idx = 0 # ZIP64 extension (large files and/or large archives) - if self.file_size in (0xffffffffffffffffL, 0xffffffffL): + if self.file_size in (0xffffffffffffffff, 0xffffffff): self.file_size = counts[idx] idx += 1 - if self.compress_size == 0xFFFFFFFFL: + if self.compress_size == 0xFFFFFFFF: self.compress_size = counts[idx] idx += 1 - if self.header_offset == 0xffffffffL: + if self.header_offset == 0xffffffff: old = self.header_offset self.header_offset = counts[idx] idx+=1 extra = extra[ln+4:] + @classmethod + def from_file(cls, filename, arcname=None, date_time=DEFAULT_DATE): + """Construct an appropriate ZipInfo for a file on the filesystem. + + filename should be the path to a file or directory on the filesystem. + + arcname is the name which it will have within the archive (by default, + this will be the same as filename, but without a drive letter and with + leading path separators removed). + """ + if isinstance(filename, os.PathLike): + filename = os.fspath(filename) + st = os.stat(filename) + isdir = stat.S_ISDIR(st.st_mode) + # Create ZipInfo instance to store file information + if arcname is None: + arcname = filename + arcname = os.path.normpath(os.path.splitdrive(arcname)[1]) + while arcname[0] in (os.sep, os.altsep): + arcname = arcname[1:] + if isdir: + arcname += '/' + zinfo = cls(arcname, date_time) + zinfo.external_attr = 25165824 # Unix attributes, hard-codeds + if isdir: + zinfo.file_size = 0 + zinfo.external_attr |= 0x10 # MS-DOS directory flag + else: + zinfo.file_size = st.st_size + + return zinfo + + def is_dir(self): + """Return True if this archive member is a directory.""" + return self.filename[-1] == '/' + class _ZipDecrypter: """Class to handle decryption of files stored within a ZIP archive. @@ -433,13 +542,15 @@ def _GenerateCRCTable(): crc = ((crc >> 1) & 0x7FFFFFFF) table[i] = crc return table - crctable = _GenerateCRCTable() + crctable = None def _crc32(self, ch, crc): """Compute the CRC32 primitive on one byte.""" - return ((crc >> 8) & 0xffffff) ^ self.crctable[(crc ^ ord(ch)) & 0xff] + return ((crc >> 8) & 0xffffff) ^ self.crctable[(crc ^ ch) & 0xff] def __init__(self, pwd): + if _ZipDecrypter.crctable is None: + _ZipDecrypter.crctable = _ZipDecrypter._GenerateCRCTable() self.key0 = 305419896 self.key1 = 591751049 self.key2 = 878082192 @@ -450,220 +561,496 @@ def _UpdateKeys(self, c): self.key0 = self._crc32(c, self.key0) self.key1 = (self.key1 + (self.key0 & 255)) & 4294967295 self.key1 = (self.key1 * 134775813 + 1) & 4294967295 - self.key2 = self._crc32(chr((self.key1 >> 24) & 255), self.key2) + self.key2 = self._crc32((self.key1 >> 24) & 255, self.key2) def __call__(self, c): """Decrypt a single character.""" - c = ord(c) + assert isinstance(c, int) k = self.key2 | 2 c = c ^ (((k * (k^1)) >> 8) & 255) - c = chr(c) self._UpdateKeys(c) return c -class ZipExtFile: + +class LZMACompressor: + + def __init__(self): + self._comp = None + + def _init(self): + props = lzma._encode_filter_properties({'id': lzma.FILTER_LZMA1}) + self._comp = lzma.LZMACompressor(lzma.FORMAT_RAW, filters=[ + lzma._decode_filter_properties(lzma.FILTER_LZMA1, props) + ]) + return struct.pack('= 0: - nllen = len(sep) - return nl, nllen - - return nl, nllen - - def readline(self, size = -1): - """Read a line with approx. size. If size is negative, - read a whole line. - """ - if size < 0: - size = 2147483647 - elif size == 0: - return '' + if hasattr(zipinfo, 'CRC'): + self._expected_crc = zipinfo.CRC + self._running_crc = crc32(b'') + else: + self._expected_crc = None + + def __repr__(self): + result = ['<%s.%s' % (self.__class__.__module__, + self.__class__.__qualname__)] + if not self.closed: + result.append(' name=%r mode=%r' % (self.name, self.mode)) + if self._compress_type != ZIP_STORED: + result.append(' compress_type=%s' % + compressor_names.get(self._compress_type, + self._compress_type)) + else: + result.append(' [closed]') + result.append('>') + return ''.join(result) - # check for a newline already in buffer - nl, nllen = self._checkfornewline() + def readline(self, limit=-1): + """Read and return a line from the stream. - if nl >= 0: - # the next line was already in the buffer - nl = min(nl, size) - else: - # no line break in buffer - try to read more - size -= len(self.linebuffer) - while nl < 0 and size > 0: - buf = self.read(min(size, 100)) - if not buf: - break - self.linebuffer += buf - size -= len(buf) - - # check for a newline in buffer - nl, nllen = self._checkfornewline() - - # we either ran out of bytes in the file, or - # met the specified size limit without finding a newline, - # so return current buffer - if nl < 0: - s = self.linebuffer - self.linebuffer = '' - return s - - buf = self.linebuffer[:nl] - self.lastdiscard = self.linebuffer[nl:nl + nllen] - self.linebuffer = self.linebuffer[nl + nllen:] - - # line is always returned with \n as newline char (except possibly - # for a final incomplete line in the file, which is handled above). - return buf + "\n" - - def readlines(self, sizehint = -1): - """Return a list with all (following) lines. The sizehint parameter - is ignored in this implementation. + If limit is specified, at most limit bytes will be read. """ - result = [] - while True: - line = self.readline() - if not line: break - result.append(line) - return result - def read(self, size = None): - # act like file() obj and return empty string if size is 0 - if size == 0: - return '' - - # determine read size - bytesToRead = self.compress_size - self.bytes_read - - # adjust read size for encrypted files since the first 12 bytes - # are for the encryption/password information - if self.decrypter is not None: - bytesToRead -= 12 - - if size is not None and size >= 0: - if self.compress_type == ZIP_STORED: - lr = len(self.readbuffer) - bytesToRead = min(bytesToRead, size - lr) - elif self.compress_type == ZIP_DEFLATED: - if len(self.readbuffer) > size: - # the user has requested fewer bytes than we've already - # pulled through the decompressor; don't read any more - bytesToRead = 0 - else: - # user will use up the buffer, so read some more - lr = len(self.rawbuffer) - bytesToRead = min(bytesToRead, self.compreadsize - lr) - - # avoid reading past end of file contents - if bytesToRead + self.bytes_read > self.compress_size: - bytesToRead = self.compress_size - self.bytes_read - - # try to read from file (if necessary) - if bytesToRead > 0: - bytes = self.fileobj.read(bytesToRead) - self.bytes_read += len(bytes) - self.rawbuffer += bytes - - # handle contents of raw buffer - if self.rawbuffer: - newdata = self.rawbuffer - self.rawbuffer = '' - - # decrypt new data if we were given an object to handle that - if newdata and self.decrypter is not None: - newdata = ''.join(map(self.decrypter, newdata)) - - # decompress newly read data if necessary - if newdata and self.compress_type == ZIP_DEFLATED: - newdata = self.dc.decompress(newdata) - self.rawbuffer = self.dc.unconsumed_tail - if self.eof and len(self.rawbuffer) == 0: - # we're out of raw bytes (both from the file and - # the local buffer); flush just to make sure the - # decompressor is done - newdata += self.dc.flush() - # prevent decompressor from being used again - self.dc = None - - self.readbuffer += newdata - - - # return what the user asked for - if size is None or len(self.readbuffer) <= size: - bytes = self.readbuffer - self.readbuffer = '' + if limit < 0: + # Shortcut common case - newline found in buffer. + i = self._readbuffer.find(b'\n', self._offset) + 1 + if i > 0: + line = self._readbuffer[self._offset: i] + self._offset = i + return line + + return io.BufferedIOBase.readline(self, limit) + + def peek(self, n=1): + """Returns buffered bytes without advancing the position.""" + if n > len(self._readbuffer) - self._offset: + chunk = self.read(n) + if len(chunk) > self._offset: + self._readbuffer = chunk + self._readbuffer[self._offset:] + self._offset = 0 + else: + self._offset -= len(chunk) + + # Return up to 512 bytes to reduce allocation overhead for tight loops. + return self._readbuffer[self._offset: self._offset + 512] + + def readable(self): + return True + + def read(self, n=-1): + """Read and return up to n bytes. + If the argument is omitted, None, or negative, data is read and returned until EOF is reached.. + """ + if n is None or n < 0: + buf = self._readbuffer[self._offset:] + self._readbuffer = b'' + self._offset = 0 + while not self._eof: + buf += self._read1(self.MAX_N) + return buf + + end = n + self._offset + if end < len(self._readbuffer): + buf = self._readbuffer[self._offset:end] + self._offset = end + return buf + + n = end - len(self._readbuffer) + buf = self._readbuffer[self._offset:] + self._readbuffer = b'' + self._offset = 0 + while n > 0 and not self._eof: + data = self._read1(n) + if n < len(data): + self._readbuffer = data + self._offset = n + buf += data[:n] + break + buf += data + n -= len(data) + return buf + + def _update_crc(self, newdata): + # Update the CRC using the given data. + if self._expected_crc is None: + # No need to compute the CRC if we don't have a reference value + return + self._running_crc = crc32(newdata, self._running_crc) + # Check the CRC if we're at the end of the file + if self._eof and self._running_crc != self._expected_crc: + raise BadZipFile("Bad CRC-32 for file %r" % self.name) + + def read1(self, n): + """Read up to n bytes with at most one read() system call.""" + + if n is None or n < 0: + buf = self._readbuffer[self._offset:] + self._readbuffer = b'' + self._offset = 0 + while not self._eof: + data = self._read1(self.MAX_N) + if data: + buf += data + break + return buf + + end = n + self._offset + if end < len(self._readbuffer): + buf = self._readbuffer[self._offset:end] + self._offset = end + return buf + + n = end - len(self._readbuffer) + buf = self._readbuffer[self._offset:] + self._readbuffer = b'' + self._offset = 0 + if n > 0: + while not self._eof: + data = self._read1(n) + if n < len(data): + self._readbuffer = data + self._offset = n + buf += data[:n] + break + if data: + buf += data + break + return buf + + def _read1(self, n): + # Read up to n compressed bytes with at most one read() system call, + # decrypt and decompress them. + if self._eof or n <= 0: + return b'' + + # Read from file. + if self._compress_type == ZIP_DEFLATED: + ## Handle unconsumed data. + data = self._decompressor.unconsumed_tail + if n > len(data): + data += self._read2(n - len(data)) + else: + data = self._read2(n) + + if self._compress_type == ZIP_STORED: + self._eof = self._compress_left <= 0 + elif self._compress_type == ZIP_DEFLATED: + n = max(n, self.MIN_READ_SIZE) + data = self._decompressor.decompress(data, n) + self._eof = (self._decompressor.eof or + self._compress_left <= 0 and + not self._decompressor.unconsumed_tail) + if self._eof: + data += self._decompressor.flush() else: - bytes = self.readbuffer[:size] - self.readbuffer = self.readbuffer[size:] + data = self._decompressor.decompress(data) + self._eof = self._decompressor.eof or self._compress_left <= 0 + + data = data[:self._left] + self._left -= len(data) + if self._left <= 0: + self._eof = True + self._update_crc(data) + return data + + def _read2(self, n): + if self._compress_left <= 0: + return b'' - return bytes + n = max(n, self.MIN_READ_SIZE) + n = min(n, self._compress_left) + data = self._fileobj.read(n) + self._compress_left -= len(data) + if not data: + raise EOFError + + if self._decrypter is not None: + data = bytes(map(self._decrypter, data)) + return data + + def close(self): + try: + if self._close_fileobj: + self._fileobj.close() + finally: + super().close() + + +class _ZipWriteFile(io.BufferedIOBase): + def __init__(self, zf, zinfo, zip64): + self._zinfo = zinfo + self._zip64 = zip64 + self._zipfile = zf + self._compressor = _get_compressor(zinfo.compress_type) + self._file_size = 0 + self._compress_size = 0 + self._crc = 0 + + @property + def _fileobj(self): + return self._zipfile.fp + + def writable(self): + return True + + def write(self, data): + if self.closed: + raise ValueError('I/O operation on closed file.') + nbytes = len(data) + self._file_size += nbytes + self._crc = crc32(data, self._crc) + if self._compressor: + data = self._compressor.compress(data) + self._compress_size += len(data) + self._fileobj.write(data) + return nbytes + + def close(self): + if self.closed: + return + super().close() + # Flush any data from the compressor, and update header info + if self._compressor: + buf = self._compressor.flush() + self._compress_size += len(buf) + self._fileobj.write(buf) + self._zinfo.compress_size = self._compress_size + else: + self._zinfo.compress_size = self._file_size + self._zinfo.CRC = self._crc + self._zinfo.file_size = self._file_size + + # Write updated header info + if self._zinfo.flag_bits & 0x08: + # Write CRC and file sizes after the file data + fmt = ' ZIP64_LIMIT: + raise RuntimeError('File size unexpectedly exceeded ZIP64 ' + 'limit') + if self._compress_size > ZIP64_LIMIT: + raise RuntimeError('Compressed size unexpectedly exceeded ' + 'ZIP64 limit') + # Seek backwards and write file header (which will now include + # correct CRC and file sizes) + + # Preserve current position in file + self._zipfile.start_dir = self._fileobj.tell() + self._fileobj.seek(self._zinfo.header_offset) + self._fileobj.write(self._zinfo.FileHeader(self._zip64)) + self._fileobj.seek(self._zipfile.start_dir) + + self._zipfile._writing = False + + # Successfully written: Add file to our caches + self._zipfile.filelist.append(self._zinfo) + self._zipfile.NameToInfo[self._zinfo.filename] = self._zinfo class ZipFile: """ Class with methods to open, read, write, close, list zip files. - z = ZipFile(file, mode="r", compression=ZIP_STORED, allowZip64=False) + z = ZipFile(file, mode="r", compression=ZIP_STORED, allowZip64=True) file: Either the path to the file, or a file-like object. If it is a path, the file will be opened and closed by ZipFile. - mode: The mode can be either read "r", write "w" or append "a". - compression: ZIP_STORED (no compression) or ZIP_DEFLATED (requires zlib). + mode: The mode can be either read 'r', write 'w', exclusive create 'x', + or append 'a'. + compression: ZIP_STORED (no compression), ZIP_DEFLATED (requires zlib), + ZIP_BZIP2 (requires bz2) or ZIP_LZMA (requires lzma). allowZip64: if True ZipFile will create files with ZIP64 extensions when needed, otherwise it will raise an exception when this would be necessary. @@ -671,20 +1058,15 @@ class ZipFile: """ fp = None # Set here since __del__ checks it + _windows_illegal_name_trans_table = None - def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=False): - """Open the ZIP file with mode read "r", write "w" or append "a".""" - if mode not in ("r", "w", "a"): - raise RuntimeError('ZipFile() requires mode "r", "w", or "a"') - - if compression == ZIP_STORED: - pass - elif compression == ZIP_DEFLATED: - if not zlib: - raise RuntimeError,\ - "Compression requires the (missing) zlib module" - else: - raise RuntimeError, "That compression method is not supported" + def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True): + """Open the ZIP file with mode read 'r', write 'w', exclusive create 'x', + or append 'a'.""" + if mode not in ('r', 'w', 'x', 'a'): + raise ValueError("ZipFile requires mode 'r', 'w', 'x', or 'a'") + + _check_compression(compression) self._allowZip64 = allowZip64 self._didModify = False @@ -692,67 +1074,113 @@ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=False): self.NameToInfo = {} # Find file info given name self.filelist = [] # List of ZipInfo instances for archive self.compression = compression # Method of compression - self.mode = key = mode.replace('b', '')[0] + self.mode = mode self.pwd = None - self.comment = '' + self._comment = b'' # Check if we were passed a file-like object - if isinstance(file, basestring): + if isinstance(file, os.PathLike): + file = os.fspath(file) + if isinstance(file, str): + # No, it's a filename self._filePassed = 0 self.filename = file - modeDict = {'r' : 'rb', 'w': 'wb', 'a' : 'r+b'} - try: - self.fp = open(file, modeDict[mode]) - except IOError: - if mode == 'a': - mode = key = 'w' - self.fp = open(file, modeDict[mode]) - else: + modeDict = {'r' : 'rb', 'w': 'w+b', 'x': 'x+b', 'a' : 'r+b', + 'r+b': 'w+b', 'w+b': 'wb', 'x+b': 'xb'} + filemode = modeDict[mode] + while True: + try: + self.fp = io.open(file, filemode) + except OSError: + if filemode in modeDict: + filemode = modeDict[filemode] + continue raise + break else: self._filePassed = 1 self.fp = file self.filename = getattr(file, 'name', None) + self._fileRefCnt = 1 + self._lock = threading.RLock() + self._seekable = True + self._writing = False - if key == 'r': - self._GetContents() - elif key == 'w': - pass - elif key == 'a': - try: # See if file is a zip file - self._RealGetContents() - # seek to start of directory and overwrite - self.fp.seek(self.start_dir, 0) - except BadZipfile: # file is not a zip file, just append - self.fp.seek(0, 2) - else: - if not self._filePassed: - self.fp.close() - self.fp = None - raise RuntimeError, 'Mode must be "r", "w" or "a"' - - def _GetContents(self): - """Read the directory, making sure we close the file if the format - is bad.""" try: - self._RealGetContents() - except BadZipfile: - if not self._filePassed: - self.fp.close() - self.fp = None + if mode == 'r': + self._RealGetContents() + elif mode in ('w', 'x'): + # set the modified flag so central directory gets written + # even if no files are added to the archive + self._didModify = True + try: + self.start_dir = self.fp.tell() + except (AttributeError, OSError): + self.fp = _Tellable(self.fp) + self.start_dir = 0 + self._seekable = False + else: + # Some file-like objects can provide tell() but not seek() + try: + self.fp.seek(self.start_dir) + except (AttributeError, OSError): + self._seekable = False + elif mode == 'a': + try: + # See if file is a zip file + self._RealGetContents() + # seek to start of directory and overwrite + self.fp.seek(self.start_dir) + except BadZipFile: + # file is not a zip file, just append + self.fp.seek(0, 2) + + # set the modified flag so central directory gets written + # even if no files are added to the archive + self._didModify = True + self.start_dir = self.fp.tell() + else: + raise ValueError("Mode must be 'r', 'w', 'x', or 'a'") + except: + fp = self.fp + self.fp = None + self._fpclose(fp) raise + def __enter__(self): + return self + + def __exit__(self, type, value, traceback): + self.close() + + def __repr__(self): + result = ['<%s.%s' % (self.__class__.__module__, + self.__class__.__qualname__)] + if self.fp is not None: + if self._filePassed: + result.append(' file=%r' % self.fp) + elif self.filename is not None: + result.append(' filename=%r' % self.filename) + result.append(' mode=%r' % self.mode) + else: + result.append(' [closed]') + result.append('>') + return ''.join(result) + def _RealGetContents(self): """Read in the table of contents for the ZIP file.""" fp = self.fp - endrec = _EndRecData(fp) + try: + endrec = _EndRecData(fp) + except OSError: + raise BadZipFile("File is not a zip file") if not endrec: - raise BadZipfile, "File is not a zip file" + raise BadZipFile("File is not a zip file") if self.debug > 1: - print endrec + print(endrec) size_cd = endrec[_ECD_SIZE] # bytes in central directory offset_cd = endrec[_ECD_OFFSET] # offset of central directory - self.comment = endrec[_ECD_COMMENT] # archive comment + self._comment = endrec[_ECD_COMMENT] # archive comment # "concat" is zero, unless zip was concatenated to another file concat = endrec[_ECD_LOCATION] - size_cd - offset_cd @@ -762,38 +1190,49 @@ def _RealGetContents(self): if self.debug > 2: inferred = concat + offset_cd - print "given, inferred, offset", offset_cd, inferred, concat + print("given, inferred, offset", offset_cd, inferred, concat) # self.start_dir: Position of start of central directory self.start_dir = offset_cd + concat fp.seek(self.start_dir, 0) data = fp.read(size_cd) - fp = cStringIO.StringIO(data) + fp = io.BytesIO(data) total = 0 while total < size_cd: centdir = fp.read(sizeCentralDir) - if centdir[0:4] != stringCentralDir: - raise BadZipfile, "Bad magic number for central directory" + if len(centdir) != sizeCentralDir: + raise BadZipFile("Truncated central directory") centdir = struct.unpack(structCentralDir, centdir) + if centdir[_CD_SIGNATURE] != stringCentralDir: + raise BadZipFile("Bad magic number for central directory") if self.debug > 2: - print centdir + print(centdir) filename = fp.read(centdir[_CD_FILENAME_LENGTH]) + flags = centdir[5] + if flags & 0x800: + # UTF-8 file names extension + filename = filename.decode('utf-8') + else: + # Historical ZIP filename encoding + filename = filename.decode('cp437') # Create ZipInfo instance to store file information x = ZipInfo(filename) x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH]) x.comment = fp.read(centdir[_CD_COMMENT_LENGTH]) x.header_offset = centdir[_CD_LOCAL_HEADER_OFFSET] (x.create_version, x.create_system, x.extract_version, x.reserved, - x.flag_bits, x.compress_type, t, d, - x.CRC, x.compress_size, x.file_size) = centdir[1:12] + x.flag_bits, x.compress_type, t, d, + x.CRC, x.compress_size, x.file_size) = centdir[1:12] + if x.extract_version > MAX_EXTRACT_VERSION: + raise NotImplementedError("zip file version %.1f" % + (x.extract_version / 10)) x.volume, x.internal_attr, x.external_attr = centdir[15:18] # Convert date/time code to (year, month, day, hour, min, sec) x._raw_time = t x.date_time = ( (d>>9)+1980, (d>>5)&0xF, d&0x1F, - t>>11, (t>>5)&0x3F, (t&0x1F) * 2 ) + t>>11, (t>>5)&0x3F, (t&0x1F) * 2 ) x._decodeExtra() x.header_offset = x.header_offset + concat - x.filename = x._decodeFilename() self.filelist.append(x) self.NameToInfo[x.filename] = x @@ -803,27 +1242,26 @@ def _RealGetContents(self): + centdir[_CD_COMMENT_LENGTH]) if self.debug > 2: - print "total", total + print("total", total) def namelist(self): """Return a list of file names in the archive.""" - l = [] - for data in self.filelist: - l.append(data.filename) - return l + return [data.filename for data in self.filelist] def infolist(self): """Return a list of class ZipInfo instances for files in the archive.""" return self.filelist - def printdir(self): + def printdir(self, file=None): """Print a table of contents for the zip file.""" - print "%-46s %19s %12s" % ("File Name", "Modified ", "Size") + print("%-46s %19s %12s" % ("File Name", "Modified ", "Size"), + file=file) for zinfo in self.filelist: date = "%d-%02d-%02d %02d:%02d:%02d" % zinfo.date_time[:6] - print "%-46s %s %12d" % (zinfo.filename, date, zinfo.file_size) + print("%-46s %s %12d" % (zinfo.filename, date, zinfo.file_size), + file=file) def testzip(self): """Read all the files and check the CRC.""" @@ -832,10 +1270,10 @@ def testzip(self): try: # Read by chunks, to avoid an OverflowError or a # MemoryError with very large embedded files. - f = self.open(zinfo.filename, "r") - while f.read(chunk_size): # Check CRC-32 - pass - except BadZipfile: + with self.open(zinfo.filename, "r") as f: + while f.read(chunk_size): # Check CRC-32 + pass + except BadZipFile: return zinfo.filename def getinfo(self, name): @@ -849,89 +1287,191 @@ def getinfo(self, name): def setpassword(self, pwd): """Set default password for encrypted files.""" - self.pwd = pwd + if pwd and not isinstance(pwd, bytes): + raise TypeError("pwd: expected bytes, got %s" % type(pwd).__name__) + if pwd: + self.pwd = pwd + else: + self.pwd = None + + @property + def comment(self): + """The comment text associated with the ZIP file.""" + return self._comment + + @comment.setter + def comment(self, comment): + if not isinstance(comment, bytes): + raise TypeError("comment: expected bytes, got %s" % type(comment).__name__) + # check for valid comment length + if len(comment) > ZIP_MAX_COMMENT: + import warnings + warnings.warn('Archive comment is too long; truncating to %d bytes' + % ZIP_MAX_COMMENT, stacklevel=2) + comment = comment[:ZIP_MAX_COMMENT] + self._comment = comment + self._didModify = True def read(self, name, pwd=None): """Return file bytes (as a string) for name.""" - return self.open(name, "r", pwd).read() + with self.open(name, "r", pwd) as fp: + return fp.read() - def open(self, name, mode="r", pwd=None): - """Return file-like object for 'name'.""" - if mode not in ("r", "U", "rU"): - raise RuntimeError, 'open() requires mode "r", "U", or "rU"' - if not self.fp: - raise RuntimeError, \ - "Attempt to read ZIP archive that was already closed" + def open(self, name, mode="r", pwd=None, *, force_zip64=False): + """Return file-like object for 'name'. - # Only open a new file for instances where we were not - # given a file object in the constructor - if self._filePassed: - zef_file = self.fp - else: - zef_file = open(self.filename, 'rb') + name is a string for the file name within the ZIP file, or a ZipInfo + object. + + mode should be 'r' to read a file already in the ZIP file, or 'w' to + write to a file newly added to the archive. + + pwd is the password to decrypt files (only used for reading). + + When writing, if the file size is not known in advance but may exceed + 2 GiB, pass force_zip64 to use the ZIP64 format, which can handle large + files. If the size is known in advance, it is best to pass a ZipInfo + instance for name, with zinfo.file_size set. + """ + if mode not in {"r", "w"}: + raise ValueError('open() requires mode "r" or "w"') + if pwd and not isinstance(pwd, bytes): + raise TypeError("pwd: expected bytes, got %s" % type(pwd).__name__) + if pwd and (mode == "w"): + raise ValueError("pwd is only supported for reading files") + if not self.fp: + raise ValueError( + "Attempt to use ZIP archive that was already closed") # Make sure we have an info object if isinstance(name, ZipInfo): # 'name' is already an info object zinfo = name + elif mode == 'w': + zinfo = ZipInfo(name) + zinfo.compress_type = self.compression else: # Get info object for name zinfo = self.getinfo(name) - zef_file.seek(zinfo.header_offset, 0) - - # Skip the file header: - fheader = zef_file.read(sizeFileHeader) - if fheader[0:4] != stringFileHeader: - raise BadZipfile, "Bad magic number for file header" - - fheader = struct.unpack(structFileHeader, fheader) - fname = zef_file.read(fheader[_FH_FILENAME_LENGTH]) - if fheader[_FH_EXTRA_FIELD_LENGTH]: - zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH]) - - if fname != zinfo.orig_filename: - raise BadZipfile, \ - 'File name in directory "%s" and header "%s" differ.' % ( - zinfo.orig_filename, fname) - - # check for encrypted flag & handle password - is_encrypted = zinfo.flag_bits & 0x1 - zd = None - if is_encrypted: - if not pwd: - pwd = self.pwd - if not pwd: - raise RuntimeError, "File %s is encrypted, " \ - "password required for extraction" % name - - zd = _ZipDecrypter(pwd) - # The first 12 bytes in the cypher stream is an encryption header - # used to strengthen the algorithm. The first 11 bytes are - # completely random, while the 12th contains the MSB of the CRC, - # or the MSB of the file time depending on the header type - # and is used to check the correctness of the password. - bytes = zef_file.read(12) - h = map(zd, bytes[0:12]) - if zinfo.flag_bits & 0x8: - # compare against the file type from extended local headers - check_byte = (zinfo._raw_time >> 8) & 0xff + if mode == 'w': + return self._open_to_write(zinfo, force_zip64=force_zip64) + + if self._writing: + raise ValueError("Can't read from the ZIP file while there " + "is an open writing handle on it. " + "Close the writing handle before trying to read.") + + # Open for reading: + self._fileRefCnt += 1 + zef_file = _SharedFile(self.fp, zinfo.header_offset, + self._fpclose, self._lock, lambda: self._writing) + try: + # Skip the file header: + fheader = zef_file.read(sizeFileHeader) + if len(fheader) != sizeFileHeader: + raise BadZipFile("Truncated file header") + fheader = struct.unpack(structFileHeader, fheader) + if fheader[_FH_SIGNATURE] != stringFileHeader: + raise BadZipFile("Bad magic number for file header") + + fname = zef_file.read(fheader[_FH_FILENAME_LENGTH]) + if fheader[_FH_EXTRA_FIELD_LENGTH]: + zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH]) + + if zinfo.flag_bits & 0x20: + # Zip 2.7: compressed patched data + raise NotImplementedError("compressed patched data (flag bit 5)") + + if zinfo.flag_bits & 0x40: + # strong encryption + raise NotImplementedError("strong encryption (flag bit 6)") + + if zinfo.flag_bits & 0x800: + # UTF-8 filename + fname_str = fname.decode("utf-8") else: - # compare against the CRC otherwise - check_byte = (zinfo.CRC >> 24) & 0xff - if ord(h[11]) != check_byte: - raise RuntimeError("Bad password for file", name) - - # build and return a ZipExtFile - if zd is None: - zef = ZipExtFile(zef_file, zinfo) - else: - zef = ZipExtFile(zef_file, zinfo, zd) + fname_str = fname.decode("cp437") + + if fname_str != zinfo.orig_filename: + raise BadZipFile( + 'File name in directory %r and header %r differ.' + % (zinfo.orig_filename, fname)) + + # check for encrypted flag & handle password + is_encrypted = zinfo.flag_bits & 0x1 + zd = None + if is_encrypted: + if not pwd: + pwd = self.pwd + if not pwd: + raise RuntimeError("File %r is encrypted, password " + "required for extraction" % name) + + zd = _ZipDecrypter(pwd) + # The first 12 bytes in the cypher stream is an encryption header + # used to strengthen the algorithm. The first 11 bytes are + # completely random, while the 12th contains the MSB of the CRC, + # or the MSB of the file time depending on the header type + # and is used to check the correctness of the password. + header = zef_file.read(12) + h = list(map(zd, header[0:12])) + if zinfo.flag_bits & 0x8: + # compare against the file type from extended local headers + check_byte = (zinfo._raw_time >> 8) & 0xff + else: + # compare against the CRC otherwise + check_byte = (zinfo.CRC >> 24) & 0xff + if h[11] != check_byte: + raise RuntimeError("Bad password for file %r" % name) + + return ZipExtFile(zef_file, mode, zinfo, zd, True) + except: + zef_file.close() + raise + + def _open_to_write(self, zinfo, force_zip64=False): + if force_zip64 and not self._allowZip64: + raise ValueError( + "force_zip64 is True, but allowZip64 was False when opening " + "the ZIP file." + ) + if self._writing: + raise ValueError("Can't write to the ZIP file while there is " + "another write handle open on it. " + "Close the first handle before opening another.") + + # Sizes and CRC are overwritten with correct data after processing the file + if not hasattr(zinfo, 'file_size'): + zinfo.file_size = 0 + zinfo.compress_size = 0 + zinfo.CRC = 0 + + zinfo.flag_bits = 0x00 + if zinfo.compress_type == ZIP_LZMA: + # Compressed data includes an end-of-stream (EOS) marker + zinfo.flag_bits |= 0x02 + if not self._seekable: + zinfo.flag_bits |= 0x08 + + if not zinfo.external_attr: + zinfo.external_attr = 0o600 << 16 # permissions: ?rw------- + + # Compressed size can be larger than uncompressed size + zip64 = self._allowZip64 and \ + (force_zip64 or zinfo.file_size * 1.05 > ZIP64_LIMIT) + + if self._seekable: + self.fp.seek(self.start_dir) + zinfo.header_offset = self.fp.tell() - # set universal newlines on ZipExtFile if necessary - if "U" in mode: - zef.set_univ_newlines(True) - return zef + self._writecheck(zinfo) + self._didModify = True + + self.fp.write(zinfo.FileHeader(zip64)) + + self._writing = True + return _ZipWriteFile(self, zinfo, zip64) def extract(self, member, path=None, pwd=None): """Extract a member from the archive to the current working directory, @@ -939,11 +1479,10 @@ def extract(self, member, path=None, pwd=None): as possible. `member' may be a filename or a ZipInfo object. You can specify a different directory using `path'. """ - if not isinstance(member, ZipInfo): - member = self.getinfo(member) - if path is None: path = os.getcwd() + else: + path = os.fspath(path) return self._extract_member(member, path, pwd) @@ -956,26 +1495,53 @@ def extractall(self, path=None, members=None, pwd=None): if members is None: members = self.namelist() + if path is None: + path = os.getcwd() + else: + path = os.fspath(path) + for zipinfo in members: - self.extract(zipinfo, path, pwd) + self._extract_member(zipinfo, path, pwd) + + @classmethod + def _sanitize_windows_name(cls, arcname, pathsep): + """Replace bad characters and remove trailing dots from parts.""" + table = cls._windows_illegal_name_trans_table + if not table: + illegal = ':<>|"?*' + table = str.maketrans(illegal, '_' * len(illegal)) + cls._windows_illegal_name_trans_table = table + arcname = arcname.translate(table) + # remove trailing dots + arcname = (x.rstrip('.') for x in arcname.split(pathsep)) + # rejoin, removing empty parts. + arcname = pathsep.join(x for x in arcname if x) + return arcname def _extract_member(self, member, targetpath, pwd): """Extract the ZipInfo object 'member' to a physical file on the path targetpath. """ + if not isinstance(member, ZipInfo): + member = self.getinfo(member) + # build the destination pathname, replacing # forward slashes to platform specific separators. - # Strip trailing path separator, unless it represents the root. - if (targetpath[-1:] in (os.path.sep, os.path.altsep) - and len(os.path.splitdrive(targetpath)[1]) > 1): - targetpath = targetpath[:-1] - - # don't include leading "/" from file name if present - if member.filename[0] == '/': - targetpath = os.path.join(targetpath, member.filename[1:]) - else: - targetpath = os.path.join(targetpath, member.filename) - + arcname = member.filename.replace('/', os.path.sep) + + if os.path.altsep: + arcname = arcname.replace(os.path.altsep, os.path.sep) + # interpret absolute pathname as relative, remove drive letter or + # UNC path, redundant separators, "." and ".." components. + arcname = os.path.splitdrive(arcname)[1] + invalid_path_parts = ('', os.path.curdir, os.path.pardir) + arcname = os.path.sep.join(x for x in arcname.split(os.path.sep) + if x not in invalid_path_parts) + if os.path.sep == '\\': + # filter illegal characters on Windows + arcname = self._sanitize_windows_name(arcname, os.path.sep) + + targetpath = os.path.join(targetpath, arcname) targetpath = os.path.normpath(targetpath) # Create all upper directories if necessary. @@ -983,160 +1549,117 @@ def _extract_member(self, member, targetpath, pwd): if upperdirs and not os.path.exists(upperdirs): os.makedirs(upperdirs) - if member.filename[-1] == '/': + if member.is_dir(): if not os.path.isdir(targetpath): os.mkdir(targetpath) return targetpath - source = self.open(member, pwd=pwd) - target = file(targetpath, "wb") - shutil.copyfileobj(source, target) - source.close() - target.close() + with self.open(member, pwd=pwd) as source, \ + open(targetpath, "wb") as target: + shutil.copyfileobj(source, target) return targetpath def _writecheck(self, zinfo): """Check for errors before writing a file to the archive.""" if zinfo.filename in self.NameToInfo: - if self.debug: # Warning for duplicate names - print "Duplicate name:", zinfo.filename - if self.mode not in ("w", "a"): - raise RuntimeError, 'write() requires mode "w" or "a"' + import warnings + warnings.warn('Duplicate name: %r' % zinfo.filename, stacklevel=3) + if self.mode not in ('w', 'x', 'a'): + raise ValueError("write() requires mode 'w', 'x', or 'a'") if not self.fp: - raise RuntimeError, \ - "Attempt to write ZIP archive that was already closed" - if zinfo.compress_type == ZIP_DEFLATED and not zlib: - raise RuntimeError, \ - "Compression requires the (missing) zlib module" - if zinfo.compress_type not in (ZIP_STORED, ZIP_DEFLATED): - raise RuntimeError, \ - "That compression method is not supported" - if zinfo.file_size > ZIP64_LIMIT: - if not self._allowZip64: - raise LargeZipFile("Filesize would require ZIP64 extensions") - if zinfo.header_offset > ZIP64_LIMIT: - if not self._allowZip64: - raise LargeZipFile("Zipfile size would require ZIP64 extensions") + raise ValueError( + "Attempt to write ZIP archive that was already closed") + _check_compression(zinfo.compress_type) + if not self._allowZip64: + requires_zip64 = None + if len(self.filelist) >= ZIP_FILECOUNT_LIMIT: + requires_zip64 = "Files count" + elif zinfo.file_size > ZIP64_LIMIT: + requires_zip64 = "Filesize" + elif zinfo.header_offset > ZIP64_LIMIT: + requires_zip64 = "Zipfile size" + if requires_zip64: + raise LargeZipFile(requires_zip64 + + " would require ZIP64 extensions") def write(self, filename, arcname=None, compress_type=None, date_time=DEFAULT_DATE): """Put the bytes from filename into the archive under the name arcname.""" if not self.fp: - raise RuntimeError( - "Attempt to write to ZIP archive that was already closed") + raise ValueError( + "Attempt to write to ZIP archive that was already closed") + if self._writing: + raise ValueError( + "Can't write to ZIP archive while an open writing handle exists" + ) - st = os.stat(filename) - isdir = stat.S_ISDIR(st.st_mode) - # Create ZipInfo instance to store file information - if arcname is None: - arcname = filename - arcname = os.path.normpath(os.path.splitdrive(arcname)[1]) - while arcname[0] in (os.sep, os.altsep): - arcname = arcname[1:] - if isdir: - arcname += '/' - zinfo = ZipInfo(arcname, date_time) - zinfo.external_attr = 0600 << 16 # Unix attributes, hard-coded - if compress_type is None: - zinfo.compress_type = self.compression - else: - zinfo.compress_type = compress_type - - zinfo.file_size = long(st.st_size) - zinfo.flag_bits = 0x00 - zinfo.header_offset = self.fp.tell() # Start of header bytes - - self._writecheck(zinfo) - self._didModify = True + zinfo = ZipInfo.from_file(filename, arcname, date_time) - if isdir: - zinfo.file_size = 0 + if zinfo.is_dir(): zinfo.compress_size = 0 zinfo.CRC = 0 - self.filelist.append(zinfo) - self.NameToInfo[zinfo.filename] = zinfo - self.fp.write(zinfo.FileHeader()) - return - - fp = open(filename, "rb") - # Must overwrite CRC and sizes with correct data later - zinfo.CRC = CRC = 0 - zinfo.compress_size = compress_size = 0 - zinfo.file_size = file_size = 0 - self.fp.write(zinfo.FileHeader()) - if zinfo.compress_type == ZIP_DEFLATED: - cmpr = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, - zlib.DEFLATED, -15) else: - cmpr = None - while 1: - buf = fp.read(1024 * 8) - if not buf: - break - file_size = file_size + len(buf) - CRC = crc32(buf, CRC) & 0xffffffff - if cmpr: - buf = cmpr.compress(buf) - compress_size = compress_size + len(buf) - self.fp.write(buf) - fp.close() - if cmpr: - buf = cmpr.flush() - compress_size = compress_size + len(buf) - self.fp.write(buf) - zinfo.compress_size = compress_size + if compress_type is not None: + zinfo.compress_type = compress_type + else: + zinfo.compress_type = self.compression + + if zinfo.is_dir(): + with self._lock: + if self._seekable: + self.fp.seek(self.start_dir) + zinfo.header_offset = self.fp.tell() # Start of header bytes + if zinfo.compress_type == ZIP_LZMA: + # Compressed data includes an end-of-stream (EOS) marker + zinfo.flag_bits |= 0x02 + + self._writecheck(zinfo) + self._didModify = True + + self.filelist.append(zinfo) + self.NameToInfo[zinfo.filename] = zinfo + self.fp.write(zinfo.FileHeader(False)) + self.start_dir = self.fp.tell() else: - zinfo.compress_size = file_size - zinfo.CRC = CRC - zinfo.file_size = file_size - # Seek backwards and write CRC and file sizes - position = self.fp.tell() # Preserve current position in file - self.fp.seek(zinfo.header_offset + 14, 0) - self.fp.write(struct.pack(" ZIP64_LIMIT \ - or zinfo.compress_size > ZIP64_LIMIT: - extra.append(zinfo.file_size) - extra.append(zinfo.compress_size) - file_size = 0xffffffff - compress_size = 0xffffffff - else: - file_size = zinfo.file_size - compress_size = zinfo.compress_size + if self._writing: + raise ValueError("Can't close the ZIP file while there is " + "an open writing handle on it. " + "Close the writing handle before closing the zip.") - if zinfo.header_offset > ZIP64_LIMIT: - extra.append(zinfo.header_offset) - header_offset = 0xffffffffL - else: - header_offset = zinfo.header_offset + try: + if self.mode in ('w', 'x', 'a') and self._didModify: # write ending records + with self._lock: + if self._seekable: + self.fp.seek(self.start_dir) + self._write_end_record() + finally: + fp = self.fp + self.fp = None + self._fpclose(fp) + + def _write_end_record(self): + for zinfo in self.filelist: # write central directory + dt = zinfo.date_time + dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2] + dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2) + extra = [] + if zinfo.file_size > ZIP64_LIMIT \ + or zinfo.compress_size > ZIP64_LIMIT: + extra.append(zinfo.file_size) + extra.append(zinfo.compress_size) + file_size = 0xffffffff + compress_size = 0xffffffff + else: + file_size = zinfo.file_size + compress_size = zinfo.compress_size - extra_data = zinfo.extra - if extra: - # Append a ZIP64 field to the extra's - extra_data = struct.pack( - ' ZIP64_LIMIT: + extra.append(zinfo.header_offset) + header_offset = 0xffffffff + else: + header_offset = zinfo.header_offset - extract_version = max(45, zinfo.extract_version) - create_version = max(45, zinfo.create_version) - else: - extract_version = zinfo.extract_version - create_version = zinfo.create_version + extra_data = zinfo.extra + min_version = 0 + if extra: + # Append a ZIP64 field to the extra's + extra_data = struct.pack( + '>sys.stderr, (structCentralDir, - stringCentralDir, create_version, - zinfo.create_system, extract_version, zinfo.reserved, - zinfo.flag_bits, zinfo.compress_type, dostime, dosdate, - zinfo.CRC, compress_size, file_size, - len(zinfo.filename), len(extra_data), len(zinfo.comment), - 0, zinfo.internal_attr, zinfo.external_attr, - header_offset) - raise - self.fp.write(centdir) - self.fp.write(filename) - self.fp.write(extra_data) - self.fp.write(zinfo.comment) - - pos2 = self.fp.tell() - # Write end-of-zip-archive record - centDirCount = count - centDirSize = pos2 - pos1 - centDirOffset = pos1 - if (centDirCount >= ZIP_FILECOUNT_LIMIT or - centDirOffset > ZIP64_LIMIT or - centDirSize > ZIP64_LIMIT): - # Need to write the ZIP64 end-of-archive records - zip64endrec = struct.pack( - structEndArchive64, stringEndArchive64, - 44, 45, 45, 0, 0, centDirCount, centDirCount, - centDirSize, centDirOffset) - self.fp.write(zip64endrec) - - zip64locrec = struct.pack( - structEndArchive64Locator, - stringEndArchive64Locator, 0, pos2, 1) - self.fp.write(zip64locrec) - centDirCount = min(centDirCount, 0xFFFF) - centDirSize = min(centDirSize, 0xFFFFFFFF) - centDirOffset = min(centDirOffset, 0xFFFFFFFF) - - # check for valid comment length - if len(self.comment) >= ZIP_MAX_COMMENT: - if self.debug > 0: - msg = 'Archive comment is too long; truncating to %d bytes' \ - % ZIP_MAX_COMMENT - self.comment = self.comment[:ZIP_MAX_COMMENT] - - endrec = struct.pack(structEndArchive, stringEndArchive, - 0, 0, centDirCount, centDirCount, - centDirSize, centDirOffset, len(self.comment)) - self.fp.write(endrec) - self.fp.write(self.comment) - self.fp.flush() - - if not self._filePassed: - self.fp.close() - self.fp = None + min_version = ZIP64_VERSION + + if zinfo.compress_type == ZIP_BZIP2: + min_version = max(BZIP2_VERSION, min_version) + elif zinfo.compress_type == ZIP_LZMA: + min_version = max(LZMA_VERSION, min_version) + + extract_version = max(min_version, zinfo.extract_version) + create_version = max(min_version, zinfo.create_version) + try: + filename, flag_bits = zinfo._encodeFilenameFlags() + centdir = struct.pack(structCentralDir, + stringCentralDir, create_version, + zinfo.create_system, extract_version, zinfo.reserved, + flag_bits, zinfo.compress_type, dostime, dosdate, + zinfo.CRC, compress_size, file_size, + len(filename), len(extra_data), len(zinfo.comment), + 0, zinfo.internal_attr, zinfo.external_attr, + header_offset) + except DeprecationWarning: + print((structCentralDir, stringCentralDir, create_version, + zinfo.create_system, extract_version, zinfo.reserved, + zinfo.flag_bits, zinfo.compress_type, dostime, dosdate, + zinfo.CRC, compress_size, file_size, + len(zinfo.filename), len(extra_data), len(zinfo.comment), + 0, zinfo.internal_attr, zinfo.external_attr, + header_offset), file=sys.stderr) + raise + self.fp.write(centdir) + self.fp.write(filename) + self.fp.write(extra_data) + self.fp.write(zinfo.comment) + + pos2 = self.fp.tell() + # Write end-of-zip-archive record + centDirCount = len(self.filelist) + centDirSize = pos2 - self.start_dir + centDirOffset = self.start_dir + requires_zip64 = None + if centDirCount > ZIP_FILECOUNT_LIMIT: + requires_zip64 = "Files count" + elif centDirOffset > ZIP64_LIMIT: + requires_zip64 = "Central directory offset" + elif centDirSize > ZIP64_LIMIT: + requires_zip64 = "Central directory size" + if requires_zip64: + # Need to write the ZIP64 end-of-archive records + if not self._allowZip64: + raise LargeZipFile(requires_zip64 + + " would require ZIP64 extensions") + zip64endrec = struct.pack( + structEndArchive64, stringEndArchive64, + 44, 45, 45, 0, 0, centDirCount, centDirCount, + centDirSize, centDirOffset) + self.fp.write(zip64endrec) + + zip64locrec = struct.pack( + structEndArchive64Locator, + stringEndArchive64Locator, 0, pos2, 1) + self.fp.write(zip64locrec) + centDirCount = min(centDirCount, 0xFFFF) + centDirSize = min(centDirSize, 0xFFFFFFFF) + centDirOffset = min(centDirOffset, 0xFFFFFFFF) + + endrec = struct.pack(structEndArchive, stringEndArchive, + 0, 0, centDirCount, centDirCount, + centDirSize, centDirOffset, len(self._comment)) + self.fp.write(endrec) + self.fp.write(self._comment) + self.fp.flush() + + def _fpclose(self, fp): + assert self._fileRefCnt > 0 + self._fileRefCnt -= 1 + if not self._fileRefCnt and not self._filePassed: + fp.close() class PyZipFile(ZipFile): """Class to create ZIP archives with Python library files and packages.""" - def writepy(self, pathname, basename = ""): + def __init__(self, file, mode="r", compression=ZIP_STORED, + allowZip64=True, optimize=-1): + ZipFile.__init__(self, file, mode=mode, compression=compression, + allowZip64=allowZip64) + self._optimize = optimize + + def writepy(self, pathname, basename="", filterfunc=None): """Add all files from "pathname" to the ZIP archive. If pathname is a package directory, search the directory and @@ -1283,10 +1832,18 @@ def writepy(self, pathname, basename = ""): the modules into the archive. If pathname is a plain directory, listdir *.py and enter all modules. Else, pathname must be a Python *.py file and the module will be put into the - archive. Added modules are always module.pyo or module.pyc. + archive. Added modules are always module.pyc. This method will compile the module.py into module.pyc if necessary. + If filterfunc(pathname) is given, it is called with every argument. + When it is False, the file or directory is skipped. """ + pathname = os.fspath(pathname) + if filterfunc and not filterfunc(pathname): + if self.debug: + label = 'path' if os.path.isdir(pathname) else 'file' + print('%s %r skipped by filterfunc' % (label, pathname)) + return dir, name = os.path.split(pathname) if os.path.isdir(pathname): initname = os.path.join(pathname, "__init__.py") @@ -1297,10 +1854,10 @@ def writepy(self, pathname, basename = ""): else: basename = name if self.debug: - print "Adding package in", pathname, "as", basename + print("Adding package in", pathname, "as", basename) fname, arcname = self._get_codename(initname[0:-3], basename) if self.debug: - print "Adding", arcname + print("Adding", arcname) self.write(fname, arcname) dirlist = os.listdir(pathname) dirlist.remove("__init__.py") @@ -1311,33 +1868,42 @@ def writepy(self, pathname, basename = ""): if os.path.isdir(path): if os.path.isfile(os.path.join(path, "__init__.py")): # This is a package directory, add it - self.writepy(path, basename) # Recursive call + self.writepy(path, basename, + filterfunc=filterfunc) # Recursive call elif ext == ".py": + if filterfunc and not filterfunc(path): + if self.debug: + print('file %r skipped by filterfunc' % path) + continue fname, arcname = self._get_codename(path[0:-3], - basename) + basename) if self.debug: - print "Adding", arcname + print("Adding", arcname) self.write(fname, arcname) else: # This is NOT a package directory, add its files at top level if self.debug: - print "Adding files from directory", pathname + print("Adding files from directory", pathname) for filename in os.listdir(pathname): path = os.path.join(pathname, filename) root, ext = os.path.splitext(filename) if ext == ".py": + if filterfunc and not filterfunc(path): + if self.debug: + print('file %r skipped by filterfunc' % path) + continue fname, arcname = self._get_codename(path[0:-3], - basename) + basename) if self.debug: - print "Adding", arcname + print("Adding", arcname) self.write(fname, arcname) else: if pathname[-3:] != ".py": - raise RuntimeError, \ - 'Files added with writepy() must end with ".py"' + raise RuntimeError( + 'Files added with writepy() must end with ".py"') fname, arcname = self._get_codename(pathname[0:-3], basename) if self.debug: - print "Adding file", arcname + print("Adding file", arcname) self.write(fname, arcname) def _get_codename(self, pathname, basename): @@ -1347,25 +1913,77 @@ def _get_codename(self, pathname, basename): archive name, compiling if necessary. For example, given /python/lib/string, return (/python/lib/string.pyc, string). """ - file_py = pathname + ".py" - file_pyc = pathname + ".pyc" - file_pyo = pathname + ".pyo" - if os.path.isfile(file_pyo) and \ - os.stat(file_pyo).st_mtime >= os.stat(file_py).st_mtime: - fname = file_pyo # Use .pyo file - elif not os.path.isfile(file_pyc) or \ - os.stat(file_pyc).st_mtime < os.stat(file_py).st_mtime: + def _compile(file, optimize=-1): import py_compile if self.debug: - print "Compiling", file_py + print("Compiling", file) try: - py_compile.compile(file_py, file_pyc, None, True) - except py_compile.PyCompileError,err: - print err.msg - fname = file_pyc + py_compile.compile(file, doraise=True, optimize=optimize) + except py_compile.PyCompileError as err: + print(err.msg) + return False + return True + + file_py = pathname + ".py" + file_pyc = pathname + ".pyc" + pycache_opt0 = importlib.util.cache_from_source(file_py, optimization='') + pycache_opt1 = importlib.util.cache_from_source(file_py, optimization=1) + pycache_opt2 = importlib.util.cache_from_source(file_py, optimization=2) + if self._optimize == -1: + # legacy mode: use whatever file is present + if (os.path.isfile(file_pyc) and + os.stat(file_pyc).st_mtime >= os.stat(file_py).st_mtime): + # Use .pyc file. + arcname = fname = file_pyc + elif (os.path.isfile(pycache_opt0) and + os.stat(pycache_opt0).st_mtime >= os.stat(file_py).st_mtime): + # Use the __pycache__/*.pyc file, but write it to the legacy pyc + # file name in the archive. + fname = pycache_opt0 + arcname = file_pyc + elif (os.path.isfile(pycache_opt1) and + os.stat(pycache_opt1).st_mtime >= os.stat(file_py).st_mtime): + # Use the __pycache__/*.pyc file, but write it to the legacy pyc + # file name in the archive. + fname = pycache_opt1 + arcname = file_pyc + elif (os.path.isfile(pycache_opt2) and + os.stat(pycache_opt2).st_mtime >= os.stat(file_py).st_mtime): + # Use the __pycache__/*.pyc file, but write it to the legacy pyc + # file name in the archive. + fname = pycache_opt2 + arcname = file_pyc + else: + # Compile py into PEP 3147 pyc file. + if _compile(file_py): + if sys.flags.optimize == 0: + fname = pycache_opt0 + elif sys.flags.optimize == 1: + fname = pycache_opt1 + else: + fname = pycache_opt2 + arcname = file_pyc + else: + fname = arcname = file_py else: - fname = file_pyc - archivename = os.path.split(fname)[1] + # new mode: use given optimization level + if self._optimize == 0: + fname = pycache_opt0 + arcname = file_pyc + else: + arcname = file_pyc + if self._optimize == 1: + fname = pycache_opt1 + elif self._optimize == 2: + fname = pycache_opt2 + else: + msg = "invalid value for 'optimize': {!r}".format(self._optimize) + raise ValueError(msg) + if not (os.path.isfile(fname) and + os.stat(fname).st_mtime >= os.stat(file_py).st_mtime): + if not _compile(file_py, optimize=self._optimize): + fname = arcname = file_py + archivename = os.path.split(arcname)[1] if basename: archivename = "%s/%s" % (basename, archivename) return (fname, archivename) @@ -1384,65 +2002,58 @@ def main(args = None): args = sys.argv[1:] if not args or args[0] not in ('-l', '-c', '-e', '-t'): - print USAGE + print(USAGE) sys.exit(1) if args[0] == '-l': if len(args) != 2: - print USAGE + print(USAGE) sys.exit(1) - zf = ZipFile(args[1], 'r') - zf.printdir() - zf.close() + with ZipFile(args[1], 'r') as zf: + zf.printdir() elif args[0] == '-t': if len(args) != 2: - print USAGE + print(USAGE) sys.exit(1) - zf = ZipFile(args[1], 'r') - zf.testzip() - print "Done testing" + with ZipFile(args[1], 'r') as zf: + badfile = zf.testzip() + if badfile: + print("The following enclosed file is corrupted: {!r}".format(badfile)) + print("Done testing") elif args[0] == '-e': if len(args) != 3: - print USAGE + print(USAGE) sys.exit(1) - zf = ZipFile(args[1], 'r') - out = args[2] - for path in zf.namelist(): - if path.startswith('./'): - tgt = os.path.join(out, path[2:]) - else: - tgt = os.path.join(out, path) - - tgtdir = os.path.dirname(tgt) - if not os.path.exists(tgtdir): - os.makedirs(tgtdir) - fp = open(tgt, 'wb') - fp.write(zf.read(path)) - fp.close() - zf.close() + with ZipFile(args[1], 'r') as zf: + zf.extractall(args[2]) elif args[0] == '-c': if len(args) < 3: - print USAGE + print(USAGE) sys.exit(1) def addToZip(zf, path, zippath): if os.path.isfile(path): zf.write(path, zippath, ZIP_DEFLATED) elif os.path.isdir(path): + if zippath: + zf.write(path, zippath) for nm in os.listdir(path): addToZip(zf, - os.path.join(path, nm), os.path.join(zippath, nm)) + os.path.join(path, nm), os.path.join(zippath, nm)) # else: ignore - zf = ZipFile(args[1], 'w', allowZip64=True) - for src in args[2:]: - addToZip(zf, src, os.path.basename(src)) - - zf.close() + with ZipFile(args[1], 'w') as zf: + for path in args[2:]: + zippath = os.path.basename(path) + if not zippath: + zippath = os.path.basename(os.path.dirname(path)) + if zippath in ('', os.curdir, os.pardir): + zippath = '' + addToZip(zf, path, zippath) if __name__ == "__main__": main() From 09c3847eb7600ca7c77a74f7b17295c74abeee00 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Thu, 8 Feb 2018 23:53:09 +0100 Subject: [PATCH 646/844] Update VMware (#14567) Fix #14527 --- src/chrome/content/rules/VMware.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/VMware.xml b/src/chrome/content/rules/VMware.xml index 56a7e6b96b39..4a8347658528 100644 --- a/src/chrome/content/rules/VMware.xml +++ b/src/chrome/content/rules/VMware.xml @@ -13,7 +13,7 @@ Nonfunctional hosts: - ir ¹ - - kb ² + - link.delivery ³ - nlblogs ³ - partnerlocator ⁴ - vcloud ⁵ @@ -69,13 +69,13 @@ - + - + From 6b870b825119114ba76eaf9a3d672110b37ad25b Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 8 Feb 2018 17:56:24 -0500 Subject: [PATCH 647/844] Add CVS.com.xml (#14552) --- src/chrome/content/rules/CVS.com.xml | 45 ++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/chrome/content/rules/CVS.com.xml diff --git a/src/chrome/content/rules/CVS.com.xml b/src/chrome/content/rules/CVS.com.xml new file mode 100644 index 000000000000..ce926606cc9a --- /dev/null +++ b/src/chrome/content/rules/CVS.com.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 661db6d2c01e1585a36f33eb5d3efc35708bb3bf Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 8 Feb 2018 17:58:01 -0500 Subject: [PATCH 648/844] Add Frida.re.xml (#14550) --- src/chrome/content/rules/Frida.re.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/Frida.re.xml diff --git a/src/chrome/content/rules/Frida.re.xml b/src/chrome/content/rules/Frida.re.xml new file mode 100644 index 000000000000..9ab826932fde --- /dev/null +++ b/src/chrome/content/rules/Frida.re.xml @@ -0,0 +1,15 @@ + + + + + + + + + + From bd2fe966bcd65b05fc241176dfa1f510b42e9555 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 8 Feb 2018 18:00:22 -0500 Subject: [PATCH 649/844] Add EbayCommerceNetwork.com.xml (#14549) --- .../content/rules/EbayCommerceNetwork.com.xml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/chrome/content/rules/EbayCommerceNetwork.com.xml diff --git a/src/chrome/content/rules/EbayCommerceNetwork.com.xml b/src/chrome/content/rules/EbayCommerceNetwork.com.xml new file mode 100644 index 000000000000..5c4133340fcd --- /dev/null +++ b/src/chrome/content/rules/EbayCommerceNetwork.com.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + From b49b032892fe4f71cbeb76303c783989989e8815 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 16:42:41 -0800 Subject: [PATCH 650/844] Cleaning up test execution & naming conventions (#14570) --- .travis.yml | 22 ++-- CONTRIBUTING.md | 4 +- README.md | 6 +- fetch-test.sh | 2 - ruleset-testing.md | 5 +- run_travis.sh | 56 --------- test.sh | 2 +- test/manual.sh | 6 + test/run_travis.sh | 109 ++++++++++++++++++ setup_travis.sh => test/setup_travis.sh | 6 +- test/travis.sh | 62 ---------- test/validations.sh | 10 ++ .../validations/filename/run.py | 0 .../validations/path/run.sh | 8 +- .../validations/relaxng/run.py | 10 +- .../validations/relaxng/schema.xml | 0 .../validations/securecookie/run.py | 0 .../special}/duplicate-whitelist-cleanup.sh | 0 .../special}/duplicate-whitelist.txt | 0 .../validations/special/run.py | 8 +- .../test-coverage/run.sh} | 2 +- 21 files changed, 162 insertions(+), 156 deletions(-) delete mode 100755 fetch-test.sh delete mode 100755 run_travis.sh create mode 100755 test/manual.sh create mode 100755 test/run_travis.sh rename setup_travis.sh => test/setup_travis.sh (95%) delete mode 100755 test/travis.sh create mode 100755 test/validations.sh rename utils/ruleset_filenames_validate.py => test/validations/filename/run.py (100%) rename utils/check-ruleset-path.sh => test/validations/path/run.sh (66%) rename utils/validate.py => test/validations/relaxng/run.py (79%) rename utils/relaxng.xml => test/validations/relaxng/schema.xml (100%) rename utils/normalize-securecookie.py => test/validations/securecookie/run.py (100%) rename {utils => test/validations/special}/duplicate-whitelist-cleanup.sh (100%) rename {utils => test/validations/special}/duplicate-whitelist.txt (100%) rename utils/trivial-validate.py => test/validations/special/run.py (94%) rename test/{rules.sh => validations/test-coverage/run.sh} (98%) diff --git a/.travis.yml b/.travis.yml index 29d23029aa2e..3fda2a067fb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,31 +9,31 @@ services: matrix: fast_finish: true include: - - env: INFO="lint" + - env: TEST="lint" language: node_js node_js: - "node" - - env: INFO="unittests" + - env: TEST="unittests" language: node_js node_js: node - "node" - - env: INFO="rules" - - env: INFO="fetch" - - env: INFO="preloaded" + - env: TEST="validations" + - env: TEST="fetch" + - env: TEST="preloaded" - addons: chrome: beta - env: INFO="chrome beta" BROWSER=google-chrome-beta + env: TEST="chrome beta" BROWSER=google-chrome-beta - addons: chrome: stable - env: INFO="chrome stable" BROWSER=google-chrome-stable + env: TEST="chrome stable" BROWSER=google-chrome-stable - addons: firefox: latest - env: INFO="firefox" BROWSER=firefox + env: TEST="firefox" BROWSER=firefox - addons: firefox: latest-esr - env: INFO="firefox esr" BROWSER=firefox + env: TEST="firefox esr" BROWSER=firefox before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start -before_script: travis_retry ./setup_travis.sh -script: . ./run_travis.sh +before_script: travis_retry test/setup_travis.sh +script: . test/run_travis.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 843d7ec08bce..041595491a77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -148,7 +148,7 @@ Avoid using the left-wildcard (``) unless you int Instead, prefer listing explicit target hosts and a single rewrite from `"^http:"` to `"^https:"`. This saves you time as a ruleset author because each explicit target host automatically creates an implicit test URL, reducing the need to add your own test URLs. These also make it easier for someone reading the ruleset to figure out which subdomains are covered. -If you know all subdomains of a given domain support HTTPS, go ahead and use a left-wildcard, along with a plain rewrite from `"^http:"` to `"^https:"`. Make sure to add a bunch of test URLs for the more important subdomains. +If you know all subdomains of a given domain support HTTPS, go ahead and use a left-wildcard, along with a plain rewrite from `"^http:"` to `"^https:"`. Make sure to add a bunch of test URLs for the more important subdomains. #### Edge-Case: Right-Wildcards @@ -334,7 +334,7 @@ In `utils` we have a tool called `hsts-prune` which removes `targets` from rules Every new pull request automatically has the `hsts-prune` utility applied to it as part of the continual integration process. If a new PR introduces a `target` which is preloaded, it will fail the CI test suite. See: - `.travis.yml` -- `test/travis.sh` +- `test/run_travis.sh` * * * diff --git a/README.md b/README.md index 330fc8e5d746..9e10be63cde6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Get the packages you need and install a git hook to run tests before push: bash install-dev-dependencies.sh -Run all the tests: +Run the ruleset validations and browser tests: bash test.sh @@ -50,7 +50,7 @@ This is the source tree for HTTPS Everywhere for Firefox and Chrome. Important directories you might want to know about - + chromium/ WebExtension source code (for Firefox & Chromium/chrome) chromium/external External dependencies chromium/test Unit tests @@ -60,7 +60,7 @@ Important directories you might want to know about src/chrome/content/rules Ruleset files live here test/ Travis unit test source code live here - + utils/ Various utilities (includes some Travis test source) Hacking on the Source Code diff --git a/fetch-test.sh b/fetch-test.sh deleted file mode 100755 index b6457444c00e..000000000000 --- a/fetch-test.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec python2.7 test/rules/src/https_everywhere_checker/check_rules.py test/rules/manual.checker.config "$@" diff --git a/ruleset-testing.md b/ruleset-testing.md index 7e8a26fa0b0f..9d3a6fb82304 100644 --- a/ruleset-testing.md +++ b/ruleset-testing.md @@ -53,11 +53,10 @@ Submitting changes to any ruleset that does not meet the coverage requirements will break the build. This means that even fixes of existing rules may require additional work to bring them up to snuff. -To run the tests locally, you'll need the https-everywhere-checker, which is now -a submodule of https-everywhere. To set it up, run: +To run the tests locally, first install the development dependencies: ./install-dev-dependencies.sh To test a specific ruleset: - ./fetch-test.sh rules/Example.xml + test/manual.sh rules/Example.xml diff --git a/run_travis.sh b/run_travis.sh deleted file mode 100755 index 7680cbbbe9c6..000000000000 --- a/run_travis.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -set -x -toplevel="$(git rev-parse --show-toplevel)" -testdir="${toplevel}/test/selenium" -srcdir="${toplevel}/chromium" -linter="${toplevel}/utils/eslint/node_modules/.bin/eslint --ignore-path ${srcdir}/.eslintignore" - - -function run_lint { - $linter $srcdir - if [ $? != 0 ]; then - echo "Linting errors" - exit 1 - fi -} - -function run_unittests { - pushd ${srcdir} - npm run cover # run with coverage - if [ $? != 0 ]; then - echo "unittest errors" - exit 1 - fi - npm run report - popd -} - -function run_selenium { - ENABLE_XVFB=1 py.test -v --capture=no ${testdir} # autodiscover and run the tests -} - -if [ "$INFO" == "lint" ]; then - echo "running lint tests" - run_lint -elif [ "$INFO" == "unittests" ]; then - echo "Running unittests" - run_unittests -elif [ "$INFO" == "rules" ] || [ "$INFO" == "fetch" ] || [ "$INFO" == "preloaded" ]; then - export TEST=${INFO} - ${toplevel}/test/travis.sh # run old travis tests -else - case $BROWSER in - *chrome*) - echo "running tests on chrome" - run_selenium - ;; - *firefox*) - echo "running tests on firefox" - run_selenium - ;; - *) - echo "bad INFO variable, got $INFO" - exit 1 - ;; - esac -fi diff --git a/test.sh b/test.sh index 441bd3557157..64c9b27c68b8 100755 --- a/test.sh +++ b/test.sh @@ -14,6 +14,6 @@ else git rev-parse && cd "$(git rev-parse --show-toplevel)" fi -./test/rules.sh +./test/validations.sh ./test/firefox.sh $@ ./test/chromium.sh $@ diff --git a/test/manual.sh b/test/manual.sh new file mode 100755 index 000000000000..938c82400e64 --- /dev/null +++ b/test/manual.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# This script assists ruleset creators in ensuring that there is proper test +# coverage for their rules, and performs a network "fetch" test to alert the +# contributor of potential problems. + +exec python2.7 test/rules/src/https_everywhere_checker/check_rules.py test/rules/manual.checker.config "$@" diff --git a/test/run_travis.sh b/test/run_travis.sh new file mode 100755 index 000000000000..12557f5e0219 --- /dev/null +++ b/test/run_travis.sh @@ -0,0 +1,109 @@ +#!/bin/bash +set -x +toplevel="$(git rev-parse --show-toplevel)" +testdir="${toplevel}/test/selenium" +srcdir="${toplevel}/chromium" +linter="${toplevel}/utils/eslint/node_modules/.bin/eslint --ignore-path ${srcdir}/.eslintignore" + + +function run_lint { + $linter $srcdir + if [ $? != 0 ]; then + echo "Linting errors" + exit 1 + fi +} + +function run_unittests { + pushd ${srcdir} + npm run cover # run with coverage + if [ $? != 0 ]; then + echo "unittest errors" + exit 1 + fi + npm run report + popd +} + +function run_selenium { + ENABLE_XVFB=1 py.test -v --capture=no ${testdir} # autodiscover and run the tests +} + +if [ "$TEST" == "lint" ]; then + echo "running lint tests" + run_lint +elif [ "$TEST" == "unittests" ]; then + echo "Running unittests" + run_unittests +elif [ "$TEST" == "validations" ] || [ "$TEST" == "fetch" ] || [ "$TEST" == "preloaded" ]; then + + # Folder paths, relative to parent + RULESETFOLDER="${toplevel}/src/chrome/content/rules" + + # Go to git repo root; taken from ../test.sh. Note that + # $GIT_DIR is .git in this case. + if [ -n "$GIT_DIR" ] + then + # $GIT_DIR is set, so we're running as a hook. + cd $GIT_DIR + cd .. + else + # Let's CD to the right place. + cd $toplevel + fi + + # Fetch the current GitHub version of HTTPS-E to compare to its master + git remote add upstream-for-travis https://github.com/EFForg/https-everywhere.git + trap 'git remote remove upstream-for-travis' EXIT + + # Only do a shallow fetch if we're in Travis. No need otherwise. + if [ $TRAVIS ]; then + git fetch --depth=50 upstream-for-travis master + else + git fetch upstream-for-travis master + fi + + COMMON_BASE_COMMIT=$(git merge-base upstream-for-travis/master HEAD) + RULESETS_CHANGED=$(git diff --name-only $COMMON_BASE_COMMIT | grep $RULESETFOLDER | grep '.xml') + if [ "$(git diff --name-only $COMMON_BASE_COMMIT)" != "$RULESETS_CHANGED" ]; then + ONLY_RULESETS_CHANGED=false + fi + + # At this point, if anything fails, the test should fail + set -e + + if [ "$TEST" == "validations" ]; then + echo >&2 "Performing validations on rulesets." + docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/validations.sh" + fi + + if [ "$TEST" == "fetch" ]; then + echo >&2 "Testing test URLs in all changed rulesets." + # --privileged is required here for miredo to create a network tunnel + docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" --privileged httpse bash -c "service miredo start && service tor start && test/fetch.sh" + fi + + if [ "$TEST" == "preloaded" ]; then + echo >&2 "Ensuring rulesets do not introduce targets which are already HSTS preloaded." + docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" node bash -c "cd /opt/utils/hsts-prune && npm install && node index.js" + [ `git diff --name-only $RULESETFOLDER | wc -l` -eq 0 ] + fi + + exit 0 + +else + case $BROWSER in + *chrome*) + echo "running tests on chrome" + run_selenium + ;; + *firefox*) + echo "running tests on firefox" + run_selenium + ;; + *) + echo "bad TEST variable, got $TEST" + exit 1 + ;; + esac +fi diff --git a/setup_travis.sh b/test/setup_travis.sh similarity index 95% rename from setup_travis.sh rename to test/setup_travis.sh index b371515419f8..31f0e5a9c4f9 100755 --- a/setup_travis.sh +++ b/test/setup_travis.sh @@ -46,7 +46,7 @@ function setup_docker { docker build -t httpse . } -case $INFO in +case $TEST in *chrome*) setup_chrome browser_setup @@ -61,13 +61,13 @@ case $INFO in *unittests*) setup_unittests ;; - *rules*|*fetch*) + *validations*|*fetch*) setup_docker ;; *preloaded*) ;; *) - echo "bad INFO variable, got $INFO" + echo "bad TEST variable, got $TEST" exit 1 ;; esac diff --git a/test/travis.sh b/test/travis.sh deleted file mode 100755 index 8086f2177a73..000000000000 --- a/test/travis.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# Wrapper for travis tests - -# Folder paths, relative to parent -RULESETFOLDER="src/chrome/content/rules" - -# Go to git repo root; taken from ../test.sh. Note that -# $GIT_DIR is .git in this case. -if [ -n "$GIT_DIR" ] -then - # $GIT_DIR is set, so we're running as a hook. - cd $GIT_DIR - cd .. -else - # Git command exists? Cool, let's CD to the right place. - git rev-parse && cd "$(git rev-parse --show-toplevel)" -fi - -# Fetch the current GitHub version of HTTPS-E to compare to its master -git remote add upstream-for-travis https://github.com/EFForg/https-everywhere.git -trap 'git remote remove upstream-for-travis' EXIT - -# Only do a shallow fetch if we're in Travis. No need otherwise. -if [ $TRAVIS ]; then - git fetch --depth=50 upstream-for-travis master -else - git fetch upstream-for-travis master -fi - -COMMON_BASE_COMMIT=$(git merge-base upstream-for-travis/master HEAD) -RULESETS_CHANGED=$(git diff --name-only $COMMON_BASE_COMMIT | grep $RULESETFOLDER | grep '.xml') -if [ "$(git diff --name-only $COMMON_BASE_COMMIT)" != "$RULESETS_CHANGED" ]; then - ONLY_RULESETS_CHANGED=false -fi - -# At this point, if anything fails, the test should fail -set -e - -if [ "$TEST" == "rules" ]; then - echo >&2 "Performing comprehensive coverage test." - docker run --rm -ti -v $(pwd):/opt httpse python utils/ruleset_filenames_validate.py - docker run --rm -ti -v $(pwd):/opt -e RULESETFOLDER="$RULESETFOLDER" -e COMMON_BASE_COMMIT="$COMMON_BASE_COMMIT" httpse bash -c "utils/check-ruleset-path.sh" - docker run --rm -ti -v $(pwd):/opt httpse bash -c "utils/remove-obsolete-references.sh" - docker run --rm -ti -v $(pwd):/opt httpse python utils/validate.py - docker run --rm -ti -v $(pwd):/opt httpse python utils/trivial-validate.py --quiet - docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/rules.sh" - docker run --rm -ti -v $(pwd):/opt httpse python utils/normalize-securecookie.py -fi - -if [ "$TEST" == "fetch" ]; then - echo >&2 "Testing test URLs in all changed rulesets." - # --privileged is required here for miredo to create a network tunnel - docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" --privileged httpse bash -c "service miredo start && service tor start && test/fetch.sh" -fi - -if [ "$TEST" == "preloaded" ]; then - echo >&2 "Ensuring rulesets do not introduce targets which are already HSTS preloaded." - docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" node bash -c "cd /opt/utils/hsts-prune && npm install && node index.js" - [ `git diff --name-only $RULESETFOLDER | wc -l` -eq 0 ] -fi - -exit 0 diff --git a/test/validations.sh b/test/validations.sh new file mode 100755 index 000000000000..c13a127c5e9f --- /dev/null +++ b/test/validations.sh @@ -0,0 +1,10 @@ +#!/bin/bash -ex +# Perform validations on rulesets. + +utils/remove-obsolete-references.sh +test/validations/path/run.sh +test/validations/test-coverage/run.sh +python2.7 test/validations/securecookie/run.py +python2.7 test/validations/filename/run.py +python2.7 test/validations/relaxng/run.py +python2.7 test/validations/special/run.py --quiet diff --git a/utils/ruleset_filenames_validate.py b/test/validations/filename/run.py similarity index 100% rename from utils/ruleset_filenames_validate.py rename to test/validations/filename/run.py diff --git a/utils/check-ruleset-path.sh b/test/validations/path/run.sh similarity index 66% rename from utils/check-ruleset-path.sh rename to test/validations/path/run.sh index b1250c9ee369..b8b8ff1fc189 100755 --- a/utils/check-ruleset-path.sh +++ b/test/validations/path/run.sh @@ -1,10 +1,12 @@ #!/bin/bash -CHANGED_FILES=`git diff --name-only $COMMON_BASE_COMMIT | grep -v $RULESETFOLDER | grep '.xml'` +RULESETFOLDER=src/chrome/content/rules + +FILES=`find . | grep -v $RULESETFOLDER | grep '\.xml$'` EXIT_CODE=0 -if [ "$CHANGED_FILES" != "" ]; then +if [ "$FILES" != "" ]; then while read FILE; do # check if changed file is actually a ruleset egrep -q "^]+>" "$FILE" @@ -14,7 +16,7 @@ if [ "$CHANGED_FILES" != "" ]; then echo >&2 "ERROR: $FILE Inclusion of ruleset outside of $RULESETFOLDER" EXIT_CODE=1 fi - done <<< "$CHANGED_FILES" + done <<< "$FILES" fi exit $EXIT_CODE diff --git a/utils/validate.py b/test/validations/relaxng/run.py similarity index 79% rename from utils/validate.py rename to test/validations/relaxng/run.py index f7ad6dd2cc44..32503a58c22f 100644 --- a/utils/validate.py +++ b/test/validations/relaxng/run.py @@ -9,7 +9,7 @@ from lxml import etree # commandline arguments parsing (nobody use it, though) -parser = argparse.ArgumentParser(description="Validate rulesets against relaxng.xml") +parser = argparse.ArgumentParser(description="Validate rulesets against relaxng schema.xml") parser.add_argument("--source_dir", default="src/chrome/content/rules") args = parser.parse_args() @@ -18,12 +18,12 @@ files = glob.glob(os.path.join(args.source_dir, "*.xml")) # read the schema file -relaxng_doc = etree.parse('utils/relaxng.xml') +relaxng_doc = etree.parse('test/validations/relaxng/schema.xml') relaxng = etree.RelaxNG(relaxng_doc) exit_code = 0 -print("Validation of rulesets against utils/relaxng.xml begins...") +print("Validation of rulesets against relaxng schema.xml begins...") for filename in sorted(files): tree = etree.parse(filename) @@ -34,13 +34,13 @@ print(("%s %s:%s:%s: %s" % (e.level_name, e.filename, e.line, e.column, e.message))) if exit_code == 0: - message = "Validation of rulesets against utils/relaxng.xml succeeded." + message = "Validation of rulesets against relaxng schema.xml succeeded." else: message = "\nTwo very common reasons for this are the following:\n" \ " - missing caret (^) in 'from' attribute: it should be \"^http:\" and not \"http:\"\n" \ " - missing trailing slashes in 'from' or 'to' when specifying full hostnames: \n" \ " it should be \"https://eff.org/\" and not \"https://eff.org\"\n\n" \ - "Validation of rulesets against utils/relaxng.xml failed." + "Validation of rulesets against relaxng schema.xml failed." print(message) exit(exit_code) diff --git a/utils/relaxng.xml b/test/validations/relaxng/schema.xml similarity index 100% rename from utils/relaxng.xml rename to test/validations/relaxng/schema.xml diff --git a/utils/normalize-securecookie.py b/test/validations/securecookie/run.py similarity index 100% rename from utils/normalize-securecookie.py rename to test/validations/securecookie/run.py diff --git a/utils/duplicate-whitelist-cleanup.sh b/test/validations/special/duplicate-whitelist-cleanup.sh similarity index 100% rename from utils/duplicate-whitelist-cleanup.sh rename to test/validations/special/duplicate-whitelist-cleanup.sh diff --git a/utils/duplicate-whitelist.txt b/test/validations/special/duplicate-whitelist.txt similarity index 100% rename from utils/duplicate-whitelist.txt rename to test/validations/special/duplicate-whitelist.txt diff --git a/utils/trivial-validate.py b/test/validations/special/run.py similarity index 94% rename from utils/trivial-validate.py rename to test/validations/special/run.py index 1b5ef5103663..b9733b42a13d 100755 --- a/utils/trivial-validate.py +++ b/test/validations/special/run.py @@ -37,7 +37,7 @@ def fail(s): with open(thispath + '/duplicate-whitelist.txt') as duplicate_fh: duplicate_allowed_list = [x.rstrip('\n') for x in duplicate_fh.readlines()] -filenames = glob.glob(thispath + '/../src/chrome/content/rules/*') +filenames = glob.glob(thispath + '/../../../src/chrome/content/rules/*') def test_bad_regexp(tree, rulename, from_attrib, to): # Rules with invalid regular expressions. @@ -150,7 +150,7 @@ def nomes_all(where=sys.argv[1:]): xpath_from = etree.XPath("/ruleset/rule/@from") xpath_to = etree.XPath("/ruleset/rule/@to") -print("Complex validations & assertions of rulesets using utils/trivial-validate.py begins...") +print("Complex validations & assertions of rulesets using test/validations/special/run.py begins...") host_counter = Counter() for filename in filenames: @@ -203,9 +203,9 @@ def nomes_all(where=sys.argv[1:]): fail("%s failed: %s" % (host, is_valid_target_host.__doc__)) if failure > 0: - print("Complex validations & assertions of rulesets using utils/trivial-validate.py failed.") + print("Complex validations & assertions of rulesets using test/validations/special/run.py failed.") else: - print("Complex validations & assertions of rulesets using utils/trivial-validate.py succeeded.") + print("Complex validations & assertions of rulesets using test/validations/special/run.py succeeded.") sys.exit(failure) diff --git a/test/rules.sh b/test/validations/test-coverage/run.sh similarity index 98% rename from test/rules.sh rename to test/validations/test-coverage/run.sh index 7bef2f2d5d84..268a705f8cbd 100755 --- a/test/rules.sh +++ b/test/validations/test-coverage/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e # # Test that all rulesets modified after a certain date have sufficient test # coverage, according to the ruleset checker. From ae1e0b84c69c8be369ab2cbc002ce2d77cd94f26 Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 8 Feb 2018 19:46:33 -0500 Subject: [PATCH 651/844] Rename ebaycommercenetwork.com.xml for PR #13773 (#14571) --- .../{EbayCommerceNetwork.com.xml => ebaycommercenetwork.com.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/chrome/content/rules/{EbayCommerceNetwork.com.xml => ebaycommercenetwork.com.xml} (100%) diff --git a/src/chrome/content/rules/EbayCommerceNetwork.com.xml b/src/chrome/content/rules/ebaycommercenetwork.com.xml similarity index 100% rename from src/chrome/content/rules/EbayCommerceNetwork.com.xml rename to src/chrome/content/rules/ebaycommercenetwork.com.xml From 37d3bc28f3e7b06728d58d2d3f1dc1c8e2a3859b Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 9 Feb 2018 11:50:42 +1030 Subject: [PATCH 652/844] [ebay.com] Clean-up ruleset (#13773) * [ebay.com] Add subdomains and rename ruleset * Remove EBay-mismatches.xml * Delete EBay_static.com-problematic.xml #13772 * Remove EBay_static.com-problematic.xml from whitelist * Temporarily remove dangling references * Add more functional hosts --- src/chrome/content/rules/EBay-mismatches.xml | 36 ---- src/chrome/content/rules/EBay.xml | 167 ------------------ .../rules/EBay_static.com-problematic.xml | 26 --- src/chrome/content/rules/ebay.com.xml | 95 ++++++++++ utils/ruleset-whitelist.csv | 1 - 5 files changed, 95 insertions(+), 230 deletions(-) delete mode 100644 src/chrome/content/rules/EBay-mismatches.xml delete mode 100644 src/chrome/content/rules/EBay.xml delete mode 100644 src/chrome/content/rules/EBay_static.com-problematic.xml create mode 100644 src/chrome/content/rules/ebay.com.xml diff --git a/src/chrome/content/rules/EBay-mismatches.xml b/src/chrome/content/rules/EBay-mismatches.xml deleted file mode 100644 index 1780bb689e25..000000000000 --- a/src/chrome/content/rules/EBay-mismatches.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/EBay.xml b/src/chrome/content/rules/EBay.xml deleted file mode 100644 index 48e3517e1c4f..000000000000 --- a/src/chrome/content/rules/EBay.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/EBay_static.com-problematic.xml b/src/chrome/content/rules/EBay_static.com-problematic.xml deleted file mode 100644 index a9ed3df31c24..000000000000 --- a/src/chrome/content/rules/EBay_static.com-problematic.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/ebay.com.xml b/src/chrome/content/rules/ebay.com.xml new file mode 100644 index 000000000000..e1309c57b4b6 --- /dev/null +++ b/src/chrome/content/rules/ebay.com.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index d3a541434ba4..f64917d2f507 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -968,7 +968,6 @@ ed4d3f6dffa7d460928531572c4eef1f58a85681ef475721ee5677407ece8f71,0,1,EasyNews.xm 0b8829a889f400ac3171d5602ff812f5bbd6559db9d6a3d3b835ed6694ef3e60,0,1,Easyspace-expired.xml 2cae44c9bad27b188bbf6f16bce3b3307d7640b282fac959b5427a800242cee4,1,1,Easyspace.xml daeafd482fbd37b61bbba2a8c9c19cb05ff2cbf1422971c4d1132d93a31c2d95,0,1,EasyVoiceBiometrics.xml -fa0fc70db6708a7c811e28e0cd4fa84bbe2d26c0125eb0633a0460a574d5428c,0,1,EBay_static.com-problematic.xml 421ade575e2e1e0e75d6c7bc746c9615bd7fe023bac2e3a21401cc6c61c2ee3e,1,1,Ebi.ac.uk.xml 69543b744db80de441dc597c4edba83ba4ae47aab02eae703ed5782b59a46796,1,1,eBid.net.xml c2767020a45a762c9d5b799a7b20f5ea6a1d9e73cc4d4601491870c90cf24360,1,1,E-boks.dk.xml From 819a68787cb00202667926b7ac434d3419f64f3f Mon Sep 17 00:00:00 2001 From: Jeremy Nation Date: Thu, 8 Feb 2018 21:00:58 -0500 Subject: [PATCH 653/844] Add documentation section to CONTRIBUTING.md (#14572) --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 041595491a77..dbf63c8ddd97 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,6 +30,7 @@ * [Regular Rules](#regular-rules) * [HSTS Preloaded Rules](#hsts-preloaded-rules) * [Contributing Code](#contributing-code) +* [Contributing Documentation](#contributing-documentation) * [Contributing Translations](#contributing-translations) * * * @@ -356,6 +357,12 @@ Several of our utilities and our full test suite is written in Python. Eventual * * * +# Contributing Documentation + +Standalone documentation should be written in [Markdown](https://en.wikipedia.org/wiki/Markdown) that follows the [Google style guide](https://github.com/google/styleguide/blob/gh-pages/docguide/style.md). If you are updating existing documentation that does not follow the Google style guide, then you should follow the style of the file you are updating. + +* * * + # Contributing Translations HTTPS Everywhere translations are handled through Transifex. The easiest way to help with translations is to [create a Transifex account](https://www.transifex.com/signup/) if you don't already have one. Then log into your account and click "Explore", then search for "Tor Project", and click on The Tor Project. Then choose the language you plan to translate into, click on the name of that language, and then click "Join team" and "Go" to accept joining the translation team for your language. From fcc55b072b8fe745d8ebf0712ea570fd12c5c982 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 9 Feb 2018 13:17:35 +1030 Subject: [PATCH 654/844] [mobile.de] Re-enable ruleset and update subdomains (#14243) --- src/chrome/content/rules/mobile.de.xml | 119 +++++++++++++++++-------- 1 file changed, 84 insertions(+), 35 deletions(-) diff --git a/src/chrome/content/rules/mobile.de.xml b/src/chrome/content/rules/mobile.de.xml index aa1dba966595..36fbf2991b35 100644 --- a/src/chrome/content/rules/mobile.de.xml +++ b/src/chrome/content/rules/mobile.de.xml @@ -1,43 +1,92 @@ - - - - - - - - - - - - - - - - - - + Non-functional subdomains: - - - + - adstream (r) + - apptest (r) + - callpush (t) + - amsconsul.corp (t) + - analytics.corp (t) + - ci-jenkins.corp (t) + - kamsconsul.corp (t) + - registry.corp (t) + - tech.corp (t) + - advertising.dev (i) + - newsroom.dev (t) + - finanzierung (i) + - finanzierung-test (m) + - test.finanzierungsanfrage (e) + - www.fr (m) + - imode (HTTP error 404) + - info (m) + - mailin46-1 (t) + - mailin46-2 (t) + - mailin46-3 (t) + - mailin47-1 (t) + - mailin47-2 (t) + - mailin47-3 (t) + - mailout46-1 (t) + - mailout46-2 (t) + - mailout46-3 (t) + - mailout46-4 (t) + - mailout47-1 (t) + - mailout47-2 (t) + - mailout47-3 (t) + - mailout47-4 (t) + - marktdaten (t) + - presse (HTTP error 404) + - promo (i) + - sandbox (t) + - survey (i) + + e: expired certificate + h: http redirect + i: invalid certificate chain + m: certificate mismatch + r: connection refused + s: self-signed certificate + t: timeout on https +--> + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + to="https:" /> From cbd524c6f1b442962c44b4936bf977a925ac755b Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 9 Feb 2018 13:41:45 +1030 Subject: [PATCH 655/844] [ebayclassifiedsgroup.com] New ruleset (#13820) * Delete ebayclassifieds.com.xml * [ebayclassifiedsgroup.com] New ruleset * Remove irrelevant references * Delete ebayclassifieds.com-falsemixed.xml --- .../rules/ebayclassifieds.com-falsemixed.xml | 20 --- .../content/rules/ebayclassifieds.com.xml | 147 ------------------ .../rules/ebayclassifiedsgroup.com.xml | 25 +++ 3 files changed, 25 insertions(+), 167 deletions(-) delete mode 100644 src/chrome/content/rules/ebayclassifieds.com-falsemixed.xml delete mode 100644 src/chrome/content/rules/ebayclassifieds.com.xml create mode 100644 src/chrome/content/rules/ebayclassifiedsgroup.com.xml diff --git a/src/chrome/content/rules/ebayclassifieds.com-falsemixed.xml b/src/chrome/content/rules/ebayclassifieds.com-falsemixed.xml deleted file mode 100644 index 678ec3c86836..000000000000 --- a/src/chrome/content/rules/ebayclassifieds.com-falsemixed.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/ebayclassifieds.com.xml b/src/chrome/content/rules/ebayclassifieds.com.xml deleted file mode 100644 index 91486a23d22f..000000000000 --- a/src/chrome/content/rules/ebayclassifieds.com.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/ebayclassifiedsgroup.com.xml b/src/chrome/content/rules/ebayclassifiedsgroup.com.xml new file mode 100644 index 000000000000..a19ceb938568 --- /dev/null +++ b/src/chrome/content/rules/ebayclassifiedsgroup.com.xml @@ -0,0 +1,25 @@ + + + + + + + + + From 2a7b91b3828a417291f79b9739cd6fd089f989b2 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 19:24:26 -0800 Subject: [PATCH 656/844] Speed up path validation test --- test/validations/path/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/validations/path/run.sh b/test/validations/path/run.sh index b8b8ff1fc189..6909183aa6e8 100755 --- a/test/validations/path/run.sh +++ b/test/validations/path/run.sh @@ -2,7 +2,7 @@ RULESETFOLDER=src/chrome/content/rules -FILES=`find . | grep -v $RULESETFOLDER | grep '\.xml$'` +FILES=`git grep --name-only . | grep -v $RULESETFOLDER | grep '\.xml$'` EXIT_CODE=0 From 5920ed46e4956b577ac261c0ea03fa4d5186b34f Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 19:26:45 -0800 Subject: [PATCH 657/844] Add .venv2 and .venv3 to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8869de9406aa..252f5c330084 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ .idea .vagrant .venv/ +.venv2/ +.venv3/ chromium.pem from-preloads/ pkg/ From d12ea9c6558816d90755452654405acc907af37e Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 22:12:50 -0800 Subject: [PATCH 658/844] Fix invalid extended regex --- src/chrome/content/rules/Meritrust_CU.org.xml | 2 +- utils/ruleset-whitelist.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Meritrust_CU.org.xml b/src/chrome/content/rules/Meritrust_CU.org.xml index 3b2445588780..234a15eea369 100644 --- a/src/chrome/content/rules/Meritrust_CU.org.xml +++ b/src/chrome/content/rules/Meritrust_CU.org.xml @@ -15,7 +15,7 @@ --> - + Date: Sun, 11 Feb 2018 04:15:54 +0800 Subject: [PATCH 659/844] Update test/run_travis.sh, Fix Travis fetch-test (#14585) --- test/run_travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_travis.sh b/test/run_travis.sh index 12557f5e0219..5f01cca66a56 100755 --- a/test/run_travis.sh +++ b/test/run_travis.sh @@ -38,7 +38,7 @@ elif [ "$TEST" == "unittests" ]; then elif [ "$TEST" == "validations" ] || [ "$TEST" == "fetch" ] || [ "$TEST" == "preloaded" ]; then # Folder paths, relative to parent - RULESETFOLDER="${toplevel}/src/chrome/content/rules" + RULESETFOLDER="src/chrome/content/rules" # Go to git repo root; taken from ../test.sh. Note that # $GIT_DIR is .git in this case. From f0b58643f95fd7c8a26cd8173c50c379ae6ed245 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 12 Feb 2018 19:32:28 +0100 Subject: [PATCH 660/844] [IdStronghold.com] Remove mixedcontent platform (#14603) * [IdStronghold.com] Remove mixedcontent platform * Rename Identity-Stronghold.xml to IDStronghold.com.xml --- .../rules/{Identity-Stronghold.xml => IDStronghold.com.xml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/chrome/content/rules/{Identity-Stronghold.xml => IDStronghold.com.xml} (67%) diff --git a/src/chrome/content/rules/Identity-Stronghold.xml b/src/chrome/content/rules/IDStronghold.com.xml similarity index 67% rename from src/chrome/content/rules/Identity-Stronghold.xml rename to src/chrome/content/rules/IDStronghold.com.xml index 08e5bbc93905..e17a04fd5137 100644 --- a/src/chrome/content/rules/Identity-Stronghold.xml +++ b/src/chrome/content/rules/IDStronghold.com.xml @@ -1,4 +1,4 @@ - + From a1e928da505d2157aa203b0598c4af8e94478a16 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 12 Feb 2018 19:32:37 +0100 Subject: [PATCH 661/844] [CollegeInfoGeek.com] Remove mixedcontent platform (#14604) --- .../content/rules/collegeinfogeek.com.xml | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/chrome/content/rules/collegeinfogeek.com.xml b/src/chrome/content/rules/collegeinfogeek.com.xml index a333c6f79d3a..0e22e4b71759 100644 --- a/src/chrome/content/rules/collegeinfogeek.com.xml +++ b/src/chrome/content/rules/collegeinfogeek.com.xml @@ -1,33 +1,11 @@ - - + + + - - - - - - - + From 28087477257523c65d14bd5b4e1e79ad84056c08 Mon Sep 17 00:00:00 2001 From: modem_down Date: Tue, 13 Feb 2018 00:02:54 +0000 Subject: [PATCH 662/844] Bring docs into line with Markdown style guide (#14423) --- docs/README.md | 10 +- docs/en_US/development.md | 99 +++++++++--- docs/en_US/faq.md | 296 +++++++++++++++++++++++++++-------- docs/en_US/rulesets.md | 168 ++++++++++++++++---- docs/es/faq.md | 319 ++++++++++++++++++++++++++++++-------- 5 files changed, 710 insertions(+), 182 deletions(-) diff --git a/docs/README.md b/docs/README.md index 3a7d52816e87..129e8e6890a4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,7 +1,13 @@ # HTTPS Everywhere Documentation -The markdown files contained in this path provide documentation for contributing to HTTPS Everywhere. These files are also templates that can be used to generate the markup for HTTPS Everywhere pages under `https://www.eff.org/https-everywhere`. To do so, install the program `pandoc` and run +The markdown files contained in this path provide documentation for +contributing to HTTPS Everywhere. These files are also templates that can be +used to generate the markup for HTTPS Everywhere pages under +`https://www.eff.org/https-everywhere`. To do so, install the program `pandoc` +and run pandoc faq.md -Copy the output, excluding the header on the first line, to the source of the relevant page within the CMS. Note that some of the pages are dynamically generated and are not generated from templates contained here. +Copy the output, excluding the header on the first line, to the source of the +relevant page within the CMS. Note that some of the pages are dynamically +generated and are not generated from templates contained here. diff --git a/docs/en_US/development.md b/docs/en_US/development.md index 0c2cab0cdad0..d6e068582ee3 100644 --- a/docs/en_US/development.md +++ b/docs/en_US/development.md @@ -2,24 +2,59 @@ ### Pointers for developers -- **License:** GPL version 3+ (although most of the code is GPL-2 compatible) -- **Source code:** Available via Git with `git clone https://github.com/EFForg/https-everywhere.git`. You can fork and open pull requests using Github at [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). -- **Translations:** If you would like to help translate HTTPS Everywhere into another language, you can do that [through Transifex](https://www.transifex.com/otf/torproject/). -- **Bug tracker:** Use the [GitHub issue tracker](https://github.com/EFForg/https-everywhere/issues/) or the [Tor Project issue tracker](https://trac.torproject.org/projects/tor/report/19). For the Tor Project issue tracker, you can make an account or use the anonymous one — "cypherpunks"/"writecode". You won't see replies unless you put an email address in the CC field. Bugs that are caused by rulesets should be tagged "httpse-ruleset-bug", and can be viewed [in this report](https://trac.torproject.org/projects/tor/report/48). -- **Mailing lists:** The [https-everywhere](https://lists.eff.org/mailman/listinfo/https-everywhere) list ([archives](https://lists.eff.org/pipermail/https-everywhere/)) is for discussing the project as a whole; the [https-everywhere-rules](https://lists.eff.org/mailman/listinfo/https-everywhere-rules) mailing list ([archives](https://lists.eff.org/pipermail/https-everywhere-rules)) is for discussing the [rulesets](https://www.eff.org/https-everywhere/rulesets) and their contents, including patches and git pull requests. -- **IRC:** `#https-everywhere` on `irc.oftc.net`; if you don't have an IRC client application already installed, you can [use this webchat interface](https://webchat.oftc.net/?channels=#https-everywhere). If you ask a question, be sure to stay in the channel — someone may reply a few hours or a few days later. +* **License:** GPL version 3+ (although most of the code is GPL-2 compatible) +* **Source code:** Available via Git with `git clone + https://github.com/EFForg/https-everywhere.git`. You can fork and open pull + requests using Github at + [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). +* **Translations:** If you would like to help translate HTTPS Everywhere into + another language, you can do that [through + Transifex](https://www.transifex.com/otf/torproject/). +* **Bug tracker:** Use the [GitHub issue + tracker](https://github.com/EFForg/https-everywhere/issues/) or the [Tor + Project issue tracker](https://trac.torproject.org/projects/tor/report/19). + For the Tor Project issue tracker, you can make an account or use the + anonymous one — "cypherpunks"/"writecode". You won't see replies unless you + put an email address in the CC field. Bugs that are caused by rulesets + should be tagged "httpse-ruleset-bug", and can be viewed [in this + report](https://trac.torproject.org/projects/tor/report/48). +* **Mailing lists:** The + [https-everywhere](https://lists.eff.org/mailman/listinfo/https-everywhere) + list ([archives](https://lists.eff.org/pipermail/https-everywhere/)) is for + discussing the project as a whole; the + [https-everywhere-rules](https://lists.eff.org/mailman/listinfo/https-everywhere-rules) + mailing list + ([archives](https://lists.eff.org/pipermail/https-everywhere-rules)) is for + discussing the [rulesets](https://www.eff.org/https-everywhere/rulesets) + and their contents, including patches and git pull requests. +* **IRC:** `#https-everywhere` on `irc.oftc.net`; if you don't have an IRC + client application already installed, you can [use this webchat + interface](https://webchat.oftc.net/?channels=#https-everywhere). If you + ask a question, be sure to stay in the channel — someone may reply a few + hours or a few days later. ### Testing and contributing changes to the source code -HTTPS Everywhere consists of a large number of rules for switching sites from HTTP to HTTPS. You can read more about how to write these rules [here](https://www.eff.org/https-everywhere/rulesets). +HTTPS Everywhere consists of a large number of rules for switching sites from +HTTP to HTTPS. You can read more about how to write these rules +[here](https://www.eff.org/https-everywhere/rulesets). -If you want to create new rules to submit to us, we expect them to be in the src/chrome/content/rules directory. That directory also contains a useful script, make-trivial-rule, to create a simple rule for a specified domain. There is also a script called trivial-validate.py, to check all the pending rules for several common errors and oversights. For example, if you wanted to make a rule for the example.com domain, you could run +If you want to create new rules to submit to us, we expect them to be in the +src/chrome/content/rules directory. That directory also contains a useful +script, make-trivial-rule, to create a simple rule for a specified domain. +There is also a script called trivial-validate.py, to check all the pending +rules for several common errors and oversights. For example, if you wanted to +make a rule for the example.com domain, you could run bash ./make-trivial-rule example.com -inside the rules directory. This would create Example.com.xml, which you could then take a look at and edit based on your knowledge of any specific URLs at example.com that do or don't work in HTTPS. +inside the rules directory. This would create Example.com.xml, which you could +then take a look at and edit based on your knowledge of any specific URLs at +example.com that do or don't work in HTTPS. -Before submitting your change, you should test it in Firefox and/or Chrome, as applicable. You can build the latest version of the extension and run it in a standalone Firefox profile using: +Before submitting your change, you should test it in Firefox and/or Chrome, as +applicable. You can build the latest version of the extension and run it in a +standalone Firefox profile using: bash ./test.sh --justrun @@ -27,7 +62,9 @@ Similarly, to build and run in a standalone Chromium profile, run: bash ./run-chromium.sh -You should thoroughly test your changes on the target site: Navigate to as wide a variety of pages as you can find. Try to comment or log in if applicable. Make sure everything still works properly. +You should thoroughly test your changes on the target site: Navigate to as wide +a variety of pages as you can find. Try to comment or log in if applicable. +Make sure everything still works properly. After running your manual tests, run the automated tests and the fetch tests: @@ -35,16 +72,24 @@ After running your manual tests, run the automated tests and the fetch tests: bash ./fetch-test.sh -This will catch some of the most common types of errors, but is not a guaranteed of correctness. +This will catch some of the most common types of errors, but is not a +guaranteed of correctness. -Once you've tested your changes, you can submit them for review via any of the following: +Once you've tested your changes, you can submit them for review via any of the +following: -- Open a pull request at [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). -- Email https-everywhere-rules@eff.org to tell us about your changes. You can use the following command to create a patch file: `git format-patch` +* Open a pull request at + [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). +* Email https-everywhere-rules@eff.org to tell us about your changes. You can + use the following command to create a patch file: `git format-patch` ### A quick HOWTO on working with Git -You may want to also look at the [Git Reference](http://gitref.org/), [GitHub Help Site](https://help.github.com/) and the [Tor Project's Git documentation](https://gitweb.torproject.org/githax.git/tree/doc/Howto.txt) to fill in the gaps here, but the below should be enough to get the basics of the workflow down. +You may want to also look at the [Git Reference](http://gitref.org/), [GitHub +Help Site](https://help.github.com/) and the [Tor Project's Git +documentation](https://gitweb.torproject.org/githax.git/tree/doc/Howto.txt) to +fill in the gaps here, but the below should be enough to get the basics of the +workflow down. First, tell git your name: @@ -55,25 +100,35 @@ Then, get a copy of the 'origin' repository: git clone https://github.com/EFForg/https-everywhere.git cd https-everywhere -Alternatively, if you already have a Github account, you can create a "fork" of the repository on Github at [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). See [this page](https://help.github.com/articles/fork-a-repo) for a tutorial. +Alternatively, if you already have a Github account, you can create a "fork" of +the repository on Github at +[https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). +See [this page](https://help.github.com/articles/fork-a-repo) for a tutorial. -Once you have a local copy of the repository, create a new branch for your changes and check it out: +Once you have a local copy of the repository, create a new branch for your +changes and check it out: git checkout -b my-new-rules master -When you want to send us your work, you'll need to add any new files to the index with git add: +When you want to send us your work, you'll need to add any new files to the +index with git add: git add ./src/chrome/content/rules/MyRule1.xml git add ./src/chrome/content/rules/MyRule2.xml -You can now commit your changes to the local branch. To make things easier, you should commit each xml file individually: +You can now commit your changes to the local branch. To make things easier, you +should commit each xml file individually: git commit ./src/chrome/content/rules/MyRule1.xml git commit ./src/chrome/content/rules/MyRule2.xml -Now, you need a place to publish your changes. You can create a github account here: [https://github.com/join](https://help.github.com/). [https://help.github.com/](https://help.github.com/) describes the account creation process and some other github-specific things. +Now, you need a place to publish your changes. You can create a github account +here: [https://github.com/join](https://help.github.com/). +[https://help.github.com/](https://help.github.com/) describes the account +creation process and some other github-specific things. -Once you have created your account and added your remote in your local checkout, you want to push your branch to your github remote: +Once you have created your account and added your remote in your local +checkout, you want to push your branch to your github remote: git push github my-new-rules:my-new-rules diff --git a/docs/en_US/faq.md b/docs/en_US/faq.md index 3ca4656371d7..e9e993b1222b 100644 --- a/docs/en_US/faq.md +++ b/docs/en_US/faq.md @@ -1,91 +1,234 @@ ## HTTPS Everywhere FAQ -This page answers frequently-asked questions about EFF's [HTTPS Everywhere](https://www.eff.org/https-everywhere) project. If your question isn't answered below, you can try the resources [listed here](https://www.eff.org/https-everywhere/development). - -- [What if HTTPS Everywhere breaks some site that I use?](#what-if-https-everywhere-breaks-some-site-that-i-use) -- [Why is HTTPS Everywhere preventing me from joining this hotel/school/other wireless network?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) -- [Will there be a version of HTTPS Everywhere for IE, Safari, or some other browser?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -- [Why use a whitelist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) -- [How do I get rid of/move the HTTPS Everywhere button in the toolbar?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) -- [When does HTTPS Everywhere protect me? When does it not protect me?](#when-does-https-everywhere-protect-me-when-does-it-not-protect-me) -- [What does HTTPS Everywhere protect me against?](#what-does-https-everywhere-protect-me-against) -- [How do I get support for an additional site in HTTPS Everywhere?](#how-do-i-get-support-for-an-additional-site-in-https-everywhere) -- [What if the site doesn't support HTTPS, or only supports it for some activities, like entering credit card information?](#what-if-the-site-doesnt-support-https-or-only-supports-it-for-some-activities-like-entering-credit-card-information) -- [Isn't it more expensive or slower for a site to support HTTPS compared to regular HTTP?](#isnt-it-more-expensive-or-slower-for-a-site-to-support-https-compared-to-regular-http) -- [Why should I use HTTPS Everywhere instead of just typing https:// at the beginning of site names?](#why-should-i-use-https-everywhere-instead-of-just-typing-https-at-the-beginning-of-site-names) -- [Why does HTTPS Everywhere include rules for sites like PayPal that already require HTTPS on all their pages?](#why-does-https-everywhere-include-rules-for-sites-like-paypal-that-already-require-https-on-all-their-pages) -- [What do the different colors for rulesets in the Firefox toolbar menu mean?](#what-do-the-different-colors-for-rulesets-in-the-firefox-toolbar-menu-mean) -- [What do the different colors of the HTTPS Everywhere icon mean?](#what-do-the-different-colors-of-the-https-everywhere-icon-mean) -- [I'm having a problem installing the browser extension.](#im-having-a-problem-installing-the-browser-extension.) -- [How do I uninstall/remove HTTPS Everywhere?](#how-do-i-uninstallremove-https-everywhere) -- [How do I add my own site to HTTPS Everywhere?](#how-do-i-add-my-own-site-to-https-everywhere) -- [Can I help translate HTTPS Everywhere into my own language?](#can-i-help-translate-https-everywhere-into-my-own-language) +This page answers frequently-asked questions about EFF's [HTTPS +Everywhere](https://www.eff.org/https-everywhere) project. If your question +isn't answered below, you can try the resources [listed +here](https://www.eff.org/https-everywhere/development). + +* [What if HTTPS Everywhere breaks some site that I + use?](#what-if-https-everywhere-breaks-some-site-that-i-use) +* [Why is HTTPS Everywhere preventing me from joining this hotel/school/other + wireless + network?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) +* [Will there be a version of HTTPS Everywhere for IE, Safari, or some other + browser?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) +* [Why use a whitelist of sites that support HTTPS? Why can't you try to use + HTTPS for every last site, and only fall back to HTTP if it isn't + available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) +* [How do I get rid of/move the HTTPS Everywhere button in the + toolbar?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) +* [When does HTTPS Everywhere protect me? When does it not protect + me?](#when-does-https-everywhere-protect-me-when-does-it-not-protect-me) +* [What does HTTPS Everywhere protect me + against?](#what-does-https-everywhere-protect-me-against) +* [How do I get support for an additional site in HTTPS + Everywhere?](#how-do-i-get-support-for-an-additional-site-in-https-everywhere) +* [What if the site doesn't support HTTPS, or only supports it for some + activities, like entering credit card + information?](#what-if-the-site-doesnt-support-https-or-only-supports-it-for-some-activities-like-entering-credit-card-information) +* [Isn't it more expensive or slower for a site to support HTTPS compared to + regular + HTTP?](#isnt-it-more-expensive-or-slower-for-a-site-to-support-https-compared-to-regular-http) +* [Why should I use HTTPS Everywhere instead of just typing https:// at the + beginning of site + names?](#why-should-i-use-https-everywhere-instead-of-just-typing-https-at-the-beginning-of-site-names) +* [Why does HTTPS Everywhere include rules for sites like PayPal that already + require HTTPS on all their + pages?](#why-does-https-everywhere-include-rules-for-sites-like-paypal-that-already-require-https-on-all-their-pages) +* [What do the different colors for rulesets in the Firefox toolbar menu + mean?](#what-do-the-different-colors-for-rulesets-in-the-firefox-toolbar-menu-mean) +* [What do the different colors of the HTTPS Everywhere icon + mean?](#what-do-the-different-colors-of-the-https-everywhere-icon-mean) +* [I'm having a problem installing the browser + extension.](#im-having-a-problem-installing-the-browser-extension.) +* [How do I uninstall/remove HTTPS + Everywhere?](#how-do-i-uninstallremove-https-everywhere) +* [How do I add my own site to HTTPS + Everywhere?](#how-do-i-add-my-own-site-to-https-everywhere) +* [Can I help translate HTTPS Everywhere into my own + language?](#can-i-help-translate-https-everywhere-into-my-own-language) ### [What if HTTPS Everywhere breaks some site that I use?](#what-if-https-everywhere-breaks-some-site-that-i-use) -This is occasionally possible because of inconsistent support for HTTPS on sites (e.g., when a site seems to support HTTPS access but makes a few, unpredictable, parts of the site unavailable in HTTPS). If you [report the problem to us](https://github.com/EFForg/https-everywhere/issues), we can try to fix it. In the meantime, you can disable the rule affecting that particular site in your own copy of HTTPS Everywhere by clicking on the HTTPS Everywhere toolbar button and unchecking the rule for that site. +This is occasionally possible because of inconsistent support for HTTPS on +sites (e.g., when a site seems to support HTTPS access but makes a few, +unpredictable, parts of the site unavailable in HTTPS). If you [report the +problem to us](https://github.com/EFForg/https-everywhere/issues), we can try +to fix it. In the meantime, you can disable the rule affecting that particular +site in your own copy of HTTPS Everywhere by clicking on the HTTPS Everywhere +toolbar button and unchecking the rule for that site. -You can also report the problem to the site, since they have the power to fix it! +You can also report the problem to the site, since they have the power to fix +it! ### [Why is HTTPS Everywhere preventing me from joining this hotel/school/other wireless network?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) -Some wireless networks hijack your HTTP connections when you first join them, in order to demand authentication or simply to try to make you agree to terms of use. HTTPS pages are protected against this type of hijacking, which is as it should be. If you go to a website that isn't protected by HTTPS Everywhere or by HSTS (currently, example.com is one such site), that will allow your connection to be captured and redirected to the authentication or terms of use page. +Some wireless networks hijack your HTTP connections when you first join them, +in order to demand authentication or simply to try to make you agree to terms +of use. HTTPS pages are protected against this type of hijacking, which is as +it should be. If you go to a website that isn't protected by HTTPS Everywhere +or by HSTS (currently, example.com is one such site), that will allow your +connection to be captured and redirected to the authentication or terms of use +page. ### [Will there be a version of HTTPS Everywhere for IE, Safari, or some other browser?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -As of early 2012, the Safari extension API does not offer a way to perform secure rewriting of http requests to https. But if you happen to know a way to perform secure request rewriting in these browsers, feel free to let us know at https-everywhere at EFF.org (but note that modifying document.location or window.location in JavaScript is not secure). +As of early 2012, the Safari extension API does not offer a way to perform +secure rewriting of http requests to https. But if you happen to know a way to +perform secure request rewriting in these browsers, feel free to let us know at +https-everywhere at EFF.org (but note that modifying document.location or +window.location in JavaScript is not secure). ### [Why use a whitelist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) -There are several problems with the idea of trying to automatically detect HTTPS on every site. There is no guarantee that sites are going to give the same response via HTTPS that they give via HTTP. Also, it's not possible to test for HTTPS in real time without introducing security vulnerabilities (What should the extension do if the HTTPS connection attempt fails? Falling back to insecure HTTP isn't safe). And in some cases, HTTPS Everywhere has to perform quite complicated transformations on URIs — for example until recently the Wikipedia rule had to turn an address like `http://en.wikipedia.org/wiki/World_Wide_Web` into one like `https://secure.wikimedia.org/wikipedia/en/wiki/World_Wide_Web` because HTTPS was not available on Wikipedia's usual domains. +There are several problems with the idea of trying to automatically detect +HTTPS on every site. There is no guarantee that sites are going to give the +same response via HTTPS that they give via HTTP. Also, it's not possible to +test for HTTPS in real time without introducing security vulnerabilities (What +should the extension do if the HTTPS connection attempt fails? Falling back to +insecure HTTP isn't safe). And in some cases, HTTPS Everywhere has to perform +quite complicated transformations on URIs — for example until recently the +Wikipedia rule had to turn an address like +`http://en.wikipedia.org/wiki/World_Wide_Web` into one like +`https://secure.wikimedia.org/wikipedia/en/wiki/World_Wide_Web` because HTTPS +was not available on Wikipedia's usual domains. ### [How do I get rid of/move the HTTPS Everywhere button in the toolbar?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) -The HTTPS Everywhere button is useful because it allows you to see, and disable, a ruleset if it happens to be causing problems with a site. But if you'd rather disable it, go to View->Toolbars->Customize, and drag the button out of the toolbar into the Addons bar at the bottom of the page. Then you can hide the Addons bar. (In theory you should be able to drag it into the tray of available icons too, but that may trigger [this bug](https://trac.torproject.org/projects/tor/ticket/6276). +The HTTPS Everywhere button is useful because it allows you to see, and +disable, a ruleset if it happens to be causing problems with a site. But if +you'd rather disable it, go to View->Toolbars->Customize, and drag the button +out of the toolbar into the Addons bar at the bottom of the page. Then you can +hide the Addons bar. (In theory you should be able to drag it into the tray of +available icons too, but that may trigger [this +bug](https://trac.torproject.org/projects/tor/ticket/6276). ### [When does HTTPS Everywhere protect me? When does it not protect me?](#when-does-https-everywhere-protect-me-when-does-it-not-protect-me) -HTTPS Everywhere protects you only when you are using _encrypted portions of supported web sites_. On a supported site, it will automatically activate HTTPS encryption for all known supported parts of the site (for some sites, this might be only a portion of the entire site). For example, if your web mail provider does not support HTTPS at all, HTTPS Everywhere can't make your access to your web mail secure. Similarly, if a site allows HTTPS for text but not images, someone might be able to see which images your browser loads and guess what you're accessing. - -HTTPS Everywhere depends entirely on the security features of the individual web sites that you use; it _activates_ those security features, but it can't _create_ them if they don't already exist. If you use a site not supported by HTTPS Everywhere or a site that provides some information in an insecure way, HTTPS Everywhere can't provide additional protection for your use of that site. Please remember to check that a particular site's security is working to the level you expect before sending or receiving confidential information, including passwords. - -One way to determine what level of protection you're getting when using a particular site is to use a packet-sniffing tool like [Wireshark](https://www.wireshark.org/) to record your own communications with the site. The resulting view of your communications is about the same as what an eavesdropper on your wifi network or at your ISP would see. This way, you can determine whether some or all of your communications would be protected; however, it may be quite time-consuming to make sense of the Wireshark output with enough care to get a definitive answer. - -You can also turn on the "Block all HTTP requests" feature for added protection. Instead of loading insecure pages or images, HTTPS Everywhere will block them outright. +HTTPS Everywhere protects you only when you are using _encrypted portions of +supported web sites_. On a supported site, it will automatically activate HTTPS +encryption for all known supported parts of the site (for some sites, this +might be only a portion of the entire site). For example, if your web mail +provider does not support HTTPS at all, HTTPS Everywhere can't make your access +to your web mail secure. Similarly, if a site allows HTTPS for text but not +images, someone might be able to see which images your browser loads and guess +what you're accessing. + +HTTPS Everywhere depends entirely on the security features of the individual +web sites that you use; it _activates_ those security features, but it can't +_create_ them if they don't already exist. If you use a site not supported by +HTTPS Everywhere or a site that provides some information in an insecure way, +HTTPS Everywhere can't provide additional protection for your use of that site. +Please remember to check that a particular site's security is working to the +level you expect before sending or receiving confidential information, +including passwords. + +One way to determine what level of protection you're getting when using a +particular site is to use a packet-sniffing tool like +[Wireshark](https://www.wireshark.org/) to record your own communications with +the site. The resulting view of your communications is about the same as what +an eavesdropper on your wifi network or at your ISP would see. This way, you +can determine whether some or all of your communications would be protected; +however, it may be quite time-consuming to make sense of the Wireshark output +with enough care to get a definitive answer. + +You can also turn on the "Block all HTTP requests" feature for added +protection. Instead of loading insecure pages or images, HTTPS Everywhere will +block them outright. ### [What does HTTPS Everywhere protect me against?](#what-does-https-everywhere-protect-me-against) -On supported parts of supported sites, HTTPS Everywhere enables the sites' HTTPS protection which can protect you against eavesdropping and tampering with the contents of the site or with the information you send to the site. Ideally, this provides some protection against an attacker learning the content of the information flowing in each direction — for instance, the text of e-mail messages you send or receive through a webmail site, the products you browse or purchase on an e-commerce site, or the particular articles you read on a reference site. - -However, HTTPS Everywhere **does not conceal the identities of the sites you access**, the amount of time you spend using them, or the amount of information you upload or download from a particular site. For example, if you access `http://www.eff.org/issues/nsa-spying` and HTTPS Everywhere rewrites it to `https://www.eff.org/issues/nsa-spying`, an eavesdropper can still trivially recognize that you are accessing www.eff.org (but might not know which issue you are reading about). In general, the entire hostname part of the URL remains exposed to the eavesdropper because this must be sent repeatedly in unencrypted form while setting up the connection. Another way of saying this is that HTTPS was never designed to conceal the identity of the sites that you visit. - -Researchers have also shown that it may be possible for someone to figure out more about what you're doing on a site merely through careful observation of the amount of data you upload and download, or the timing patterns of your use of the site. A simple example is that if the site only has one page of a certain total size, anyone downloading exactly that much data from the site is probably accessing that page. - -If you want to protect yourself against monitoring of the sites you visit, consider using HTTPS Everywhere together with software like [Tor](https://www.torproject.org/). +On supported parts of supported sites, HTTPS Everywhere enables the sites' +HTTPS protection which can protect you against eavesdropping and tampering with +the contents of the site or with the information you send to the site. Ideally, +this provides some protection against an attacker learning the content of the +information flowing in each direction — for instance, the text of e-mail +messages you send or receive through a webmail site, the products you browse or +purchase on an e-commerce site, or the particular articles you read on a +reference site. + +However, HTTPS Everywhere **does not conceal the identities of the sites you +access**, the amount of time you spend using them, or the amount of information +you upload or download from a particular site. For example, if you access +`http://www.eff.org/issues/nsa-spying` and HTTPS Everywhere rewrites it to +`https://www.eff.org/issues/nsa-spying`, an eavesdropper can still trivially +recognize that you are accessing www.eff.org (but might not know which issue +you are reading about). In general, the entire hostname part of the URL remains +exposed to the eavesdropper because this must be sent repeatedly in unencrypted +form while setting up the connection. Another way of saying this is that HTTPS +was never designed to conceal the identity of the sites that you visit. + +Researchers have also shown that it may be possible for someone to figure out +more about what you're doing on a site merely through careful observation of +the amount of data you upload and download, or the timing patterns of your use +of the site. A simple example is that if the site only has one page of a +certain total size, anyone downloading exactly that much data from the site is +probably accessing that page. + +If you want to protect yourself against monitoring of the sites you visit, +consider using HTTPS Everywhere together with software like +[Tor](https://www.torproject.org/). ### [How do I get support for an additional site in HTTPS Everywhere?](#how-do-i-get-support-for-an-additional-site-in-https-everywhere) -You can learn [how to write rules](https://www.eff.org/https-everywhere/rulesets) that teach HTTPS Everywhere to support new sites. You can install these rules in your own browser or send them to us for possible inclusion in the official version. +You can learn [how to write +rules](https://www.eff.org/https-everywhere/rulesets) that teach HTTPS +Everywhere to support new sites. You can install these rules in your own +browser or send them to us for possible inclusion in the official version. ### [What if the site doesn't support HTTPS, or only supports it for some activities, like entering credit card information?](#what-if-the-site-doesnt-support-https-or-only-supports-it-for-some-activities-like-entering-credit-card-information) -You could try to contact the site and point out that using HTTPS for all site features is an increasingly common practice nowadays and protects users (and sites) against a variety of Internet attacks. For instance, it defends against the ability of other people on a wifi network to spy on your use of the site or even take over your account. You can also point out that credit card numbers aren't the only information you consider private or sensitive. +You could try to contact the site and point out that using HTTPS for all site +features is an increasingly common practice nowadays and protects users (and +sites) against a variety of Internet attacks. For instance, it defends against +the ability of other people on a wifi network to spy on your use of the site or +even take over your account. You can also point out that credit card numbers +aren't the only information you consider private or sensitive. -Sites like Google, Twitter, and Facebook now support HTTPS for non-financial information — for general privacy and security reasons. +Sites like Google, Twitter, and Facebook now support HTTPS for non-financial +information — for general privacy and security reasons. ### [Isn't it more expensive or slower for a site to support HTTPS compared to regular HTTP?](#isnt-it-more-expensive-or-slower-for-a-site-to-support-https-compared-to-regular-http) -It can be, but some sites have been pleasantly surprised to see how practical it can be. Also, experts at Google are currently implementing several enhancements to the TLS protocol that make HTTPS dramatically faster; if these enhancements are added to the standard soon, the speed gap between the two should almost disappear. See [Adam Langley's description of the HTTPS deployment situation](https://www.imperialviolet.org/2010/06/25/overclocking-ssl.html) for more details on these issues. Notably, Langley states: "In order to [enable HTTPS by default for Gmail] we had to deploy no additional machines and no special hardware. On our production frontend machines, SSL/TLS accounts for less than 1% of the CPU load, less than 10KB of memory per connection and less than 2% of network overhead." - -It used to be expensive to purchase a certificate for HTTPS usage, but they can now be obtained for free from [Let's Encrypt](https://letsencrypt.org/) as well. +It can be, but some sites have been pleasantly surprised to see how practical +it can be. Also, experts at Google are currently implementing several +enhancements to the TLS protocol that make HTTPS dramatically faster; if these +enhancements are added to the standard soon, the speed gap between the two +should almost disappear. See [Adam Langley's description of the HTTPS +deployment +situation](https://www.imperialviolet.org/2010/06/25/overclocking-ssl.html) for +more details on these issues. Notably, Langley states: "In order to [enable +HTTPS by default for Gmail] we had to deploy no additional machines and no +special hardware. On our production frontend machines, SSL/TLS accounts for +less than 1% of the CPU load, less than 10KB of memory per connection and less +than 2% of network overhead." + +It used to be expensive to purchase a certificate for HTTPS usage, but they can +now be obtained for free from [Let's Encrypt](https://letsencrypt.org/) as +well. ### [Why should I use HTTPS Everywhere instead of just typing https:// at the beginning of site names?](#why-should-i-use-https-everywhere-instead-of-just-typing-https-at-the-beginning-of-site-names) -Even if you normally type https://, HTTPS Everywhere might protect you if you occasionally forget. Also, it can rewrite other people's links that you follow. For instance, if you click on a link to `http://en.wikipedia.org/wiki/EFF_Pioneer_Award`, HTTPS Everywhere will automatically rewrite the link to `https://en.wikimedia.org/wikipedia/en/wiki/EFF_Pioneer_Award`. Thus, you might get some protection even if you wouldn't have noticed that the target site is available in HTTPS. +Even if you normally type https://, HTTPS Everywhere might protect you if you +occasionally forget. Also, it can rewrite other people's links that you follow. +For instance, if you click on a link to +`http://en.wikipedia.org/wiki/EFF_Pioneer_Award`, HTTPS Everywhere will +automatically rewrite the link to +`https://en.wikimedia.org/wikipedia/en/wiki/EFF_Pioneer_Award`. Thus, you might +get some protection even if you wouldn't have noticed that the target site is +available in HTTPS. ### [Why does HTTPS Everywhere include rules for sites like PayPal that already require HTTPS on all their pages?](#why-does-https-everywhere-include-rules-for-sites-like-paypal-that-already-require-https-on-all-their-pages) -HTTPS Everywhere, like the [HSTS spec](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security), tries to address an attack called [SSL stripping](https://moxie.org/software/sslstrip/). Users are only protected against the SSL stripping attack if their browsers don't even _try_ to connect to the HTTP version of the site — even if the site would have redirected them to the HTTPS version. With HTTPS Everywhere, the browser won't even attempt the insecure HTTP connection, even if that's what you ask it to do. (Note that HTTPS Everywhere currently does not include a comprehensive list of such sites, which are mainly financial institutions.) +HTTPS Everywhere, like the [HSTS +spec](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security), tries to +address an attack called [SSL stripping](https://moxie.org/software/sslstrip/). +Users are only protected against the SSL stripping attack if their browsers +don't even _try_ to connect to the HTTP version of the site — even if the site +would have redirected them to the HTTPS version. With HTTPS Everywhere, the +browser won't even attempt the insecure HTTP connection, even if that's what +you ask it to do. (Note that HTTPS Everywhere currently does not include a +comprehensive list of such sites, which are mainly financial institutions.) ### [What do the different colors for rulesets in the Firefox toolbar menu mean?](#what-do-the-different-colors-for-rulesets-in-the-firefox-toolbar-menu-mean) @@ -93,9 +236,12 @@ The colors are: Dark Green: ruleset was active in loading the resources in the current page. -Light Green: ruleset was ready to prevent HTTP loads in the current page, but everything that the ruleset would have covered was loaded over HTTPS anyway (in the code, light green is called a "moot rule"). +Light Green: ruleset was ready to prevent HTTP loads in the current page, but +everything that the ruleset would have covered was loaded over HTTPS anyway (in +the code, light green is called a "moot rule"). -Dark Brown or Clockwise Red Arrow: broken rule -- the ruleset is active but the server is redirecting at least some URLs back from HTTPS to HTTP. +Dark Brown or Clockwise Red Arrow: broken rule -- the ruleset is active but the +server is redirecting at least some URLs back from HTTPS to HTTP. Gray: the ruleset is disabled. @@ -105,7 +251,8 @@ The colors are: Light Blue: HTTPS Everywhere is enabled. -Dark Blue: HTTPS Everywhere is both enabled and active in loading resources in the current page. +Dark Blue: HTTPS Everywhere is both enabled and active in loading resources in +the current page. Red: All unencrypted requests will be blocked by HTTPS Everywhere. @@ -113,24 +260,49 @@ Gray: HTTPS Everywhere is disabled. ### [I'm having a problem installing the browser extension.](#im-having-a-problem-installing-the-browser-extension.) -Some people report that installing HTTPS Everywhere gives them the error: "The addon could not be downloaded because of a connection failure on www.eff.org." This may be caused by Avast anti-virus, which blocks installation of browser extensions. You may be able to [install from addons.mozilla.org instead](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/). +Some people report that installing HTTPS Everywhere gives them the error: "The +addon could not be downloaded because of a connection failure on www.eff.org." +This may be caused by Avast anti-virus, which blocks installation of browser +extensions. You may be able to [install from addons.mozilla.org +instead](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/). ### [How do I uninstall/remove HTTPS Everywhere?](#how-do-i-uninstallremove-https-everywhere) -In Firefox: Click the menu button in the top right of the window at the end of the toolbar (it looks like three horizontal lines), and then click "Add-ons" (it looks like a puzzle piece). Scroll until you see HTTPS Everywhere, and then click the "Remove" button all the way on the right. You can then safely close the Add-ons tab. +In Firefox: Click the menu button in the top right of the window at the end of +the toolbar (it looks like three horizontal lines), and then click "Add-ons" +(it looks like a puzzle piece). Scroll until you see HTTPS Everywhere, and then +click the "Remove" button all the way on the right. You can then safely close +the Add-ons tab. -In Chrome: Click the menu button in the top right of the window at the end of the toolbar (it looks like three horizontal lines), and then click "Settings" near the bottom. On the left, click "Extensions". Scroll until you see HTTPS Everywhere, and then click the trash can icon on the right, and then click "Remove" to confirm removal. You can then safely close the Settings tab. +In Chrome: Click the menu button in the top right of the window at the end of +the toolbar (it looks like three horizontal lines), and then click "Settings" +near the bottom. On the left, click "Extensions". Scroll until you see HTTPS +Everywhere, and then click the trash can icon on the right, and then click +"Remove" to confirm removal. You can then safely close the Settings tab. ### [How do I add my own site to HTTPS Everywhere?](#how-do-i-add-my-own-site-to-https-everywhere) -We're excited that you want your site in HTTPS Everywhere! However, remember that not everyone who visits your site has our extension installed. If you run a web site, you can make it default to HTTPS for everyone, not just HTTPS Everywhere users. And it's less work! The steps you should take, in order, are: - -1. Set up a [redirect](https://www.sslshopper.com/apache-redirect-http-to-https.html) from HTTP to HTTPS on your site. -2. [Add the Strict-Transport-Security (HSTS) header on your site.](https://raymii.org/s/tutorials/HTTP_Strict_Transport_Security_for_Apache_NGINX_and_Lighttpd.html) -3. [Add your site to the HSTS Preload list.](https://hstspreload.appspot.com/) - -These steps will give your site much better protection than adding it to HTTPS Everywhere. Generally speaking, once you are done, there is no need to add your site to HTTPS Everywhere. However, if you would still like to, please follow the [instructions on writing rulesets](https://eff.org/https-everywhere/rulesets), and indicate that you are the author of the web site when you submit your pull request. +We're excited that you want your site in HTTPS Everywhere! However, remember +that not everyone who visits your site has our extension installed. If you run +a web site, you can make it default to HTTPS for everyone, not just HTTPS +Everywhere users. And it's less work! The steps you should take, in order, are: + +1. Set up a + [redirect](https://www.sslshopper.com/apache-redirect-http-to-https.html) + from HTTP to HTTPS on your site. +2. [Add the Strict-Transport-Security (HSTS) header on your + site.](https://raymii.org/s/tutorials/HTTP_Strict_Transport_Security_for_Apache_NGINX_and_Lighttpd.html) +3. [Add your site to the HSTS Preload list.](https://hstspreload.appspot.com/) + +These steps will give your site much better protection than adding it to HTTPS +Everywhere. Generally speaking, once you are done, there is no need to add your +site to HTTPS Everywhere. However, if you would still like to, please follow +the [instructions on writing +rulesets](https://eff.org/https-everywhere/rulesets), and indicate that you are +the author of the web site when you submit your pull request. ### [Can I help translate HTTPS Everywhere into my own language? ](#can-i-help-translate-https-everywhere-into-my-own-language) -Yes! We use the Tor Project's Transifex account for translations, please sign up to help translate at [https://www.transifex.com/otf/torproject](https://www.transifex.com/otf/torproject). +Yes! We use the Tor Project's Transifex account for translations, please sign +up to help translate at +[https://www.transifex.com/otf/torproject](https://www.transifex.com/otf/torproject). diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md index 4578299ac236..cf607772cf8a 100644 --- a/docs/en_US/rulesets.md +++ b/docs/en_US/rulesets.md @@ -1,10 +1,20 @@ ## HTTPS Everywhere Rulesets -This page describes how to write rulesets for [HTTPS Everywhere](https://eff.org/https-everywhere), a browser extension that switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that tell HTTPS Everywhere which sites it should switch to HTTPS and how. If there is a site that offers HTTPS and is not handled by the extension, this guide will explain how to add that site. +This page describes how to write rulesets for [HTTPS +Everywhere](https://eff.org/https-everywhere), a browser extension that +switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes +with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that +tell HTTPS Everywhere which sites it should switch to HTTPS and how. If there +is a site that offers HTTPS and is not handled by the extension, this guide +will explain how to add that site. #### [Rulesets](#rulesets) -A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file describing behavior for a site or group of sites. A ruleset contains one or more `rules`. For example, here is [`RabbitMQ.xml`](https://github.com/efforg/https-everywhere/blob/master/src/chrome/content/rules/RabbitMQ.xml), from the addon distribution: +A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file +describing behavior for a site or group of sites. A ruleset contains one or +more `rules`. For example, here is +[`RabbitMQ.xml`](https://github.com/efforg/https-everywhere/blob/master/src/chrome/content/rules/RabbitMQ.xml), +from the addon distribution: ```xml @@ -16,19 +26,41 @@ A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file ``` -The `target` tag specifies which web sites the ruleset applies to. The `rule` tag specifies how URLs on those web sites should be rewritten. This rule says that any URLs on `rabbitmq.com` and `www.rabbitmq.com` should be modified by replacing "http:" with "https:". +The `target` tag specifies which web sites the ruleset applies to. The `rule` +tag specifies how URLs on those web sites should be rewritten. This rule says +that any URLs on `rabbitmq.com` and `www.rabbitmq.com` should be modified by +replacing "http:" with "https:". -When the browser loads a URL, HTTPS Everywhere takes the host name (e.g. www.rabbitmq.com) and searches its ruleset database for rulesets that match that host name. +When the browser loads a URL, HTTPS Everywhere takes the host name (e.g. +www.rabbitmq.com) and searches its ruleset database for rulesets that +match that host name. -HTTPS Everywhere then tries each rule in those rulesets against the full URL. If the [Regular Expression](http://www.regular-expressions.info/quickstart.html), or regexp, in one of those rules matches, HTTPS Everywhere [rewrites the URL](#rules-and-regular-expressions) according the `to` attribute of the rule. +HTTPS Everywhere then tries each rule in those rulesets against the full URL. +If the [Regular +Expression](http://www.regular-expressions.info/quickstart.html), or regexp, in +one of those rules matches, HTTPS Everywhere [rewrites the +URL](#rules-and-regular-expressions) according the `to` attribute of the rule. #### [Wildcard Targets](#wildcard-targets) -To cover all of a domain's subdomains, you may want to specify a wildcard target like `*.twitter.com`. Specifying this type of left-side wildcard matches any host name with `.twitter.com` as a suffix, e.g. `www.twitter.com` or `urls.api.twitter.com`. You can also specify a right-side wildcard like `www.google.*`. Right-side wildcards, unlike left-side wildcards, apply only one level deep. So if you want to cover all countries you'll generally need to specify `www.google.*`, `www.google.co.*`, and `www.google.com.*` to cover domains like `www.google.co.uk` or `www.google.com.au`. You should use wildcard targets only when you have rules that apply to the entire wildcard space. If your rules only apply to specific hosts, you should list each host as a separate target. +To cover all of a domain's subdomains, you may want to specify a wildcard +target like `*.twitter.com`. Specifying this type of left-side wildcard matches +any host name with `.twitter.com` as a suffix, e.g. `www.twitter.com` or +`urls.api.twitter.com`. You can also specify a right-side wildcard like +`www.google.*`. Right-side wildcards, unlike left-side wildcards, apply only +one level deep. So if you want to cover all countries you'll generally need to +specify `www.google.*`, `www.google.co.*`, and `www.google.com.*` to cover +domains like `www.google.co.uk` or `www.google.com.au`. You should use wildcard +targets only when you have rules that apply to the entire wildcard space. If +your rules only apply to specific hosts, you should list each host as a +separate target. #### [Rules and Regular Expressions](#rules-and-regular-expressions) -The `rule` tags do the actual rewriting work. The `from` attribute of each rule is a [regular expression](http://www.regular-expressions.info/quickstart.html) matched against a full URL. You can use rules to rewrite URLs in simple or complicated ways. Here's a simplified (and now obsolete) example for Wikipedia: +The `rule` tags do the actual rewriting work. The `from` attribute of each rule +is a [regular expression](http://www.regular-expressions.info/quickstart.html) +matched against a full URL. You can use rules to rewrite URLs in simple or +complicated ways. Here's a simplified (and now obsolete) example for Wikipedia: ```xml @@ -39,58 +71,121 @@ The `rule` tags do the actual rewriting work. The `from` attribute of each rule ``` -The `to` attribute replaces the text matched by the `from` attribute. It can contain placeholders like `$1` that are replaced with the text matched inside the parentheses. +The `to` attribute replaces the text matched by the `from` attribute. It can +contain placeholders like `$1` that are replaced with the text matched inside +the parentheses. -This rule rewrites a URL like `http://fr.wikipedia.org/wiki/Chose` to `https://secure.wikimedia.org/wikipedia/fr/wiki/Chose`. Notice, again, that the target is allowed to contain (just one) * as a wildcard meaning "any". +This rule rewrites a URL like `http://fr.wikipedia.org/wiki/Chose` to +`https://secure.wikimedia.org/wikipedia/fr/wiki/Chose`. Notice, again, that the +target is allowed to contain (just one) * as a wildcard meaning "any". -Rules are applied in the order they are listed within each ruleset. Order between rulesets is unspecified. Only the first rule or exception matching a given URL is applied. +Rules are applied in the order they are listed within each ruleset. Order +between rulesets is unspecified. Only the first rule or exception matching a +given URL is applied. -Rules are evaluated using [Javascript regular expressions](http://www.regular-expressions.info/javascript.html), which are similar but not identical to [Perl-style regular expressions.](http://www.regular-expressions.info/pcre.html) Note that if your rules include ampersands (&), they need to be appropriately XML-encoded: replace each occurrence of **&** with **&#x26;**. +Rules are evaluated using [Javascript regular +expressions](http://www.regular-expressions.info/javascript.html), which are +similar but not identical to [Perl-style regular +expressions.](http://www.regular-expressions.info/pcre.html) Note that if your +rules include ampersands (&), they need to be appropriately XML-encoded: +replace each occurrence of **&** with **&#x26;**. #### [Exclusions](#exclusions) -An exclusion specifies a pattern, using a regular expression, for URLs where the rule should **not** be applied. The Stack Exchange rule contains an exclusion for the OpenID login path, which breaks logins if it is rewritten: +An exclusion specifies a pattern, using a regular expression, for URLs where +the rule should **not** be applied. The Stack Exchange rule contains an +exclusion for the OpenID login path, which breaks logins if it is rewritten: ```xml ``` -Exclusions are always evaluated before rules in a given ruleset. Matching any exclusion means that a URL won't match any rules within the same ruleset. However, if other rulesets match the same target hosts, the rules in those rulesets will still be tried. +Exclusions are always evaluated before rules in a given ruleset. Matching any +exclusion means that a URL won't match any rules within the same ruleset. +However, if other rulesets match the same target hosts, the rules in those +rulesets will still be tried. #### [Style Guide](#style-guide) -There are many different ways you can write a ruleset, or regular expression within the ruleset. It's easier for everyone to understand the rulesets if they follow similar practices. You should read and follow the [Ruleset style guide](https://github.com/EFForg/https-everywhere/blob/master/CONTRIBUTING.md#ruleset-style-guide). Some of the guidelines in that document are intended to make [Ruleset testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) less cumbersome. +There are many different ways you can write a ruleset, or regular expression +within the ruleset. It's easier for everyone to understand the rulesets if they +follow similar practices. You should read and follow the [Ruleset style +guide](https://github.com/EFForg/https-everywhere/blob/master/CONTRIBUTING.md#ruleset-style-guide). +Some of the guidelines in that document are intended to make [Ruleset +testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) +less cumbersome. #### [Secure Cookies](#secure-cookies) -Many HTTPS websites fail to correctly set the [secure flag](https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_cookie#Secure_and_HttpOnly) on authentication and/or tracking cookies. HTTPS Everywhere provides a facility for turning this flag on. For instance: +Many HTTPS websites fail to correctly set the [secure +flag](https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_cookie#Secure_and_HttpOnly) +on authentication and/or tracking cookies. HTTPS Everywhere provides a facility +for turning this flag on. For instance: ```xml ``` -The "host" parameter is a regexp specifying which domains should have their cookies secured; the "name" parameter is a regexp specifying which cookies should be secured. For a cookie to be secured, it must be sent by a target host for that ruleset. It must also be sent over HTTPS and match the name regexp. For cookies set by Javascript in a web page, the Firefox extension can't tell which host set the cookie and instead uses the domain attribute of the cookie to check against target hosts. A cookie whose domain attribute starts with a "." (the default, if not specified by Javascript) will be matched as if it was sent from a host name made by stripping the leading dot. +The "host" parameter is a regexp specifying which domains should have their +cookies secured; the "name" parameter is a regexp specifying which cookies +should be secured. For a cookie to be secured, it must be sent by a target host +for that ruleset. It must also be sent over HTTPS and match the name regexp. +For cookies set by Javascript in a web page, the Firefox extension can't tell +which host set the cookie and instead uses the domain attribute of the cookie +to check against target hosts. A cookie whose domain attribute starts with a +"." (the default, if not specified by Javascript) will be matched as if it was +sent from a host name made by stripping the leading dot. #### [Testing](#testing) -We use an [automated checker](https://github.com/hiviah/https-everywhere-checker) to run some basic tests on all rulesets. This is described in more detail in our [Ruleset Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) document, but in short there are two parts: Your ruleset must have enough test URLs to cover all the various types of URL covered by your rules. And each of those test URLs must load, both before rewriting and after rewriting. Every target host tag generates an implicit test URL unless it contains a wildcard. You can add additional test URLs manually using the `` tag. The test URLs you add this way should be real pages loaded from the site, or real images, CSS, and Javascript if you have rules that specifically affect those resources. - -You can test rulesets in the browser using a hidden debugging page, but please be aware that this approach should only be used for debugging purposes and should not be used for setting up personal custom rules. You can access the hidden debugging page this way: - -* Firefox: `about:addons` > HTTPS Everywhere preferences > click under `General Settings` > press Ctrl-Z -* Chromium/Chrome: `chrome://extensions/` > HTTPS Everywhere options > click under `General Settings` > press Ctrl-Z - -You might need to disable popup blocking for the page to appear. Once you have loaded the page, you might find it convenient to bookmark it for later use. - -If you've tested your rule and are sure it would be of use to the world at large, submit it as a [pull request](https://help.github.com/articles/using-pull-requests/) on our [GitHub repository](https://github.com/EFForg/https-everywhere/) or send it to the rulesets mailing list at `https-everywhere-rules AT eff.org`. Please be aware that this is a public and publicly-archived mailing list. +We use an [automated +checker](https://github.com/hiviah/https-everywhere-checker) to run some basic +tests on all rulesets. This is described in more detail in our [Ruleset +Testing](https://github.com/EFForg/https-everywhere/blob/master/ruleset-testing.md) +document, but in short there are two parts: Your ruleset must have enough test +URLs to cover all the various types of URL covered by your rules. And each of +those test URLs must load, both before rewriting and after rewriting. Every +target host tag generates an implicit test URL unless it contains a wildcard. +You can add additional test URLs manually using the `` tag. +The test URLs you add this way should be real pages loaded from the site, or +real images, CSS, and Javascript if you have rules that specifically affect +those resources. + +You can test rulesets in the browser using a hidden debugging page, but please +be aware that this approach should only be used for debugging purposes and +should not be used for setting up personal custom rules. You can access the +hidden debugging page this way: + +* Firefox: `about:addons` > HTTPS Everywhere preferences > click under + `General Settings` > press Ctrl-Z +* Chromium/Chrome: `chrome://extensions/` > HTTPS Everywhere options > click + under `General Settings` > press Ctrl-Z + +You might need to disable popup blocking for the page to appear. Once you have +loaded the page, you might find it convenient to bookmark it for later use. + +If you've tested your rule and are sure it would be of use to the world at +large, submit it as a [pull +request](https://help.github.com/articles/using-pull-requests/) on our [GitHub +repository](https://github.com/EFForg/https-everywhere/) or send it to the +rulesets mailing list at `https-everywhere-rules AT eff.org`. Please be aware +that this is a public and publicly-archived mailing list. #### [make-trivial-rule](#make-trivial-rule) -As an alternative to writing rules by hand, there are scripts you can run from a Unix command line to automate the process of creating a simple rule for a specified domain. These scripts are not included with HTTPS Everywhere releases but are available in our development repository and are described in [our development documentation](https://www.eff.org/https-everywhere/development). +As an alternative to writing rules by hand, there are scripts you can run from +a Unix command line to automate the process of creating a simple rule for a +specified domain. These scripts are not included with HTTPS Everywhere releases +but are available in our development repository and are described in [our +development documentation](https://www.eff.org/https-everywhere/development). #### [Disabling a ruleset by default](#disabling-a-ruleset-by-default) -Sometimes rulesets are useful or interesting, but cause problems that make them unsuitable for being enabled by default in everyone's browsers. Typically when a ruleset has problems we will disable it by default until someone has time to fix it. You can do this by adding a `default_off` attribute to the ruleset element, with a value explaining why the rule is off. +Sometimes rulesets are useful or interesting, but cause problems that make them +unsuitable for being enabled by default in everyone's browsers. Typically when +a ruleset has problems we will disable it by default until someone has time to +fix it. You can do this by adding a `default_off` attribute to the ruleset +element, with a value explaining why the rule is off. ```xml @@ -99,10 +194,19 @@ Sometimes rulesets are useful or interesting, but cause problems that make them ``` -You can add more details, like a link to a bug report, in the comments for the file. +You can add more details, like a link to a bug report, in the comments for the +file. #### [Mixed Content Blocking (MCB)](#mixed-content-blocking-mcb) -Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP instead of HTTPS). This type of mixed content is blocked in both [Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox, before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version. This generally breaks the site. However, the Tor Browser doesn't block mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs to an HTTPS version. - -To enable a rule only on platforms that allow mixed content (currently only the Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset element. +Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP +instead of HTTPS). This type of mixed content is blocked in both +[Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox, +before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version. +This generally breaks the site. However, the Tor Browser doesn't block +mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs +to an HTTPS version. + +To enable a rule only on platforms that allow mixed content (currently only the +Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset +element. diff --git a/docs/es/faq.md b/docs/es/faq.md index e704754396c9..c3074a1dd629 100644 --- a/docs/es/faq.md +++ b/docs/es/faq.md @@ -1,101 +1,261 @@ ## Preguntas Frecuentes sobre "HTTPS Everywhere" -Esta página responde a las preguntas más frecuentes sobre el proyecto de la EFF [HTTPS Everywhere](https://www.eff.org/https-everywhere) "HTTPS en todos lados". Si no encuentra la respuesta a su pregunta, puede intentar con los recursos [enumerados aquí](https://www.eff.org/https-everywhere/development). - -- [¿Qué pasa si HTTPS Everywhere rompe algún sitio que uso?](#what-if-https-everywhere-breaks-some-site-that-i-use) -- [¿Por qué HTTPS Everywhere me impide unirme a la red del hotel/escuela u otra red inalámbrica?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) -- [¿Habrá una versión de HTTPS Everywhere para IE, Safari o algún otro navegador?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -- [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) -- [¿Cómo puedo eliminar o mover el botón HTTPS Everywhere de la barra de herramientas?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) -- [¿Cuándo me protege HTTPS Everywhere? ¿Cuándo no me protege?](#when-does-https-everywhere-protect-me-when-does-it-not-protect-me) -- [¿De qué me protege HTTPS Everywhere?](#what-does-https-everywhere-protect-me-against) -- [¿Cómo obtengo soporte para un sitio adicional en HTTPS Everywhere?](#how-do-i-get-support-for-an-additional-site-in-https-everywhere) -- [¿Qué pasa si el sitio no admite HTTPS, o si sólo lo admite para algunas actividades, como introducir información de la tarjeta de crédito?](#what-if-the-site-doesnt-support-https-or-only-supports-it-for-some-activities-like-entering-credit-card-information) -- [¿No es más caro o lento para un sitio usar HTTPS en comparación con HTTP normal?](#isnt-it-more-expensive-or-slower-for-a-site-to-support-https-compared-to-regular-http) -- [¿Por qué debría usar HTTPS Everywhere en lugar de simplemente teclear https:// al principio del nombre de un sitio?](#why-should-i-use-https-everywhere-instead-of-just-typing-https-at-the-beginning-of-site-names) -- [¿Por qué HTTPS Everywhere incluye reglas para sitios como PayPal que ya requieren HTTPS en todas sus páginas?](#why-does-https-everywhere-include-rules-for-sites-like-paypal-that-already-require-https-on-all-their-pages) -- [¿Qué significan los diferentes colores de las reglas en el menú de la barra de herramientas en Firefox?](#what-do-the-different-colors-for-rulesets-in-the-firefox-toolbar-menu-mean) -- [¿Qué significan los diferentes colores del icono de HTTPS Everywhere?](#what-do-the-different-colors-of-the-https-everywhere-icon-mean) -- [Tengo un problema al instalar la extensión del navegador.](#im-having-a-problem-installing-the-browser-extension.) -- [¿Cómo desinstalo/elimino HTTPS Everywhere?](#how-do-i-uninstallremove-https-everywhere) -- [¿Cómo agrego mi propio sitio a HTTPS Everywhere?](#how-do-i-add-my-own-site-to-https-everywhere) -- [¿Puedo ayudar a traducir HTTPS Everywhere a mi propio idioma?](#can-i-help-translate-https-everywhere-into-my-own-language) +Esta página responde a las preguntas más frecuentes sobre el proyecto de la EFF +[HTTPS Everywhere](https://www.eff.org/https-everywhere) "HTTPS en todos +lados". Si no encuentra la respuesta a su pregunta, puede intentar con los +recursos [enumerados aquí](https://www.eff.org/https-everywhere/development). + +* [¿Qué pasa si HTTPS Everywhere rompe algún sitio que + uso?](#what-if-https-everywhere-breaks-some-site-that-i-use) +* [¿Por qué HTTPS Everywhere me impide unirme a la red del hotel/escuela u + otra red + inalámbrica?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) +* [¿Habrá una versión de HTTPS Everywhere para IE, Safari o algún otro + navegador?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) +* [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué + no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si + no está + disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) +* [¿Cómo puedo eliminar o mover el botón HTTPS Everywhere de la barra de + herramientas?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) +* [¿Cuándo me protege HTTPS Everywhere? ¿Cuándo no me + protege?](#when-does-https-everywhere-protect-me-when-does-it-not-protect-me) +* [¿De qué me protege HTTPS + Everywhere?](#what-does-https-everywhere-protect-me-against) +* [¿Cómo obtengo soporte para un sitio adicional en HTTPS + Everywhere?](#how-do-i-get-support-for-an-additional-site-in-https-everywhere) +* [¿Qué pasa si el sitio no admite HTTPS, o si sólo lo admite para algunas + actividades, como introducir información de la tarjeta de + crédito?](#what-if-the-site-doesnt-support-https-or-only-supports-it-for-some-activities-like-entering-credit-card-information) +* [¿No es más caro o lento para un sitio usar HTTPS en comparación con HTTP + normal?](#isnt-it-more-expensive-or-slower-for-a-site-to-support-https-compared-to-regular-http) +* [¿Por qué debría usar HTTPS Everywhere en lugar de simplemente teclear + https:// al principio del nombre de un + sitio?](#why-should-i-use-https-everywhere-instead-of-just-typing-https-at-the-beginning-of-site-names) +* [¿Por qué HTTPS Everywhere incluye reglas para sitios como PayPal que ya + requieren HTTPS en todas sus + páginas?](#why-does-https-everywhere-include-rules-for-sites-like-paypal-that-already-require-https-on-all-their-pages) +* [¿Qué significan los diferentes colores de las reglas en el menú de la + barra de herramientas en + Firefox?](#what-do-the-different-colors-for-rulesets-in-the-firefox-toolbar-menu-mean) +* [¿Qué significan los diferentes colores del icono de HTTPS + Everywhere?](#what-do-the-different-colors-of-the-https-everywhere-icon-mean) +* [Tengo un problema al instalar la extensión del + navegador.](#im-having-a-problem-installing-the-browser-extension.) +* [¿Cómo desinstalo/elimino HTTPS + Everywhere?](#how-do-i-uninstallremove-https-everywhere) +* [¿Cómo agrego mi propio sitio a HTTPS + Everywhere?](#how-do-i-add-my-own-site-to-https-everywhere) +* [¿Puedo ayudar a traducir HTTPS Everywhere a mi propio + idioma?](#can-i-help-translate-https-everywhere-into-my-own-language) ### [¿Qué pasa si HTTPS Everywhere rompe algún sitio que uso?](#what-if-https-everywhere-breaks-some-site-that-i-use) -Esto es ocasionalmente posible debido al soporte inconsistente de HTTPS en sitios (por ejemplo, cuando un sitio parece soportar HTTPS pero hace algunas partes del sitio, imprededicibles, indisponibles por medio de HTTPS). Si nos [informa del problema](https://github.com/EFForg/https-everywhere/issues), podemos intentar solucionarlo. Mientras tanto, puede desactivar la regla que afecta a ese sitio en particular en su propia copia de HTTPS Everywhere haciendo clic en el botón de la barra de herramientas HTTPS Everywhere y desmarcando la regla para ese sitio. +Esto es ocasionalmente posible debido al soporte inconsistente de HTTPS en +sitios (por ejemplo, cuando un sitio parece soportar HTTPS pero hace algunas +partes del sitio, imprededicibles, indisponibles por medio de HTTPS). Si nos +[informa del problema](https://github.com/EFForg/https-everywhere/issues), +podemos intentar solucionarlo. Mientras tanto, puede desactivar la regla que +afecta a ese sitio en particular en su propia copia de HTTPS Everywhere +haciendo clic en el botón de la barra de herramientas HTTPS Everywhere y +desmarcando la regla para ese sitio. -También puede informar el problema al sitio, ya que ellos tienen el poder para solucionarlo! +También puede informar el problema al sitio, ya que ellos tienen el poder para +solucionarlo! ### [¿Por qué HTTPS Everywhere me impide unirme a la red del hotel/escuela u otra red inalámbrica?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network) -Algunas redes inalámbricas secuestran sus conexiones HTTP cuando se une por primera vez a ellas, con el fin de exigir su autenticación o simplemente intentar hacer que acepte los términos de uso. Las páginas HTTPS están protegidas contra este tipo de secuestro, que es como debería ser. Si va a un sitio web que no está protegido por HTTPS Everywhere o por HSTS (actualmente, example.com es uno de esos sitios), permitirá que su conexión sea capturada y redirigida a la página de autenticación o términos de uso. +Algunas redes inalámbricas secuestran sus conexiones HTTP cuando se une por +primera vez a ellas, con el fin de exigir su autenticación o simplemente +intentar hacer que acepte los términos de uso. Las páginas HTTPS están +protegidas contra este tipo de secuestro, que es como debería ser. Si va a un +sitio web que no está protegido por HTTPS Everywhere o por HSTS (actualmente, +example.com es uno de esos sitios), permitirá que su conexión sea capturada y +redirigida a la página de autenticación o términos de uso. ### [¿Habrá una versión de HTTPS Everywhere para IE, Safari o algún otro navegador?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser) -A principios de 2012, la API para extensiones de Safari no ofrece una forma de realizar la reescritura segura de las solicitudes HTTP a HTTPS. Pero si por casualidad conoce una forma de realizar la reescritura segura de solicitudes en estos navegadores, no dude en hacérnoslo saber en https-everywhere en EFF.org (pero tenga en cuenta que modificar document.location o window.location en JavaScript no es seguro). +A principios de 2012, la API para extensiones de Safari no ofrece una forma de +realizar la reescritura segura de las solicitudes HTTP a HTTPS. Pero si por +casualidad conoce una forma de realizar la reescritura segura de solicitudes en +estos navegadores, no dude en hacérnoslo saber en https-everywhere en EFF.org +(pero tenga en cuenta que modificar document.location o window.location en +JavaScript no es seguro). ### [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available) -Hay varios problemas con la idea de tratar de detectar automáticamente HTTPS en cada sitio. No hay ninguna garantía de que los sitios van a dar la misma respuesta a través de HTTPS que a través de HTTP. Además, no es posible probar HTTPS en tiempo real sin introducir vulnerabilidades de seguridad (¿Qué debería hacer la extensión si falla el intento de conexión por HTTPS? Volver a un HTTP inseguro no es seguro). Y en algunos casos, HTTPS Everywhere tiene que llevar a cabo transformaciones bastante complicadas en URIs - por ejemplo, hasta recientemente la regla de Wikipedia tenía que convertir una dirección como `http://en.wikipedia.org/wiki/World_Wide_Web` en `https://secure.wikimedia.org/wikipedia/en/wiki/World_Wide_Web` por que HTTPS no estaba disponible en los dominios habituales de Wikipedia. +Hay varios problemas con la idea de tratar de detectar automáticamente HTTPS en +cada sitio. No hay ninguna garantía de que los sitios van a dar la misma +respuesta a través de HTTPS que a través de HTTP. Además, no es posible probar +HTTPS en tiempo real sin introducir vulnerabilidades de seguridad (¿Qué debería +hacer la extensión si falla el intento de conexión por HTTPS? Volver a un HTTP +inseguro no es seguro). Y en algunos casos, HTTPS Everywhere tiene que llevar a +cabo transformaciones bastante complicadas en URIs - por ejemplo, hasta +recientemente la regla de Wikipedia tenía que convertir una dirección como +`http://en.wikipedia.org/wiki/World_Wide_Web` en +`https://secure.wikimedia.org/wikipedia/en/wiki/World_Wide_Web` por que HTTPS +no estaba disponible en los dominios habituales de Wikipedia. ### [¿Cómo puedo eliminar o mover el botón HTTPS Everywhere de la barra de herramientas?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar) -El botón HTTPS Everywhere es útil porque le permite ver y desactivar un conjunto de reglas si causa problemas con un sitio. Pero si prefiere desactivarla, vaya a Ver->Barras de herramientas->Personalizar y arrastre el botón fuera de la barra de herramientas y dentro en la barra de complementos en la parte inferior de la página. Después, puede ocultar la barra de complementos. (En teoría, debería poder arrastrarlo a la bandeja de iconos disponibles también, pero eso puede desencadenar [este error](https://trac.torproject.org/projects/tor/ticket/6276). +El botón HTTPS Everywhere es útil porque le permite ver y desactivar un +conjunto de reglas si causa problemas con un sitio. Pero si prefiere +desactivarla, vaya a Ver->Barras de herramientas->Personalizar y arrastre el +botón fuera de la barra de herramientas y dentro en la barra de complementos en +la parte inferior de la página. Después, puede ocultar la barra de +complementos. (En teoría, debería poder arrastrarlo a la bandeja de iconos +disponibles también, pero eso puede desencadenar [este +error](https://trac.torproject.org/projects/tor/ticket/6276). ### [¿Cuándo me protege HTTPS Everywhere? ¿Cuándo no me protege?](#when-does-https-everywhere-protect-me-when-does-it-not-protect-me) -HTTPS Everywhere lo protege sólo cuando está utilizando _porciones cifradas de sitios web soportados_. En un sitio soportado, se activará automáticamente el cifrado HTTPS para todas las partes soportadas conocidas del sitio (para algunos sitios, esto podría ser sólo una parte de todo el sitio). Por ejemplo, si su proveedor de correo web no admite HTTPS en absoluto, HTTPS Everywhere no puede hacer que su acceso a su correo web sea seguro. Del mismo modo, si un sitio permite HTTPS para texto pero no para imágenes, es posible que alguien vea las imágenes que cargue el navegador y adivine a qué está accediendo. - -HTTPS Everywhere depende completamente de las características de seguridad de los sitios web individuales que utilice; _Activa_ estas funciones de seguridad, pero no las puede _crear_ si no existen. Si utiliza un sitio no no soportado por HTTPS Everywhere o un sitio que proporciona cierta información de forma insegura, HTTPS Everywhere no puede proporcionar protección adicional para su uso de ese sitio. Por favor recuerde verificar que la seguridad de un sitio en particular está funcionando al nivel que usted espera antes de enviar o recibir información confidencial, incluyendo contraseñas. - -Una forma de determinar el nivel de protección que obtendrá al utilizar un sitio en particular es utilizar una herramienta de análisis de paquetes como [Wireshark] (https://www.wireshark.org/) para registrar sus propias comunicaciones con el sitio. La vista resultante de sus comunicaciones es aproximadamente igual a lo que un escucha secreto vería en su red wifi o en su ISP. De esta manera, puede determinar si algunas o todas sus comunicaciones estarían protegidas; Sin embargo, puede tomar bastante tiempo hacer sentido a la vista de Wireshark con suficiente cuidado para obtener una respuesta definitiva. - -También puede activar la función "Bloquear todas las solicitudes HTTP" para obtener mayor protección. En lugar de cargar páginas o imágenes inseguras, HTTPS Everywhere las bloqueará completamente. +HTTPS Everywhere lo protege sólo cuando está utilizando _porciones cifradas de +sitios web soportados_. En un sitio soportado, se activará automáticamente el +cifrado HTTPS para todas las partes soportadas conocidas del sitio (para +algunos sitios, esto podría ser sólo una parte de todo el sitio). Por ejemplo, +si su proveedor de correo web no admite HTTPS en absoluto, HTTPS Everywhere no +puede hacer que su acceso a su correo web sea seguro. Del mismo modo, si un +sitio permite HTTPS para texto pero no para imágenes, es posible que alguien +vea las imágenes que cargue el navegador y adivine a qué está accediendo. + +HTTPS Everywhere depende completamente de las características de seguridad de +los sitios web individuales que utilice; _Activa_ estas funciones de seguridad, +pero no las puede _crear_ si no existen. Si utiliza un sitio no no soportado +por HTTPS Everywhere o un sitio que proporciona cierta información de forma +insegura, HTTPS Everywhere no puede proporcionar protección adicional para su +uso de ese sitio. Por favor recuerde verificar que la seguridad de un sitio en +particular está funcionando al nivel que usted espera antes de enviar o recibir +información confidencial, incluyendo contraseñas. + +Una forma de determinar el nivel de protección que obtendrá al utilizar un +sitio en particular es utilizar una herramienta de análisis de paquetes como +[Wireshark] (https://www.wireshark.org/) para registrar sus propias +comunicaciones con el sitio. La vista resultante de sus comunicaciones es +aproximadamente igual a lo que un escucha secreto vería en su red wifi o en su +ISP. De esta manera, puede determinar si algunas o todas sus comunicaciones +estarían protegidas; Sin embargo, puede tomar bastante tiempo hacer sentido a +la vista de Wireshark con suficiente cuidado para obtener una respuesta +definitiva. + +También puede activar la función "Bloquear todas las solicitudes HTTP" para +obtener mayor protección. En lugar de cargar páginas o imágenes inseguras, +HTTPS Everywhere las bloqueará completamente. ### [¿De qué me protege HTTPS Everywhere?](#what-does-https-everywhere-protect-me-against) -En las partes compatibles de los sitios admitidos, HTTPS Everywhere habilita la protección HTTPS de los sitios, lo que le puede proteger contra la escucha y la manipulación indebida del contenido del sitio o de la información que envía al sitio. Idealmente, esto proporciona cierta protección contra un atacante que aprende el contenido de la información que fluye en ambos sentidos - por ejemplo, el texto de los mensajes de correo electrónico que envía o recibe a través de un sitio de webmail, los productos que navega o compra en un comercio electrónico Sitio o los artículos particulares que lea en un sitio de referencia. - -Sin embargo, HTTPS Everywhere **no oculta las identidades de los sitios a los que accede**, la cantidad de tiempo que pasa con ellos ni la cantidad de información que carga o descarga desde un sitio en particular. Por ejemplo, si accede a `http://www.eff.org/issues/nsa-spying` y HTTPS Everywhere vuelve a escribirlo como `https://www.eff.org/issues/nsa-spying`, un espía todavía puede reconocer de forma trivial que está accediendo a www.eff.org (pero puede que no sepa qué tema está leyendo). En general, toda la parte del nombre de dominio de una URL permanece expuesta al intruso, ya que ésta debe enviarse repetidamente en forma no cifrada durante el establecimiento de la conexión. Otra forma de decirlo es que HTTPS nunca fue diseñado para ocultar la identidad de los sitios que visita. - -Investigadores también han demostrado que es posible que alguien pueda averiguar más acerca de lo que está haciendo en un sitio simplemente a través de una cuidadosa observación de la cantidad de datos que sube y descarga, o los patrones de tiempo de su uso del sitio. Un ejemplo simple es que si el sitio sólo tiene una página de cierto tamaño total, cualquier persona que descargue exactamente esa cantidad de datos del sitio probablemente está accediendo a esa página. - -Si desea protegerse contra el monitoreo de los sitios que visita, considere usar HTTPS Everywhere junto con software como [Tor](https://www.torproject.org/). +En las partes compatibles de los sitios admitidos, HTTPS Everywhere habilita la +protección HTTPS de los sitios, lo que le puede proteger contra la escucha y la +manipulación indebida del contenido del sitio o de la información que envía al +sitio. Idealmente, esto proporciona cierta protección contra un atacante que +aprende el contenido de la información que fluye en ambos sentidos - por +ejemplo, el texto de los mensajes de correo electrónico que envía o recibe a +través de un sitio de webmail, los productos que navega o compra en un comercio +electrónico Sitio o los artículos particulares que lea en un sitio de +referencia. + +Sin embargo, HTTPS Everywhere **no oculta las identidades de los sitios a los +que accede**, la cantidad de tiempo que pasa con ellos ni la cantidad de +información que carga o descarga desde un sitio en particular. Por ejemplo, si +accede a `http://www.eff.org/issues/nsa-spying` y HTTPS Everywhere vuelve a +escribirlo como `https://www.eff.org/issues/nsa-spying`, un espía todavía puede +reconocer de forma trivial que está accediendo a www.eff.org (pero puede que no +sepa qué tema está leyendo). En general, toda la parte del nombre de dominio de +una URL permanece expuesta al intruso, ya que ésta debe enviarse repetidamente +en forma no cifrada durante el establecimiento de la conexión. Otra forma de +decirlo es que HTTPS nunca fue diseñado para ocultar la identidad de los sitios +que visita. + +Investigadores también han demostrado que es posible que alguien pueda +averiguar más acerca de lo que está haciendo en un sitio simplemente a través +de una cuidadosa observación de la cantidad de datos que sube y descarga, o los +patrones de tiempo de su uso del sitio. Un ejemplo simple es que si el sitio +sólo tiene una página de cierto tamaño total, cualquier persona que descargue +exactamente esa cantidad de datos del sitio probablemente está accediendo a esa +página. + +Si desea protegerse contra el monitoreo de los sitios que visita, considere +usar HTTPS Everywhere junto con software como +[Tor](https://www.torproject.org/). ### [¿Cómo obtengo soporte para un sitio adicional en HTTPS Everywhere?](#how-do-i-get-support-for-an-additional-site-in-https-everywhere) -Puede aprender [como escribir reglas](https://www.eff.org/https-everywhere/rulesets) que enseñan a HTTPS Everywhere a soportar nuevos sitios. Puede instalar estas reglas en su propio navegador o enviárnoslas para su posible inclusión en la versión oficial. +Puede aprender [como escribir +reglas](https://www.eff.org/https-everywhere/rulesets) que enseñan a HTTPS +Everywhere a soportar nuevos sitios. Puede instalar estas reglas en su propio +navegador o enviárnoslas para su posible inclusión en la versión oficial. ### [¿Qué pasa si el sitio no admite HTTPS, o si sólo lo admite para algunas actividades, como introducir información de la tarjeta de crédito?](#what-if-the-site-doesnt-support-https-or-only-supports-it-for-some-activities-like-entering-credit-card-information) -Podría tratar de ponerse en contacto con el sitio y señalar que el uso de HTTPS para todas las características del sitio es una práctica cada vez más común hoy en día y protege a los usuarios (y sitios) contra una variedad de ataques de Internet. Por ejemplo, le defiende contra la capacidad de otras personas en una red inalámbrica de espiar su uso del sitio o incluso tomar control de su cuenta. También puede señalar que los números de tarjetas de crédito no son la única información que usted considera privada o sensible. +Podría tratar de ponerse en contacto con el sitio y señalar que el uso de HTTPS +para todas las características del sitio es una práctica cada vez más común hoy +en día y protege a los usuarios (y sitios) contra una variedad de ataques de +Internet. Por ejemplo, le defiende contra la capacidad de otras personas en una +red inalámbrica de espiar su uso del sitio o incluso tomar control de su +cuenta. También puede señalar que los números de tarjetas de crédito no son la +única información que usted considera privada o sensible. -Sitios como Google, Twitter y Facebook ahora soportan HTTPS para información no financiera, por razones de privacidad y seguridad general. +Sitios como Google, Twitter y Facebook ahora soportan HTTPS para información no +financiera, por razones de privacidad y seguridad general. ### [¿No es más caro o lento para un sitio usar HTTPS en comparación con HTTP normal?](#isnt-it-more-expensive-or-slower-for-a-site-to-support-https-compared-to-regular-http) -Puede ser, pero algunos sitios han sido gratamente sorprendidos al ver lo práctico que puede ser. Además, los expertos de Google están actualmente implementando varias mejoras en el protocolo TLS que hacen HTTPS dramáticamente más rápido; si estas mejoras se añaden a la norma pronto, la brecha de velocidad entre los dos debería casi desaparecer. Ver [la descripción de Adam Langley de la situación de la implementación de HTTPS](https://www.imperialviolet.org/2010/06/25/overclocking-ssl.html) para más detalles sobre esta cuestión. En particular, Langley afirma: "Para [habilitar HTTPS de forma predeterminada para Gmail] no tuvimos que desplegar máquinas adicionales ni hardware especial. En nuestras máquinas frontend de producción, SSL/TLS representa menos del 1% de la carga del CPU, menos de 10KB de memoria por conexión y menos del 2% de la sobrecarga de red". - -Solía ser caro comprar un certificado para el uso de HTTPS, pero ahora se puede obtener de forma gratuita en [Let's Encrypt](https://letsencrypt.org/) de igual manera. +Puede ser, pero algunos sitios han sido gratamente sorprendidos al ver lo +práctico que puede ser. Además, los expertos de Google están actualmente +implementando varias mejoras en el protocolo TLS que hacen HTTPS dramáticamente +más rápido; si estas mejoras se añaden a la norma pronto, la brecha de +velocidad entre los dos debería casi desaparecer. Ver [la descripción de Adam +Langley de la situación de la implementación de +HTTPS](https://www.imperialviolet.org/2010/06/25/overclocking-ssl.html) para +más detalles sobre esta cuestión. En particular, Langley afirma: "Para +[habilitar HTTPS de forma predeterminada para Gmail] no tuvimos que desplegar +máquinas adicionales ni hardware especial. En nuestras máquinas frontend de +producción, SSL/TLS representa menos del 1% de la carga del CPU, menos de 10KB +de memoria por conexión y menos del 2% de la sobrecarga de red". + +Solía ser caro comprar un certificado para el uso de HTTPS, pero ahora se puede +obtener de forma gratuita en [Let's Encrypt](https://letsencrypt.org/) de igual +manera. ### [¿Por qué debría usar HTTPS Everywhere en lugar de simplemente teclear https:// al principio del nombre de un sitio?](#why-should-i-use-https-everywhere-instead-of-just-typing-https-at-the-beginning-of-site-names) -Incluso si normalmente escribe https://, HTTPS Everywhere podría protegerlo si alguna vez lo olvida. Además, puede reescribir los enlaces que siga de otras personas. Por ejemplo, si hace clic en un enlace a `http://en.wikipedia.org/wiki/EFF_Pioneer_Award`, HTTPS Everywhere volverá a escribir el enlace de forma automática como `https://en.wikimedia.org/wikipedia/en/wiki/EFF_Pioneer_Award`. Por lo tanto, puede obtener alguna protección incluso si no hubiera notado que el sitio de destino está disponible en HTTPS. +Incluso si normalmente escribe https://, HTTPS Everywhere podría protegerlo si +alguna vez lo olvida. Además, puede reescribir los enlaces que siga de otras +personas. Por ejemplo, si hace clic en un enlace a +`http://en.wikipedia.org/wiki/EFF_Pioneer_Award`, HTTPS Everywhere volverá a +escribir el enlace de forma automática como +`https://en.wikimedia.org/wikipedia/en/wiki/EFF_Pioneer_Award`. Por lo tanto, +puede obtener alguna protección incluso si no hubiera notado que el sitio de +destino está disponible en HTTPS. ### [¿Por qué HTTPS Everywhere incluye reglas para sitios como PayPal que ya requieren HTTPS en todas sus páginas?](#why-does-https-everywhere-include-rules-for-sites-like-paypal-that-already-require-https-on-all-their-pages) -HTTPS Everywhere, como la [especificación HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security), trata de abordar un ataque llamado [SSL stripping](https://moxie.org/software/sslstrip/). Los usuarios sólo están protegidos contra un ataque "SSL stripping" si sus navegadores ni siquiera _intentan_ conectarse a la versión HTTP del sitio, incluso si el sitio los hubiera redirigido a la versión HTTPS. Con HTTPS Everywhere, el navegador ni siquiera intenta la conexión HTTP insegura, incluso si eso es lo que usted le pide que haga. (Tenga en cuenta que actualmente HTTPS Everywhere no incluye una lista completa de dichos sitios, que son principalmente instituciones financieras). +HTTPS Everywhere, como la [especificación +HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security), trata de +abordar un ataque llamado [SSL +stripping](https://moxie.org/software/sslstrip/). Los usuarios sólo están +protegidos contra un ataque "SSL stripping" si sus navegadores ni siquiera +_intentan_ conectarse a la versión HTTP del sitio, incluso si el sitio los +hubiera redirigido a la versión HTTPS. Con HTTPS Everywhere, el navegador ni +siquiera intenta la conexión HTTP insegura, incluso si eso es lo que usted le +pide que haga. (Tenga en cuenta que actualmente HTTPS Everywhere no incluye una +lista completa de dichos sitios, que son principalmente instituciones +financieras). ### [¿Qué significan los diferentes colores de las reglas en el menú de la barra de herramientas en Firefox?](#what-do-the-different-colors-for-rulesets-in-the-firefox-toolbar-menu-mean) Los colores son: -Verde oscuro: el conjunto de reglas estaba activa durante la carga de recursos en la página actual. +Verde oscuro: el conjunto de reglas estaba activa durante la carga de recursos +en la página actual. -Verde claro: el conjunto de reglas estaba listo para evitar las cargas HTTP en la página actual, pero todo lo que el conjunto de reglas habría cubierto se cargó a través de HTTPS de todos modos (en el código, verde claro se le llama una "regla discutible"). +Verde claro: el conjunto de reglas estaba listo para evitar las cargas HTTP en +la página actual, pero todo lo que el conjunto de reglas habría cubierto se +cargó a través de HTTPS de todos modos (en el código, verde claro se le llama +una "regla discutible"). -Marrón oscuro o Flecha roja en el sentido de las agujas del reloj: regla rota -- el conjunto de reglas está activo, pero el servidor está redirigiendo al menos algunas direcciones URL de HTTPS a HTTP. +Marrón oscuro o Flecha roja en el sentido de las agujas del reloj: regla rota +-- el conjunto de reglas está activo, pero el servidor está redirigiendo al +menos algunas direcciones URL de HTTPS a HTTP. Gris: el conjunto de reglas está deshabilitado. @@ -105,7 +265,8 @@ Los colores son: Azul claro: HTTPS Everywhere está habilitado. -Azul oscuro: HTTPS Everywhere está habilitado y activo para cargar recursos en la página actual. +Azul oscuro: HTTPS Everywhere está habilitado y activo para cargar recursos en +la página actual. Rojo: Todas las peticiones sin cifrar serán bloqueadas por HTTPS Everywhere. @@ -113,24 +274,54 @@ Gris: HTTPS Everywhere está deshabilitado. ### [Tengo un problema al instalar la extensión del navegador.](#im-having-a-problem-installing-the-browser-extension.) -Algunas personas informan que la instalación de HTTPS Everywhere les da el error: "El complemento no se pudo descargar debido a un error de conexión en www.eff.org". Esto puede ser causado por el antivirus Avast, que bloquea la instalación de extensiones de navegador. Puede que pueda [instalarlo desde addons.mozilla.org](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/). +Algunas personas informan que la instalación de HTTPS Everywhere les da el +error: "El complemento no se pudo descargar debido a un error de conexión en +www.eff.org". Esto puede ser causado por el antivirus Avast, que bloquea la +instalación de extensiones de navegador. Puede que pueda [instalarlo desde +addons.mozilla.org](https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/). ### [¿Cómo desinstalo/elimino HTTPS Everywhere?](#how-do-i-uninstallremove-https-everywhere) -En Firefox: Haga clic en el botón de menú en la parte superior derecha de la ventana al final de la barra de herramientas (aparece como tres líneas horizontales) y, a continuación, haga clic en "Complementos" (parece una pieza de rompecabezas). Desplácese hasta que vea HTTPS Everywhere y a continuación haga clic en el botón "Eliminar" que se encuentra completamente a la derecha. Al finalizar, puede cerrar la ventana de complementos. - -En Chrome: haga clic en el botón de menú situado en la parte superior derecha de la ventana al final de la barra de herramientas (aparece como tres líneas horizontales) y, a continuación, haz clic en "Configuración" cerca de la parte inferior. A la izquierda, haga clic en "Extensiones". Desplácese hasta que vea HTTPS Everywhere y a continuación, haga clic en el icono de la papelera de la derecha y haga clic en "Eliminar" para confirmar la eliminación. Al finalizar, puede cerrar la ventana de configuración. +En Firefox: Haga clic en el botón de menú en la parte superior derecha de la +ventana al final de la barra de herramientas (aparece como tres líneas +horizontales) y, a continuación, haga clic en "Complementos" (parece una pieza +de rompecabezas). Desplácese hasta que vea HTTPS Everywhere y a continuación +haga clic en el botón "Eliminar" que se encuentra completamente a la derecha. +Al finalizar, puede cerrar la ventana de complementos. + +En Chrome: haga clic en el botón de menú situado en la parte superior derecha +de la ventana al final de la barra de herramientas (aparece como tres líneas +horizontales) y, a continuación, haz clic en "Configuración" cerca de la parte +inferior. A la izquierda, haga clic en "Extensiones". Desplácese hasta que vea +HTTPS Everywhere y a continuación, haga clic en el icono de la papelera de la +derecha y haga clic en "Eliminar" para confirmar la eliminación. Al finalizar, +puede cerrar la ventana de configuración. ### [¿Cómo agrego mi propio sitio a HTTPS Everywhere?](#how-do-i-add-my-own-site-to-https-everywhere) -Estamos contentos de que desee que su sitio en HTTPS Everywhere! Sin embargo, recuerde que no todos los que visitan su sitio tienen instalada nuestra extensión. Si administra un sitio web, puede configurarlo para que use de forma predeterminada HTTPS para todos, no solo para los usuarios de HTTPS Everywhere. Y es menos trabajo! Los pasos que usted debe tomar, en orden, son: - -1. Configure un [redireccionamiento](https://www.sslshopper.com/apache-redirect-http-to-https.html) de HTTP a HTTPS en su sitio. -2. [Agregue el header "Strict-Transport-Security" (HSTS) en su sitio.](https://raymii.org/s/tutorials/HTTP_Strict_Transport_Security_for_Apache_NGINX_and_Lighttpd.html) -3. [Agregue su sitio a la lista de precarga de HSTS.](https://hstspreload.appspot.com/) - -Estos pasos le darán a su sitio una protección mucho mejor que añadirlo a HTTPS Everywhere. En términos generales, una vez que haya terminado, no es necesario agregar su sitio a HTTPS Everywhere. Sin embargo, si lo aún desea, siga las [instrucciones sobre escribir conjuntos de reglas](https://eff.org/https-everywhere/rulesets), e indique que usted es el autor del sitio cuando solicite un "pull request". +Estamos contentos de que desee que su sitio en HTTPS Everywhere! Sin embargo, +recuerde que no todos los que visitan su sitio tienen instalada nuestra +extensión. Si administra un sitio web, puede configurarlo para que use de forma +predeterminada HTTPS para todos, no solo para los usuarios de HTTPS Everywhere. +Y es menos trabajo! Los pasos que usted debe tomar, en orden, son: + +1. Configure un + [redireccionamiento](https://www.sslshopper.com/apache-redirect-http-to-https.html) + de HTTP a HTTPS en su sitio. +2. [Agregue el header "Strict-Transport-Security" (HSTS) en su + sitio.](https://raymii.org/s/tutorials/HTTP_Strict_Transport_Security_for_Apache_NGINX_and_Lighttpd.html) +3. [Agregue su sitio a la lista de precarga de + HSTS.](https://hstspreload.appspot.com/) + +Estos pasos le darán a su sitio una protección mucho mejor que añadirlo a HTTPS +Everywhere. En términos generales, una vez que haya terminado, no es necesario +agregar su sitio a HTTPS Everywhere. Sin embargo, si lo aún desea, siga las +[instrucciones sobre escribir conjuntos de +reglas](https://eff.org/https-everywhere/rulesets), e indique que usted es el +autor del sitio cuando solicite un "pull request". ### [¿Puedo ayudar a traducir HTTPS Everywhere a mi propio idioma? ](#can-i-help-translate-https-everywhere-into-my-own-language) -¡Sí! Utilizamos la cuenta Transifex de Tor Project para las traducciones, por favor inscríbase para ayudar a traducir en [https://www.transifex.com/otf/torproject](https://www.transifex.com/otf/torproject). +¡Sí! Utilizamos la cuenta Transifex de Tor Project para las traducciones, por +favor inscríbase para ayudar a traducir en +[https://www.transifex.com/otf/torproject](https://www.transifex.com/otf/torproject). From 72eb5d1898ea8e6cc1c9665cb5488612d97e9111 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 14 Feb 2018 07:22:57 +0800 Subject: [PATCH 663/844] Split RCI.com.xml from Wyndham.xml (#14507) * Split RCI.com.xml from Wyndham.xml * Update RCI.com.xml --- src/chrome/content/rules/RCI.com.xml | 36 ++++++++++++++++++++++++++++ src/chrome/content/rules/Wyndham.xml | 6 +---- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 src/chrome/content/rules/RCI.com.xml diff --git a/src/chrome/content/rules/RCI.com.xml b/src/chrome/content/rules/RCI.com.xml new file mode 100644 index 000000000000..ab50170e9a04 --- /dev/null +++ b/src/chrome/content/rules/RCI.com.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml index b6755b6ec191..a3955adcdb4b 100644 --- a/src/chrome/content/rules/Wyndham.xml +++ b/src/chrome/content/rules/Wyndham.xml @@ -13,6 +13,7 @@ + Italian-Country-Cottages.co.uk.xml + JamesVillas.co.uk.xml + Ovscruise.com.xml + + RCI.com.xml + RCITravelStore.co.uk.xml + Scottish-Country-Cottages.co.uk.xml + WelcomeCottages.com.xml @@ -36,7 +37,6 @@ - holidaycottagesgroup.com (redirects to thehoseasonsgroup.co.uk) - static.landal.com (cert: redhotminute.com, listing denied) - novasol.(d[ek]|n[lo]) (timeout) - - www.rci.com (valid cert, Akamai: "Service Unavailable") - www.resortquest.com (cert: www.resortrequestsecure.com, shows that domain's data) - thehoseasonsgroup.co.uk (timeout) - wmowners.com (cert: *.accountservergroup.com, shows site5 page) @@ -52,7 +52,6 @@ - @@ -68,9 +67,6 @@ - - From 8e97e5085e2fc2b5cb00124428ecdff2d52d37a6 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 15 Feb 2018 08:01:34 +0800 Subject: [PATCH 664/844] Add upgrade-insecure-requests to responseHeaders in HTTP Nowhere Mode (#14600) --- chromium/background.js | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/chromium/background.js b/chromium/background.js index 7b77731f6a65..077332343f58 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -497,11 +497,48 @@ function onErrorOccurred(details) { } } +/** + * handle webrequest.onHeadersReceived, insert upgrade-insecure-requests directive + * @param details details for the chrome.webRequest (see chrome doc) + */ +function onHeadersReceived(details) { + if (isExtensionEnabled && httpNowhereOn) { + // Do not upgrade the .onion requests in HTTP Nowhere Mode, + // See https://github.com/EFForg/https-everywhere/pull/14600#discussion_r168072480 + const uri = new URL(details.url); + if (uri.hostname.slice(-6) == '.onion') { + return {}; + } + + for (const idx in details.responseHeaders) { + if (details.responseHeaders[idx].name.match(/Content-Security-Policy/i)) { + // Existing CSP headers found + const value = details.responseHeaders[idx].value; + + // Prepend if no upgrade-insecure-requests directive exists + if (!value.match(/upgrade-insecure-requests/i)) { + details.responseHeaders[idx].value = "upgrade-insecure-requests; " + value; + return {responseHeaders: details.responseHeaders}; + } + return {}; + } + } + + // CSP headers not found + const upgradeInsecureRequests = { + name: 'Content-Security-Policy', + value: 'upgrade-insecure-requests' + } + details.responseHeaders.push(upgradeInsecureRequests); + return {responseHeaders: details.responseHeaders}; + } + return {}; +} + // Registers the handler for requests // See: https://github.com/EFForg/https-everywhere/issues/10039 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["*://*/*"]}, ["blocking"]); - // Try to catch redirect loops on URLs we've redirected to HTTPS. chrome.webRequest.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https://*/*"]}); @@ -511,9 +548,13 @@ chrome.webRequest.onCompleted.addListener(onCompleted, {urls: ["*://*/*"]}); // Cleanup redirectCounter if neccessary chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]}) +// Insert upgrade-insecure-requests directive in httpNowhere mode +chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["https://*/*"]}, ["blocking", "responseHeaders"]); + // Listen for cookies set/updated and secure them if applicable. This function is async/nonblocking. chrome.cookies.onChanged.addListener(onCookieChanged); + /** * disable switch Planner * @param tabId the Tab to disable for From 31017e7969213f6b3ccff45679f22de37e5d9e6f Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Wed, 14 Feb 2018 20:42:18 -0500 Subject: [PATCH 665/844] [Hotfix] Fix bot edit ignore date (#14634) --- utils/issue-format-bot/lib/issueedit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/issue-format-bot/lib/issueedit.js b/utils/issue-format-bot/lib/issueedit.js index 0ec12c42d7f2..7ab4d8e39161 100644 --- a/utils/issue-format-bot/lib/issueedit.js +++ b/utils/issue-format-bot/lib/issueedit.js @@ -8,7 +8,7 @@ const parse = require('./parse'), _ = require('lodash'); // We do this outside the event handler to avoid setting up and tearing down this object each time a hook is received -const botStartDate = new Date('2018-09-25'); +const botStartDate = new Date('2017-09-25'); // TODO make this share more with newissue.js? @@ -91,7 +91,7 @@ module.exports = function(robot, alexa) { } else { // Submit a comment telling them what the issues were let comment = 'Thanks for editing!\n\n'; - comment += 'I\'m sorry, but I still couldn\'t to understand your submission. '; + comment += 'I\'m sorry, but I still couldn\'t understand your submission. '; comment += 'Here are the problems I ran into this time:\n\n'; problems.forEach(problem => comment += ` * ${problem}\n`); comment += '\nIf you edit your issue again, I\'ll try again and report back if I have problems again.'; From 376c84a68df2d41023976dfa12e0fdfafec1eeac Mon Sep 17 00:00:00 2001 From: William Budington Date: Wed, 14 Feb 2018 18:05:43 -0800 Subject: [PATCH 666/844] Adding a comment on @ghost accounts in CONTRIBUTING.md --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dbf63c8ddd97..85808ff04ebb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -363,6 +363,14 @@ Standalone documentation should be written in [Markdown](https://en.wikipedia.or * * * +# Pull Requests from Deleted Accounts + +Sometimes a contributor will [delete their GitHub account](https://help.github.com/articles/deleting-your-user-account/) after submitting a pull request, resulting in the pull request being associated with the [Ghost user (@ghost)](https://github.com/ghost). These @ghost pull requests can cause problems for HTTPS Everywhere maintainers, leaving questions unanswered and closing off the possibility of receiving maintainer feedback to solicit clarification or request changes. + +We ask that if you want to delete your GitHub account, you either close your HTTPS Everywhere pull requests before you delete your account, or wait to delete your account until we merge your pull requests. Otherwise, maintainers are free to close @ghost pull requests without any comment. + +* * * + # Contributing Translations HTTPS Everywhere translations are handled through Transifex. The easiest way to help with translations is to [create a Transifex account](https://www.transifex.com/signup/) if you don't already have one. Then log into your account and click "Explore", then search for "Tor Project", and click on The Tor Project. Then choose the language you plan to translate into, click on the name of that language, and then click "Join team" and "Go" to accept joining the translation team for your language. From de68e441c5dedbeb6f21988794a026284ff3b0f1 Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Wed, 14 Feb 2018 21:59:37 -0500 Subject: [PATCH 667/844] Report issue bot code coverage (#14617) --- utils/issue-format-bot/package-lock.json | 1594 ++++++++++++++++++++++ utils/issue-format-bot/package.json | 3 +- 2 files changed, 1596 insertions(+), 1 deletion(-) diff --git a/utils/issue-format-bot/package-lock.json b/utils/issue-format-bot/package-lock.json index e6347af48b33..6bf3209b6289 100644 --- a/utils/issue-format-bot/package-lock.json +++ b/utils/issue-format-bot/package-lock.json @@ -3927,6 +3927,1600 @@ "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz", "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==" }, + "nyc": { + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", + "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", + "dev": true, + "requires": { + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "archy": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "async": { + "version": "1.5.2", + "bundled": true, + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "bundled": true, + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "bundled": true, + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "builtin-modules": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "caching-transform": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + } + }, + "camelcase": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true + }, + "center-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "cliui": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "commondir": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "convert-source-map": { + "version": "1.5.1", + "bundled": true, + "dev": true + }, + "core-js": { + "version": "2.5.3", + "bundled": true, + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "debug-log": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "detect-indent": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "error-ex": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "esutils": { + "version": "2.0.2", + "bundled": true, + "dev": true + }, + "execa": { + "version": "0.7.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "bundled": true, + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "extglob": { + "version": "0.3.2", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "bundled": true, + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "find-cache-dir": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "requires": { + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "for-in": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreground-child": { + "version": "1.5.6", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "bundled": true, + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "globals": { + "version": "9.18.0", + "bundled": true, + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "handlebars": { + "version": "4.0.11", + "bundled": true, + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "has-ansi": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-flag": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "hosted-git-info": { + "version": "2.5.0", + "bundled": true, + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "bundled": true, + "dev": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "invariant": { + "version": "2.2.2", + "bundled": true, + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-dotfile": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-number": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "istanbul-lib-coverage": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.9.1", + "bundled": true, + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" + } + }, + "istanbul-lib-report": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "bundled": true, + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.2", + "bundled": true, + "dev": true, + "requires": { + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "istanbul-reports": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "handlebars": "4.0.11" + } + }, + "js-tokens": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "jsesc": { + "version": "1.3.0", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "lazy-cache": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } + } + }, + "lodash": { + "version": "4.17.4", + "bundled": true, + "dev": true + }, + "longest": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "lru-cache": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "md5-hex": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "mem": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "merge-source-map": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "micromatch": { + "version": "2.3.11", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mimic-fn": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "normalize-package-data": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "optimist": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8", + "wordwrap": "0.0.3" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "p-finally": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-limit": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "p-locate": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-limit": "1.1.0" + } + }, + "parse-glob": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "path-exists": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "path-type": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "bundled": true, + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "pkg-dir": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "find-up": "1.1.2" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "preserve": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "read-pkg": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "bundled": true, + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "bundled": true, + "dev": true + }, + "repeating": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "resolve-from": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "right-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "semver": { + "version": "5.4.1", + "bundled": true, + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "slide": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "source-map": { + "version": "0.5.7", + "bundled": true, + "dev": true + }, + "spawn-wrap": { + "version": "1.4.2", + "bundled": true, + "dev": true, + "requires": { + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" + } + }, + "spdx-correct": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "bundled": true, + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "bundled": true, + "dev": true + }, + "string-width": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "test-exclude": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" + } + }, + "to-fast-properties": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "trim-right": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "yargs": { + "version": "3.10.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "which": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "window-size": { + "version": "0.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.3", + "bundled": true, + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "write-file-atomic": { + "version": "1.3.4", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + }, + "y18n": { + "version": "3.2.1", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "2.1.2", + "bundled": true, + "dev": true + }, + "yargs": { + "version": "10.0.3", + "bundled": true, + "dev": true, + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "cliui": { + "version": "3.2.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + } + } + }, + "yargs-parser": { + "version": "8.0.0", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + } + } + } + } + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", diff --git a/utils/issue-format-bot/package.json b/utils/issue-format-bot/package.json index 6632dab5d4bd..573f856bfd5d 100644 --- a/utils/issue-format-bot/package.json +++ b/utils/issue-format-bot/package.json @@ -12,7 +12,7 @@ "scripts": { "lint": "eslint index.js test lib", "start": "probot run ./index.js", - "test": "npm run lint && perjury test/*-test.js" + "test": "npm run lint && nyc perjury test/*-test.js" }, "bugs": { "url": "https://github.com/EFForg/HTTPS-Everywhere/issues" @@ -22,6 +22,7 @@ "eslint": "^4.3.0", "expect": "^1.20.2", "localtunnel": "^1.8.3", + "nyc": "^11.4.1", "perjury": "^1.0.10", "sinon": "^4.0.2" }, From f6937b4221aef1142137516b429df18958229781 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 16 Feb 2018 02:47:04 +0800 Subject: [PATCH 668/844] Update https_everywhere_checker/http_client.py, Fix #14365 (#14598) --- .../https_everywhere_checker/http_client.py | 62 ++++++++++--------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/test/rules/src/https_everywhere_checker/http_client.py b/test/rules/src/https_everywhere_checker/http_client.py index 8b9330d2efb9..6294a0752d24 100644 --- a/test/rules/src/https_everywhere_checker/http_client.py +++ b/test/rules/src/https_everywhere_checker/http_client.py @@ -195,38 +195,44 @@ def idnEncodedUrl(self, url): return urlparse.urlunparse(parts) def absolutizeUrl(self, base, url): - """Returns absolutized URL in respect to base URL as per - RFC 3986. If url is already absolute (with scheme), return url. + """ + Construct a full ("absolute") URL by combining a "base URL" (base) + with another URL (url) as per RFC 3986. @param base: base URL of original document @param url: URL to be resolved against base URL """ - #urljoin fails for some of the abnormal examples in section 5.4.2 - #of RFC 3986 if there are too many ./ or ../ - #See http://bugs.python.org/issue3647 - resolved = urlparse.urljoin(base, url) - resolvedParsed = urlparse.urlparse(resolved) - path = resolvedParsed.path - - #covers corner cases like "g:h" relative URL - if path == "" or not path.startswith("/"): - return resolved - - #strip any leading ./ or ../ - pathParts = path[1:].split("/") - while len(pathParts) > 0 and pathParts[0] in (".", ".."): - pathParts = pathParts[1:] - - if len(pathParts) > 0: - newPath = "/" + "/".join(pathParts) - else: - newPath = "/" - - #replace old path and unparse into URL - urlParts = resolvedParsed[0:2] + (newPath,) + resolvedParsed[3:6] - newUrl = urlparse.urlunparse(urlParts) - - return newUrl + + # urljoin fails for some of the abnormal examples in section 5.4.2 + # of RFC 3986 if there are too many ./ or ../ + # See https://bugs.python.org/issue3647 + joinedUrl = urlparse.urljoin(base, url) + joinedUrlParts = urlparse.urlparse(joinedUrl) + + # Strip any leading ./ and ../ + path = joinedUrlParts.path + if path[:1] == '/': + segments = path.split('/') + while '.' in segments: + segments.remove('.') + while '..' in segments: + segments.remove('..') + path = '/'.join(segments) + + # Non-trivial rewrites do not work without a trailing '/' + # See https://github.com/EFForg/https-everywhere/issues/14365 + if path == '': + path = '/' + + joinedUrlParts = urlparse.ParseResult( + joinedUrlParts.scheme, + joinedUrlParts.netloc, + path, + joinedUrlParts.params, + joinedUrlParts.query, + joinedUrlParts.fragment, + ) + return joinedUrlParts.geturl() @staticmethod def _doFetch(url, options, platformPath): From 2187380e9b4d381dabcfdd7a7d8253ef58a7d91c Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Thu, 15 Feb 2018 20:45:53 -0500 Subject: [PATCH 669/844] Bump issue bot deps (#14635) --- utils/issue-format-bot/.env.example | 2 + utils/issue-format-bot/docs/development.md | 2 +- utils/issue-format-bot/package-lock.json | 3752 ++++++-------------- utils/issue-format-bot/package.json | 16 +- 4 files changed, 1066 insertions(+), 2706 deletions(-) diff --git a/utils/issue-format-bot/.env.example b/utils/issue-format-bot/.env.example index d42e43eaee2a..c619b9daedb5 100644 --- a/utils/issue-format-bot/.env.example +++ b/utils/issue-format-bot/.env.example @@ -1,3 +1,5 @@ # The ID of your GitHub integration APP_ID= WEBHOOK_SECRET=development +# This is the default: +LOG_LEVEL=info diff --git a/utils/issue-format-bot/docs/development.md b/utils/issue-format-bot/docs/development.md index 29f20994cb80..b6084508f29c 100644 --- a/utils/issue-format-bot/docs/development.md +++ b/utils/issue-format-bot/docs/development.md @@ -1,4 +1,4 @@ # Development To get the bot running against GitHub, see -https://github.com/probot/probot/blob/master/docs/development.md. +https://github.com/probot/probot/blob/master/docs/development.md#configure-a-github-app. diff --git a/utils/issue-format-bot/package-lock.json b/utils/issue-format-bot/package-lock.json index 6bf3209b6289..fab94f6ca930 100644 --- a/utils/issue-format-bot/package-lock.json +++ b/utils/issue-format-bot/package-lock.json @@ -4,10 +4,14 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "abab": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" + "@sinonjs/formatio": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", + "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", + "dev": true, + "requires": { + "samsam": "1.3.0" + } }, "accepts": { "version": "1.3.4", @@ -16,44 +20,14 @@ "requires": { "mime-types": "2.1.17", "negotiator": "0.6.1" - }, - "dependencies": { - "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" - }, - "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", - "requires": { - "mime-db": "1.30.0" - } - } } }, "acorn": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", - "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz", + "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==", "dev": true }, - "acorn-globals": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", - "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", - "requires": { - "acorn": "4.0.13" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" - } - } - }, "acorn-jsx": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", @@ -72,34 +46,28 @@ } }, "agent-base": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz", - "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz", + "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==", "requires": { - "extend": "3.0.1", - "semver": "5.0.3" - }, - "dependencies": { - "semver": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", - "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=" - } + "es6-promisify": "5.0.0" } }, "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { "co": "4.6.0", - "json-stable-stringify": "1.0.1" + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "ajv-keywords": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", - "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", "dev": true }, "align-text": { @@ -120,7 +88,8 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==" + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "dev": true }, "ansi-regex": { "version": "2.1.1", @@ -130,7 +99,8 @@ "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true }, "ansicolors": { "version": "0.2.1", @@ -142,23 +112,6 @@ "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz", "integrity": "sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk=" }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" - } - }, - "append-transform": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", - "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", - "requires": { - "default-require-extensions": "1.0.0" - } - }, "argparse": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", @@ -167,24 +120,6 @@ "sprintf-js": "1.0.3" } }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "requires": { - "arr-flatten": "1.1.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "array-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" - }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -210,15 +145,11 @@ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", "dev": true }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" - }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true }, "asn1": { "version": "0.2.3", @@ -226,19 +157,18 @@ "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" - }, - "astral-regex": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==" + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "dev": true, + "requires": { + "lodash": "4.17.5" + } }, "asynckit": { "version": "0.4.0", @@ -246,9 +176,9 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { "version": "1.6.0", @@ -256,203 +186,31 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" }, "babel-code-frame": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", - "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { "chalk": "1.1.3", "esutils": "2.0.2", "js-tokens": "3.0.2" - } - }, - "babel-core": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", - "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", - "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.0", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.0", - "debug": "2.6.8", - "json5": "0.5.1", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" - }, - "dependencies": { - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - } - } - } - }, - "babel-generator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", - "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-jest": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-21.2.0.tgz", - "integrity": "sha512-O0W2qLoWu1QOoOGgxiR2JID4O6WSpxPiQanrkyi9SSlM0PJ60Ptzlck47lhtnr9YZO3zYOsxHwnyeWJ6AffoBQ==", - "requires": { - "babel-plugin-istanbul": "4.1.5", - "babel-preset-jest": "21.2.0" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-istanbul": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz", - "integrity": "sha1-Z2DN2Xf0EdPhdbsGTyvDJ9mbK24=", - "requires": { - "find-up": "2.1.0", - "istanbul-lib-instrument": "1.9.1", - "test-exclude": "4.1.1" - } - }, - "babel-plugin-jest-hoist": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz", - "integrity": "sha512-yi5QuiVyyvhBUDLP4ButAnhYzkdrUwWDtvUJv71hjH3fclhnZg4HkDeqaitcR2dZZx/E67kGkRcPVjtVu+SJfQ==" - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=" - }, - "babel-preset-jest": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz", - "integrity": "sha512-hm9cBnr2h3J7yXoTtAVV0zg+3vg0Q/gT2GYuzlreTU0EPkJRtlNgKJJ3tBKEn0+VjAi3JykV6xCJkuUYttEEfA==", - "requires": { - "babel-plugin-jest-hoist": "21.2.0", - "babel-plugin-syntax-object-rest-spread": "6.13.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "requires": { - "babel-core": "6.26.0", - "babel-runtime": "6.26.0", - "core-js": "2.5.1", - "home-or-tmp": "2.0.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "2.5.1", - "regenerator-runtime": "0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.8", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" }, "dependencies": { - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } } } }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" - }, "bail": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.1.tgz", @@ -468,6 +226,15 @@ "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" }, + "basic-auth": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz", + "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "bcrypt-pbkdf": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", @@ -505,6 +272,13 @@ "process-nextick-args": "1.0.7", "string_decoder": "0.10.31", "util-deprecate": "1.0.2" + }, + "dependencies": { + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + } } }, "string_decoder": { @@ -522,7 +296,7 @@ "bytes": "3.0.0", "content-type": "1.0.4", "debug": "2.6.9", - "depd": "1.1.1", + "depd": "1.1.2", "http-errors": "1.6.2", "iconv-lite": "0.4.19", "on-finished": "2.3.0", @@ -538,25 +312,15 @@ "requires": { "ms": "2.0.0" } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" - }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" } } }, "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "requires": { - "hoek": "2.16.3" + "hoek": "4.2.0" } }, "bottleneck": { @@ -565,47 +329,14 @@ "integrity": "sha1-1s4TgIUnr8gLaQkvFWBmVeWyHxo=" }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "browser-resolve": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz", - "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=", - "requires": { - "resolve": "1.1.7" - }, - "dependencies": { - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" - } - } - }, - "bser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz", - "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=", - "requires": { - "node-int64": "0.4.0" - } - }, "buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -626,8 +357,8 @@ "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz", "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=", "requires": { - "dtrace-provider": "0.8.5", - "moment": "2.19.1", + "dtrace-provider": "0.8.6", + "moment": "2.20.1", "mv": "2.1.1", "safe-json-stringify": "1.0.4" } @@ -671,14 +402,19 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cache-manager": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.5.0.tgz", - "integrity": "sha1-y2VMF3jwLNnpvUr3MU5Ajjuui+o=", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.7.0.tgz", + "integrity": "sha1-hHeALQole+oNNrkkIKyJmORgsJ0=", "requires": { "async": "1.5.2", "lru-cache": "4.0.0" }, "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + }, "lru-cache": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz", @@ -708,7 +444,8 @@ "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "optional": true }, "caseless": { "version": "0.12.0", @@ -739,21 +476,33 @@ } }, "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", + "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", + "dev": true, "requires": { - "ansi-styles": "2.2.1", + "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "supports-color": "5.2.0" }, "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } } } }, @@ -777,21 +526,36 @@ "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.0.tgz", "integrity": "sha1-3smtHfufjQa0/NqircPE/ZevHmg=" }, - "ci-info": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz", - "integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==" + "chardet": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", + "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", + "dev": true + }, + "charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=" }, "circular-json": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz", - "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", "dev": true }, - "cli-width": { + "cli-cursor": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", - "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, "cliui": { @@ -825,9 +589,10 @@ "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw=" }, "color-convert": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -835,20 +600,27 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { "delayed-stream": "1.0.0" } }, "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==" + }, + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true }, "concat-map": { "version": "0.0.1", @@ -862,7 +634,7 @@ "dev": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.3", + "readable-stream": "2.3.4", "typedarray": "0.0.6" } }, @@ -876,16 +648,6 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, - "content-type-parser": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz", - "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==" - }, - "convert-source-map": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=" - }, "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", @@ -896,10 +658,11 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "core-js": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz", - "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=" + "cookiejar": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", + "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -910,31 +673,34 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, "requires": { "lru-cache": "4.1.1", "shebang-command": "1.2.0", - "which": "1.2.14" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "requires": { - "boom": "2.10.1" + "which": "1.3.0" } }, - "cssom": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", - "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=" + "crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=" }, - "cssstyle": { - "version": "0.2.37", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", - "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", "requires": { - "cssom": "0.3.2" + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "requires": { + "hoek": "4.2.0" + } + } } }, "dashdash": { @@ -943,13 +709,6 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "debug": { @@ -968,15 +727,8 @@ "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" - }, - "default-require-extensions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", - "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", - "requires": { - "strip-bom": "2.0.0" - } + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true }, "define-properties": { "version": "1.1.2", @@ -1001,22 +753,6 @@ "pify": "2.3.0", "pinkie-promise": "2.0.1", "rimraf": "2.6.1" - }, - "dependencies": { - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - } } }, "delayed-stream": { @@ -1025,36 +761,28 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "requires": { - "repeating": "2.0.1" - } - }, "diff": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==" + "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "dev": true }, "doctrine": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", - "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "2.0.2", - "isarray": "1.0.0" + "esutils": "2.0.2" } }, "domain-from-partial-url": { @@ -1070,7 +798,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "camelcase": { @@ -1086,7 +814,7 @@ "async": "2.5.0", "coffee-script": "1.12.7", "debug": "2.6.8", - "lodash": "4.17.4", + "lodash": "4.17.5", "yargs": "5.0.0" } }, @@ -1138,12 +866,12 @@ "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=" }, "dtrace-provider": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz", - "integrity": "sha1-mOu6Ihr6xG4cOf02hY2Pk2dSS5I=", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz", + "integrity": "sha1-QooiOv4DQl0s1tY0f99AxmkDVj0=", "optional": true, "requires": { - "nan": "2.7.0" + "nan": "2.8.0" } }, "ecc-jsbn": { @@ -1169,23 +897,10 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, - "ejs": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz", - "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=" - }, "encodeurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=" - }, - "errno": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", - "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", - "requires": { - "prr": "0.0.0" - } + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, "error-ex": { "version": "1.3.1", @@ -1218,6 +933,19 @@ "is-symbol": "1.0.1" } }, + "es6-promise": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", + "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==" + }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "requires": { + "es6-promise": "4.2.4" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -1226,124 +954,67 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - } + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "eslint": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.3.0.tgz", - "integrity": "sha1-/NfJY3a780yF7mftABKimWQrEI8=", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.17.0.tgz", + "integrity": "sha512-AyxBUCANU/o/xC0ijGMKavo5Ls3oK6xykiOITlMdjFjrKOsqLrA7Nf5cnrDgcKrHzBirclAZt63XO7YZlVUPwA==", "dev": true, "requires": { - "ajv": "5.2.2", - "babel-code-frame": "6.22.0", - "chalk": "1.1.3", + "ajv": "5.5.2", + "babel-code-frame": "6.26.0", + "chalk": "2.3.1", "concat-stream": "1.6.0", "cross-spawn": "5.1.0", - "debug": "2.6.8", - "doctrine": "2.0.0", + "debug": "3.1.0", + "doctrine": "2.1.0", "eslint-scope": "3.7.1", - "espree": "3.4.3", + "eslint-visitor-keys": "1.0.0", + "espree": "3.5.3", "esquery": "1.0.0", - "estraverse": "4.2.0", "esutils": "2.0.2", "file-entry-cache": "2.0.0", "functional-red-black-tree": "1.0.1", "glob": "7.1.2", - "globals": "9.18.0", - "ignore": "3.3.3", + "globals": "11.3.0", + "ignore": "3.3.7", "imurmurhash": "0.1.4", - "inquirer": "3.2.1", - "is-resolvable": "1.0.0", - "js-yaml": "3.8.4", - "json-stable-stringify": "1.0.1", + "inquirer": "3.3.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.10.0", + "json-stable-stringify-without-jsonify": "1.0.1", "levn": "0.3.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "minimatch": "3.0.4", "mkdirp": "0.5.1", "natural-compare": "1.4.0", "optionator": "0.8.2", "path-is-inside": "1.0.2", - "pluralize": "4.0.0", + "pluralize": "7.0.0", "progress": "2.0.0", "require-uncached": "1.0.3", - "semver": "5.3.0", + "semver": "5.5.0", + "strip-ansi": "4.0.0", "strip-json-comments": "2.0.1", - "table": "4.0.1", + "table": "4.0.2", "text-table": "0.2.0" }, "dependencies": { - "ajv": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", - "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=", - "dev": true, - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "json-schema-traverse": "0.3.1", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-escapes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", - "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", - "dev": true - }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.0" - } - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "2.0.0" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.2.14" - } - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "ms": "2.0.0" } }, "glob": { @@ -1360,109 +1031,6 @@ "path-is-absolute": "1.0.1" } }, - "inquirer": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz", - "integrity": "sha512-QgW3eiPN8gpj/K5vVpHADJJgrrF0ho/dZGylikGX7iqAdRgC9FVKYKWFLx6hZDBFcOLEoSqINYrVPeFAeG/PdA==", - "dev": true, - "requires": { - "ansi-escapes": "2.0.0", - "chalk": "2.0.1", - "cli-cursor": "2.1.0", - "cli-width": "2.1.0", - "external-editor": "2.0.4", - "figures": "2.0.0", - "lodash": "4.17.4", - "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" - }, - "dependencies": { - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "1.1.0" - } - }, - "pluralize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz", - "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=", - "dev": true - }, - "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", - "dev": true - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "2.1.0" - } - }, - "rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -1471,32 +1039,6 @@ "requires": { "ansi-regex": "3.0.0" } - }, - "table": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz", - "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=", - "dev": true, - "requires": { - "ajv": "4.11.8", - "ajv-keywords": "1.5.1", - "chalk": "1.1.3", - "lodash": "4.17.4", - "slice-ansi": "0.0.4", - "string-width": "2.1.1" - }, - "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - } - } } } }, @@ -1510,20 +1052,26 @@ "estraverse": "4.2.0" } }, + "eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", + "dev": true + }, "espree": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", - "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz", + "integrity": "sha512-Zy3tAJDORxQZLl2baguiRU1syPERAIg0L+JB2MWorORgTu/CplzvxS9WWA7Xh4+Q+eOQihNs/1o1Xep8cvCxWQ==", "dev": true, "requires": { - "acorn": "5.1.1", + "acorn": "5.4.1", "acorn-jsx": "3.0.1" } }, "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" }, "esquery": { "version": "1.0.0", @@ -1547,30 +1095,34 @@ "estraverse": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true }, "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true }, "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, - "exec-sh": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz", - "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==", + "eventsource": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.5.tgz", + "integrity": "sha512-IzjLaND9GBK3+fBPhmvG/Yq3FhSDGHnucJCDWhNsneLlN+HX5jeaSpl3Folr2PipGmyUsd/T2Vrua+s6I2aTgQ==", + "dev": true, "requires": { - "merge": "1.2.0" + "original": "1.0.0" } }, "execa": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, "requires": { "cross-spawn": "5.1.0", "get-stream": "3.0.0", @@ -1581,22 +1133,6 @@ "strip-eof": "1.0.0" } }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "requires": { - "fill-range": "2.2.3" - } - }, "expect": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/expect/-/expect-1.20.2.tgz", @@ -1625,8 +1161,8 @@ "cookie": "0.3.1", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.1", - "encodeurl": "1.0.1", + "depd": "1.1.2", + "encodeurl": "1.0.2", "escape-html": "1.0.3", "etag": "1.8.1", "finalhandler": "1.1.0", @@ -1656,65 +1192,61 @@ "requires": { "ms": "2.0.0" } - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" } } }, + "express-async-errors": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/express-async-errors/-/express-async-errors-2.1.0.tgz", + "integrity": "sha512-l32SdF88BOZ3+kpQYERtL9mMHZNFI5flBp+qJeGT6Jt+bz2Ch6qhqQsc1QPTvup9u0+5KmcOjZuBxLROLt49Vg==", + "requires": { + "express": "4.16.2" + } + }, "extend": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" }, "external-editor": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz", - "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", + "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", "dev": true, "requires": { - "iconv-lite": "0.4.18", - "jschardet": "1.5.0", - "tmp": "0.0.31" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "requires": { - "is-extglob": "1.0.0" + "chardet": "0.4.2", + "iconv-lite": "0.4.19", + "tmp": "0.0.33" } }, "extsprintf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true }, - "fb-watchman": { + "figures": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz", - "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, "requires": { - "bser": "2.0.0" + "escape-string-regexp": "1.0.5" } }, "file-entry-cache": { @@ -1723,43 +1255,17 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.2.2", + "flat-cache": "1.3.0", "object-assign": "4.1.1" } }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" - }, - "fileset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", - "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", - "requires": { - "glob": "7.1.1", - "minimatch": "3.0.4" - } - }, - "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, "finalhandler": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", "requires": { "debug": "2.6.9", - "encodeurl": "1.0.1", + "encodeurl": "1.0.2", "escape-html": "1.0.3", "on-finished": "2.3.0", "parseurl": "1.3.2", @@ -1786,37 +1292,33 @@ } }, "flat-cache": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", - "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.1", + "circular-json": "0.3.3", "del": "2.2.2", "graceful-fs": "4.1.11", "write": "0.2.1" } }, "follow-redirects": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz", - "integrity": "sha1-NLkLqyqRGqNHVx2pDyK9NuzYqRk=", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.6.tgz", + "integrity": "sha512-FrMqZ/FONtHnbqO651UPpfRUVukIEwJhXMfdr/JWAmrDbeYBu773b1J6gdWDyRIj4hvvzQEHoEOTrdR8o6KLYA==", "requires": { - "debug": "2.6.8", - "stream-consume": "0.1.0" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "requires": { - "for-in": "1.0.2" + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } } }, "foreach": { @@ -1825,29 +1327,31 @@ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", "dev": true }, + "foreachasync": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz", + "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=" + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" + "combined-stream": "1.0.6", + "mime-types": "2.1.17" } }, - "formatio": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", - "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", - "dev": true, - "requires": { - "samsam": "1.3.0" - } + "formidable": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz", + "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=", + "dev": true }, "forwarded": { "version": "0.1.2", @@ -1904,7 +1408,8 @@ "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true }, "getpass": { "version": "0.1.7", @@ -1912,37 +1417,32 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "github": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/github/-/github-10.1.0.tgz", - "integrity": "sha512-9id0pjUTIkmOrcGcIgLhpZZjIsXUTRzDpQUR5hqvtIwPC93Eq6/4DfWc8iqp0/E73lr7zp38+5TOddcPvuaDKw==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/github/-/github-12.1.0.tgz", + "integrity": "sha512-HhWjhd/OATC4Hjj7xfGjGRtwWzo/fzTc55EkvsRatI9G6Vp47mVcdBIt1lQ56A9Qit/yVQRX1+M9jbWlcJvgug==", "requires": { - "follow-redirects": "0.0.7", - "https-proxy-agent": "1.0.0", - "mime": "1.4.1", + "dotenv": "4.0.0", + "follow-redirects": "1.2.6", + "https-proxy-agent": "2.1.1", + "lodash": "4.17.5", + "mime": "2.2.0", "netrc": "0.1.4" - } - }, - "github-app": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/github-app/-/github-app-3.2.0.tgz", - "integrity": "sha512-afKv6H9svvYcDILaKM5xcRY77dvfDoRmj7Vv2Rf+bNYu3ibNHDFifD5nk5DE4qw0CGBu6u559NQmo5vwOAyKJA==", - "requires": { - "github": "10.1.0", - "jsonwebtoken": "7.4.3" + }, + "dependencies": { + "mime": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz", + "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA==" + } } }, "github-webhook-handler": { - "version": "github:rvagg/github-webhook-handler#7cfcb5b724a7735f132778cf15245cac8547ff60", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/github-webhook-handler/-/github-webhook-handler-0.7.1.tgz", + "integrity": "sha512-MbNHzZ4CjMOIzhR2PN0G54nANYcgHZNcpDADIOj2xSEzwyKx7N+Rg6fhBHfSnw1Sw3/xLhr2ufZjLXGcHqHcvg==", "requires": { "bl": "1.1.2", "buffer-equal-constant-time": "1.0.1" @@ -1961,42 +1461,35 @@ "path-is-absolute": "1.0.1" } }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - } + "globals": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz", + "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==", + "dev": true }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, "requires": { - "is-glob": "2.0.1" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" - }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, - "growly": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", - "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=" - }, "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz", + "integrity": "sha1-ksbta7FkEQxQ1NjQ+93HCAbG+Oc=", "requires": { "async": "1.5.2", "optimist": "0.6.1", @@ -2004,28 +1497,25 @@ "uglify-js": "2.8.29" }, "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": "1.0.1" - } + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" } } }, "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" + "ajv": "5.5.2", + "har-schema": "2.0.0" } }, "has": { @@ -2040,53 +1530,47 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, "requires": { "ansi-regex": "2.1.1" } }, "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true }, "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.0", + "sntp": "2.1.0" } }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "hbs": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/hbs/-/hbs-4.0.1.tgz", + "integrity": "sha1-S/2YZQ3IydrESzyprfnAmOi8M7Y=", "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "handlebars": "4.0.5", + "walk": "2.3.9" } }, + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" }, - "html-encoding-sniffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", - "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", - "requires": { - "whatwg-encoding": "1.0.3" - } - }, "html-entities": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", @@ -2103,6 +1587,11 @@ "statuses": "1.3.1" }, "dependencies": { + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=" + }, "setprototypeof": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", @@ -2111,41 +1600,50 @@ } }, "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", + "assert-plus": "1.0.0", + "jsprim": "1.4.1", "sshpk": "1.13.1" } }, "https-proxy-agent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz", - "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz", + "integrity": "sha512-LK6tQUR/VOkTI6ygAfWUKKP95I+e6M1h7N3PncGu1CATHCnex+CAv9ttR0lbHu1Uk2PXm/WoAHFo6JCGwMjVMw==", "requires": { - "agent-base": "2.1.1", - "debug": "2.6.8", - "extend": "3.0.1" + "agent-base": "4.2.0", + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } } }, "iconv-lite": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", - "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==", - "dev": true + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" }, "ignore": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", - "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", + "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==", "dev": true }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true }, "inflight": { "version": "1.0.6", @@ -2161,12 +1659,59 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, - "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "inquirer": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "dev": true, "requires": { - "loose-envify": "1.3.1" + "ansi-escapes": "3.0.0", + "chalk": "2.3.1", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.1.0", + "figures": "2.0.0", + "lodash": "4.17.5", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } } }, "invert-kv": { @@ -2237,14 +1782,6 @@ "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", "dev": true }, - "is-ci": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz", - "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", - "requires": { - "ci-info": "1.1.1" - } - }, "is-date-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", @@ -2256,11 +1793,6 @@ "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.0.tgz", "integrity": "sha1-lAV5tupjxigICmnmK9qIyEcLT+A=" }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" - }, "is-equal": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/is-equal/-/is-equal-1.5.5.tgz", @@ -2280,32 +1812,6 @@ "object.entries": "1.0.4" } }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "requires": { - "is-primitive": "2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "requires": { - "number-is-nan": "1.0.1" - } - }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -2320,27 +1826,11 @@ "integrity": "sha1-nnFlPNFf/zQcecQVFGChMdMen8Q=", "dev": true }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "requires": { - "is-extglob": "1.0.0" - } - }, "is-hexadecimal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.0.tgz", "integrity": "sha1-XEWXcdKvmi45Ungf1U/LG8/kETw=" }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "requires": { - "kind-of": "3.2.2" - } - }, "is-number-object": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz", @@ -2359,13 +1849,13 @@ "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", "dev": true, "requires": { - "is-path-inside": "1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", - "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { "path-is-inside": "1.0.2" @@ -2376,16 +1866,6 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" - }, "is-promise": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", @@ -2402,18 +1882,16 @@ } }, "is-resolvable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", - "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", - "dev": true, - "requires": { - "tryit": "1.0.3" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true }, "is-string": { "version": "1.0.4", @@ -2452,948 +1930,42 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, - "isemail": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz", - "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=" - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "requires": { - "isarray": "1.0.0" - } + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "istanbul-api": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.1.tgz", - "integrity": "sha512-oFCwXvd65amgaPCzqrR+a2XjanS1MvpXN6l/MlMUTv6uiA1NOgGX+I0uyq8Lg3GDxsxPsaP1049krz3hIJ5+KA==", - "requires": { - "async": "2.5.0", - "fileset": "2.0.3", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "js-yaml": "3.8.4", - "mkdirp": "0.5.1", - "once": "1.4.0" - }, - "dependencies": { - "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", - "requires": { - "lodash": "4.17.4" - } - } - } - }, - "istanbul-lib-coverage": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==" - }, - "istanbul-lib-hook": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", - "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", - "requires": { - "append-transform": "0.4.0" - } - }, - "istanbul-lib-instrument": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", - "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", - "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.3.0" - } - }, - "istanbul-lib-report": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", - "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", - "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", - "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", - "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.1", - "source-map": "0.5.7" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true }, - "istanbul-reports": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", - "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", "requires": { - "handlebars": "4.0.11" - } - }, - "jest": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest/-/jest-21.2.1.tgz", - "integrity": "sha512-mXN0ppPvWYoIcC+R+ctKxAJ28xkt/Z5Js875padm4GbgUn6baeR5N4Ng6LjatIRpUQDZVJABT7Y4gucFjPryfw==", - "requires": { - "jest-cli": "21.2.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "jest-cli": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-21.2.1.tgz", - "integrity": "sha512-T1BzrbFxDIW/LLYQqVfo94y/hhaj1NzVQkZgBumAC+sxbjMROI7VkihOdxNR758iYbQykL2ZOWUBurFgkQrzdg==", - "requires": { - "ansi-escapes": "3.0.0", - "chalk": "2.3.0", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "is-ci": "1.0.10", - "istanbul-api": "1.2.1", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-source-maps": "1.2.2", - "jest-changed-files": "21.2.0", - "jest-config": "21.2.1", - "jest-environment-jsdom": "21.2.1", - "jest-haste-map": "21.2.0", - "jest-message-util": "21.2.1", - "jest-regex-util": "21.2.0", - "jest-resolve-dependencies": "21.2.0", - "jest-runner": "21.2.1", - "jest-runtime": "21.2.1", - "jest-snapshot": "21.2.1", - "jest-util": "21.2.1", - "micromatch": "2.3.11", - "node-notifier": "5.1.2", - "pify": "3.0.0", - "slash": "1.0.0", - "string-length": "2.0.0", - "strip-ansi": "4.0.0", - "which": "1.2.14", - "worker-farm": "1.5.1", - "yargs": "9.0.1" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "2.3.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - }, - "yargs": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz", - "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "requires": { - "camelcase": "4.1.0" - } - } - } - }, - "jest-changed-files": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-21.2.0.tgz", - "integrity": "sha512-+lCNP1IZLwN1NOIvBcV5zEL6GENK6TXrDj4UxWIeLvIsIDa+gf6J7hkqsW2qVVt/wvH65rVvcPwqXdps5eclTQ==", - "requires": { - "throat": "4.1.0" - } - }, - "jest-config": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-21.2.1.tgz", - "integrity": "sha512-fJru5HtlD/5l2o25eY9xT0doK3t2dlglrqoGpbktduyoI0T5CwuB++2YfoNZCrgZipTwPuAGonYv0q7+8yDc/A==", - "requires": { - "chalk": "2.3.0", - "glob": "7.1.1", - "jest-environment-jsdom": "21.2.1", - "jest-environment-node": "21.2.1", - "jest-get-type": "21.2.0", - "jest-jasmine2": "21.2.1", - "jest-regex-util": "21.2.0", - "jest-resolve": "21.2.0", - "jest-util": "21.2.1", - "jest-validate": "21.2.1", - "pretty-format": "21.2.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-diff": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-21.2.1.tgz", - "integrity": "sha512-E5fu6r7PvvPr5qAWE1RaUwIh/k6Zx/3OOkZ4rk5dBJkEWRrUuSgbMt2EO8IUTPTd6DOqU3LW6uTIwX5FRvXoFA==", - "requires": { - "chalk": "2.3.0", - "diff": "3.4.0", - "jest-get-type": "21.2.0", - "pretty-format": "21.2.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==" - }, - "jest-environment-jsdom": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-21.2.1.tgz", - "integrity": "sha512-mecaeNh0eWmzNrUNMWARysc0E9R96UPBamNiOCYL28k7mksb1d0q6DD38WKP7ABffjnXyUWJPVaWRgUOivwXwg==", - "requires": { - "jest-mock": "21.2.0", - "jest-util": "21.2.1", - "jsdom": "9.12.0" - } - }, - "jest-environment-node": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-21.2.1.tgz", - "integrity": "sha512-R211867wx9mVBVHzrjGRGTy5cd05K7eqzQl/WyZixR/VkJ4FayS8qkKXZyYnwZi6Rxo6WEV81cDbiUx/GfuLNw==", - "requires": { - "jest-mock": "21.2.0", - "jest-util": "21.2.1" - } - }, - "jest-get-type": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz", - "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==" - }, - "jest-haste-map": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-21.2.0.tgz", - "integrity": "sha512-5LhsY/loPH7wwOFRMs+PT4aIAORJ2qwgbpMFlbWbxfN0bk3ZCwxJ530vrbSiTstMkYLao6JwBkLhCJ5XbY7ZHw==", - "requires": { - "fb-watchman": "2.0.0", - "graceful-fs": "4.1.11", - "jest-docblock": "21.2.0", - "micromatch": "2.3.11", - "sane": "2.2.0", - "worker-farm": "1.5.1" - } - }, - "jest-jasmine2": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-21.2.1.tgz", - "integrity": "sha512-lw8FXXIEekD+jYNlStfgNsUHpfMWhWWCgHV7n0B7mA/vendH7vBFs8xybjQsDzJSduptBZJHqQX9SMssya9+3A==", - "requires": { - "chalk": "2.3.0", - "expect": "21.2.1", - "graceful-fs": "4.1.11", - "jest-diff": "21.2.1", - "jest-matcher-utils": "21.2.1", - "jest-message-util": "21.2.1", - "jest-snapshot": "21.2.1", - "p-cancelable": "0.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "expect": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/expect/-/expect-21.2.1.tgz", - "integrity": "sha512-orfQQqFRTX0jH7znRIGi8ZMR8kTNpXklTTz8+HGTpmTKZo3Occ6JNB5FXMb8cRuiiC/GyDqsr30zUa66ACYlYw==", - "requires": { - "ansi-styles": "3.2.0", - "jest-diff": "21.2.1", - "jest-get-type": "21.2.0", - "jest-matcher-utils": "21.2.1", - "jest-message-util": "21.2.1", - "jest-regex-util": "21.2.0" - } - } - } - }, - "jest-matcher-utils": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz", - "integrity": "sha512-kn56My+sekD43dwQPrXBl9Zn9tAqwoy25xxe7/iY4u+mG8P3ALj5IK7MLHZ4Mi3xW7uWVCjGY8cm4PqgbsqMCg==", - "requires": { - "chalk": "2.3.0", - "jest-get-type": "21.2.0", - "pretty-format": "21.2.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-message-util": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-21.2.1.tgz", - "integrity": "sha512-EbC1X2n0t9IdeMECJn2BOg7buOGivCvVNjqKMXTzQOu7uIfLml+keUfCALDh8o4rbtndIeyGU8/BKfoTr/LVDQ==", - "requires": { - "chalk": "2.3.0", - "micromatch": "2.3.11", - "slash": "1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-mock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-21.2.0.tgz", - "integrity": "sha512-aZDfyVf0LEoABWiY6N0d+O963dUQSyUa4qgzurHR3TBDPen0YxKCJ6l2i7lQGh1tVdsuvdrCZ4qPj+A7PievCw==" - }, - "jest-regex-util": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-21.2.0.tgz", - "integrity": "sha512-BKQ1F83EQy0d9Jen/mcVX7D+lUt2tthhK/2gDWRgLDJRNOdRgSp1iVqFxP8EN1ARuypvDflRfPzYT8fQnoBQFQ==" - }, - "jest-resolve": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-21.2.0.tgz", - "integrity": "sha512-vefQ/Lr+VdNvHUZFQXWtOqHX3HEdOc2MtSahBO89qXywEbUxGPB9ZLP9+BHinkxb60UT2Q/tTDOS6rYc6Mwigw==", - "requires": { - "browser-resolve": "1.11.2", - "chalk": "2.3.0", - "is-builtin-module": "1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-resolve-dependencies": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-21.2.0.tgz", - "integrity": "sha512-ok8ybRFU5ScaAcfufIQrCbdNJSRZ85mkxJ1EhUp8Bhav1W1/jv/rl1Q6QoVQHObNxmKnbHVKrfLZbCbOsXQ+bQ==", - "requires": { - "jest-regex-util": "21.2.0" - } - }, - "jest-runner": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-21.2.1.tgz", - "integrity": "sha512-Anb72BOQlHqF/zETqZ2K20dbYsnqW/nZO7jV8BYENl+3c44JhMrA8zd1lt52+N7ErnsQMd2HHKiVwN9GYSXmrg==", - "requires": { - "jest-config": "21.2.1", - "jest-docblock": "21.2.0", - "jest-haste-map": "21.2.0", - "jest-jasmine2": "21.2.1", - "jest-message-util": "21.2.1", - "jest-runtime": "21.2.1", - "jest-util": "21.2.1", - "pify": "3.0.0", - "throat": "4.1.0", - "worker-farm": "1.5.1" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "jest-runtime": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-21.2.1.tgz", - "integrity": "sha512-6omlpA3+NSE+rHwD0PQjNEjZeb2z+oRmuehMfM1tWQVum+E0WV3pFt26Am0DUfQkkPyTABvxITRjCUclYgSOsA==", - "requires": { - "babel-core": "6.26.0", - "babel-jest": "21.2.0", - "babel-plugin-istanbul": "4.1.5", - "chalk": "2.3.0", - "convert-source-map": "1.5.0", - "graceful-fs": "4.1.11", - "jest-config": "21.2.1", - "jest-haste-map": "21.2.0", - "jest-regex-util": "21.2.0", - "jest-resolve": "21.2.0", - "jest-util": "21.2.1", - "json-stable-stringify": "1.0.1", - "micromatch": "2.3.11", - "slash": "1.0.0", - "strip-bom": "3.0.0", - "write-file-atomic": "2.3.0", - "yargs": "9.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "2.3.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - }, - "yargs": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz", - "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "requires": { - "camelcase": "4.1.0" - } - } - } - }, - "jest-snapshot": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-21.2.1.tgz", - "integrity": "sha512-bpaeBnDpdqaRTzN8tWg0DqOTo2DvD3StOemxn67CUd1p1Po+BUpvePAp44jdJ7Pxcjfg+42o4NHw1SxdCA2rvg==", - "requires": { - "chalk": "2.3.0", - "jest-diff": "21.2.1", - "jest-matcher-utils": "21.2.1", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "pretty-format": "21.2.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-util": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-21.2.1.tgz", - "integrity": "sha512-r20W91rmHY3fnCoO7aOAlyfC51x2yeV3xF+prGsJAUsYhKeV670ZB8NO88Lwm7ASu8SdH0S+U+eFf498kjhA4g==", - "requires": { - "callsites": "2.0.0", - "chalk": "2.3.0", - "graceful-fs": "4.1.11", - "jest-message-util": "21.2.1", - "jest-mock": "21.2.0", - "jest-validate": "21.2.1", - "mkdirp": "0.5.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "jest-validate": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-21.2.1.tgz", - "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==", - "requires": { - "chalk": "2.3.0", - "jest-get-type": "21.2.0", - "leven": "2.1.0", - "pretty-format": "21.2.1" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.1" - } - } - } - }, - "joi": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz", - "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=", - "requires": { - "hoek": "2.16.3", - "isemail": "1.2.0", - "moment": "2.19.1", - "topo": "1.1.0" - } - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" - }, - "js-yaml": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz", - "integrity": "sha1-UgtFZPhlc7qWZir4Woyvp7S1pvY=", - "requires": { - "argparse": "1.0.9", - "esprima": "3.1.3" + "argparse": "1.0.9", + "esprima": "4.0.0" } }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true - }, - "jschardet": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.0.tgz", - "integrity": "sha512-+Q8JsoEQbrdE+a/gg1F9XO92gcKXgpE5UACqr0sIubjDmBEkd+OOWPGzQeMrWSLxd73r4dHxBeRW7edHu5LmJQ==", - "dev": true - }, - "jsdom": { - "version": "9.12.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz", - "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=", - "requires": { - "abab": "1.0.4", - "acorn": "4.0.13", - "acorn-globals": "3.1.0", - "array-equal": "1.0.0", - "content-type-parser": "1.0.2", - "cssom": "0.3.2", - "cssstyle": "0.2.37", - "escodegen": "1.9.0", - "html-encoding-sniffer": "1.0.2", - "nwmatcher": "1.4.3", - "parse5": "1.5.1", - "request": "2.81.0", - "sax": "1.2.4", - "symbol-tree": "3.2.2", - "tough-cookie": "2.3.2", - "webidl-conversions": "4.0.2", - "whatwg-encoding": "1.0.3", - "whatwg-url": "4.8.0", - "xml-name-validator": "2.0.1" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" - } - } + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" + "json-parse-better-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz", + "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==" }, "json-schema": { "version": "0.2.3", @@ -3403,60 +1975,52 @@ "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, - "json-stable-stringify": { + "json-stable-stringify-without-jsonify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "requires": { - "jsonify": "0.0.0" - } + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" - }, "jsonwebtoken": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz", - "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.1.1.tgz", + "integrity": "sha512-+ijVOtfLMlCII8LJkvabaKX3+8tGrGjiCTfzoed2D1b/ebKTO1hIYBQUJHbd9dJ9Fa4kH+dhYEd1qDwyzDLUUw==", "requires": { - "joi": "6.10.1", "jws": "3.1.4", + "lodash.includes": "4.3.0", + "lodash.isboolean": "3.0.3", + "lodash.isinteger": "4.0.4", + "lodash.isnumber": "3.0.3", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", "lodash.once": "4.1.1", - "ms": "2.0.0", + "ms": "2.1.1", "xtend": "4.0.1" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } } }, "jsprim": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", - "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { "assert-plus": "1.0.0", - "extsprintf": "1.0.2", + "extsprintf": "1.3.0", "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } + "verror": "1.10.0" } }, "just-extend": { @@ -3508,31 +2072,41 @@ "invert-kv": "1.0.0" } }, - "leven": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", - "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=" - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, "requires": { "prelude-ls": "1.1.2", "type-check": "0.3.2" } }, "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "requires": { "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", + "parse-json": "4.0.0", + "pify": "3.0.0", "strip-bom": "3.0.0" }, "dependencies": { + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "requires": { + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.1" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -3540,18 +2114,6 @@ } } }, - "localtunnel": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz", - "integrity": "sha1-3MWSL9hWUQN9S94k/ZMkjQsk6wU=", - "dev": true, - "requires": { - "debug": "2.6.8", - "openurl": "1.1.1", - "request": "2.81.0", - "yargs": "3.29.0" - } - }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -3562,9 +2124,9 @@ } }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "lodash.assign": { "version": "4.2.0", @@ -3577,6 +2139,36 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, "lodash.omit": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", @@ -3588,9 +2180,9 @@ "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, "lolex": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.1.3.tgz", - "integrity": "sha512-BdHq78SeI+6PAUtl4atDuCt7L6E4fab3mSRtqxm4ywaXe4uP7jZ0TTcFNuU20syUjxZc2l7jFqKVMJ+AX0LnpQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", + "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", "dev": true }, "longest": { @@ -3603,36 +2195,16 @@ "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.1.tgz", "integrity": "sha1-QtKRtUEeQDZcAOYxk0l+IkcxbjU=" }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "requires": { - "js-tokens": "3.0.2" - } - }, "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, "requires": { "pseudomap": "1.0.2", "yallist": "2.1.2" } }, - "lsmod": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz", - "integrity": "sha1-mgD3bco26yP6BTUK/htYXUKZ5ks=" - }, - "makeerror": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", - "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", - "requires": { - "tmpl": "1.0.4" - } - }, "markdown-escapes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.0.tgz", @@ -3675,6 +2247,16 @@ } } }, + "md5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", + "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", + "requires": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "1.1.5" + } + }, "mdast-util-compact": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz", @@ -3693,15 +2275,11 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" } }, - "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", - "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=" - }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -3712,55 +2290,36 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - }, "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" }, "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=" + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" }, "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "requires": { - "mime-db": "1.27.0" + "mime-db": "1.30.0" } }, "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -3777,15 +2336,46 @@ } }, "moment": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz", - "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=" + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", + "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==", + "optional": true + }, + "morgan": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz", + "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=", + "dev": true, + "requires": { + "basic-auth": "2.0.0", + "debug": "2.6.9", + "depd": "1.1.2", + "on-finished": "2.3.0", + "on-headers": "1.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, "mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -3822,9 +2412,9 @@ } }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", "optional": true }, "natives": { @@ -3835,7 +2425,8 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true }, "ncp": { "version": "2.0.0", @@ -3854,42 +2445,35 @@ "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=" }, "nise": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", - "integrity": "sha512-q9jXh3UNsMV28KeqI43ILz5+c3l+RiNW8mhurEwCKckuHQbL+hTJIKKTiUlCPKlgQ/OukFvSnKB/Jk3+sFbkGA==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.5.tgz", + "integrity": "sha512-Es4hGuq3lpip5PckrB+Qpuma282M0UJANJ+jxAgI+0wWTL9X6MtNv+M385JgqsAE8hv6NvD3lv8CQtXgEnvlpQ==", "dev": true, "requires": { - "formatio": "1.2.0", + "@sinonjs/formatio": "2.0.0", "just-extend": "1.1.27", - "lolex": "1.6.0", + "lolex": "2.3.2", "path-to-regexp": "1.7.0", "text-encoding": "0.6.4" }, "dependencies": { - "lolex": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", - "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "dev": true, + "requires": { + "isarray": "0.0.1" + } } } }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=" - }, - "node-notifier": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz", - "integrity": "sha1-L6nhJgX6EACdRFSdb82KY93g5P8=", - "requires": { - "growly": "1.3.0", - "semver": "5.3.0", - "shellwords": "0.1.1", - "which": "1.2.14" - } - }, "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", @@ -3897,22 +2481,15 @@ "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", - "semver": "5.3.0", + "semver": "5.5.0", "validate-npm-package-license": "3.0.1" } }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, "requires": { "path-key": "2.0.1" } @@ -3922,11 +2499,6 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, - "nwmatcher": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz", - "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==" - }, "nyc": { "version": "11.4.1", "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", @@ -5529,7 +4101,8 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true }, "object-inspect": { "version": "1.2.2", @@ -5555,15 +4128,6 @@ "has": "1.0.1" } }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - } - }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -5572,6 +4136,12 @@ "ee-first": "1.1.1" } }, + "on-headers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", + "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", + "dev": true + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -5580,11 +4150,14 @@ "wrappy": "1.0.2" } }, - "openurl": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz", - "integrity": "sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=", - "dev": true + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "1.2.0" + } }, "optimist": { "version": "0.6.1", @@ -5606,6 +4179,7 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, "requires": { "deep-is": "0.1.3", "fast-levenshtein": "2.0.6", @@ -5615,10 +4189,14 @@ "wordwrap": "1.0.0" } }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + "original": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", + "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", + "dev": true, + "requires": { + "url-parse": "1.0.5" + } }, "os-locale": { "version": "1.4.0", @@ -5631,36 +4209,41 @@ "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true }, "over": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz", "integrity": "sha1-8phS5w/X4l82DgE6jsRMgq7bVwg=" }, - "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true }, "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "requires": { + "p-try": "1.0.0" + } }, "p-locate": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "requires": { - "p-limit": "1.1.0" + "p-limit": "1.2.0" } }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + }, "parse-entities": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz", @@ -5674,17 +4257,6 @@ "is-hexadecimal": "1.0.0" } }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - } - }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -5693,11 +4265,6 @@ "error-ex": "1.3.1" } }, - "parse5": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", - "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=" - }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", @@ -5722,7 +4289,8 @@ "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true }, "path-parse": { "version": "1.0.5", @@ -5730,21 +4298,9 @@ "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" }, "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "path-type": { "version": "1.1.0", @@ -5757,21 +4313,21 @@ } }, "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "perjury": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/perjury/-/perjury-1.0.10.tgz", - "integrity": "sha1-v9G6uQf4eXS5Y1YRsI+NB/pZWFA=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/perjury/-/perjury-1.1.1.tgz", + "integrity": "sha512-ajpb3Cf1tQtnLKNB1YDLCpo1zEWCV/JMlWBNOlxK1VNtLikhJkf/FCtA+wVaxtn2Js1Bi/wT+lFDFIZkFnbYNQ==", "dev": true, "requires": { - "async": "2.5.0", - "coffee-script": "1.12.7", + "async": "2.6.0", + "coffeescript": "1.12.7", "debug": "3.1.0", - "lodash": "4.17.4", - "yargs": "10.0.3" + "lodash": "4.17.5", + "yargs": "11.0.0" }, "dependencies": { "ansi-regex": { @@ -5780,15 +4336,23 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "cliui": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", + "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", "dev": true, "requires": { - "lodash": "4.17.4" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, + "coffeescript": { + "version": "1.12.7", + "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz", + "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==", + "dev": true + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -5835,12 +4399,12 @@ } }, "yargs": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz", - "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", "find-up": "2.1.0", "get-caller-file": "1.0.2", @@ -5851,7 +4415,7 @@ "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "8.0.0" + "yargs-parser": "9.0.2" } } } @@ -5875,104 +4439,63 @@ } }, "pkg-conf": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.0.0.tgz", - "integrity": "sha1-BxyHZQQDvM+5xif1h1G/5HwGcnk=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz", + "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "requires": { "find-up": "2.1.0", - "load-json-file": "2.0.0" + "load-json-file": "4.0.0" } }, + "pluralize": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "dev": true + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" - }, - "pretty-format": { - "version": "21.2.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-21.2.1.tgz", - "integrity": "sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==", - "requires": { - "ansi-regex": "3.0.0", - "ansi-styles": "3.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "requires": { - "color-convert": "1.9.0" - } - } - } - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true }, "probot": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/probot/-/probot-3.0.1.tgz", - "integrity": "sha512-FHSzwqsIDIxb4X0gKVspDRbMzsRA62GGeIUsAoLsG7bnWTlqaMieJLETHAvMv9dJmYFgLoo+FTk0kXxwbwZKmg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/probot/-/probot-5.0.0.tgz", + "integrity": "sha512-/idAAkDJguZWoW2G5lgo9Q2632eG/2wjGcbauqpECAfv9Iyng7qDhfb94PjOYR4w86xE6gOineUJ07TQHIZwpA==", "requires": { "bottleneck": "1.16.0", "bunyan": "1.8.12", "bunyan-format": "0.2.1", "bunyan-sentry-stream": "1.2.1", - "cache-manager": "2.5.0", - "commander": "2.11.0", + "cache-manager": "2.7.0", + "commander": "2.14.1", "dotenv": "4.0.0", - "ejs": "2.5.7", "express": "4.16.2", - "github": "10.1.0", - "github-app": "3.2.0", - "github-webhook-handler": "github:rvagg/github-webhook-handler#7cfcb5b724a7735f132778cf15245cac8547ff60", - "jest": "21.2.1", + "express-async-errors": "2.1.0", + "github": "12.1.0", + "github-webhook-handler": "0.7.1", + "hbs": "4.0.1", "js-yaml": "3.10.0", - "pkg-conf": "2.0.0", + "jsonwebtoken": "8.1.1", + "pkg-conf": "2.1.0", "promise-events": "0.1.4", - "raven": "2.2.1", + "raven": "2.4.1", "resolve": "1.5.0", - "semver": "5.4.1" - }, - "dependencies": { - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" - }, - "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", - "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" - } - }, - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" - } + "semver": "5.5.0" } }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "dev": true + }, + "progress": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", + "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", + "dev": true }, "promise-events": { "version": "0.1.4", @@ -5988,11 +4511,6 @@ "ipaddr.js": "1.5.2" } }, - "prr": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", - "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=" - }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -6038,46 +4556,15 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" }, - "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.5" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "requires": { - "is-buffer": "1.1.5" - } - } - } + "querystringify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", + "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", + "dev": true }, "range-parser": { "version": "1.2.0", @@ -6085,12 +4572,12 @@ "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" }, "raven": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/raven/-/raven-2.2.1.tgz", - "integrity": "sha1-V8f75oqAFH7FJ97z18AVdc+Uj+M=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/raven/-/raven-2.4.1.tgz", + "integrity": "sha512-LLLS8bOJC1q33qszBsLaEtEg7X8G8hYLGcKO4s6EifAce2BN6cTRdBXNvwVNv4kNk82YUZYrj53yEbL4kCmjjw==", "requires": { "cookie": "0.3.1", - "lsmod": "1.0.0", + "md5": "2.2.1", "stack-trace": "0.0.9", "timed-out": "4.0.1", "uuid": "3.0.0" @@ -6110,15 +4597,8 @@ "requires": { "bytes": "3.0.0", "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" - } + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" } }, "read-pkg": { @@ -6182,33 +4662,20 @@ } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz", + "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==", "dev": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "1.0.7", + "process-nextick-args": "2.0.0", "safe-buffer": "5.1.1", "string_decoder": "1.0.3", "util-deprecate": "1.0.2" } }, - "regenerator-runtime": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", - "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==" - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "requires": { - "is-equal-shallow": "0.1.3" - } - }, "remark": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/remark/-/remark-7.0.1.tgz", @@ -6263,61 +4730,43 @@ "xtend": "4.0.1" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" - }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "requires": { - "is-finite": "1.0.2" - } - }, "replace-ext": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" }, "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "version": "2.83.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", + "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", "requires": { - "aws-sign2": "0.6.0", + "aws-sign2": "0.7.0", "aws4": "1.6.0", "caseless": "0.12.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", + "mime-types": "2.1.17", "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", + "performance-now": "2.1.0", + "qs": "6.5.1", "safe-buffer": "5.1.1", "stringstream": "0.0.5", - "tough-cookie": "2.3.2", + "tough-cookie": "2.3.3", "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "uuid": "3.2.1" } }, "require-directory": { @@ -6338,16 +4787,14 @@ "requires": { "caller-path": "0.1.0", "resolve-from": "1.0.1" - }, - "dependencies": { - "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", - "dev": true - } } }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, "resolve": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", @@ -6356,6 +4803,22 @@ "path-parse": "1.0.5" } }, + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "2.0.1", + "signal-exit": "3.0.2" + } + }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -6373,10 +4836,19 @@ "glob": "7.1.1" } }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "2.1.0" + } + }, "rx-lite": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", - "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", + "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "dev": true }, "rx-lite-aggregates": { @@ -6385,7 +4857,7 @@ "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", "dev": true, "requires": { - "rx-lite": "3.1.2" + "rx-lite": "4.0.8" } }, "safe-buffer": { @@ -6405,36 +4877,10 @@ "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==", "dev": true }, - "sane": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/sane/-/sane-2.2.0.tgz", - "integrity": "sha512-OSJxhHO0CgPUw3lUm3GhfREAfza45smvEI9ozuFrxKG10GHVo0ryW9FK5VYlLvxj0SV7HVKHW0voYJIRu27GWg==", - "requires": { - "anymatch": "1.3.2", - "exec-sh": "0.2.1", - "fb-watchman": "2.0.0", - "minimatch": "3.0.4", - "minimist": "1.2.0", - "walker": "1.0.7", - "watch": "0.18.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" - }, "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" }, "send": { "version": "0.16.1", @@ -6442,9 +4888,9 @@ "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", "requires": { "debug": "2.6.9", - "depd": "1.1.1", + "depd": "1.1.2", "destroy": "1.0.4", - "encodeurl": "1.0.1", + "encodeurl": "1.0.2", "escape-html": "1.0.3", "etag": "1.8.1", "fresh": "0.5.2", @@ -6471,7 +4917,7 @@ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", "requires": { - "encodeurl": "1.0.1", + "encodeurl": "1.0.2", "escape-html": "1.0.3", "parseurl": "1.3.2", "send": "0.16.1" @@ -6496,6 +4942,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, "requires": { "shebang-regex": "1.0.0" } @@ -6503,54 +4950,57 @@ "shebang-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" - }, - "shellwords": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", - "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==" + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true }, "sinon": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.0.2.tgz", - "integrity": "sha512-4mUsjHfjrHyPFGDTtNJl0q8cv4VOJGvQykI1r3fnn05ys0sQL9M1Y+DyyGNWLD2PMcoyqjJ/nFDm4K54V1eQOg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.3.0.tgz", + "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", "dev": true, "requires": { + "@sinonjs/formatio": "2.0.0", "diff": "3.4.0", - "formatio": "1.2.0", "lodash.get": "4.4.2", - "lolex": "2.1.3", - "nise": "1.2.0", - "supports-color": "4.5.0", - "type-detect": "4.0.3" + "lolex": "2.3.2", + "nise": "1.2.5", + "supports-color": "5.2.0", + "type-detect": "4.0.8" }, "dependencies": { "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" } } } }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" - }, "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", + "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + } + } }, "slice-stream": { "version": "1.0.0", @@ -6583,25 +5033,32 @@ } } }, + "smee-client": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/smee-client/-/smee-client-1.0.1.tgz", + "integrity": "sha512-porkZGtw7sHPuS5w6LW5FX7JY3JQuR52Y1cZoXHMmCzz3JKlFPkFZ3db6sXU+5iTTvexcUZ3U/bGWOMZECev/w==", + "dev": true, + "requires": { + "commander": "2.14.1", + "eventsource": "1.0.5", + "morgan": "1.9.0", + "superagent": "3.8.2" + } + }, "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "requires": { - "hoek": "2.16.3" + "hoek": "4.2.0" } }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { - "source-map": "0.5.7" + "amdefine": "1.0.1" } }, "spdx-correct": { @@ -6640,13 +5097,6 @@ "getpass": "0.1.7", "jsbn": "0.1.1", "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "stack-trace": { @@ -6664,35 +5114,6 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" }, - "stream-consume": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", - "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=" - }, - "string-length": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", - "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", - "requires": { - "astral-regex": "1.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -6736,18 +5157,11 @@ "ansi-regex": "2.1.1" } }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "0.2.1" - } - }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true }, "strip-json-comments": { "version": "2.0.1", @@ -6756,33 +5170,90 @@ "dev": true }, "strip-markdown": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-markdown/-/strip-markdown-3.0.0.tgz", - "integrity": "sha1-yHs8YtLUX2b47Lv1MkkCnv4SLJU=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-markdown/-/strip-markdown-3.0.1.tgz", + "integrity": "sha512-fvTgE4bDtZoA/NDHldeAyMEbF7d5SLwi9qJAVSCF45zyQPW7d0lINPjrEvNGgQ8dgwJx1eAxvicK+IDiWohuig==" }, - "supports-color": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", - "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "superagent": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz", + "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==", + "dev": true, "requires": { - "has-flag": "2.0.0" + "component-emitter": "1.2.1", + "cookiejar": "2.1.1", + "debug": "3.1.0", + "extend": "3.0.1", + "form-data": "2.3.2", + "formidable": "1.1.1", + "methods": "1.1.2", + "mime": "1.4.1", + "qs": "6.5.1", + "readable-stream": "2.3.4" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, - "symbol-tree": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", - "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=" + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true }, - "test-exclude": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz", - "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==", + "table": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", + "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "ajv": "5.5.2", + "ajv-keywords": "2.1.1", + "chalk": "2.3.1", + "lodash": "4.17.5", + "slice-ansi": "1.0.0", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } } }, "text-encoding": { @@ -6797,11 +5268,6 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, - "throat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", - "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=" - }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -6820,45 +5286,22 @@ "dev": true }, "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { "os-tmpdir": "1.0.2" } }, - "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" - }, - "topo": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz", - "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=", - "requires": { - "hoek": "2.16.3" - } - }, "tough-cookie": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", - "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "requires": { "punycode": "1.4.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" - }, "traverse": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", @@ -6869,11 +5312,6 @@ "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" - }, "trim-trailing-lines": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz", @@ -6884,12 +5322,6 @@ "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.0.tgz", "integrity": "sha1-a97f5/KqSabzxDIldodVWVfzQv0=" }, - "tryit": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", - "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", - "dev": true - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -6908,14 +5340,15 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, "requires": { "prelude-ls": "1.1.2" } }, "type-detect": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz", - "integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, "type-is": { @@ -6924,7 +5357,7 @@ "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.15" + "mime-types": "2.1.17" } }, "typedarray": { @@ -6955,6 +5388,12 @@ "wordwrap": "0.0.2" } }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "optional": true + }, "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", @@ -7077,6 +5516,16 @@ } } }, + "url-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", + "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", + "dev": true, + "requires": { + "querystringify": "0.0.4", + "requires-port": "1.0.0" + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -7088,9 +5537,9 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" }, "validate-npm-package-license": { "version": "3.0.1", @@ -7107,11 +5556,13 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "verror": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "extsprintf": "1.0.2" + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" } }, "vfile": { @@ -7129,70 +5580,19 @@ "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.1.tgz", "integrity": "sha1-C/iBb3MrD4vZAqVv2kxiyOk13FI=" }, - "walker": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", - "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", - "requires": { - "makeerror": "1.0.11" - } - }, - "watch": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz", - "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=", - "requires": { - "exec-sh": "0.2.1", - "minimist": "1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } - } - }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" - }, - "whatwg-encoding": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", - "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==", - "requires": { - "iconv-lite": "0.4.19" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" - } - } - }, - "whatwg-url": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz", - "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=", + "walk": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz", + "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=", "requires": { - "tr46": "0.0.3", - "webidl-conversions": "3.0.1" - }, - "dependencies": { - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" - } + "foreachasync": "3.0.0" } }, "which": { - "version": "1.2.14", - "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", - "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "dev": true, "requires": { "isexe": "2.0.0" } @@ -7200,27 +5600,14 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "window-size": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", - "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, - "worker-farm": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz", - "integrity": "sha512-T5NH6Wqsd8MwGD4AK8BBllUy6LmHaqjEOyo/YIUEegZui6/v5Bqde//3jwyE3PGiGYMmWi06exFBi5LNhhPFNw==", - "requires": { - "errno": "0.1.4", - "xtend": "4.0.1" - } + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true }, "wrap-ansi": { "version": "2.1.0", @@ -7245,16 +5632,6 @@ "mkdirp": "0.5.1" } }, - "write-file-atomic": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.2" - } - }, "x-is-function": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz", @@ -7265,11 +5642,6 @@ "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz", "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=" }, - "xml-name-validator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz", - "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" - }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", @@ -7285,24 +5657,10 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, - "yargs": { - "version": "3.29.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz", - "integrity": "sha1-GquWYOrnnYuPZ1vK7qtu40ws9pw=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "os-locale": "1.4.0", - "window-size": "0.1.4", - "y18n": "3.2.1" - } - }, "yargs-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz", - "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { "camelcase": "4.1.0" diff --git a/utils/issue-format-bot/package.json b/utils/issue-format-bot/package.json index 573f856bfd5d..b262eed2a885 100644 --- a/utils/issue-format-bot/package.json +++ b/utils/issue-format-bot/package.json @@ -19,12 +19,12 @@ }, "homepage": "https://github.com/EFForg/HTTPS-Everywhere#readme", "devDependencies": { - "eslint": "^4.3.0", + "eslint": "^4.17.0", "expect": "^1.20.2", - "localtunnel": "^1.8.3", "nyc": "^11.4.1", - "perjury": "^1.0.10", - "sinon": "^4.0.2" + "perjury": "^1.1.1", + "sinon": "^4.3.0", + "smee-client": "^1.0.1" }, "engines": { "node": ">= 7.7.0", @@ -33,11 +33,11 @@ "dependencies": { "domain-from-partial-url": "^1.0.0", "html-entities": "^1.2.1", - "lodash": "^4.17.4", - "probot": "^3.0.1", + "lodash": "^4.17.5", + "probot": "^5.0.0", "remark": "^7.0.1", - "request": "^2.81.0", - "strip-markdown": "^3.0.0", + "request": "^2.83.0", + "strip-markdown": "^3.0.1", "unzip": "^0.1.11" } } From b008ed1cd3d846966ddb9bf13d0c65e7025702c9 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 15 Feb 2018 20:29:08 -0800 Subject: [PATCH 670/844] Thin out the requirements. Don't duplicate those from test/rules/requirements.txt (#14645) --- Dockerfile | 7 +------ requirements.txt | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67099c090ba8..6ffee8e42419 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,6 @@ -FROM electronicfrontierfoundation/https-everywhere-docker-base +FROM electronicfrontierfoundation/https-everywhere-docker-base MAINTAINER William Budington "bill@eff.org" WORKDIR /opt COPY test/rules/requirements.txt /tmp/ RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt - -COPY test/chromium/requirements.txt /tmp/ -RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt - -ENV FIREFOX /firefox-latest/firefox/firefox diff --git a/requirements.txt b/requirements.txt index 03aa65f5a7c0..6f97e1d4cd67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1 @@ lxml>=3.3.3 -pycurl -regex -bsdiff4 -python-Levenshtein -selenium From d3117679e1f243a93f3a489ac8d65990da9fcd14 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 15 Feb 2018 21:39:39 -0800 Subject: [PATCH 671/844] lxml needed for validations and fetch tests --- test/rules/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/rules/requirements.txt b/test/rules/requirements.txt index 702314f7fcf3..0057c226a169 100644 --- a/test/rules/requirements.txt +++ b/test/rules/requirements.txt @@ -1,3 +1,4 @@ +lxml>=3.3.3 pycurl regex bsdiff4 From 98855263db5a630bb3d9a8e33f4c7894a02634ac Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 20:12:43 -0800 Subject: [PATCH 672/844] Convert securecookie validation to py3.6 --- test/validations.sh | 2 +- test/validations/securecookie/run.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/validations.sh b/test/validations.sh index c13a127c5e9f..2b81ac30a3f8 100755 --- a/test/validations.sh +++ b/test/validations.sh @@ -4,7 +4,7 @@ utils/remove-obsolete-references.sh test/validations/path/run.sh test/validations/test-coverage/run.sh -python2.7 test/validations/securecookie/run.py +python3.6 test/validations/securecookie/run.py python2.7 test/validations/filename/run.py python2.7 test/validations/relaxng/run.py python2.7 test/validations/special/run.py --quiet diff --git a/test/validations/securecookie/run.py b/test/validations/securecookie/run.py index cad8361a3094..da315dd52428 100644 --- a/test/validations/securecookie/run.py +++ b/test/validations/securecookie/run.py @@ -1,8 +1,8 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 # This python utility check for wildcard securecookies which -# can be normalized, warn and exit with non-zero when such -# rulesets exist. +# can be normalized, warn and exit with non-zero when such +# rulesets exist. # This is create in attempt to fix the issues on # https://github.com/EFForg/https-everywhere/pull/13840 @@ -16,10 +16,10 @@ def normalize_fn(fn): """ - OSX and Linux filesystems encode composite characters differently in + OSX and Linux filesystems encode composite characters differently in filenames. We should normalize to NFC: https://unicode.org/reports/tr15/ """ - fn = unicodedata.normalize("NFC", unicode(fn, "utf-8")).encode() + fn = unicodedata.normalize("NFC", fn) return fn def should_normalize_securecookie(host, name): @@ -50,8 +50,8 @@ def should_normalize_securecookie(host, name): name = branch.attrib["name"] if should_normalize_securecookie(host, name): - print ("ERROR %s: contains wildcard securecookies "\ - "which can be normalized." % filename) + print ("ERROR {}: contains wildcard securecookies "\ + "which can be normalized.".format(filename)) exit_with_non_zero = True break From 96c719be188711117719f814a3576b6dd02c147e Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 20:17:38 -0800 Subject: [PATCH 673/844] Convert filename validation to py3.6 --- test/validations.sh | 2 +- test/validations/filename/run.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/validations.sh b/test/validations.sh index 2b81ac30a3f8..8d9bd285f6d8 100755 --- a/test/validations.sh +++ b/test/validations.sh @@ -5,6 +5,6 @@ utils/remove-obsolete-references.sh test/validations/path/run.sh test/validations/test-coverage/run.sh python3.6 test/validations/securecookie/run.py -python2.7 test/validations/filename/run.py +python3.6 test/validations/filename/run.py python2.7 test/validations/relaxng/run.py python2.7 test/validations/special/run.py --quiet diff --git a/test/validations/filename/run.py b/test/validations/filename/run.py index 0f288e3a126e..37c0bdaedd3c 100755 --- a/test/validations/filename/run.py +++ b/test/validations/filename/run.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python2.7 -# +#!/usr/bin/env python3.6 +# # Validates and provides a generator for ruleset filenames # @@ -18,7 +18,7 @@ def validate_filenames(): most_common_entry = counted_lowercase_names.most_common(1)[0] if most_common_entry[1] > 1: dupe_filename = re.compile(re.escape(most_common_entry[0]), re.IGNORECASE) - print("%s failed case-insensitivity testing." % filter(dupe_filename.match, filenames)) + print("{} failed case-insensitivity testing.".format(list(filter(dupe_filename.match, filenames)))) print("Rules exist with identical case-insensitive names, which breaks some filesystems.") sys.exit(1) @@ -28,10 +28,10 @@ def validate_filenames(): continue if " " in fi: - print("%s failed validity: Rule filenames cannot contain spaces" % (fi)) + print("{} failed validity: Rule filenames cannot contain spaces".format(fi)) sys.exit(1) if not fi.endswith('.xml'): - print("%s failed validity: Rule filenames must end in .xml" % (fi)) + print("{} failed validity: Rule filenames must end in .xml".format(fi)) sys.exit(1) yield fi From 1a82ea014fe3687360419480c16823ac9748643f Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 20:21:32 -0800 Subject: [PATCH 674/844] Convert relaxng validation to py3.6 --- test/validations.sh | 2 +- test/validations/relaxng/run.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/validations.sh b/test/validations.sh index 8d9bd285f6d8..76ac1e95c381 100755 --- a/test/validations.sh +++ b/test/validations.sh @@ -6,5 +6,5 @@ test/validations/path/run.sh test/validations/test-coverage/run.sh python3.6 test/validations/securecookie/run.py python3.6 test/validations/filename/run.py -python2.7 test/validations/relaxng/run.py +python3.6 test/validations/relaxng/run.py python2.7 test/validations/special/run.py --quiet diff --git a/test/validations/relaxng/run.py b/test/validations/relaxng/run.py index 32503a58c22f..97e730934c35 100644 --- a/test/validations/relaxng/run.py +++ b/test/validations/relaxng/run.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.6 # -*- encoding: utf-8 -*- import argparse import glob import os -import unicodedata from lxml import etree @@ -31,7 +30,7 @@ if not relaxng.validate(tree): exit_code = 1 e = relaxng.error_log.last_error - print(("%s %s:%s:%s: %s" % (e.level_name, e.filename, e.line, e.column, e.message))) + print("{} {}:{}:{}: {}".format(e.level_name, e.filename, e.line, e.column, e.message)) if exit_code == 0: message = "Validation of rulesets against relaxng schema.xml succeeded." From f8fc1aad47ce27381442b5feaf6112f0b607ac4f Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 8 Feb 2018 21:53:58 -0800 Subject: [PATCH 675/844] Convert special validation to py3.6 --- test/validations.sh | 2 +- test/validations/special/run.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/validations.sh b/test/validations.sh index 76ac1e95c381..50d328a6155c 100755 --- a/test/validations.sh +++ b/test/validations.sh @@ -7,4 +7,4 @@ test/validations/test-coverage/run.sh python3.6 test/validations/securecookie/run.py python3.6 test/validations/filename/run.py python3.6 test/validations/relaxng/run.py -python2.7 test/validations/special/run.py --quiet +python3.6 test/validations/special/run.py --quiet diff --git a/test/validations/special/run.py b/test/validations/special/run.py index b9733b42a13d..737fea1001ba 100755 --- a/test/validations/special/run.py +++ b/test/validations/special/run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 import glob import argparse @@ -163,7 +163,7 @@ def nomes_all(where=sys.argv[1:]): try: tree = etree.parse(filename, xml_parser) except Exception as oops: - print("%s failed XML validity: %s\n" % (filename, oops)) + print("{} failed XML validity: {}\n".format(filename, oops)) sys.exit(1) if not xpath_ruleset(tree): From 87bc092a8267f25145e1ac8a3dd31c9c28a79845 Mon Sep 17 00:00:00 2001 From: William Budington Date: Tue, 13 Feb 2018 14:05:02 -0800 Subject: [PATCH 676/844] Convert test/script.py to py3.6 --- test/chromium.sh | 4 ++-- test/firefox.sh | 4 ++-- test/script.py | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/chromium.sh b/test/chromium.sh index 7724dcbc865a..efc134dba48d 100755 --- a/test/chromium.sh +++ b/test/chromium.sh @@ -25,7 +25,7 @@ if [ "$1" == "--justrun" ]; then PROFILE_DIRECTORY="$(mktemp -d)" trap 'rm -r "$PROFILE_DIRECTORY"' EXIT - + # Chromium package name is 'chromium' in Debian 7 (wheezy) and other distros like Arch BROWSER="chromium-browser" which $BROWSER || BROWSER="chromium" @@ -37,5 +37,5 @@ else ./make.sh echo "running tests" CRX_NAME="`ls -tr pkg/*.crx | tail -1`" - $XVFB_RUN python2.7 test/script.py Chrome $CRX_NAME + $XVFB_RUN python3.6 test/script.py Chrome $CRX_NAME fi diff --git a/test/firefox.sh b/test/firefox.sh index de60bfb4b376..56ec5720ef59 100755 --- a/test/firefox.sh +++ b/test/firefox.sh @@ -58,8 +58,8 @@ else PATH=/home/user/geckodriver:$PATH if [ -n "$FIREFOX" ]; then - $XVFB_RUN python2.7 test/script.py Firefox "$PROFILE_DIRECTORY" $FIREFOX + $XVFB_RUN python3.6 test/script.py Firefox "$PROFILE_DIRECTORY" $FIREFOX else - $XVFB_RUN python2.7 test/script.py Firefox "$PROFILE_DIRECTORY" + $XVFB_RUN python3.6 test/script.py Firefox "$PROFILE_DIRECTORY" fi fi diff --git a/test/script.py b/test/script.py index ec53abd71554..219e3c7945ae 100644 --- a/test/script.py +++ b/test/script.py @@ -49,8 +49,8 @@ class bcolors: error = e.__str__() if "executable needs to be in PATH" in e.__str__(): - print "ChromeDriver isn't installed. Check test/chromium/README.md " \ - "for instructions on how to install ChromeDriver" + print("ChromeDriver isn't installed. Check test/chromium/README.md " \ + "for instructions on how to install ChromeDriver") sys.exit(2) else: @@ -68,8 +68,8 @@ class bcolors: error = e.__str__() if "executable needs to be in PATH" in e.__str__(): - print "GeckoDriver isn't installed. Check test/firefox/README.md " \ - "for instructions on how to install GeckoDriver" + print("GeckoDriver isn't installed. Check test/firefox/README.md " \ + "for instructions on how to install GeckoDriver") sys.exit(2) else: @@ -78,18 +78,18 @@ class bcolors: # Allow the extension time to load time.sleep(1) -print '' +print('') driver.get('http://freerangekitten.com') test_failed = False if driver.current_url.startswith('https'): - print bcolors.OKGREEN + sys.argv[1] + ": HTTP to HTTPS redirection successful" + bcolors.ENDC + print(bcolors.OKGREEN + sys.argv[1] + ": HTTP to HTTPS redirection successful" + bcolors.ENDC) elif driver.current_url.startswith('http'): - print bcolors.FAIL + sys.argv[1] + ": HTTP to HTTPS redirection failed" + bcolors.ENDC + print(bcolors.FAIL + sys.argv[1] + ": HTTP to HTTPS redirection failed" + bcolors.ENDC) test_failed = True -print '' +print('') driver.quit() From 5d50293e4691dc9ea937c5a5623012297d938054 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 15 Feb 2018 22:04:48 -0800 Subject: [PATCH 677/844] Install pip modules for 3.6 as well --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ffee8e42419..eaf31bb4a93d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,6 @@ MAINTAINER William Budington "bill@eff.org" WORKDIR /opt COPY test/rules/requirements.txt /tmp/ -RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt +RUN pip install -r /tmp/requirements.txt +RUN pip3 install -r /tmp/requirements.txt +RUN rm /tmp/requirements.txt From f670a2ed66b7a7d1500dc30e9790fa469c5a33fc Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 15 Feb 2018 22:58:32 -0800 Subject: [PATCH 678/844] Delay popup for longer after initial page display --- test/selenium/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/selenium/util.py b/test/selenium/util.py index ba5cd448fb8c..35c1618f1289 100644 --- a/test/selenium/util.py +++ b/test/selenium/util.py @@ -81,7 +81,7 @@ def load_popup_for(self, url='about:blank'): chrome.tabs.create({url: '%s'}, function(tab) { setTimeout( () => chrome.tabs.create({url: '%s' + '?tabId=' + String(tab.id)}, done), - 250 + 500 ); }); })(arguments[0]); From ed52404e9e0d7d0f4119958453e3c33f69a8cfbe Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 16 Feb 2018 14:28:25 -0800 Subject: [PATCH 679/844] Clean up rules test. This is no longer a separate module in pypi, remove associated files. --- test/rules/HISTORY.rst | 9 - test/rules/{COPYING => LICENSE.txt} | 0 test/rules/MANIFEST.in | 11 - test/rules/README.md | 74 ++++++ test/rules/README.rst | 226 ------------------ .../certs_transitive_closure/build_closure.sh | 103 -------- test/rules/certs_transitive_closure/c_rehash | 180 -------------- .../certs_transitive_closure/unique_certs.py | 62 ----- test/rules/curl_test_nss/cacert/cacert1.pem | 41 ---- test/rules/curl_test_nss/cacert/cacert2.pem | 35 --- test/rules/curl_test_nss/cacert/cacert3.pem | 42 ---- .../curl_test_nss/curl_testcase_nss_sni.py | 43 ---- test/rules/setup.py | 33 --- test/rules/tox.ini | 24 -- 14 files changed, 74 insertions(+), 809 deletions(-) delete mode 100644 test/rules/HISTORY.rst rename test/rules/{COPYING => LICENSE.txt} (100%) delete mode 100644 test/rules/MANIFEST.in create mode 100644 test/rules/README.md delete mode 100644 test/rules/README.rst delete mode 100755 test/rules/certs_transitive_closure/build_closure.sh delete mode 100755 test/rules/certs_transitive_closure/c_rehash delete mode 100755 test/rules/certs_transitive_closure/unique_certs.py delete mode 100644 test/rules/curl_test_nss/cacert/cacert1.pem delete mode 100644 test/rules/curl_test_nss/cacert/cacert2.pem delete mode 100644 test/rules/curl_test_nss/cacert/cacert3.pem delete mode 100755 test/rules/curl_test_nss/curl_testcase_nss_sni.py delete mode 100644 test/rules/setup.py delete mode 100644 test/rules/tox.ini diff --git a/test/rules/HISTORY.rst b/test/rules/HISTORY.rst deleted file mode 100644 index 1b6f7af1ac52..000000000000 --- a/test/rules/HISTORY.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. :changelog: - -History -------- - -0.1.0 (unreleased) -++++++++++++++++++ - -* First release on PyPI. diff --git a/test/rules/COPYING b/test/rules/LICENSE.txt similarity index 100% rename from test/rules/COPYING rename to test/rules/LICENSE.txt diff --git a/test/rules/MANIFEST.in b/test/rules/MANIFEST.in deleted file mode 100644 index 2bb6bb1c98ff..000000000000 --- a/test/rules/MANIFEST.in +++ /dev/null @@ -1,11 +0,0 @@ -include AUTHORS.rst -include CONTRIBUTING.rst -include HISTORY.rst -include LICENSE -include README.rst - -recursive-include tests * -recursive-exclude * __pycache__ -recursive-exclude * *.py[co] - -recursive-include docs *.rst conf.py Makefile make.bat diff --git a/test/rules/README.md b/test/rules/README.md new file mode 100644 index 000000000000..8c574b0f408f --- /dev/null +++ b/test/rules/README.md @@ -0,0 +1,74 @@ +# HTTPS Everywhere Rule Checker + +Author: Ondrej Mikle, CZ.NIC (ondrej.mikle@nic.cz) + +## Configuration + +Copy `checker.config.sample` to `checker.config` and change the `rulesdir` under `[rulesets]` to point to a directory with the XML files of HTTPS Everywhere rules (usually the `src/chrome/content/rules` of locally checked out git tree of HTTPS Everywhere). + +## Running + +Once you have modified the config, run: + + check-https-rules checker.config + +Output will be written to selected log file, infos/warnings/errors contain the useful information. + +## Features + +* Attempts to follow Firefox behavior as closely as possible (including rewriting HTTP redirects according to rules; well except for Javascript and meta-redirects) +* IDN domain support +* Currently two metrics on "distance" of two resources implemented, one is purely string-based, the other tries to measure "similarity of the shape of DOM tree" +* Multi-threaded scanner +* Support for various "platforms" (e.g. CAcert), i.e. sets of CA certificate sets which can be switched during following of redirects +* set of used CA certificates can be statically restricted to one CA certificate set (see `static_ca_path` in config file) + +## What errors in rulesets can be detected + +* big difference in HTML page structure +* error in ruleset - declared target that no rule rewrites, bad regexps (usually capture groups are wrong), incomplete FQDNs, non-existent domains +* HTTP 200 in original page, while rewritten page returns 4xx/5xx +* cycle detection in redirects +* transvalid certificates (incomplete chains) +* other invalid certificate detection (self-signed, expired, CN mismatch...) + +## False positives and shortcomings + +* Some pages deliberately have different HTTP and HTTPS page, some for example redirect to different page under https +* URLs to scan are naively guessed from target hosts, having test set of URLs in a ruleset would improve it (better coverage) + +## Known bugs + +### At most 9 capture groups in rule supported + +This is a workaround for ambiguous rewrites in rules such as: + + + +The `$101` would actually mean 101-st group, so we assume that only first digit after `$` denotes the group (which is how it seems to work in javascript). + +### May not work under Windows + +According to [PyCURL documentation](http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCAPATH), using CAPATH may not work under Windows. I'd guess it's due to openssl's `c_rehash` utility that creates symlinks to PEM certificates. Hypothetically it could work if the symlinks were replaced by regular files with identical names, but haven't tried. + +### Threading bugs and workarounds + +There are some race conditions with Python threads and OpenSSL/GnuTLS that cause about due to SIGPIPE or SIGSEGV. While libcurl code seems to have implemented the necessary callbacks, there's a bug somewhere :-) + +Workaround: set `fetch_in_subprocess` under `http` section in config to true when using multiple threads for fetching. Using subprocess is on by default. + +You might have to set PYTHONPATH if working dir is different from code dir with python scripts. + +If underlying SSL library is NSS, threading looks fine. + +As a side effect, the CURL+NSS SNI bug does not happen with subprocesses (SSL session ID cache is not kept among process invocations). + +If pure-threaded version starts eating too much memory (like 1 GB in a minute), turn on the ``fetch_in_subprocess`` option metioned above. Some combinations of CURL and SSL library versions do that. Spawning separate subprocesses prevents any caches building up and eating too much memory. + +Using subprocess hypothetically might cause a deadlock due to insufficient buffer size when exchanging data through stdin/stdout in case of a large HTML page, but hasn't happened for any of the rules (I've tried to run them on the complete batch of rulesets contained in HTTPS Everywhere Nov 2 2012 commit c343f230a49d960dba90424799c3bacc2325fc94). Though in case deadlock happens, increase buffer size in `subprocess.Popen` invocation in `http_client.py`. + +### Generic bugs/quirks of SSL libraries + +Each of the three possible libraries (OpenSSL, GnuTLS, NSS) has different set of quirks. GnuTLS seems to be the most strict one regarding relevant RFCs and will not for instance tolerate certificate chain in wrong order or forgive server not sending `close_notify` alert. + +Thus it's entirely possible that while a server chain and SSL/TLS handshake seems OK when using one lib, it may break with the other. diff --git a/test/rules/README.rst b/test/rules/README.rst deleted file mode 100644 index fa404ae75802..000000000000 --- a/test/rules/README.rst +++ /dev/null @@ -1,226 +0,0 @@ -HTTPS Everywhere Rule Checker -============================= - -Author: Ondrej Mikle, CZ.NIC (ondrej.mikle@nic.cz) - -Installation ------------- - -:: - - pip install https-everywhere-checker - -or using the supplied setup.py - -:: - - python setup.py install - -Configuration -------------- - -Copy ``checker.config.sample`` to ``checker.config`` and change the -``rulesdir`` under ``[rulesets]`` to point to a directory with the XML -files of HTTPS Everywhere rules (usually the -``src/chrome/content/rules`` of locally checked out git tree of HTTPS -Everywhere). - -Running -------- - -Once you have modified the config, run: - -:: - - check-https-rules checker.config - -Output will be written to selected log file, infos/warnings/errors -contain the useful information. - -Features --------- - -- Attempts to follow Firefox behavior as closely as possible (including - rewriting HTTP redirects according to rules; well except for - Javascript and meta-redirects) -- IDN domain support -- Currently two metrics on "distance" of two resources implemented, one - is purely string-based, the other tries to measure "similarity of the - shape of DOM tree" -- Multi-threaded scanner -- Support for various "platforms" (e.g. CAcert), i.e. sets of CA - certificate sets which can be switched during following of redirects -- set of used CA certificates can be statically restricted to one CA - certificate set (see ``static_ca_path`` in config file) - -What errors in rulesets can be detected ---------------------------------------- - -- big difference in HTML page structure -- error in ruleset - declared target that no rule rewrites, bad regexps - (usually capture groups are wrong), incomplete FQDNs, non-existent - domains -- HTTP 200 in original page, while rewritten page returns 4xx/5xx -- cycle detection in redirects -- transvalid certificates (incomplete chains) -- other invalid certificate detection (self-signed, expired, CN - mismatch...) - -False positives and shortcomings --------------------------------- - -- Some pages deliberately have different HTTP and HTTPS page, some for - example redirect to different page under https -- URLs to scan are naively guessed from target hosts, having test set - of URLs in a ruleset would improve it (better coverage) - -Known bugs ----------- - -CURL+NSS can't handle hosts with SNI sharing same IP address -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -PyCURL and NSS incorrectly handle the case when two FQDNs have identical -IP address, use Server Name Indication and try to resume TLS session -with the same session ID. Even turning off SSL session cache via setting -``pycurl.SSL_SESSIONID_CACHE`` to zero won't help (it's ignored by -libcurl/pycurl for some reason). PyCURL+NSS fail to see that server -didn't acknowledge SNI in response (see RFC 4366 reference below), thus -'Host' header in HTTP and SNI seen by server are different, thus HTTP -404. - -This one issue was especially insidious bug, many thanks to Pavel Janík -for helping hunt this bug down. - -Testcase -^^^^^^^^ - -See ``curl_test_nss/curl_testcase_nss_sni.py`` script that demonstrates -the bug. - -Technical details -^^^^^^^^^^^^^^^^^ - -PyCURL sends TLS handshake with SNI for the first host. This works. -Connection is then closed, but PyCURL+NSS remembers the SSL session ID. -It will attempt to use the same session ID when later connecting to -second host on the same IP. - -However, the server won't acknowledge what client requested with new -SNI, because client attempts to resume during TLS handshake using the -incorrect session ID. Thus the session is "resumed" to the first host's -SNI. - -Side observation: When validation is turned off in PyCURL+NSS, it also -turns off session resume as a side effect (the code is in curl's nss.c). - -Workaround -^^^^^^^^^^ - -Set config to use SSLv3 instead of default TLSv1 (option ``ssl_version`` -under ``http`` section). - -Normative reference -^^^^^^^^^^^^^^^^^^^ - -See last four paragraphs of `RFC 4366, section -3.1 `__. Contrast with -`RFC 6066 section 3 `__, -last two paragraphs. In TLS 1.2 the logic is reversed - server must not -resume such connection and must go through full handshake again. - -At most 9 capture groups in rule supported -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This is a workaround for ambiguous rewrites in rules such as: - -:: - - - -The ``$101`` would actually mean 101-st group, so we assume that only first digit after ``$`` -denotes the group (which is how it seems to work in javascript). - -May not work under Windows -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -According to `PyCURL -documentation `__, -using CAPATH may not work under Windows. I'd guess it's due to openssl's -``c_rehash`` utility that creates symlinks to PEM certificates. -Hypothetically it could work if the symlinks were replaced by regular -files with identical names, but haven't tried. - -Threading bugs and workarounds -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -There are some race conditions with Python threads and OpenSSL/GnuTLS -that cause about due to SIGPIPE or SIGSEGV. While libcurl code seems to -have implemented the necessary callbacks, there's a bug somewhere :-) - -Workaround: set ``fetch_in_subprocess`` under ``http`` section in config -to true when using multiple threads for fetching. Using subprocess is on -by default. - -You might have to set PYTHONPATH if working dir is different from code -dir with python scripts. - -If underlying SSL library is NSS, threading looks fine. - -As a side effect, the CURL+NSS SNI bug does not happen with subprocesses -(SSL session ID cache is not kept among process invocations). - -If pure-threaded version starts eating too much memory (like 1 GB in a -minute), turn on the ``fetch_in_subprocess`` option metioned above. Some -combinations of CURL and SSL library versions do that. Spawning separate -subprocesses prevents any caches building up and eating too much memory. - -Using subprocess hypothetically might cause a deadlock due to -insufficient buffer size when exchanging data through stdin/stdout in -case of a large HTML page, but hasn't happened for any of the rules -(I've tried to run them on the complete batch of rulesets contained in -HTTPS Everywhere Nov 2 2012 commit -c343f230a49d960dba90424799c3bacc2325fc94). Though in case deadlock -happens, increase buffer size in ``subprocess.Popen`` invocation in -``http_client.py``. - -Generic bugs/quirks of SSL libraries -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Each of the three possible libraries (OpenSSL, GnuTLS, NSS) has -different set of quirks. GnuTLS seems to be the most strict one -regarding relevant RFCs and will not for instance tolerate certificate -chain in wrong order or forgive server not sending ``close_notify`` -alert. - -Thus it's entirely possible that while a server chain and SSL/TLS -handshake seems OK when using one lib, it may break with the other. - -Transvalid certificates (transitive closure of root and intermediate certs) ---------------------------------------------------------------------------- - -The ``platform_certs/FF_transvalid.tar.bz2`` attempts to simulate common -browser behavior of caching intermediate certs. The directory contains -FF's builtin certs and all intermediate certs that validate from FF's -builtin certs (a transitive closure). - -The certs above are in a tarball (need to be unpacked and c\_rehash'd -for use). - -The script is in ``certs_transitive_closure/build_closure.sh`` and is -rather crude, definitely needs some double-checking of sanity (see -comments inside the script). - -Quick outline of the script's algorithm: - -1. IntermediateSet\_0 := {trusted builtin certs from clean install of - Firefox} -2. Certs that have basic constraints CA=true or are X509 version 1 are - exported from some DB like SSL Observatory -3. Iterate over all exported certs, add new unique certificates not yet - contained in IntermediateSet\_n validate against latest - IntermediateSet\_n, forming IntermediateSet\_{n+1} -4. n += 1 -5. If any certs were added in step 3, goto 3, else end - -Last IntermediateSet is the closure. diff --git a/test/rules/certs_transitive_closure/build_closure.sh b/test/rules/certs_transitive_closure/build_closure.sh deleted file mode 100755 index ca4c0a19f915..000000000000 --- a/test/rules/certs_transitive_closure/build_closure.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Script to build transitive closure of valid intermediate and root certificates -# from a starting set of "trusted" ones and a set of intermediate CA ones. -# See usage() below for invocation. - -# IMPORTANT: You MUST compile openssl from source, otherwise it may take trust -# anchors from some distribution bundle (I didn't find a switch to turn it off -# Use latest stable openssl from openssl.org (I tested with 1.0.1c). - -OPENSSL="$HOME/tmp/openssl_raw/bin/openssl" - -usage() { - cat << EOF -Usage: $0 trusted_certs_dir intermediate_certs_dir output_dir - -Upon finishing, "output_dir" will contain all certificates from -"trusted_certs_dir" with all the certificates from "intermediate_certs_dir" that -can be transitively validated. - -All certs are expected in PEM format with ".pem" extension (lowercase). - -Note: this script will first run openssl's c_rehash on "trusted_certs_dir", so -symlinks will be added there. -EOF -} - -# print $@ and die with exitcode 1 -fatal() { - echo "$@" - exit 1 -} - -# Rehash certs for openssl's use in directory given as arg1 -rehash_dir() { - perl "$REHASH" "$1" > /dev/null -} - -if [ "$#" -lt 3 ]; then - usage - exit 1 -fi - -TRUSTED_DIR="$1" -INTERMEDIATE_DIR="$2" -OUTPUT_DIR="$3" - -SCRIPT_DIR="${0%/*}" -REHASH="$SCRIPT_DIR/c_rehash" -UNIQUE_CERTS="$SCRIPT_DIR/unique_certs.py" -ROUND=1 # iteration index -ROUND_NEW_CERTS=0 # number of new certs found in the round -ROUND_TA_DIR="$TRUSTED_DIR" # trust anchor dir for round -WORKDIR=$(mktemp -d closure_workdir.XXXX) - -echo "=== Starting, workdir is $WORKDIR" -#echo "=== Rehashing source dir $TRUSTED_DIR" -#rehash_dir "$TRUSTED_DIR" - -mkdir -p "$OUTPUT_DIR" || fatal "Can't create output dir and it's not directory - $OUTPUT_DIR" - -# Loop until no new transitively trusted certs are found -while [ "$ROUND_NEW_CERTS" -gt 0 -o "$TRUSTED_DIR" = "$ROUND_TA_DIR" ]; do - ROUND_NEW_CERTS=0 - echo "=== Starting round $ROUND" - ROUND_OUT_DIR="$WORKDIR/round_${ROUND}" - mkdir -p "$ROUND_OUT_DIR" - echo " \- Copying previous round certs from $ROUND_TA_DIR to $ROUND_OUT_DIR" - find "$ROUND_TA_DIR" -name "*.pem" -exec cp {} "$ROUND_OUT_DIR" ';' - echo " \- Rehash previous round certs in $ROUND_TA_DIR" - rehash_dir "$ROUND_TA_DIR" - - # Iterate over unique certs not yet in partial closure - # ...the for cycle below is ugly and has limit on cert count but while runs - # in a subshell (can't get variables out) - for TESTED_CERT in $(python "$UNIQUE_CERTS" "$INTERMEDIATE_DIR" "$ROUND_TA_DIR"); do - # TODO: - # - we should check against untrusted like Diginotar - # - openssl verify has "-purpose" option, but doesn't seem to work - # - find out if there's a way to disable built-in certbundle other than - # compile openssl locally - # - time checks are not done unless '-attime' is used, but it shouldn't - # matter for our purpose - # - the method of grepping for 'error' is crude, but exit code is - # meaningless - ERROR_COUNT=$("$OPENSSL" verify -CApath "$ROUND_TA_DIR" "$TESTED_CERT" 2>&1 | grep -ci error) - - if [ "$ERROR_COUNT" -eq 0 ]; then #chain validated - echo " \- Found $TESTED_CERT to be transitively trusted" - cp "$TESTED_CERT" "$ROUND_OUT_DIR" - ROUND_NEW_CERTS=$(($ROUND_NEW_CERTS+1)) - fi - done - - ROUND_TA_DIR="$ROUND_OUT_DIR" - ROUND=$((ROUND+1)) -done - -echo "=== Finished at round $ROUND" -echo " \- Last round dir with transitive closure is $ROUND_TA_DIR, copying to $OUTPUT_DIR" -find "$ROUND_TA_DIR" -name "*.pem" -type f -exec cp {} "$OUTPUT_DIR" ';' - -#rm -r "$WORKDIR" diff --git a/test/rules/certs_transitive_closure/c_rehash b/test/rules/certs_transitive_closure/c_rehash deleted file mode 100755 index 2fea36840257..000000000000 --- a/test/rules/certs_transitive_closure/c_rehash +++ /dev/null @@ -1,180 +0,0 @@ -#!/usr/bin/env perl - - -# Perl c_rehash script, scan all files in a directory -# and add symbolic links to their hash values. - -my $openssl; - -my $dir = "openssl really does not care about this var"; -my $prefix = "nor this one"; - -if(defined $ENV{OPENSSL}) { - $openssl = $ENV{OPENSSL}; -} else { - $openssl = "openssl"; - $ENV{OPENSSL} = $openssl; -} - -my $pwd; -eval "require Cwd"; -if (defined(&Cwd::getcwd)) { - $pwd=Cwd::getcwd(); -} else { - $pwd=`pwd`; chomp($pwd); -} -my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':'; # DOS/Win32 or Unix delimiter? - -$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); # prefix our path - -if(! -x $openssl) { - my $found = 0; - foreach (split /$path_delim/, $ENV{PATH}) { - if(-x "$_/$openssl") { - $found = 1; - $openssl = "$_/$openssl"; - last; - } - } - if($found == 0) { - print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n"; - exit 0; - } -} - -if(@ARGV) { - @dirlist = @ARGV; -} elsif($ENV{SSL_CERT_DIR}) { - @dirlist = split /$path_delim/, $ENV{SSL_CERT_DIR}; -} else { - $dirlist[0] = "$dir/certs"; -} - -if (-d $dirlist[0]) { - chdir $dirlist[0]; - $openssl="$pwd/$openssl" if (!-x $openssl); - chdir $pwd; -} - -foreach (@dirlist) { - if(-d $_ and -w $_) { - hash_dir($_); - } -} - -sub hash_dir { - my %hashlist; - print "Doing $_[0]\n"; - chdir $_[0]; - opendir(DIR, "."); - my @flist = readdir(DIR); - # Delete any existing symbolic links - foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) { - if(-l $_) { - unlink $_; - } - } - closedir DIR; - FILE: foreach $fname (grep {/\.pem$/} @flist) { - # Check to see if certificates and/or CRLs present. - my ($cert, $crl) = check_file($fname); - if(!$cert && !$crl) { - print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; - next; - } - link_hash_cert($fname) if($cert); - link_hash_crl($fname) if($crl); - } -} - -sub check_file { - my ($is_cert, $is_crl) = (0,0); - my $fname = $_[0]; - open IN, $fname; - while() { - if(/^-----BEGIN (.*)-----/) { - my $hdr = $1; - if($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) { - $is_cert = 1; - last if($is_crl); - } elsif($hdr eq "X509 CRL") { - $is_crl = 1; - last if($is_cert); - } - } - } - close IN; - return ($is_cert, $is_crl); -} - - -# Link a certificate to its subject name hash value, each hash is of -# the form . where n is an integer. If the hash value already exists -# then we need to up the value of n, unless its a duplicate in which -# case we skip the link. We check for duplicates by comparing the -# certificate fingerprints - -sub link_hash_cert { - my $fname = $_[0]; - $fname =~ s/'/'\\''/g; - my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in "$fname"`; - chomp $hash; - chomp $fprint; - $fprint =~ s/^.*=//; - $fprint =~ tr/://d; - my $suffix = 0; - # Search for an unused hash filename - while(exists $hashlist{"$hash.$suffix"}) { - # Hash matches: if fingerprint matches its a duplicate cert - if($hashlist{"$hash.$suffix"} eq $fprint) { - print STDERR "WARNING: Skipping duplicate certificate $fname\n"; - return; - } - $suffix++; - } - $hash .= ".$suffix"; - print "$fname => $hash\n"; - $symlink_exists=eval {symlink("",""); 1}; - if ($symlink_exists) { - symlink $fname, $hash; - } else { - open IN,"<$fname" or die "can't open $fname for read"; - open OUT,">$hash" or die "can't open $hash for write"; - print OUT ; # does the job for small text files - close OUT; - close IN; - } - $hashlist{$hash} = $fprint; -} - -# Same as above except for a CRL. CRL links are of the form .r - -sub link_hash_crl { - my $fname = $_[0]; - $fname =~ s/'/'\\''/g; - my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`; - chomp $hash; - chomp $fprint; - $fprint =~ s/^.*=//; - $fprint =~ tr/://d; - my $suffix = 0; - # Search for an unused hash filename - while(exists $hashlist{"$hash.r$suffix"}) { - # Hash matches: if fingerprint matches its a duplicate cert - if($hashlist{"$hash.r$suffix"} eq $fprint) { - print STDERR "WARNING: Skipping duplicate CRL $fname\n"; - return; - } - $suffix++; - } - $hash .= ".r$suffix"; - print "$fname => $hash\n"; - $symlink_exists=eval {symlink("",""); 1}; - if ($symlink_exists) { - symlink $fname, $hash; - } else { - system ("cp", $fname, $hash); - } - $hashlist{$hash} = $fprint; -} - diff --git a/test/rules/certs_transitive_closure/unique_certs.py b/test/rules/certs_transitive_closure/unique_certs.py deleted file mode 100755 index 78e59c587142..000000000000 --- a/test/rules/certs_transitive_closure/unique_certs.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python - -# Given a directory as arg1 with PEM certs as *.pem named files, return list of -# filenames that constitute set of unique certs (comparison is done on certs' -# SHA256) -# -# Symlinks are skipped, only regular files are returned. -# -# Second directory can be specified as arg2, containing *.pem certificates that -# should be skipped - i.e. set subtraction. Symlinks are accounted for in this -# exclude dir). - -import os -import sys -import logging -import ssl -from hashlib import sha256 -from glob import glob - -def pemFileHash(fname): - """ Return SHA256 hash of PEM cert in hex """ - with file(fname) as certFile: - pemData = certFile.read() - derData = ssl.PEM_cert_to_DER_cert(pemData) - certDigest = sha256(derData).hexdigest() - - return certDigest - - -sourceDir = sys.argv[1] -if not os.path.isdir(sourceDir): - raise ValueError("%s is not a directory" % sourceDir) - -filenames = glob("%s/*.pem" % sourceDir) -filenames.sort() #let's have some deterministic ordering -hash2cert = {} - -# Certs to be excluded -if len(sys.argv) >= 3: - excludeDir = sys.argv[2] - if not os.path.isdir(excludeDir): - raise ValueError("%s is not a directory" % excludeDir) - - for fname in filter(os.path.isfile, glob(excludeDir+"/*.pem")): - try: - certDigest = pemFileHash(fname) - hash2cert[certDigest] = fname - except: - logging.exception("Failed to process certificate file %s" % fname) - -# take only regular files, no symlinks -filenames = [f for f in filenames if os.path.isfile(f) and not os.path.islink(f)] - -for fname in filenames: - try: - certDigest = pemFileHash(fname) - if certDigest not in hash2cert: - print fname - hash2cert[certDigest] = fname - except: - logging.exception("Failed to process certificate file %s" % fname) - diff --git a/test/rules/curl_test_nss/cacert/cacert1.pem b/test/rules/curl_test_nss/cacert/cacert1.pem deleted file mode 100644 index e7dfc82947e3..000000000000 --- a/test/rules/curl_test_nss/cacert/cacert1.pem +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO -BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi -MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ -ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ -8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6 -zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y -fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7 -w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc -G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k -epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q -laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ -QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU -fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826 -YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w -ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY -gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe -MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0 -IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy -dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw -czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0 -dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl -aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC -AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg -b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB -ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc -nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg -18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c -gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl -Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY -sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T -SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF -CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum -GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk -zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW -omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD ------END CERTIFICATE----- diff --git a/test/rules/curl_test_nss/cacert/cacert2.pem b/test/rules/curl_test_nss/cacert/cacert2.pem deleted file mode 100644 index 35e2689d98ff..000000000000 --- a/test/rules/curl_test_nss/cacert/cacert2.pem +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290 -IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB -IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA -Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS -BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v -cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9 -4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB -Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J -0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ -FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx -bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q -SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb -6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV -m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g -eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG -kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7 -6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG -CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc -aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB -gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w -aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6 -tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0 -nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M -77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV -Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L -ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM -zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU -rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF -YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT -oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu -FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB -0m6lG5kngOcLqagA ------END CERTIFICATE----- diff --git a/test/rules/curl_test_nss/cacert/cacert3.pem b/test/rules/curl_test_nss/cacert/cacert3.pem deleted file mode 100644 index 087ca0e52a57..000000000000 --- a/test/rules/curl_test_nss/cacert/cacert3.pem +++ /dev/null @@ -1,42 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv -b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ -Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y -dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU -MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0 -Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN -AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a -iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1 -aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C -jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia -pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0 -FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt -XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL -oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6 -R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp -rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/ -LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA -BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow -gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV -BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG -A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS -c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH -AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr -BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB -MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y -Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj -ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5 -b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D -QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc -7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH -Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4 -D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3 -VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a -lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW -Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt -hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz -0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn -ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT -d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60 -4GGSt/M3mMS+lqO3ig== ------END CERTIFICATE----- diff --git a/test/rules/curl_test_nss/curl_testcase_nss_sni.py b/test/rules/curl_test_nss/curl_testcase_nss_sni.py deleted file mode 100755 index bf4195c954c7..000000000000 --- a/test/rules/curl_test_nss/curl_testcase_nss_sni.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python2.7 -import pycurl -import cStringIO - -""" Test case showing the CURL+NSS bug with SNI and FQDNs sharing IP address """ - -def curlRequest(url): - buf = cStringIO.StringIO() - headers = cStringIO.StringIO() - - c = pycurl.Curl() - c.setopt(c.URL, url) - c.setopt(c.VERBOSE, 1) - c.setopt(c.WRITEFUNCTION, buf.write) - c.setopt(c.HEADERFUNCTION, headers.write) - c.setopt(c.CONNECTTIMEOUT, 5) - c.setopt(c.TIMEOUT, 8) - c.setopt(c.CAPATH, "cacert/") - # Even though the bug is caused by SSL session IDs and session resume, the - # following option doesn't help, it's somehow "ignored" - #c.setopt(c.SSL_SESSIONID_CACHE, 0) - # Turning off certchain validation turns off SSL session IDs and the HTTP - # 400 thus vanishes: - #c.setopt(c.SSL_VERIFYPEER, 0) - #c.setopt(c.SSL_VERIFYHOST, 0) - # Also using SSLv3 instead of TLSv1 is a "workaround" for the HTTP 400: - #c.setopt(c.SSLVERSION, c.SSLVERSION_SSLv3) - c.perform() - - bufData = buf.getvalue() - headerData = headers.getvalue() - buf.close() - headers.close() - c.close() - - return (bufData, headerData) - -(data, headers) = curlRequest("https://wiki.vorratsdatenspeicherung.de") -print "=== Data length: ", len(data) -# This will return HTTP 400 if CURL was linked with NSS -(data, headers) = curlRequest("https://www.vorratsdatenspeicherung.de") -print "=== Data length: ", len(data) - diff --git a/test/rules/setup.py b/test/rules/setup.py deleted file mode 100644 index 31c875c775b8..000000000000 --- a/test/rules/setup.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup, find_packages - -readme = open('README.rst').read() -history = open('HISTORY.rst').read().replace('.. :changelog:', '') - -setup( - name='https-everywhere-checker', - version='0.1.0', - description='Rule checker for HTTPS Everywhere', - long_description=readme + '\n\n' + history, - author='Ondrej Mikle', - author_email='ondrej.mikle@nic.cz', - url='https://github.com/hiviah/https-everywhere-checker', - packages=find_packages('src', exclude=('tests',)), - package_dir={'': 'src'}, - include_package_data=True, - install_requires=[ - "pycurl>=7.19.0", - "lxml>=2.2.3", - "bsdiff4>=1.1.4", - "python-levenshtein>=0.10.2", - "regex>=0.1.20120613", - ], - license="GPL3", - keywords='https https-everywhere http security', - entry_points={ - 'console_scripts': [ - 'check-https-rules = https_everywhere_checker.check_rules:cli' - ], - } -) diff --git a/test/rules/tox.ini b/test/rules/tox.ini deleted file mode 100644 index 8af9a16c3a93..000000000000 --- a/test/rules/tox.ini +++ /dev/null @@ -1,24 +0,0 @@ -[tox] -envlist = py27,lint -[testenv] -commands= - py.test --basetemp={envtmpdir} {posargs} -deps = - pycurl>=7.19.0 - lxml>=2.2.3 - bsdiff4>=1.1.4 - python-levenshtein>=0.10.2 - regex>=0.1.20120613 - pytest>=2.3.5 - -[testenv:lint] -commands = - flake8 {toxinidir}/src/ -deps = - flake8==2.1.0 - pep8==1.5.7 - mccabe==0.2.1 - pep8-naming==0.2.2 - -[flake8] -ignore=N802,N806 From 49516e4f1d59c27a7858c96ec746bd148ff2b25a Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 16 Feb 2018 14:33:10 -0800 Subject: [PATCH 680/844] Run autopep8 on rules tests --- .../https_everywhere_checker/check_rules.py | 884 +++++++++--------- .../src/https_everywhere_checker/gvgen.py | 832 ++++++++--------- .../https_everywhere_checker/http_client.py | 867 ++++++++--------- .../src/https_everywhere_checker/metrics.py | 226 ++--- .../src/https_everywhere_checker/rule_trie.py | 416 +++++---- .../src/https_everywhere_checker/rules.py | 804 ++++++++-------- 6 files changed, 2055 insertions(+), 1974 deletions(-) diff --git a/test/rules/src/https_everywhere_checker/check_rules.py b/test/rules/src/https_everywhere_checker/check_rules.py index 66ab7851bd1d..59d25803ce34 100644 --- a/test/rules/src/https_everywhere_checker/check_rules.py +++ b/test/rules/src/https_everywhere_checker/check_rules.py @@ -22,455 +22,487 @@ from rules import Ruleset from rule_trie import RuleTrie + def convertLoglevel(levelString): - """Converts string 'debug', 'info', etc. into corresponding - logging.XXX value which is returned. - - @raises ValueError if the level is undefined - """ - try: - return getattr(logging, levelString.upper()) - except AttributeError: - raise ValueError("No such loglevel - %s" % levelString) + """Converts string 'debug', 'info', etc. into corresponding + logging.XXX value which is returned. + + @raises ValueError if the level is undefined + """ + try: + return getattr(logging, levelString.upper()) + except AttributeError: + raise ValueError("No such loglevel - %s" % levelString) + def getMetricClass(metricType): - """Get class for metric type from config file. - - @raises ValueError if the metric type is unknown - """ - metricMap = { - "markup": metrics.MarkupMetric, - "bsdiff": metrics.BSDiffMetric, - } - - if metricType not in metricMap: - raise ValueError("Metric type '%s' is not known" % metricType) - - return metricMap[metricType] + """Get class for metric type from config file. + + @raises ValueError if the metric type is unknown + """ + metricMap = { + "markup": metrics.MarkupMetric, + "bsdiff": metrics.BSDiffMetric, + } + + if metricType not in metricMap: + raise ValueError("Metric type '%s' is not known" % metricType) + + return metricMap[metricType] class ComparisonTask(object): - """Container for objects necessary for several plain/rewritten URL comparison - associated with a single ruleset. - """ - - def __init__(self, urls, fetcherPlain, fetcherRewriting, ruleset): - self.urls = urls - self.fetcherPlain = fetcherPlain - self.fetcherRewriting = fetcherRewriting - self.ruleset = ruleset - self.ruleFname = ruleset.filename - + """Container for objects necessary for several plain/rewritten URL comparison + associated with a single ruleset. + """ + + def __init__(self, urls, fetcherPlain, fetcherRewriting, ruleset): + self.urls = urls + self.fetcherPlain = fetcherPlain + self.fetcherRewriting = fetcherRewriting + self.ruleset = ruleset + self.ruleFname = ruleset.filename + + class UrlComparisonThread(threading.Thread): - """Thread worker for comparing plain and rewritten URLs. - """ - - def __init__(self, taskQueue, metric, thresholdDistance, autoDisable, resQueue): - """ - Comparison thread running HTTP/HTTPS scans. - - @param taskQueue: Queue.Queue filled with ComparisonTask objects - @param metric: metric.Metric instance - @param threshold: min distance that is reported as "too big" - @param resQueue: Result Queue, results are added there - """ - self.taskQueue = taskQueue - self.resQueue = resQueue - self.metric = metric - self.thresholdDistance = thresholdDistance - self.autoDisable = autoDisable - threading.Thread.__init__(self) - - def run(self): - while True: - try: - self.processTask(self.taskQueue.get()) - self.taskQueue.task_done() - except Exception, e: - logging.exception(e) - if self.taskQueue.empty(): - break - - def processTask(self, task): - problems = [] - for url in task.urls: - result = self.processUrl(url, task) - if result: - problems.append(result) - if problems: - for problem in problems: - logging.error("%s: %s" % (task.ruleFname, problem)) - if self.autoDisable: - disableRuleset(task.ruleset, problems) - - def queue_result(self, result, details, fname, url, https_url=None): - """ - Add results to result Queue - - @param result: Result of the test. "error" or "success" - @param details: More detailed results (in case of error) - @param fname: rule file name - @param url: base url of the test (http) - @param https_url: re-written https url - """ - - res = {"result": result, - "details": details, - "fname": fname, - "url": url} - if https_url: - res["https_url"] = https_url - self.resQueue.put(res) - - def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname): - logging.debug("=**= Start %s => %s ****", plainUrl, transformedUrl) - logging.debug("Fetching transformed page %s", transformedUrl) - transformedRcode, transformedPage = fetcherRewriting.fetchHtml(transformedUrl) - logging.debug("Fetching plain page %s", plainUrl) - # If we get an exception (e.g. connection refused, - # connection timeout) on the plain page, don't treat - # that as a failure (except DNS resolution errors) - plainRcode, plainPage = None, None - try: - plainRcode, plainPage = fetcherPlain.fetchHtml(plainUrl) - except Exception, e: - errno, message = e - if errno == 6: - message = "Fetch error: %s => %s: %s" % ( - plainUrl, transformedUrl, e) - self.queue_result("error", "fetch-error %s"% e, ruleFname, plainUrl, https_url=transformedUrl) - return message - - logging.debug("Non-fatal fetch error for plain page %s: %s" % (plainUrl, e)) - - # Compare HTTP return codes - if original page returned 2xx, - # but the transformed didn't, consider it an error in ruleset - # (note this is not symmetric, we don't care if orig page is broken). - # We don't handle 1xx codes for now. - if plainRcode and plainRcode//100 == 2 and transformedRcode//100 != 2: - message = "Non-2xx HTTP code: %s (%d) => %s (%d)" % ( - plainUrl, plainRcode, transformedUrl, transformedRcode) - self.queue_result("error", "non-2xx http code", ruleFname, plainUrl, https_url=transformedUrl) - logging.debug(message) - return message - - # If the plain page fetch got an exception, we don't - # need to do the distance comparison. Intuitively, if a - # plain page is fetchable people expect it to have the - # same content as the HTTPS page. But if the plain page - # is unreachable, there's nothing to compare to. - if plainPage: - distance = self.metric.distanceNormed(plainPage, transformedPage) - - logging.debug("==== D: %0.4f; %s (%d) -> %s (%d) =====", - distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage)) - if distance >= self.thresholdDistance: - logging.info("Big distance %0.4f: %s (%d) -> %s (%d). Rulefile: %s =====", - distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage), ruleFname) - - self.queue_result("success", "", ruleFname, plainUrl) - - def processUrl(self, plainUrl, task): - fetcherPlain = task.fetcherPlain - fetcherRewriting = task.fetcherRewriting - ruleFname = task.ruleFname - - try: - transformedUrl = task.ruleset.apply(plainUrl) - except Exception, e: - self.queue_result("regex_error", str(e), ruleFname, plainUrl) - logging.error("%s: Regex Error %s" % (ruleFname, str(e))) - return - - try: - message = self.fetchUrl(plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname) - - except: - # Try once more before sending an error result - try: - message = self.fetchUrl(plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname) - except Exception, e: - message = "Fetch error: %s => %s: %s" % ( - plainUrl, transformedUrl, e) - self.queue_result("error", "fetch-error %s"% e, ruleFname, plainUrl, https_url=transformedUrl) - logging.debug(message) - - finally: - logging.info("Finished comparing %s -> %s. Rulefile: %s.", - plainUrl, transformedUrl, ruleFname) - - return message + """Thread worker for comparing plain and rewritten URLs. + """ + + def __init__(self, taskQueue, metric, thresholdDistance, autoDisable, resQueue): + """ + Comparison thread running HTTP/HTTPS scans. + + @param taskQueue: Queue.Queue filled with ComparisonTask objects + @param metric: metric.Metric instance + @param threshold: min distance that is reported as "too big" + @param resQueue: Result Queue, results are added there + """ + self.taskQueue = taskQueue + self.resQueue = resQueue + self.metric = metric + self.thresholdDistance = thresholdDistance + self.autoDisable = autoDisable + threading.Thread.__init__(self) + + def run(self): + while True: + try: + self.processTask(self.taskQueue.get()) + self.taskQueue.task_done() + except Exception, e: + logging.exception(e) + if self.taskQueue.empty(): + break + + def processTask(self, task): + problems = [] + for url in task.urls: + result = self.processUrl(url, task) + if result: + problems.append(result) + if problems: + for problem in problems: + logging.error("%s: %s" % (task.ruleFname, problem)) + if self.autoDisable: + disableRuleset(task.ruleset, problems) + + def queue_result(self, result, details, fname, url, https_url=None): + """ + Add results to result Queue + + @param result: Result of the test. "error" or "success" + @param details: More detailed results (in case of error) + @param fname: rule file name + @param url: base url of the test (http) + @param https_url: re-written https url + """ + + res = {"result": result, + "details": details, + "fname": fname, + "url": url} + if https_url: + res["https_url"] = https_url + self.resQueue.put(res) + + def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname): + logging.debug("=**= Start %s => %s ****", plainUrl, transformedUrl) + logging.debug("Fetching transformed page %s", transformedUrl) + transformedRcode, transformedPage = fetcherRewriting.fetchHtml( + transformedUrl) + logging.debug("Fetching plain page %s", plainUrl) + # If we get an exception (e.g. connection refused, + # connection timeout) on the plain page, don't treat + # that as a failure (except DNS resolution errors) + plainRcode, plainPage = None, None + try: + plainRcode, plainPage = fetcherPlain.fetchHtml(plainUrl) + except Exception, e: + errno, message = e + if errno == 6: + message = "Fetch error: %s => %s: %s" % ( + plainUrl, transformedUrl, e) + self.queue_result("error", "fetch-error %s" % + e, ruleFname, plainUrl, https_url=transformedUrl) + return message + + logging.debug( + "Non-fatal fetch error for plain page %s: %s" % (plainUrl, e)) + + # Compare HTTP return codes - if original page returned 2xx, + # but the transformed didn't, consider it an error in ruleset + # (note this is not symmetric, we don't care if orig page is broken). + # We don't handle 1xx codes for now. + if plainRcode and plainRcode//100 == 2 and transformedRcode//100 != 2: + message = "Non-2xx HTTP code: %s (%d) => %s (%d)" % ( + plainUrl, plainRcode, transformedUrl, transformedRcode) + self.queue_result("error", "non-2xx http code", + ruleFname, plainUrl, https_url=transformedUrl) + logging.debug(message) + return message + + # If the plain page fetch got an exception, we don't + # need to do the distance comparison. Intuitively, if a + # plain page is fetchable people expect it to have the + # same content as the HTTPS page. But if the plain page + # is unreachable, there's nothing to compare to. + if plainPage: + distance = self.metric.distanceNormed(plainPage, transformedPage) + + logging.debug("==== D: %0.4f; %s (%d) -> %s (%d) =====", + distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage)) + if distance >= self.thresholdDistance: + logging.info("Big distance %0.4f: %s (%d) -> %s (%d). Rulefile: %s =====", + distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage), ruleFname) + + self.queue_result("success", "", ruleFname, plainUrl) + + def processUrl(self, plainUrl, task): + fetcherPlain = task.fetcherPlain + fetcherRewriting = task.fetcherRewriting + ruleFname = task.ruleFname + + try: + transformedUrl = task.ruleset.apply(plainUrl) + except Exception, e: + self.queue_result("regex_error", str(e), ruleFname, plainUrl) + logging.error("%s: Regex Error %s" % (ruleFname, str(e))) + return + + try: + message = self.fetchUrl( + plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname) + + except: + # Try once more before sending an error result + try: + message = self.fetchUrl( + plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname) + except Exception, e: + message = "Fetch error: %s => %s: %s" % ( + plainUrl, transformedUrl, e) + self.queue_result("error", "fetch-error %s" % + e, ruleFname, plainUrl, https_url=transformedUrl) + logging.debug(message) + + finally: + logging.info("Finished comparing %s -> %s. Rulefile: %s.", + plainUrl, transformedUrl, ruleFname) + + return message + def disableRuleset(ruleset, problems): - logging.info("Disabling ruleset %s", ruleset.filename) - contents = open(ruleset.filename).read() - # Don't bother to disable rulesets that are already disabled - if re.search("\bdefault_off=", contents): - return - contents = re.sub("(]*)>", - "\\1 default_off='failed ruleset test'>", contents) - - # Since the problems are going to be inserted into an XML comment, they cannot - # contain "--", or they will generate a parse error. Split up all "--" with a - # space in the middle. - safeProblems = [re.sub('--', '- -', p) for p in problems] - # If there's not already a comment section at the beginning, add one. - if not re.search("^\n" + contents - problemStatement = (""" + logging.info("Disabling ruleset %s", ruleset.filename) + contents = open(ruleset.filename).read() + # Don't bother to disable rulesets that are already disabled + if re.search("\bdefault_off=", contents): + return + contents = re.sub("(]*)>", + "\\1 default_off='failed ruleset test'>", contents) + + # Since the problems are going to be inserted into an XML comment, they cannot + # contain "--", or they will generate a parse error. Split up all "--" with a + # space in the middle. + safeProblems = [re.sub('--', '- -', p) for p in problems] + # If there's not already a comment section at the beginning, add one. + if not re.search("^\n" + contents + problemStatement = (""" + + + + + + + + + From 788927ca9f675832220c21ff22114a5113f730c0 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 18 Feb 2018 07:14:51 +1030 Subject: [PATCH 682/844] [Nieuweautokopen.nl] New ruleset (#14248) * [Nieuweautokopen.nl] New ruleset * Add missing host * Remove irrelevant comment --- .../content/rules/Nieuweautokopen.nl.xml | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 src/chrome/content/rules/Nieuweautokopen.nl.xml diff --git a/src/chrome/content/rules/Nieuweautokopen.nl.xml b/src/chrome/content/rules/Nieuweautokopen.nl.xml new file mode 100644 index 000000000000..617536d9dda8 --- /dev/null +++ b/src/chrome/content/rules/Nieuweautokopen.nl.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 77dfb45e45b8117d59ed240229441c9b76fb7760 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 18 Feb 2018 07:15:22 +1030 Subject: [PATCH 683/844] [Kijiji.it] New ruleset (#14251) * [Kijiji.it] New ruleset * Update comment --- src/chrome/content/rules/Kijiji.it.xml | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/chrome/content/rules/Kijiji.it.xml diff --git a/src/chrome/content/rules/Kijiji.it.xml b/src/chrome/content/rules/Kijiji.it.xml new file mode 100644 index 000000000000..513290e7c46b --- /dev/null +++ b/src/chrome/content/rules/Kijiji.it.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + From 23d76424a30c72f24bf6cf5fbd7522d230698477 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 18 Feb 2018 07:40:58 +1030 Subject: [PATCH 684/844] [2dehands.be] New ruleset (#13990) * [2dehands.be] New ruleset * Update comment --- src/chrome/content/rules/2dehands.be.xml | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/chrome/content/rules/2dehands.be.xml diff --git a/src/chrome/content/rules/2dehands.be.xml b/src/chrome/content/rules/2dehands.be.xml new file mode 100644 index 000000000000..365ac33c18de --- /dev/null +++ b/src/chrome/content/rules/2dehands.be.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + From baedba42e03f74e71248b0d8482cef794dcdbf08 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 18 Feb 2018 07:57:48 +1030 Subject: [PATCH 685/844] [Vivanuncios.com.mx] New ruleset (#14244) * [Vivanuncios.com.mx] New ruleset * Remove irrelevant comments --- .../content/rules/Vivanuncios.com.mx.xml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/chrome/content/rules/Vivanuncios.com.mx.xml diff --git a/src/chrome/content/rules/Vivanuncios.com.mx.xml b/src/chrome/content/rules/Vivanuncios.com.mx.xml new file mode 100644 index 000000000000..c1823f395b34 --- /dev/null +++ b/src/chrome/content/rules/Vivanuncios.com.mx.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + From 596a9907c17b6e35b6e87ecefd6eec3f62516801 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 17 Feb 2018 22:42:02 +0100 Subject: [PATCH 686/844] [Test-IPv6.cz] Merge and simplify rulesets (#14478) * [Test-IPv6.cz] Simplify ruleset * Delete Test-IPv6.cz-falsemixed.xml * [Test-IPv6.cz] Remove extra slash * [Test-IPv6.cz] Add targets * [Test-IPv6.cz] Add target --- .../content/rules/Test-IPv6.cz-falsemixed.xml | 21 ------ src/chrome/content/rules/Test-IPv6.cz.xml | 69 ++++++------------- 2 files changed, 22 insertions(+), 68 deletions(-) delete mode 100644 src/chrome/content/rules/Test-IPv6.cz-falsemixed.xml diff --git a/src/chrome/content/rules/Test-IPv6.cz-falsemixed.xml b/src/chrome/content/rules/Test-IPv6.cz-falsemixed.xml deleted file mode 100644 index de6cd1c2849a..000000000000 --- a/src/chrome/content/rules/Test-IPv6.cz-falsemixed.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/chrome/content/rules/Test-IPv6.cz.xml b/src/chrome/content/rules/Test-IPv6.cz.xml index aacb1037062d..40e8a5601130 100644 --- a/src/chrome/content/rules/Test-IPv6.cz.xml +++ b/src/chrome/content/rules/Test-IPv6.cz.xml @@ -1,52 +1,27 @@ - + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + From caafb0cd4250f123012238cd8dcc30601a240017 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 14:28:39 +0100 Subject: [PATCH 687/844] [Disqus] Fix duplicate test url (#14676) --- src/chrome/content/rules/Disqus.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Disqus.xml b/src/chrome/content/rules/Disqus.xml index 2a7deea18c3a..e436d1506e30 100644 --- a/src/chrome/content/rules/Disqus.xml +++ b/src/chrome/content/rules/Disqus.xml @@ -23,9 +23,9 @@ - + - + @@ -33,11 +33,11 @@ - + - + - + - + From 36b05371621c1f71b010034bda53b67d29584adc Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:29:52 +0800 Subject: [PATCH 688/844] Remove duplicated test urls from Unblocked.xml (#14675) * Remove duplicated test urls from Unblocked.xml * Update Unblocked.xml --- src/chrome/content/rules/Unblocked.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/chrome/content/rules/Unblocked.xml b/src/chrome/content/rules/Unblocked.xml index 6c44b1893024..3ed6745c4dc1 100644 --- a/src/chrome/content/rules/Unblocked.xml +++ b/src/chrome/content/rules/Unblocked.xml @@ -16,7 +16,6 @@ - @@ -34,11 +33,8 @@ - - - @@ -48,7 +44,6 @@ - From 7dfbeb73ceb99ad0f63c5df4e225662627e1615a Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:30:22 +0800 Subject: [PATCH 689/844] Remove duplicated test urls from continuousphp.com.xml (#14672) --- src/chrome/content/rules/continuousphp.com.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/rules/continuousphp.com.xml b/src/chrome/content/rules/continuousphp.com.xml index 92b0823fc4c0..84e403427fc6 100644 --- a/src/chrome/content/rules/continuousphp.com.xml +++ b/src/chrome/content/rules/continuousphp.com.xml @@ -10,7 +10,5 @@ statuspage.continuousphp.com mismatch - - From 3be5b1cfa4154642c826bbd7ca014c26e711f0d8 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:30:55 +0800 Subject: [PATCH 690/844] Remove duplicated test urls from 2345.com.xml (#14671) --- src/chrome/content/rules/2345.com.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/rules/2345.com.xml b/src/chrome/content/rules/2345.com.xml index a036db34f38c..1cac12464eb9 100644 --- a/src/chrome/content/rules/2345.com.xml +++ b/src/chrome/content/rules/2345.com.xml @@ -83,7 +83,6 @@ - From f1ec7636d96f4432fa615b37d4326b624fc3f93e Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:37:10 +0800 Subject: [PATCH 691/844] Remove duplicated test urls from JS.org.xml (#14668) * Remove duplicated test urls from JS.org.xml * Update JS.org.xml * Update JS.org.xml --- src/chrome/content/rules/JS.org.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/chrome/content/rules/JS.org.xml b/src/chrome/content/rules/JS.org.xml index e0f57b276ce2..7742cf4fbe21 100644 --- a/src/chrome/content/rules/JS.org.xml +++ b/src/chrome/content/rules/JS.org.xml @@ -872,7 +872,6 @@ - @@ -1567,7 +1566,6 @@ - @@ -1777,7 +1775,6 @@ - @@ -1796,10 +1793,8 @@ - - From a60d11a8bae351d58f377c1425ae15abac19054c Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:37:48 +0800 Subject: [PATCH 692/844] Remove duplicated test urls from 2ch.net.xml (#14667) --- src/chrome/content/rules/2ch.net.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/rules/2ch.net.xml b/src/chrome/content/rules/2ch.net.xml index f9af87978c1b..c1b9e92d5ee1 100644 --- a/src/chrome/content/rules/2ch.net.xml +++ b/src/chrome/content/rules/2ch.net.xml @@ -42,7 +42,6 @@ - @@ -169,7 +168,6 @@ - From 6e05ee05b58ad720e1e3842eff6400cf68612bcf Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:38:39 +0800 Subject: [PATCH 693/844] Remove duplicated test urls from voterinfo.gov.hk.xml (#14666) --- src/chrome/content/rules/voterinfo.gov.hk.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/chrome/content/rules/voterinfo.gov.hk.xml b/src/chrome/content/rules/voterinfo.gov.hk.xml index 9e092e029895..eeda88b8bb61 100644 --- a/src/chrome/content/rules/voterinfo.gov.hk.xml +++ b/src/chrome/content/rules/voterinfo.gov.hk.xml @@ -6,19 +6,12 @@ --> - - - - - - From d50658d0d3b3b9e441fa84ed43188c8f50f8c1aa Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:38:59 +0800 Subject: [PATCH 694/844] Remove duplicated test urls from tokyo2020.jp.xml (#14665) --- src/chrome/content/rules/tokyo2020.jp.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/rules/tokyo2020.jp.xml b/src/chrome/content/rules/tokyo2020.jp.xml index 8a920b53c82e..f944e995f5be 100644 --- a/src/chrome/content/rules/tokyo2020.jp.xml +++ b/src/chrome/content/rules/tokyo2020.jp.xml @@ -1,5 +1,6 @@ @@ -13,7 +14,5 @@ www.tokyo2020.jp mismatch - - From c3df8503b37eb96ef87f08dbd2fb930d775c1bb7 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:39:43 +0800 Subject: [PATCH 695/844] Remove duplicated test urls from Mozilla.xml (#14664) * Remove duplicated test urls from Mozilla.xml * Update Mozilla.xml --- src/chrome/content/rules/Mozilla.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml index d2f5d8541c1c..08978ddfd5d8 100644 --- a/src/chrome/content/rules/Mozilla.xml +++ b/src/chrome/content/rules/Mozilla.xml @@ -222,9 +222,9 @@ https://mail1.eff.org/pipermail/https-everywhere-rules/2013-June/001635.html --> - + - + @@ -245,7 +245,6 @@ - From 5f06995d234a38402f3d729c73af07aee556103c Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:41:08 +0800 Subject: [PATCH 696/844] Remove duplicated test urls from Twitter.xml (#14662) * Remove duplicated test urls from Twitter.xml * Update Twitter.xml --- src/chrome/content/rules/Twitter.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Twitter.xml b/src/chrome/content/rules/Twitter.xml index 48143aaed662..fee03382ff9b 100644 --- a/src/chrome/content/rules/Twitter.xml +++ b/src/chrome/content/rules/Twitter.xml @@ -32,6 +32,7 @@ Problematic hosts in *twitter.com: - app.tweet * + - widgets.platform * * Mismatched @@ -122,12 +123,10 @@ - - @@ -137,8 +136,9 @@ - + + From 93a7a236653480fdc0e288dc2624fa7e42355ac1 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 21:41:45 +0800 Subject: [PATCH 697/844] Remove duplicated test urls from PolyU.edu.hk.xml (#14663) * Remove duplicated test urls from PolyU.edu.hk.xml * Update PolyU.edu.hk.xml --- src/chrome/content/rules/PolyU.edu.hk.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/PolyU.edu.hk.xml b/src/chrome/content/rules/PolyU.edu.hk.xml index 5270c5c4ffa2..d071d089cb46 100644 --- a/src/chrome/content/rules/PolyU.edu.hk.xml +++ b/src/chrome/content/rules/PolyU.edu.hk.xml @@ -1,3 +1,8 @@ + @@ -8,7 +13,6 @@ - @@ -17,7 +21,6 @@ - From fef946273bbbd5fc341c457ba2a79f8d5faba571 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Sun, 18 Feb 2018 21:42:58 +0800 Subject: [PATCH 698/844] Update Firefox.net.cn.xml (#14657) --- src/chrome/content/rules/Firefox.net.cn.xml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/rules/Firefox.net.cn.xml b/src/chrome/content/rules/Firefox.net.cn.xml index d170c4601446..78fd5951181d 100644 --- a/src/chrome/content/rules/Firefox.net.cn.xml +++ b/src/chrome/content/rules/Firefox.net.cn.xml @@ -1,22 +1,9 @@ - - - + - - - - - - + - From db634be0de73f209045f58e026fe3882b727258b Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 14:49:39 +0100 Subject: [PATCH 699/844] [Thompsonhotels.com] Default_off ruleset (#14650) --- src/chrome/content/rules/Thompson_Hotels.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Thompson_Hotels.com.xml b/src/chrome/content/rules/Thompson_Hotels.com.xml index 9bafee1c96ec..ced0fd89fcbb 100644 --- a/src/chrome/content/rules/Thompson_Hotels.com.xml +++ b/src/chrome/content/rules/Thompson_Hotels.com.xml @@ -12,7 +12,7 @@ * Secured by us --> - + From 029ff5adc8bf1c5b720eafdf93e0156f3c2ee958 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 14:54:27 +0100 Subject: [PATCH 700/844] [Vodafone.ie] Remove broken targets (#14648) * [Vodafone.ie] Remove shop.vodafone.ie * [Vodafone.ie] Remove community.vodafone.ie * [Vodafone.ie] Remove non-trivial rule --- src/chrome/content/rules/Vodafone.ie.xml | 34 +++++++----------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/src/chrome/content/rules/Vodafone.ie.xml b/src/chrome/content/rules/Vodafone.ie.xml index 7b96752db4d9..8df0f2e911df 100644 --- a/src/chrome/content/rules/Vodafone.ie.xml +++ b/src/chrome/content/rules/Vodafone.ie.xml @@ -10,9 +10,6 @@ * Handshake fails - ^vodafone.ie: Mismatched - - Insecure cookies are set for these hosts: - community.vodafone.ie @@ -28,42 +25,31 @@ * Secured by us + Some pages redirect to HTTP: + shop.vodafone.ie + + Keeping partial coverage causes CORS issues + + Mixed content: + community.vodafone.ie + --> - - + + - - - - - - - - - - - - - - - - From e2ad8e39ccbcc9b0ef6345b2bcb3036fa291da1f Mon Sep 17 00:00:00 2001 From: Carlo van Wyk <25knots@gmail.com> Date: Sun, 18 Feb 2018 15:58:30 +0200 Subject: [PATCH 701/844] humankode rules (#14652) --- src/chrome/content/rules/humankode.com.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/chrome/content/rules/humankode.com.xml diff --git a/src/chrome/content/rules/humankode.com.xml b/src/chrome/content/rules/humankode.com.xml new file mode 100644 index 000000000000..8b005ffe1498 --- /dev/null +++ b/src/chrome/content/rules/humankode.com.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From 3a16f0364a1986c07d49cd3f7f8b6aeb568e4778 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 22:07:49 +0800 Subject: [PATCH 702/844] Remove duplicated test urls from ACLU-of-Florida.xml (#14673) * Remove duplicated test urls from ACLU-of-Florida.xml * Update ACLU-of-Florida.xml --- src/chrome/content/rules/ACLU-of-Florida.xml | 28 +++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/rules/ACLU-of-Florida.xml b/src/chrome/content/rules/ACLU-of-Florida.xml index 14c52940ef39..35518a5a3607 100644 --- a/src/chrome/content/rules/ACLU-of-Florida.xml +++ b/src/chrome/content/rules/ACLU-of-Florida.xml @@ -2,15 +2,23 @@ For other ACLU coverage, see ACLU.xml + Non-functional hosts: + Certificate expired: + - media.aclufl.org + + Certificate mismatched: + - devespanol.aclufl.org + - northeast.aclufl.org + - panhandle.aclufl.org + - tallahassee.aclufl.org + --> - - @@ -23,27 +31,15 @@ - - - - + - - - - - - - - \ No newline at end of file + From 6ce7f1e6a44439e122b5ee123b4c63e5d2ddea8e Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 15:11:52 +0100 Subject: [PATCH 703/844] [AmazonAWS.com] Add exclusion for anvato-api-config (#14656) * [AmazonAWS.com] Add exclusion for anvato-api-config This subdomain is causing CORS issues on wishtv.com. Fix #14655 * [AmazonAWS.com] Clean up top comment * [AmazonAWS.com] Remove duplicate tests * [AmazonAWS.com] Add more info in comment --- src/chrome/content/rules/AmazonAWS.com.xml | 93 +++------------------- 1 file changed, 12 insertions(+), 81 deletions(-) diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml index e7bb5eda71d6..b60102abe425 100644 --- a/src/chrome/content/rules/AmazonAWS.com.xml +++ b/src/chrome/content/rules/AmazonAWS.com.xml @@ -1,60 +1,6 @@ @@ -128,7 +49,19 @@ Breaks forecast.io radar images --> + + + + - From 9747b9134a6181b17147a84f15e115e1fc0e0f32 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 23:47:54 +0800 Subject: [PATCH 705/844] Remove duplicated test urls from Washington_Times.xml (#14669) * Remove duplicated test urls from Washington_Times.xml * Update Washington_Times.xml * Update Washington_Times.xml --- src/chrome/content/rules/Washington_Times.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Washington_Times.xml b/src/chrome/content/rules/Washington_Times.xml index eef1da0b12de..baecc7141f64 100644 --- a/src/chrome/content/rules/Washington_Times.xml +++ b/src/chrome/content/rules/Washington_Times.xml @@ -56,6 +56,8 @@ + + @@ -64,7 +66,6 @@ - From 5d91fa508f2dbae8cf020943516c9341d7bff060 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 16:48:59 +0100 Subject: [PATCH 706/844] [TMZ.com] Simplify ruleset (#14651) * [TMZ.com] Simplify ruleset * [TMZ.com] Add subdomains --- src/chrome/content/rules/TMZ.com.xml | 69 ++++------------------------ 1 file changed, 9 insertions(+), 60 deletions(-) diff --git a/src/chrome/content/rules/TMZ.com.xml b/src/chrome/content/rules/TMZ.com.xml index e3c150a7f5a6..0f30a9b4ee4f 100644 --- a/src/chrome/content/rules/TMZ.com.xml +++ b/src/chrome/content/rules/TMZ.com.xml @@ -1,70 +1,26 @@ - - - - - - - + - + + @@ -72,13 +28,6 @@ - - - - - From ae99458845a16a8a2916a1715f4c70a9e6c33753 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 18 Feb 2018 23:58:44 +0800 Subject: [PATCH 707/844] Rename and Update PCGamer.com.xml (#14637) --- src/chrome/content/rules/{Pcgamer.com.xml => PCGamer.com.xml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/chrome/content/rules/{Pcgamer.com.xml => PCGamer.com.xml} (89%) diff --git a/src/chrome/content/rules/Pcgamer.com.xml b/src/chrome/content/rules/PCGamer.com.xml similarity index 89% rename from src/chrome/content/rules/Pcgamer.com.xml rename to src/chrome/content/rules/PCGamer.com.xml index f54f8771dc30..8cb7eb4c25a3 100644 --- a/src/chrome/content/rules/Pcgamer.com.xml +++ b/src/chrome/content/rules/PCGamer.com.xml @@ -10,7 +10,7 @@ weekender.pcgamer.com (mismatch) sl.pcgamer.com (Expired cert) --> - + From 72f90b918dbd3d6e0d5c66622b3e35c032869353 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:13:16 +0100 Subject: [PATCH 708/844] [Where2GetIt.com] Remove broken rules and wildcard (#14649) * [Where2GetIt.com] Remove broken rules and wildcard * Rename Where_2_Get_It.xml to Where2GetIt.com.xml * [Where2GetIt.com] Add targets * [Where2GetIt.com] Try a different test url --- src/chrome/content/rules/Where2GetIt.com.xml | 31 ++++++++++++ src/chrome/content/rules/Where_2_Get_It.xml | 50 -------------------- 2 files changed, 31 insertions(+), 50 deletions(-) create mode 100644 src/chrome/content/rules/Where2GetIt.com.xml delete mode 100644 src/chrome/content/rules/Where_2_Get_It.xml diff --git a/src/chrome/content/rules/Where2GetIt.com.xml b/src/chrome/content/rules/Where2GetIt.com.xml new file mode 100644 index 000000000000..23a9925f8bd3 --- /dev/null +++ b/src/chrome/content/rules/Where2GetIt.com.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Where_2_Get_It.xml b/src/chrome/content/rules/Where_2_Get_It.xml deleted file mode 100644 index 6b635a92ea47..000000000000 --- a/src/chrome/content/rules/Where_2_Get_It.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file From d3f198a43e864cdf66c8a085126e17d3de662df1 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:24:59 +0100 Subject: [PATCH 709/844] [saltpack.org] Simplify ruleset (#14619) --- src/chrome/content/rules/saltpack.org.xml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/chrome/content/rules/saltpack.org.xml b/src/chrome/content/rules/saltpack.org.xml index eac61e79f30b..04d4bdebd68b 100644 --- a/src/chrome/content/rules/saltpack.org.xml +++ b/src/chrome/content/rules/saltpack.org.xml @@ -1,28 +1,10 @@ - - - - - - - - - - - - + - From 0671bbfa199ff9382c6f3e44cb27ccb8c0893942 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:25:44 +0100 Subject: [PATCH 710/844] [SharedCount.com] Increase coverage (#14621) * [SharedCount.com] Increase coverage * Rename Sharedcount.com-API.xml to Sharedcount.com.xml * Rename Sharedcount.com.xml to SharedCount.com.xml --- src/chrome/content/rules/SharedCount.com.xml | 26 +++++++++++++++++++ .../content/rules/Sharedcount.com-API.xml | 5 ---- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 src/chrome/content/rules/SharedCount.com.xml delete mode 100644 src/chrome/content/rules/Sharedcount.com-API.xml diff --git a/src/chrome/content/rules/SharedCount.com.xml b/src/chrome/content/rules/SharedCount.com.xml new file mode 100644 index 000000000000..12677710a76c --- /dev/null +++ b/src/chrome/content/rules/SharedCount.com.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Sharedcount.com-API.xml b/src/chrome/content/rules/Sharedcount.com-API.xml deleted file mode 100644 index 2c2c6e045e11..000000000000 --- a/src/chrome/content/rules/Sharedcount.com-API.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 9af1f72526571f8185090d92f0e2af34d6475bc8 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:32:32 +0100 Subject: [PATCH 711/844] Create KyngChaos.com.xml (#14566) * Create KyngChaos.com.xml * [KyngChaos.com] Remove extra tab --- src/chrome/content/rules/KyngChaos.com.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/KyngChaos.com.xml diff --git a/src/chrome/content/rules/KyngChaos.com.xml b/src/chrome/content/rules/KyngChaos.com.xml new file mode 100644 index 000000000000..2e9138ff61b1 --- /dev/null +++ b/src/chrome/content/rules/KyngChaos.com.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + From 2b260052302a2677d50490bf6a9c868aa8a20c13 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:33:09 +0100 Subject: [PATCH 712/844] Delete charlottenaturemuseum.org-resources.xml (#14564) * Delete charlottenaturemuseum.org-resources.xml * [CharlotteNatureMuseum.org] Simplify ruleset --- .../content/rules/CharlotteNatureMuseum.xml | 75 +------------------ .../charlottenaturemuseum.org-resources.xml | 49 ------------ 2 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 src/chrome/content/rules/charlottenaturemuseum.org-resources.xml diff --git a/src/chrome/content/rules/CharlotteNatureMuseum.xml b/src/chrome/content/rules/CharlotteNatureMuseum.xml index b7db1a1e6f29..7236349e2100 100644 --- a/src/chrome/content/rules/CharlotteNatureMuseum.xml +++ b/src/chrome/content/rules/CharlotteNatureMuseum.xml @@ -1,81 +1,8 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/charlottenaturemuseum.org-resources.xml b/src/chrome/content/rules/charlottenaturemuseum.org-resources.xml deleted file mode 100644 index 003c10015d77..000000000000 --- a/src/chrome/content/rules/charlottenaturemuseum.org-resources.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From b543a0a95d9a98faedfe411cd09f88a582300ec6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:37:30 +0100 Subject: [PATCH 713/844] Create Pollen.cl.xml (#14624) --- src/chrome/content/rules/Pollen.cl.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Pollen.cl.xml diff --git a/src/chrome/content/rules/Pollen.cl.xml b/src/chrome/content/rules/Pollen.cl.xml new file mode 100644 index 000000000000..b4d52d18f49d --- /dev/null +++ b/src/chrome/content/rules/Pollen.cl.xml @@ -0,0 +1,12 @@ + + + + + + + + From b39aff48e89ee2e9a534358040f24bb15836d6a0 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 19:38:01 +0100 Subject: [PATCH 714/844] Create Freeplane.org.xml (#14623) MCB doesn't seem to affect anything on the page (facebook, twitter and google requests) --- src/chrome/content/rules/Freeplane.org.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/chrome/content/rules/Freeplane.org.xml diff --git a/src/chrome/content/rules/Freeplane.org.xml b/src/chrome/content/rules/Freeplane.org.xml new file mode 100644 index 000000000000..fe557c6b31c8 --- /dev/null +++ b/src/chrome/content/rules/Freeplane.org.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + From e3bdaabaa50b22b0193092d742a19da9cc613972 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 21:25:42 +0100 Subject: [PATCH 715/844] Delete Wireless_Leiden.nl-cacert.xml (#14611) * Delete Wireless_Leiden.nl-cacert.xml * [WirelessLeiden.nl] Add target * [WirelessLeiden.nl] Fix mismatch * Rename Wireless_Leiden.nl.xml to WirelessLeiden.nl.xml * [WirelessLeiden.nl] Add targets --- .../content/rules/WirelessLeiden.nl.xml | 21 +++++++++++++++++ .../rules/Wireless_Leiden.nl-cacert.xml | 19 --------------- .../content/rules/Wireless_Leiden.nl.xml | 23 ------------------- 3 files changed, 21 insertions(+), 42 deletions(-) create mode 100644 src/chrome/content/rules/WirelessLeiden.nl.xml delete mode 100644 src/chrome/content/rules/Wireless_Leiden.nl-cacert.xml delete mode 100644 src/chrome/content/rules/Wireless_Leiden.nl.xml diff --git a/src/chrome/content/rules/WirelessLeiden.nl.xml b/src/chrome/content/rules/WirelessLeiden.nl.xml new file mode 100644 index 000000000000..76ff9336049f --- /dev/null +++ b/src/chrome/content/rules/WirelessLeiden.nl.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Wireless_Leiden.nl-cacert.xml b/src/chrome/content/rules/Wireless_Leiden.nl-cacert.xml deleted file mode 100644 index 363c339f0c22..000000000000 --- a/src/chrome/content/rules/Wireless_Leiden.nl-cacert.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/Wireless_Leiden.nl.xml b/src/chrome/content/rules/Wireless_Leiden.nl.xml deleted file mode 100644 index 72651140d416..000000000000 --- a/src/chrome/content/rules/Wireless_Leiden.nl.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - From c8958e02749e167b8a7fcea55716bfc088bcf038 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 21:27:10 +0100 Subject: [PATCH 716/844] [Security-Database.com] Simplify ruleset (#14620) * [Security-Database.com] Simplify ruleset * [Security-Database.com] Add subdomains --- .../content/rules/Security-Database.com.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Security-Database.com.xml b/src/chrome/content/rules/Security-Database.com.xml index 165bb533dbc7..07bbcda44458 100644 --- a/src/chrome/content/rules/Security-Database.com.xml +++ b/src/chrome/content/rules/Security-Database.com.xml @@ -1,17 +1,25 @@ + + + + - - - - + + From 0ce3cc9263badd1075071eafb464c8d1b5cb7fd5 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 18 Feb 2018 21:27:32 +0100 Subject: [PATCH 717/844] [RStudio.com] Add targets (#14560) * Create rstd.io.xml * [rstd.io] Fix XML structure * Delete rstd.io.xml * [RStudio.com] Add targets --- src/chrome/content/rules/RStudio.com.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/RStudio.com.xml b/src/chrome/content/rules/RStudio.com.xml index 088d2ec41c08..dc9b02737314 100644 --- a/src/chrome/content/rules/RStudio.com.xml +++ b/src/chrome/content/rules/RStudio.com.xml @@ -2,8 +2,6 @@ Timeout: colorado.rstudio.com docs.rstudio.com - rmarkdown.rstudio.com - spark.rstudio.com www.spark.rstudio.com --> @@ -15,9 +13,17 @@ + + + + + + + From b7306d32a7485d135614cec8be1705646a20cc30 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Wed, 21 Feb 2018 09:21:41 +0800 Subject: [PATCH 718/844] Order rulesets by names in popup, Fix #11986 (#14678) --- chromium/background.js | 116 ++++++++++++++++++++++++++--------------- chromium/popup.js | 18 ++++--- 2 files changed, 85 insertions(+), 49 deletions(-) diff --git a/chromium/background.js b/chromium/background.js index 077332343f58..8d5d650215e7 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -100,25 +100,6 @@ var switchPlannerEnabledFor = {}; // rw / nrw stand for "rewritten" versus "not rewritten" var switchPlannerInfo = {}; -function getActiveRulesetCount(id) { - const applied = activeRulesets.getRulesets(id); - - if (!applied) - { - return 0; - } - - let activeCount = 0; - - for (const key in applied) { - if (applied[key].active) { - activeCount++; - } - } - - return activeCount; -} - /** * Set the icon color correctly * active: extension is enabled. @@ -154,7 +135,7 @@ function updateState () { return; } const tabId = tabs[0].id; - const activeCount = getActiveRulesetCount(tabId); + const activeCount = appliedRulesets.getActiveRulesetCount(tabId); if ('setBadgeBackgroundColor' in chrome.browserAction) { chrome.browserAction.setBadgeBackgroundColor({ color: '#666666', tabId }); @@ -178,13 +159,16 @@ chrome.browserAction.onClicked.addListener(e => { }); }); + + /** - * Adds a listener for removed tabs - * */ + * Add a listener for removed tabs + */ function AppliedRulesets() { - this.active_tab_rules = {}; + this.active_tab_rules = new Map(); + this.active_tab_main_frames = new Map(); - var that = this; + let that = this; if (chrome.tabs) { chrome.tabs.onRemoved.addListener(function(tabId) { that.removeTab(tabId); @@ -193,29 +177,70 @@ function AppliedRulesets() { } AppliedRulesets.prototype = { - addRulesetToTab: function(tabId, ruleset) { - if (tabId in this.active_tab_rules) { - this.active_tab_rules[tabId][ruleset.name] = ruleset; + addRulesetToTab: function(tabId, type, ruleset) { + if (!this.active_tab_main_frames.has(tabId)) { + this.active_tab_main_frames.set(tabId, false); + } + + // always show main_frame ruleset on the top + if (type == "main_frame") { + this.active_tab_main_frames.set(tabId, true); + this.active_tab_rules.set(tabId, [ruleset,]); + return ; + } + + if (this.active_tab_rules.has(tabId)) { + let rulesets = this.active_tab_rules.get(tabId); + let insertIndex = 0; + + const ruleset_name = ruleset.name.toLowerCase(); + + for (const item of rulesets) { + const item_name = item.name.toLowerCase(); + + if (item_name == ruleset_name) { + return ; + } else if (insertIndex == 0 && this.active_tab_main_frames.get(tabId)) { + insertIndex = 1; + } else if (item_name < ruleset_name) { + insertIndex++; + } + } + rulesets.splice(insertIndex, 0, ruleset); } else { - this.active_tab_rules[tabId] = {}; - this.active_tab_rules[tabId][ruleset.name] = ruleset; + this.active_tab_rules.set(tabId, [ruleset,]); } }, getRulesets: function(tabId) { - if (tabId in this.active_tab_rules) { - return this.active_tab_rules[tabId]; + if (this.active_tab_rules.has(tabId)) { + return this.active_tab_rules.get(tabId); + } else { + return null; } - return null; }, removeTab: function(tabId) { - delete this.active_tab_rules[tabId]; + this.active_tab_rules.delete(tabId); + this.active_tab_main_frames.delete(tabId); + }, + + getActiveRulesetCount: function (tabId) { + let activeCount = 0; + + const rulesets = this.getRulesets(tabId); + if (rulesets) { + for (const ruleset of rulesets) { + if (ruleset.active) { + activeCount++; + } + } + } + return activeCount; } }; -// FIXME: change this name -var activeRulesets = new AppliedRulesets(); +var appliedRulesets = new AppliedRulesets(); var urlBlacklist = new Set(); @@ -275,7 +300,7 @@ function onBeforeRequest(details) { } if (details.type == "main_frame") { - activeRulesets.removeTab(details.tabId); + appliedRulesets.removeTab(details.tabId); } var potentiallyApplicable = all_rules.potentiallyApplicableRulesets(canonical_host); @@ -291,7 +316,7 @@ function onBeforeRequest(details) { var newuristr = null; for (let ruleset of potentiallyApplicable) { - activeRulesets.addRulesetToTab(details.tabId, ruleset); + appliedRulesets.addRulesetToTab(details.tabId, details.type, ruleset); if (ruleset.active && !newuristr) { newuristr = ruleset.apply(canonical_url); } @@ -614,13 +639,20 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ } else if (message.type == "delete_from_ruleset_cache") { all_rules.ruleCache.delete(message.object); } else if (message.type == "get_active_rulesets") { - sendResponse(activeRulesets.getRulesets(message.object)); + sendResponse(appliedRulesets.getRulesets(message.object)); } else if (message.type == "set_ruleset_active_status") { - var ruleset = activeRulesets.getRulesets(message.object.tab_id)[message.object.name]; - ruleset.active = message.object.active; - if (ruleset.default_state == message.object.active) { - message.object.active = undefined; + let rulesets = appliedRulesets.getRulesets(message.object.tab_id); + + for (let ruleset of rulesets) { + if (ruleset.name == message.object.name) { + ruleset.active = message.object.active; + if (ruleset.default_state == message.object.active) { + message.object.active = undefined; + } + break; + } } + all_rules.setRuleActiveState(message.object.name, message.object.active).then(() => { sendResponse(true); }); diff --git a/chromium/popup.js b/chromium/popup.js index d9276cc19039..45cf9aec6866 100644 --- a/chromium/popup.js +++ b/chromium/popup.js @@ -128,15 +128,19 @@ function toggleEnabledDisabled() { * @param tabArray */ function gotTab(activeTab) { - sendMessage("get_active_rulesets", activeTab.id, function(rulesets){ - for (var r in rulesets) { - var listDiv = stableRules; - if (!rulesets[r].default_state) { - listDiv = unstableRules; + sendMessage("get_active_rulesets", activeTab.id, function(rulesets) { + if (rulesets) { + for (const ruleset of rulesets) { + let listDiv = stableRules; + + if (!ruleset.default_state) { + listDiv = unstableRules; + } + appendRuleLineToListDiv(ruleset, listDiv, activeTab.id); + listDiv.style.display = 'block'; } - appendRuleLineToListDiv(rulesets[r], listDiv, activeTab.id); - listDiv.style.display = 'block'; } + // Only show the "Add a rule" link if we're on an HTTPS page if (/^https:/.test(activeTab.url)) { show(e("add-rule-link")); From ea204e5f6de5d117af91ea15ca1916f6f301ed69 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 17:34:38 +0100 Subject: [PATCH 719/844] [AmazonAWS.com] Add exclusion (fix #11640) (#14706) * [AmazonAWS.com] Add exclusion (fix #11640) * [AmazonAWS.com] Use stricter regex in exclusion * [AmazonAWS.com] Add a test url --- src/chrome/content/rules/AmazonAWS.com.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml index b60102abe425..323fbe16e8bf 100644 --- a/src/chrome/content/rules/AmazonAWS.com.xml +++ b/src/chrome/content/rules/AmazonAWS.com.xml @@ -62,6 +62,12 @@ --> + + + + - + + + - + + @@ -89,12 +88,10 @@ Fetch error: http://council-webapp.gentoo.org/ => https://council-webapp.gentoo. - - @@ -111,7 +108,6 @@ Fetch error: http://council-webapp.gentoo.org/ => https://council-webapp.gentoo. - From 8d2fdc05cc4b2e78eb518f8c84084777e3ecf68a Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:25:46 +0100 Subject: [PATCH 722/844] [Cloudfront.net] Add exclusion (fix #3021 and #5060) (#14705) * [Cloudfront.net] Add exclusion (fix #3021) * [Cloudfront.net] Add exclusion (fix #5060) --- src/chrome/content/rules/Cloudfront.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/content/rules/Cloudfront.xml b/src/chrome/content/rules/Cloudfront.xml index 3b8cd0bb8793..b6dd6ebb0ad9 100644 --- a/src/chrome/content/rules/Cloudfront.xml +++ b/src/chrome/content/rules/Cloudfront.xml @@ -19,6 +19,11 @@ + + + + @@ -55,4 +60,10 @@ + + + + + + From 0760ba95e29fedf7cc87d7d812f408cf7d9d59fc Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:28:31 +0100 Subject: [PATCH 723/844] [JWPlatform.com] Fix exclusion pattern regex (#14701) --- src/chrome/content/rules/JW_Platform.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/JW_Platform.com.xml b/src/chrome/content/rules/JW_Platform.com.xml index fe7f9b8ba1e4..28abd809a2c4 100644 --- a/src/chrome/content/rules/JW_Platform.com.xml +++ b/src/chrome/content/rules/JW_Platform.com.xml @@ -15,7 +15,7 @@ - + From 0fb7f20ca0efab5adeb528adafa4bb7aae9334ab Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:30:01 +0100 Subject: [PATCH 724/844] [StatusPage.io] Fix duplicated test url (#14693) --- src/chrome/content/rules/StatusPage.io.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/rules/StatusPage.io.xml b/src/chrome/content/rules/StatusPage.io.xml index 375423509f9c..8c242d62b837 100644 --- a/src/chrome/content/rules/StatusPage.io.xml +++ b/src/chrome/content/rules/StatusPage.io.xml @@ -11,13 +11,12 @@ - + - From 829d4d241398fb410eeb7f48d05258e79c09f8fd Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:31:00 +0100 Subject: [PATCH 725/844] [Shields.io] Remove extra test url (#14692) --- src/chrome/content/rules/shields.io.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/rules/shields.io.xml b/src/chrome/content/rules/shields.io.xml index 890c21b1b20a..9ba825a80a6f 100644 --- a/src/chrome/content/rules/shields.io.xml +++ b/src/chrome/content/rules/shields.io.xml @@ -9,7 +9,5 @@ www.shields.io mismatch - - From 9869a4bf58238c9bc2d201dab6e7b4bf6a9cb0db Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:32:40 +0100 Subject: [PATCH 726/844] [PHPtesting.org] Simplify ruleset (#14682) --- src/chrome/content/rules/phptesting.org.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/rules/phptesting.org.xml b/src/chrome/content/rules/phptesting.org.xml index 3600c14d656f..819507592923 100644 --- a/src/chrome/content/rules/phptesting.org.xml +++ b/src/chrome/content/rules/phptesting.org.xml @@ -1,14 +1,8 @@ - + - - - - + From 81a17570147aa0c476f93379215963dda66d9ef7 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:39:03 +0100 Subject: [PATCH 727/844] Delete bitmixer.io.xml (#14691) Website shut down: https://en.wikipedia.org/wiki/Bitmixer.IO --- src/chrome/content/rules/bitmixer.io.xml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/chrome/content/rules/bitmixer.io.xml diff --git a/src/chrome/content/rules/bitmixer.io.xml b/src/chrome/content/rules/bitmixer.io.xml deleted file mode 100644 index 97e241a7b12f..000000000000 --- a/src/chrome/content/rules/bitmixer.io.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - From d26ea2a7261ed0c6eb19b77d44dbad2c6e5b81c6 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 22 Feb 2018 03:39:47 +0800 Subject: [PATCH 728/844] Remove duplicated test urls from NYTimes-Problematic.xml (#14688) --- src/chrome/content/rules/NYTimes-Problematic.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/rules/NYTimes-Problematic.xml b/src/chrome/content/rules/NYTimes-Problematic.xml index 45beeb4f5038..44c4a278c603 100644 --- a/src/chrome/content/rules/NYTimes-Problematic.xml +++ b/src/chrome/content/rules/NYTimes-Problematic.xml @@ -43,7 +43,6 @@ - From 74ab33478f7d57a91a96767234c7bfa0d81b777e Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 22 Feb 2018 03:40:41 +0800 Subject: [PATCH 729/844] Update and rename slimerjs.org.xml to SlimerJS.org.xml (#14687) --- src/chrome/content/rules/SlimerJS.org.xml | 12 ++++++++++++ src/chrome/content/rules/slimerjs.org.xml | 18 ------------------ 2 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 src/chrome/content/rules/SlimerJS.org.xml delete mode 100644 src/chrome/content/rules/slimerjs.org.xml diff --git a/src/chrome/content/rules/SlimerJS.org.xml b/src/chrome/content/rules/SlimerJS.org.xml new file mode 100644 index 000000000000..68c4656179bb --- /dev/null +++ b/src/chrome/content/rules/SlimerJS.org.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/chrome/content/rules/slimerjs.org.xml b/src/chrome/content/rules/slimerjs.org.xml deleted file mode 100644 index 8c7881e1ba50..000000000000 --- a/src/chrome/content/rules/slimerjs.org.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - From def707ce8a26a7217ee867d69147c9c9bf8fcbb0 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 22 Feb 2018 03:41:46 +0800 Subject: [PATCH 730/844] Remove duplicated test urls from Youku.com.xml (#14686) * Remove duplicated test URLs from Youku.com.xml * Update Youku.com.xml --- src/chrome/content/rules/Youku.com.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/chrome/content/rules/Youku.com.xml b/src/chrome/content/rules/Youku.com.xml index cab22473a429..7ab6e1d6136d 100644 --- a/src/chrome/content/rules/Youku.com.xml +++ b/src/chrome/content/rules/Youku.com.xml @@ -88,7 +88,6 @@ - @@ -123,11 +122,9 @@ - - From bebb64a476077132702dc878229bbf7fe416b61a Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 22 Feb 2018 03:43:23 +0800 Subject: [PATCH 731/844] Remove duplicated test urls from Qpic.cn.xml (#14683) --- src/chrome/content/rules/Qpic.cn.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/rules/Qpic.cn.xml b/src/chrome/content/rules/Qpic.cn.xml index cf1f292d5544..135874f7994f 100644 --- a/src/chrome/content/rules/Qpic.cn.xml +++ b/src/chrome/content/rules/Qpic.cn.xml @@ -11,7 +11,6 @@ - From e26453ca2ccba458aea2d05e2baa5d8c10a7dfb0 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:45:19 +0100 Subject: [PATCH 732/844] Delete Jabberd.org.xml (#14613) --- src/chrome/content/rules/Jabberd.org.xml | 25 ------------------------ 1 file changed, 25 deletions(-) delete mode 100644 src/chrome/content/rules/Jabberd.org.xml diff --git a/src/chrome/content/rules/Jabberd.org.xml b/src/chrome/content/rules/Jabberd.org.xml deleted file mode 100644 index 94b47cb47135..000000000000 --- a/src/chrome/content/rules/Jabberd.org.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - From aa2c94c1c79724e7b248762341008d499c6e1172 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:45:51 +0100 Subject: [PATCH 733/844] Delete Obnox.de.xml (#14612) --- src/chrome/content/rules/Obnox.de.xml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/chrome/content/rules/Obnox.de.xml diff --git a/src/chrome/content/rules/Obnox.de.xml b/src/chrome/content/rules/Obnox.de.xml deleted file mode 100644 index a21a8a8a5af6..000000000000 --- a/src/chrome/content/rules/Obnox.de.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - From 687c853ce1b09f11bc3bc149af64f107cad541c7 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:46:14 +0100 Subject: [PATCH 734/844] Delete 1time.aero.xml (#14630) All targets are gone from DNS. --- src/chrome/content/rules/1time.aero.xml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/chrome/content/rules/1time.aero.xml diff --git a/src/chrome/content/rules/1time.aero.xml b/src/chrome/content/rules/1time.aero.xml deleted file mode 100644 index bb9583fa82a4..000000000000 --- a/src/chrome/content/rules/1time.aero.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - From e1650645e41fef6e4c433c60d6e3439f2c002494 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 20:47:43 +0100 Subject: [PATCH 735/844] [PeerJ.com] Simplify rule and securecookie (#14631) * [PeerJ.com] Simplify rule and securecookie * Rename PeerJ.xml to PeerJ.com.xml * [PeerJ.com] Update top comment --- src/chrome/content/rules/PeerJ.com.xml | 26 +++++++++++++++++++ src/chrome/content/rules/PeerJ.xml | 35 -------------------------- 2 files changed, 26 insertions(+), 35 deletions(-) create mode 100644 src/chrome/content/rules/PeerJ.com.xml delete mode 100644 src/chrome/content/rules/PeerJ.xml diff --git a/src/chrome/content/rules/PeerJ.com.xml b/src/chrome/content/rules/PeerJ.com.xml new file mode 100644 index 000000000000..279fd5832e9d --- /dev/null +++ b/src/chrome/content/rules/PeerJ.com.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/PeerJ.xml b/src/chrome/content/rules/PeerJ.xml deleted file mode 100644 index 52913fb4a44d..000000000000 --- a/src/chrome/content/rules/PeerJ.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - From e70ba73adfa6a45e030430a15aab1110f72c18df Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 22 Feb 2018 03:49:54 +0800 Subject: [PATCH 736/844] Remove duplicated test urls from 3.cn.xml (#14684) * Remove duplicated test urls from 3.cn.xml * Update 3.cn.xml --- src/chrome/content/rules/3.cn.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/3.cn.xml b/src/chrome/content/rules/3.cn.xml index 6a043e645d4b..59ccf96b006d 100644 --- a/src/chrome/content/rules/3.cn.xml +++ b/src/chrome/content/rules/3.cn.xml @@ -5,7 +5,6 @@ - @@ -19,6 +18,7 @@ + From b9c201b4bb667911ecd06d77a5899c39a91f0f66 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Wed, 21 Feb 2018 21:03:15 +0100 Subject: [PATCH 737/844] [KISSmetrics.com] Simplify ruleset (#14638) * [KISSmetrics.com] Simplify ruleset * [KISSmetrics.com] Add target --- src/chrome/content/rules/KISSmetrics.xml | 57 +++--------------------- 1 file changed, 7 insertions(+), 50 deletions(-) diff --git a/src/chrome/content/rules/KISSmetrics.xml b/src/chrome/content/rules/KISSmetrics.xml index 3f04f826bfb2..4eb887bc2c3a 100644 --- a/src/chrome/content/rules/KISSmetrics.xml +++ b/src/chrome/content/rules/KISSmetrics.xml @@ -1,63 +1,20 @@ - + + - - - - - + - - - - - + From 1181146558801b9deb26a0ce7fbb9c1a65c8a120 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Thu, 22 Feb 2018 04:04:32 +0800 Subject: [PATCH 738/844] Update iQiyi.com.xml (#14589) --- src/chrome/content/rules/iQiyi.com.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/rules/iQiyi.com.xml b/src/chrome/content/rules/iQiyi.com.xml index ec70f970a3b4..90c825b7b879 100644 --- a/src/chrome/content/rules/iQiyi.com.xml +++ b/src/chrome/content/rules/iQiyi.com.xml @@ -41,28 +41,29 @@ ʳ Refused MCB: - www.iqiyi.com passport.iqiyi.com Mismatched: - ^ nl.notice.iqiyi.com - SSL_ERROR_INTERNAL_ERROR_ALERT: - qiyipic.iqiyi.com http://qiyipic.iqiyi.com/common/fix/public_images/logoCommon.png - security.iqiyi.com http://security.iqiyi.com/static/cook/v1/cooksdk.js - static.iqiyi.com http://static.iqiyi.com/js/pingback/qa.js - Insecure cookies are set for these domains and hosts: - .iqiyi.com - passport.iqiyi.com --> + + + + + + + + - + From 84348465f29c406d4c6e08cb56eed20978134fa7 Mon Sep 17 00:00:00 2001 From: William Budington Date: Wed, 21 Feb 2018 17:14:35 -0800 Subject: [PATCH 739/844] Fix shebang for test/script.py --- test/script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script.py b/test/script.py index 219e3c7945ae..680d9ce23493 100644 --- a/test/script.py +++ b/test/script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 # # Run Selenium tests for HTTPS Everywhere # From 36932eee2f0fa49f8fd43b9a0014790c6ed07a07 Mon Sep 17 00:00:00 2001 From: stordoff Date: Thu, 22 Feb 2018 16:43:58 +0000 Subject: [PATCH 740/844] Create QLCrew.com.xml (#14704) * Create QLCrew.com.xml * Update QLCrew.com.xml --- src/chrome/content/rules/QLCrew.com.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/QLCrew.com.xml diff --git a/src/chrome/content/rules/QLCrew.com.xml b/src/chrome/content/rules/QLCrew.com.xml new file mode 100644 index 000000000000..4bfe2ddd4906 --- /dev/null +++ b/src/chrome/content/rules/QLCrew.com.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + From 1c3371d2a311ed36d5444b53bb3662ab44eb0f62 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Fri, 23 Feb 2018 00:46:10 +0800 Subject: [PATCH 741/844] Update Qiyi.com.xml (#14588) * Update Qiyi.com.xml * Update Qiyi.com.xml --- src/chrome/content/rules/Qiyi.com.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Qiyi.com.xml b/src/chrome/content/rules/Qiyi.com.xml index 658b02adcd0c..6662c1ffff1e 100644 --- a/src/chrome/content/rules/Qiyi.com.xml +++ b/src/chrome/content/rules/Qiyi.com.xml @@ -2,18 +2,18 @@ Other rulesets: iQiyi.com.xml reference: https://github.com/EFForg/https-everywhere/pull/4801#issuecomment-219402538 - - SSL_ERROR_INTERNAL_ERROR_ALERT: - www.qiyi.com http://www.qiyi.com/player/20110218183154/qiyi_player.swf - static.qiyi.com http://static.qiyi.com/css/common/register_css/register_new.css - yule.qiyi.com --> + + + + + From 2b832b19e4dcc5799fbb2ed55d5235eec589cc1e Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 12:08:55 -0800 Subject: [PATCH 742/844] Convert test/rules/src/https_everywhere_checker/ to py3.6 (#14717) --- test/fetch.sh | 2 +- test/manual.sh | 2 +- .../src/https_everywhere_checker/__init__.py | 0 .../https_everywhere_checker/check_rules.py | 105 +++++++++--------- .../src/https_everywhere_checker/gvgen.py | 54 +++++---- .../https_everywhere_checker/http_client.py | 68 +++++------- .../src/https_everywhere_checker/metrics.py | 6 +- .../src/https_everywhere_checker/rule_trie.py | 23 ++-- .../src/https_everywhere_checker/rules.py | 51 ++++----- test/validations/test-coverage/run.sh | 4 +- 10 files changed, 143 insertions(+), 172 deletions(-) delete mode 100644 test/rules/src/https_everywhere_checker/__init__.py diff --git a/test/fetch.sh b/test/fetch.sh index d3d0636afe4a..68969e0359bc 100755 --- a/test/fetch.sh +++ b/test/fetch.sh @@ -19,7 +19,7 @@ if [ "$TO_BE_TESTED" ]; then # Do the actual test, using https-everywhere-checker. OUTPUT_FILE=`mktemp` trap 'rm "$OUTPUT_FILE"' EXIT - python $RULETESTFOLDER/src/https_everywhere_checker/check_rules.py $RULETESTFOLDER/http.checker.config $TO_BE_TESTED 2>&1 | tee $OUTPUT_FILE + python3.6 $RULETESTFOLDER/src/https_everywhere_checker/check_rules.py $RULETESTFOLDER/http.checker.config $TO_BE_TESTED 2>&1 | tee $OUTPUT_FILE # Unfortunately, no specific exit codes are available for connection # failures, so we catch those with grep. if [[ `cat $OUTPUT_FILE | grep ERROR | wc -l` -ge 1 ]]; then diff --git a/test/manual.sh b/test/manual.sh index 938c82400e64..ccd17286e7ea 100755 --- a/test/manual.sh +++ b/test/manual.sh @@ -3,4 +3,4 @@ # coverage for their rules, and performs a network "fetch" test to alert the # contributor of potential problems. -exec python2.7 test/rules/src/https_everywhere_checker/check_rules.py test/rules/manual.checker.config "$@" +exec python3.6 test/rules/src/https_everywhere_checker/check_rules.py test/rules/manual.checker.config "$@" diff --git a/test/rules/src/https_everywhere_checker/__init__.py b/test/rules/src/https_everywhere_checker/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/test/rules/src/https_everywhere_checker/check_rules.py b/test/rules/src/https_everywhere_checker/check_rules.py index 59d25803ce34..9111239ef022 100644 --- a/test/rules/src/https_everywhere_checker/check_rules.py +++ b/test/rules/src/https_everywhere_checker/check_rules.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3.6 import binascii import argparse @@ -7,13 +7,13 @@ import hashlib import logging import os -import Queue +import queue import re import sys import threading import time -from ConfigParser import SafeConfigParser +from configparser import SafeConfigParser from lxml import etree @@ -32,7 +32,7 @@ def convertLoglevel(levelString): try: return getattr(logging, levelString.upper()) except AttributeError: - raise ValueError("No such loglevel - %s" % levelString) + raise ValueError("No such loglevel - {}".format(levelString)) def getMetricClass(metricType): @@ -46,7 +46,7 @@ def getMetricClass(metricType): } if metricType not in metricMap: - raise ValueError("Metric type '%s' is not known" % metricType) + raise ValueError("Metric type '{}' is not known".format(metricType)) return metricMap[metricType] @@ -89,7 +89,7 @@ def run(self): try: self.processTask(self.taskQueue.get()) self.taskQueue.task_done() - except Exception, e: + except Exception as e: logging.exception(e) if self.taskQueue.empty(): break @@ -102,7 +102,7 @@ def processTask(self, task): problems.append(result) if problems: for problem in problems: - logging.error("%s: %s" % (task.ruleFname, problem)) + logging.error("{}: {}".format(task.ruleFname, problem)) if self.autoDisable: disableRuleset(task.ruleset, problems) @@ -126,35 +126,35 @@ def queue_result(self, result, details, fname, url, https_url=None): self.resQueue.put(res) def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname): - logging.debug("=**= Start %s => %s ****", plainUrl, transformedUrl) - logging.debug("Fetching transformed page %s", transformedUrl) + logging.debug("=**= Start {} => {} ****".format(plainUrl, transformedUrl)) + logging.debug("Fetching transformed page {}".format(transformedUrl)) transformedRcode, transformedPage = fetcherRewriting.fetchHtml( transformedUrl) - logging.debug("Fetching plain page %s", plainUrl) + logging.debug("Fetching plain page {}".format(plainUrl)) # If we get an exception (e.g. connection refused, # connection timeout) on the plain page, don't treat # that as a failure (except DNS resolution errors) plainRcode, plainPage = None, None try: plainRcode, plainPage = fetcherPlain.fetchHtml(plainUrl) - except Exception, e: - errno, message = e + except Exception as e: + errno, message = e.args if errno == 6: - message = "Fetch error: %s => %s: %s" % ( + message = "Fetch error: {} => {}: {}".format( plainUrl, transformedUrl, e) - self.queue_result("error", "fetch-error %s" % - e, ruleFname, plainUrl, https_url=transformedUrl) + self.queue_result("error", "fetch-error {}".format(e), + ruleFname, plainUrl, https_url=transformedUrl) return message logging.debug( - "Non-fatal fetch error for plain page %s: %s" % (plainUrl, e)) + "Non-fatal fetch error for plain page {}: {}".format(plainUrl, e)) # Compare HTTP return codes - if original page returned 2xx, # but the transformed didn't, consider it an error in ruleset # (note this is not symmetric, we don't care if orig page is broken). # We don't handle 1xx codes for now. if plainRcode and plainRcode//100 == 2 and transformedRcode//100 != 2: - message = "Non-2xx HTTP code: %s (%d) => %s (%d)" % ( + message = "Non-2xx HTTP code: {} ({}) => {} ({})".format( plainUrl, plainRcode, transformedUrl, transformedRcode) self.queue_result("error", "non-2xx http code", ruleFname, plainUrl, https_url=transformedUrl) @@ -169,11 +169,11 @@ def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, rul if plainPage: distance = self.metric.distanceNormed(plainPage, transformedPage) - logging.debug("==== D: %0.4f; %s (%d) -> %s (%d) =====", - distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage)) + logging.debug("==== D: {:.4f}; {} ({}) -> {} ({}) =====".format( + distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage))) if distance >= self.thresholdDistance: - logging.info("Big distance %0.4f: %s (%d) -> %s (%d). Rulefile: %s =====", - distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage), ruleFname) + logging.info("Big distance {:.4f}: {} ({}) -> {} ({}). Rulefile: {} =====".format( + distance, plainUrl, len(plainPage), transformedUrl, len(transformedPage), ruleFname)) self.queue_result("success", "", ruleFname, plainUrl) @@ -184,9 +184,9 @@ def processUrl(self, plainUrl, task): try: transformedUrl = task.ruleset.apply(plainUrl) - except Exception, e: + except Exception as e: self.queue_result("regex_error", str(e), ruleFname, plainUrl) - logging.error("%s: Regex Error %s" % (ruleFname, str(e))) + logging.error("{}: Regex Error {}".format(ruleFname, str(e))) return try: @@ -198,22 +198,22 @@ def processUrl(self, plainUrl, task): try: message = self.fetchUrl( plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname) - except Exception, e: - message = "Fetch error: %s => %s: %s" % ( + except Exception as e: + message = "Fetch error: {} => {}: {}".format( plainUrl, transformedUrl, e) - self.queue_result("error", "fetch-error %s" % - e, ruleFname, plainUrl, https_url=transformedUrl) + self.queue_result("error", "fetch-error {}".format(e), + ruleFname, plainUrl, https_url=transformedUrl) logging.debug(message) finally: - logging.info("Finished comparing %s -> %s. Rulefile: %s.", - plainUrl, transformedUrl, ruleFname) + logging.info("Finished comparing {} -> {}. Rulefile: {}.".format( + plainUrl, transformedUrl, ruleFname)) return message def disableRuleset(ruleset, problems): - logging.info("Disabling ruleset %s", ruleset.filename) + logging.info("Disabling ruleset {}".format(ruleset.filename)) contents = open(ruleset.filename).read() # Don't bother to disable rulesets that are already disabled if re.search("\bdefault_off=", contents): @@ -231,8 +231,8 @@ def disableRuleset(ruleset, problems): problemStatement = (""" @@ -8,16 +12,14 @@ - - - + - + diff --git a/src/chrome/content/rules/cdon.se.xml b/src/chrome/content/rules/cdon.se.xml index 10714d62329f..afcc49b52e17 100644 --- a/src/chrome/content/rules/cdon.se.xml +++ b/src/chrome/content/rules/cdon.se.xml @@ -1,4 +1,6 @@ + + + + + + + + + + From 92159148e3449b959c6c994f05d418dbd9478187 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 23 Feb 2018 00:12:11 +0100 Subject: [PATCH 745/844] rules: Hartwork-Project: Remove forward for binera.de (#8265) (#14724) --- src/chrome/content/rules/Hartwork-Project.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/rules/Hartwork-Project.xml b/src/chrome/content/rules/Hartwork-Project.xml index e18cf12a4db5..cacdd496ec9f 100644 --- a/src/chrome/content/rules/Hartwork-Project.xml +++ b/src/chrome/content/rules/Hartwork-Project.xml @@ -8,8 +8,6 @@ - From 2e76824c4880d1347eb4052a06db1f35ec34a08d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 00:38:13 +0100 Subject: [PATCH 746/844] Create ClimateAction.tech.xml (#14596) --- src/chrome/content/rules/ClimateAction.tech.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/ClimateAction.tech.xml diff --git a/src/chrome/content/rules/ClimateAction.tech.xml b/src/chrome/content/rules/ClimateAction.tech.xml new file mode 100644 index 000000000000..7f7e5d6bd2c5 --- /dev/null +++ b/src/chrome/content/rules/ClimateAction.tech.xml @@ -0,0 +1,8 @@ + + + + + + + + From 13a1f61a08f30ae27cb676717dbc4fd48c4e0fbf Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 00:39:00 +0100 Subject: [PATCH 747/844] Delete Plusme.net.xml and Plusme.net-falsemixed.xml (#14594) Targets gone from DNS --- .../content/rules/Plusme.net-falsemixed.xml | 23 ------------ src/chrome/content/rules/Plusme.net.xml | 35 ------------------- 2 files changed, 58 deletions(-) delete mode 100644 src/chrome/content/rules/Plusme.net-falsemixed.xml delete mode 100644 src/chrome/content/rules/Plusme.net.xml diff --git a/src/chrome/content/rules/Plusme.net-falsemixed.xml b/src/chrome/content/rules/Plusme.net-falsemixed.xml deleted file mode 100644 index 4105de148da1..000000000000 --- a/src/chrome/content/rules/Plusme.net-falsemixed.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Plusme.net.xml b/src/chrome/content/rules/Plusme.net.xml deleted file mode 100644 index 1b5572598281..000000000000 --- a/src/chrome/content/rules/Plusme.net.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - From a443be5d0d86e8f6595ee9f49145fa8ba464c5cb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 00:42:52 +0100 Subject: [PATCH 748/844] [OAG.com] Simplify and merge rulesets (#14593) * [OAG.com] Remove outdated exclusion and comments * Delete OAG.com-falsemixed.xml --- .../content/rules/OAG.com-falsemixed.xml | 13 ------- src/chrome/content/rules/OAG.xml | 34 +------------------ 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/chrome/content/rules/OAG.com-falsemixed.xml diff --git a/src/chrome/content/rules/OAG.com-falsemixed.xml b/src/chrome/content/rules/OAG.com-falsemixed.xml deleted file mode 100644 index e129c930a7c9..000000000000 --- a/src/chrome/content/rules/OAG.com-falsemixed.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/OAG.xml b/src/chrome/content/rules/OAG.xml index 2baf372e1339..bf676196266e 100644 --- a/src/chrome/content/rules/OAG.xml +++ b/src/chrome/content/rules/OAG.xml @@ -1,47 +1,15 @@ - - - - - - - - + - From 249fb741e3ae2dca84b11d8ffa171571140a289e Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 00:49:48 +0100 Subject: [PATCH 749/844] [David-DM.org] Remove extra test url (#14695) --- src/chrome/content/rules/david-dm.org.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/rules/david-dm.org.xml b/src/chrome/content/rules/david-dm.org.xml index 7d9dbbefe296..0bc9d0d03dd8 100644 --- a/src/chrome/content/rules/david-dm.org.xml +++ b/src/chrome/content/rules/david-dm.org.xml @@ -8,7 +8,5 @@ www.david-dm.org mismatch - - From 3a6eff9d4721d2e8485e451631d85d8676db0124 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 00:53:41 +0100 Subject: [PATCH 750/844] [DavidsonTutoring.com] Merge and simplify rulesets (#14477) * [DavidsonTutoring.com] Simplify ruleset * Delete Davidson_Tutoring.com-falsemixed.xml * Rename Davidson_Tutoring.com.xml to DavidsonTutoring.com.xml --- .../content/rules/DavidsonTutoring.com.xml | 17 ++++++++++++++ .../Davidson_Tutoring.com-falsemixed.xml | 23 ------------------- .../content/rules/Davidson_Tutoring.com.xml | 20 ---------------- 3 files changed, 17 insertions(+), 43 deletions(-) create mode 100644 src/chrome/content/rules/DavidsonTutoring.com.xml delete mode 100644 src/chrome/content/rules/Davidson_Tutoring.com-falsemixed.xml delete mode 100644 src/chrome/content/rules/Davidson_Tutoring.com.xml diff --git a/src/chrome/content/rules/DavidsonTutoring.com.xml b/src/chrome/content/rules/DavidsonTutoring.com.xml new file mode 100644 index 000000000000..483fc5f07550 --- /dev/null +++ b/src/chrome/content/rules/DavidsonTutoring.com.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Davidson_Tutoring.com-falsemixed.xml b/src/chrome/content/rules/Davidson_Tutoring.com-falsemixed.xml deleted file mode 100644 index b8ae22b75978..000000000000 --- a/src/chrome/content/rules/Davidson_Tutoring.com-falsemixed.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Davidson_Tutoring.com.xml b/src/chrome/content/rules/Davidson_Tutoring.com.xml deleted file mode 100644 index 3219d81fe5a2..000000000000 --- a/src/chrome/content/rules/Davidson_Tutoring.com.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - From 14e00c38a322608f236bd1ca2c2a876ddbbf503d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 00:54:32 +0100 Subject: [PATCH 751/844] [HomeTheaterReview.com] Merge and simplify rulesets (#14479) * [HomeTheaterReview.com] Simplify ruleset * Rename Home_Theater_Review.com.xml to HomeTheaterReview.com.xml * Delete Home_Theater_Review.com-falsemixed.xml --- .../content/rules/HomeTheaterReview.com.xml | 9 ++++ .../Home_Theater_Review.com-falsemixed.xml | 18 -------- .../content/rules/Home_Theater_Review.com.xml | 46 ------------------- 3 files changed, 9 insertions(+), 64 deletions(-) create mode 100644 src/chrome/content/rules/HomeTheaterReview.com.xml delete mode 100644 src/chrome/content/rules/Home_Theater_Review.com-falsemixed.xml delete mode 100644 src/chrome/content/rules/Home_Theater_Review.com.xml diff --git a/src/chrome/content/rules/HomeTheaterReview.com.xml b/src/chrome/content/rules/HomeTheaterReview.com.xml new file mode 100644 index 000000000000..ebb01fa9efa2 --- /dev/null +++ b/src/chrome/content/rules/HomeTheaterReview.com.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/chrome/content/rules/Home_Theater_Review.com-falsemixed.xml b/src/chrome/content/rules/Home_Theater_Review.com-falsemixed.xml deleted file mode 100644 index d8419109ed4f..000000000000 --- a/src/chrome/content/rules/Home_Theater_Review.com-falsemixed.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Home_Theater_Review.com.xml b/src/chrome/content/rules/Home_Theater_Review.com.xml deleted file mode 100644 index 7cb088f6a76b..000000000000 --- a/src/chrome/content/rules/Home_Theater_Review.com.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - From 9ef32ab055578625679a349c34695e95625ccf7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 23 Feb 2018 00:56:18 +0100 Subject: [PATCH 752/844] Added ruleset for tcca.info (#14511) --- src/chrome/content/rules/TCCA.info.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/TCCA.info.xml diff --git a/src/chrome/content/rules/TCCA.info.xml b/src/chrome/content/rules/TCCA.info.xml new file mode 100644 index 000000000000..b63d83999555 --- /dev/null +++ b/src/chrome/content/rules/TCCA.info.xml @@ -0,0 +1,8 @@ + + + + + + + + From 88f76a667f053d2e2cd9bcd653b9828af49ddf19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 23 Feb 2018 00:56:55 +0100 Subject: [PATCH 753/844] Added ruleset for gda-portal.de (#14512) --- src/chrome/content/rules/GDA-Portal.de.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/chrome/content/rules/GDA-Portal.de.xml diff --git a/src/chrome/content/rules/GDA-Portal.de.xml b/src/chrome/content/rules/GDA-Portal.de.xml new file mode 100644 index 000000000000..6aea7cae63d0 --- /dev/null +++ b/src/chrome/content/rules/GDA-Portal.de.xml @@ -0,0 +1,8 @@ + + + + + + + + From 620f422084f302eb71d9f85c26d5737962008b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 23 Feb 2018 00:58:30 +0100 Subject: [PATCH 754/844] Added ruleset for inqa.de (#14513) --- src/chrome/content/rules/INQA.de.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/INQA.de.xml diff --git a/src/chrome/content/rules/INQA.de.xml b/src/chrome/content/rules/INQA.de.xml new file mode 100644 index 000000000000..3776759e9758 --- /dev/null +++ b/src/chrome/content/rules/INQA.de.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + From 1438ed76df6ed6be90a4131e9d0106a9d2f16f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Fri, 23 Feb 2018 01:01:43 +0100 Subject: [PATCH 755/844] Updated drillisch.de ruleset. (#14416) --- src/chrome/content/rules/Drillisch.de.xml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Drillisch.de.xml b/src/chrome/content/rules/Drillisch.de.xml index 6378ddfea194..1e112a836e91 100644 --- a/src/chrome/content/rules/Drillisch.de.xml +++ b/src/chrome/content/rules/Drillisch.de.xml @@ -1,6 +1,21 @@ + - - - + + + + + + + + + + + + + From 08f769e3648677937e67b176db8f293bb83e4137 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 01:35:13 +0100 Subject: [PATCH 756/844] [Transifex.com] Add subdomains (#14558) * [Transifex.com] Add subdomains * [Transifex.com] Simplify securecookie * Rename Transifex.xml to Transifex.com.xml --- src/chrome/content/rules/Transifex.com.xml | 18 ++++++++ src/chrome/content/rules/Transifex.xml | 49 ---------------------- 2 files changed, 18 insertions(+), 49 deletions(-) create mode 100644 src/chrome/content/rules/Transifex.com.xml delete mode 100644 src/chrome/content/rules/Transifex.xml diff --git a/src/chrome/content/rules/Transifex.com.xml b/src/chrome/content/rules/Transifex.com.xml new file mode 100644 index 000000000000..4677fc04afc9 --- /dev/null +++ b/src/chrome/content/rules/Transifex.com.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Transifex.xml b/src/chrome/content/rules/Transifex.xml deleted file mode 100644 index 68cc1f9302c7..000000000000 --- a/src/chrome/content/rules/Transifex.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - From 07ae25d8d14919e115ab5832772da48bc0f8708d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 01:38:06 +0100 Subject: [PATCH 757/844] [OUmedicine.com] Add subdomains (#14537) * [OUmedicine.com] Add subdomains * [OUmedicine.com] Default_off ruleset --- src/chrome/content/rules/Oumedicine.com.xml | 25 ++++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Oumedicine.com.xml b/src/chrome/content/rules/Oumedicine.com.xml index 78e4dfa1f6d2..8a06f21ceb21 100644 --- a/src/chrome/content/rules/Oumedicine.com.xml +++ b/src/chrome/content/rules/Oumedicine.com.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + + - + + to="https:" /> + From b482d7835ce31c20b9753269327b41c8b2adb884 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 01:42:44 +0100 Subject: [PATCH 758/844] [HamRadioScience.com] Trivialize and enable ruleset (#14540) * [HamRadioScience.com] Trivialize and enable ruleset * Rename Ham_Radio_Science.com.xml to HamRadioScience.com.xml --- .../content/rules/HamRadioScience.com.xml | 11 ++++++ .../content/rules/Ham_Radio_Science.com.xml | 38 ------------------- 2 files changed, 11 insertions(+), 38 deletions(-) create mode 100644 src/chrome/content/rules/HamRadioScience.com.xml delete mode 100644 src/chrome/content/rules/Ham_Radio_Science.com.xml diff --git a/src/chrome/content/rules/HamRadioScience.com.xml b/src/chrome/content/rules/HamRadioScience.com.xml new file mode 100644 index 000000000000..2aa352d06bf9 --- /dev/null +++ b/src/chrome/content/rules/HamRadioScience.com.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/Ham_Radio_Science.com.xml b/src/chrome/content/rules/Ham_Radio_Science.com.xml deleted file mode 100644 index 2e40956e5442..000000000000 --- a/src/chrome/content/rules/Ham_Radio_Science.com.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - From cd7663c1efd2a9abf4d6b24d9d1932e8d49359c8 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Fri, 23 Feb 2018 08:47:39 +0800 Subject: [PATCH 759/844] Update Centralfield.com.xml (#14601) * Update Centralfield.com.xml * Update Centralfield.com.xml --- src/chrome/content/rules/Centralfield.com.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/Centralfield.com.xml b/src/chrome/content/rules/Centralfield.com.xml index b846f1e71331..cb4879064159 100644 --- a/src/chrome/content/rules/Centralfield.com.xml +++ b/src/chrome/content/rules/Centralfield.com.xml @@ -1,19 +1,14 @@ - - + - From de4140403009f96a005781e303bc75ffbb3aa447 Mon Sep 17 00:00:00 2001 From: youdly Date: Fri, 23 Feb 2018 11:35:12 +1030 Subject: [PATCH 760/844] [Gumtree.com] Re-enable ruleset and add subdomains (#14109) --- src/chrome/content/rules/Gumtree.com.xml | 56 ++++++++++++++++++++ src/chrome/content/rules/gumtree.com.xml | 65 ------------------------ 2 files changed, 56 insertions(+), 65 deletions(-) create mode 100644 src/chrome/content/rules/Gumtree.com.xml delete mode 100644 src/chrome/content/rules/gumtree.com.xml diff --git a/src/chrome/content/rules/Gumtree.com.xml b/src/chrome/content/rules/Gumtree.com.xml new file mode 100644 index 000000000000..ea04f4348d38 --- /dev/null +++ b/src/chrome/content/rules/Gumtree.com.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/gumtree.com.xml b/src/chrome/content/rules/gumtree.com.xml deleted file mode 100644 index bb90d5681d0d..000000000000 --- a/src/chrome/content/rules/gumtree.com.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From a6e18435cd3d795725bc8fef82cd5eb3ed3b3287 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 17:13:52 -0800 Subject: [PATCH 761/844] Convert test/selenium/ to py3.6 (#14725) --- test/selenium/shim.py | 16 +++++++--------- test/selenium/util.py | 16 ++++++++-------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/test/selenium/shim.py b/test/selenium/shim.py index 07ebb6ce8f3d..6c51bd7abd01 100644 --- a/test/selenium/shim.py +++ b/test/selenium/shim.py @@ -37,7 +37,7 @@ def get_browser_type(string): for t in BROWSER_TYPES: if t in string: return t - raise ValueError("couldn't get browser type from %s" % string) + raise ValueError("couldn't get browser type from {}".format(string)) def get_browser_name(string): @@ -47,7 +47,7 @@ def get_browser_name(string): for bn in BROWSER_NAMES: if string in bn and unix_which(bn, silent=True): return os.path.basename(unix_which(bn)) - raise ValueError('Could not get browser name from %s' % string) + raise ValueError('Could not get browser name from {}'.format(string)) def build_crx(): @@ -101,21 +101,20 @@ def __init__(self, chrome_info, firefox_info): self.browser_path = unix_which(bname) self.browser_type = browser else: - raise ValueError("could not infer BROWSER from %s" % browser) + raise ValueError("could not infer BROWSER from {}".format(browser)) self.extension_path = self.get_ext_path() self._set_specifics() - print('\nUsing browser path: %s \nwith browser type: %s \nand extension path: %s' % - (self.browser_path, self.browser_type, self.extension_path)) + print('\nUsing browser path: {} \nwith browser type: {} \nand extension path: {}'.format(self.browser_path, self.browser_type, self.extension_path)) self._set_urls(self.base_url) def _set_specifics(self): self._specifics = self._specifics or { 'chrome': Specifics(self.chrome_manager, - 'chrome-extension://%s/' % self.chrome_info['extension_id'], + 'chrome-extension://{}/'.format(self.chrome_info['extension_id']), self.chrome_info), 'firefox': Specifics(self.firefox_manager, - 'moz-extension://%s/' % self.firefox_info['uuid'], + 'moz-extension://{}/'.format(self.firefox_info['uuid']), self.firefox_info)} self.manager, self.base_url, self.info = self._specifics[self.browser_type] @@ -166,8 +165,7 @@ def chrome_manager(self): def firefox_manager(self): ffp = webdriver.FirefoxProfile() # make extension id constant across runs - ffp.set_preference('extensions.webextensions.uuids', '{"%s": "%s"}' % - (self.info['extension_id'], self.info['uuid'])) + ffp.set_preference('extensions.webextensions.uuids', '{{"{}": "{}"}}'.format(self.info['extension_id'], self.info['uuid'])) driver = webdriver.Firefox(firefox_profile=ffp, firefox_binary=self.browser_path) install_ext_on_ff(driver, self.extension_path) diff --git a/test/selenium/util.py b/test/selenium/util.py index 35c1618f1289..4d80e319d645 100644 --- a/test/selenium/util.py +++ b/test/selenium/util.py @@ -69,24 +69,24 @@ def switch_to_url(self, target, open_url=False): return self.driver.refresh() if open_url: return self.driver.get(target) - raise ValueError('Target (%s) not found in current urls' % (target,)) + raise ValueError('Target ({}) not found in current urls'.format(target)) def get_variable(self, name): - return self.driver.execute_script('return %s;' % name) + return self.driver.execute_script('return {};'.format(name)) @contextmanager def load_popup_for(self, url='about:blank'): create_url_and_popup_js_str = ''' - (function(done) { - chrome.tabs.create({url: '%s'}, function(tab) { + (function(done) {{ + chrome.tabs.create({{url: '{}'}}, function(tab) {{ setTimeout( - () => chrome.tabs.create({url: '%s' + '?tabId=' + String(tab.id)}, done), + () => chrome.tabs.create({{url: '{}' + '?tabId=' + String(tab.id)}}, done), 500 ); - }); - })(arguments[0]); + }}); + }})(arguments[0]); ''' - script = create_url_and_popup_js_str % (url, self.shim.popup_url) + script = create_url_and_popup_js_str.format(url, self.shim.popup_url) self.driver.get(self.shim.bg_url) time.sleep(0.5) From b1fc615fd0bfc62b85d3bda1d185e46741e2e44c Mon Sep 17 00:00:00 2001 From: Justin Su Date: Thu, 22 Feb 2018 20:50:54 -0500 Subject: [PATCH 762/844] Add ruleset for Blogtrottr.com (#14690) * Add ruleset for Blogtrottr.com * Add target to blogtrottr.com ruleset --- src/chrome/content/rules/Blogtrottr.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/Blogtrottr.com.xml diff --git a/src/chrome/content/rules/Blogtrottr.com.xml b/src/chrome/content/rules/Blogtrottr.com.xml new file mode 100644 index 000000000000..0930af15a08d --- /dev/null +++ b/src/chrome/content/rules/Blogtrottr.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From 60fc03ed982e5f305c039b67c2183c8f29150210 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 17:55:28 -0800 Subject: [PATCH 763/844] Remove unused utils (#14728) --- utils/alexa-logs/07042014.log | 269 --------------------------------- utils/alexa-ruleset-checker.py | 178 ---------------------- utils/check_certs.py | 39 ----- utils/compare-locales.sh | 30 ---- utils/eff-pubkey.der | Bin 294 -> 0 bytes utils/find_rules.py | 112 -------------- utils/rule-sample.py | 19 --- utils/single_rule_response.py | 114 -------------- utils/test-generator.py | 52 ------- utils/trivial-response.py | 70 --------- 10 files changed, 883 deletions(-) delete mode 100644 utils/alexa-logs/07042014.log delete mode 100755 utils/alexa-ruleset-checker.py delete mode 100755 utils/check_certs.py delete mode 100755 utils/compare-locales.sh delete mode 100644 utils/eff-pubkey.der delete mode 100644 utils/find_rules.py delete mode 100755 utils/rule-sample.py delete mode 100755 utils/single_rule_response.py delete mode 100755 utils/test-generator.py delete mode 100755 utils/trivial-response.py diff --git a/utils/alexa-logs/07042014.log b/utils/alexa-logs/07042014.log deleted file mode 100644 index e7168a5dbf74..000000000000 --- a/utils/alexa-logs/07042014.log +++ /dev/null @@ -1,269 +0,0 @@ -On branch 3.5 -Changes to be committed: - (use "git reset HEAD ..." to unstage) - - new file: src/chrome/content/rules/123RF.xml - modified: src/chrome/content/rules/1and1-Internet.xml - new file: src/chrome/content/rules/1und1.de.xml - modified: src/chrome/content/rules/4Shared.xml - modified: src/chrome/content/rules/9gag.xml - new file: src/chrome/content/rules/ABC_News-falsemixed.xml - new file: src/chrome/content/rules/ABC_News.xml - modified: src/chrome/content/rules/AOL.xml - new file: src/chrome/content/rules/ATandT.xml - modified: src/chrome/content/rules/AWeber.xml - modified: src/chrome/content/rules/AdF.ly.xml - new file: src/chrome/content/rules/Adcash.xml - modified: src/chrome/content/rules/AddThis.xml - modified: src/chrome/content/rules/Adobe.xml - new file: src/chrome/content/rules/Adscale.xml - new file: src/chrome/content/rules/Adult-FriendFinder.xml - new file: src/chrome/content/rules/Aftonbladet.xml - new file: src/chrome/content/rules/Alipay.com.xml - modified: src/chrome/content/rules/Amazon.xml - new file: src/chrome/content/rules/Amazon_EU.xml - new file: src/chrome/content/rules/Amazon_JP.xml - modified: src/chrome/content/rules/Ameba.xml - new file: src/chrome/content/rules/Anyoption.com.xml - modified: src/chrome/content/rules/AppNexus.xml - modified: src/chrome/content/rules/Apple.xml - new file: src/chrome/content/rules/BBC.com.xml - modified: src/chrome/content/rules/BBC.xml - new file: src/chrome/content/rules/Battle.net.xml - modified: src/chrome/content/rules/Behance.xml - modified: src/chrome/content/rules/Bing.xml - modified: src/chrome/content/rules/Bitly.xml - modified: src/chrome/content/rules/Blogger.xml - modified: src/chrome/content/rules/Bluehost.xml - new file: src/chrome/content/rules/Box.xml - new file: src/chrome/content/rules/BrainyQuote.com.xml - modified: src/chrome/content/rules/BusinessInsider.xml - new file: src/chrome/content/rules/BuzzFeed.xml - new file: src/chrome/content/rules/CBS.xml - new file: src/chrome/content/rules/CNBC.xml - modified: src/chrome/content/rules/CareerBuilder.xml - modified: src/chrome/content/rules/Citibank.xml - modified: src/chrome/content/rules/Citrix.xml - modified: src/chrome/content/rules/ClickBank.xml - new file: src/chrome/content/rules/Clkads.com.xml - modified: src/chrome/content/rules/Comcast.xml - new file: src/chrome/content/rules/Commission_Junction.xml - new file: src/chrome/content/rules/Conduit.xml - modified: src/chrome/content/rules/Constant-Contact.xml - modified: src/chrome/content/rules/Dafont.com.xml - modified: src/chrome/content/rules/Dailymotion.xml - new file: src/chrome/content/rules/Deezer.xml - new file: src/chrome/content/rules/Dell.com-falsemixed.xml - modified: src/chrome/content/rules/Dell.xml - modified: src/chrome/content/rules/Deviantart.xml - new file: src/chrome/content/rules/Digg.xml - new file: src/chrome/content/rules/Digital_Point_Solutions.xml - modified: src/chrome/content/rules/Disqus.com.xml - modified: src/chrome/content/rules/Doubleclick.net.xml - new file: src/chrome/content/rules/Dreamstime.xml - modified: src/chrome/content/rules/Dropbox.xml - modified: src/chrome/content/rules/DuckDuckGo.xml - modified: src/chrome/content/rules/EZTV.xml - modified: src/chrome/content/rules/Etsy.xml - modified: src/chrome/content/rules/Eventbrite.xml - modified: src/chrome/content/rules/Evernote.xml - modified: src/chrome/content/rules/Examiner.com.xml - new file: src/chrome/content/rules/Exoclick.xml - new file: src/chrome/content/rules/Expedia.xml - modified: src/chrome/content/rules/EzineArticles.xml - new file: src/chrome/content/rules/FedEx.com.xml - new file: src/chrome/content/rules/Feedly.com.xml - new file: src/chrome/content/rules/Fhserve.com.xml - modified: src/chrome/content/rules/Flickr.xml - modified: src/chrome/content/rules/Focus.de.xml - modified: src/chrome/content/rules/Foursquare.com.xml - modified: src/chrome/content/rules/Freelancer.xml - modified: src/chrome/content/rules/Gawker.xml - modified: src/chrome/content/rules/Github.xml - new file: src/chrome/content/rules/Gizmodo.com.xml - new file: src/chrome/content/rules/Glassdoor.xml - modified: src/chrome/content/rules/GoDaddy.xml - modified: src/chrome/content/rules/Goodreads.xml - modified: src/chrome/content/rules/GoogleAPIs.xml - modified: src/chrome/content/rules/GoogleImages.xml - modified: src/chrome/content/rules/GoogleMainSearch.xml - modified: src/chrome/content/rules/GoogleSearch.xml - modified: src/chrome/content/rules/GoogleServices.xml - modified: src/chrome/content/rules/GoogleVideos.xml - modified: src/chrome/content/rules/HM.com.xml - new file: src/chrome/content/rules/Hatena.xml - modified: src/chrome/content/rules/Hewlett-Packard.xml - new file: src/chrome/content/rules/Home_Depot.com.xml - new file: src/chrome/content/rules/HootSuite.xml - new file: src/chrome/content/rules/HostGator.xml - new file: src/chrome/content/rules/Hotels.com.xml - new file: src/chrome/content/rules/HubSpot.xml - new file: src/chrome/content/rules/Huffington-Post.xml - new file: src/chrome/content/rules/Hulu.xml - modified: src/chrome/content/rules/IBM.xml - new file: src/chrome/content/rules/IGN-problematic.xml - modified: src/chrome/content/rules/IMDB.xml - modified: src/chrome/content/rules/Ikea.com.xml - modified: src/chrome/content/rules/Imgur.xml - modified: src/chrome/content/rules/Instagram.xml - new file: src/chrome/content/rules/Instructables.xml - modified: src/chrome/content/rules/Internet-Archive.xml - modified: src/chrome/content/rules/JQuery.xml - new file: src/chrome/content/rules/Justin.tv.xml - modified: src/chrome/content/rules/Kayak.xml - modified: src/chrome/content/rules/KickassTorrents.xml - modified: src/chrome/content/rules/Kickstarter.xml - modified: src/chrome/content/rules/Kohls.xml - new file: src/chrome/content/rules/LaPatilla.com.xml - modified: src/chrome/content/rules/Lenovo.xml - new file: src/chrome/content/rules/Leo.org.xml - new file: src/chrome/content/rules/Lifehacker.com.xml - new file: src/chrome/content/rules/Likes.xml - new file: src/chrome/content/rules/Linkbucks.xml - modified: src/chrome/content/rules/LinkedIn.xml - modified: src/chrome/content/rules/Live.xml - new file: src/chrome/content/rules/LiveInternet-falsemixed.xml - modified: src/chrome/content/rules/LiveJournal.xml - new file: src/chrome/content/rules/Los_Angeles_Times.xml - new file: src/chrome/content/rules/Lowes.com.xml - new file: src/chrome/content/rules/MGID.com.xml - modified: src/chrome/content/rules/Magento.xml - modified: src/chrome/content/rules/MailChimp.xml - new file: src/chrome/content/rules/Manta.xml - modified: src/chrome/content/rules/Marketwatch.com.xml - modified: src/chrome/content/rules/Mashable.com.xml - modified: src/chrome/content/rules/MediaFire.xml - new file: src/chrome/content/rules/Mega.xml - modified: src/chrome/content/rules/Microsoft.xml - modified: src/chrome/content/rules/Motherless.xml - modified: src/chrome/content/rules/Mozilla.xml - new file: src/chrome/content/rules/MyFitnessPal.xml - modified: src/chrome/content/rules/Myspace.xml - new file: src/chrome/content/rules/NBC-News.xml - modified: src/chrome/content/rules/NIFTY.xml - modified: src/chrome/content/rules/NPR.org.xml - modified: src/chrome/content/rules/NYDailyNews.xml - modified: src/chrome/content/rules/NYTimes.xml - modified: src/chrome/content/rules/NameCheap.xml - modified: src/chrome/content/rules/Netflix.xml - new file: src/chrome/content/rules/Nike.com.xml - modified: src/chrome/content/rules/Ning.xml - modified: src/chrome/content/rules/OkCupid.xml - new file: src/chrome/content/rules/Onclickads.net.xml - modified: src/chrome/content/rules/Oracle.xml - new file: src/chrome/content/rules/Outbrain.xml - new file: src/chrome/content/rules/Outlook_Live.xml - new file: src/chrome/content/rules/Overstock.com.xml - modified: src/chrome/content/rules/Ovh.xml - modified: src/chrome/content/rules/Pandora.xml - modified: src/chrome/content/rules/PayPal.xml - modified: src/chrome/content/rules/Pingdom.xml - modified: src/chrome/content/rules/Pinterest.xml - new file: src/chrome/content/rules/PlugRush.com.xml - new file: src/chrome/content/rules/PopAds.xml - new file: src/chrome/content/rules/PornHub.xml - modified: src/chrome/content/rules/Quora.xml - new file: src/chrome/content/rules/Rapidgator.net.xml - modified: src/chrome/content/rules/Reddit.xml - modified: src/chrome/content/rules/Reddit_via_pay.xml - new file: src/chrome/content/rules/RetailMeNot.com.xml - new file: src/chrome/content/rules/Reuters.com.xml - modified: src/chrome/content/rules/RightNow.xml - modified: src/chrome/content/rules/RottenTomatoes.xml - modified: src/chrome/content/rules/Salesforce.com.xml - new file: src/chrome/content/rules/Samsung.xml - new file: src/chrome/content/rules/Sape.xml - modified: src/chrome/content/rules/Sapo.pt.xml - new file: src/chrome/content/rules/Scoop.it.xml - modified: src/chrome/content/rules/Scribd.com.xml - new file: src/chrome/content/rules/ShareASale.com.xml - modified: src/chrome/content/rules/Shopify.xml - new file: src/chrome/content/rules/Shutterstock.xml - new file: src/chrome/content/rules/SiteAdvisor.com.xml - new file: src/chrome/content/rules/SitePoint.xml - new file: src/chrome/content/rules/Skype.xml - new file: src/chrome/content/rules/Slickdeals.xml - modified: src/chrome/content/rules/SlideShare.xml - new file: src/chrome/content/rules/Soundcloud.xml - modified: src/chrome/content/rules/SourceForge.xml - new file: src/chrome/content/rules/Speedtest.net.xml - new file: src/chrome/content/rules/Spiegel.xml - new file: src/chrome/content/rules/Spotify.xml - modified: src/chrome/content/rules/Squarespace.xml - modified: src/chrome/content/rules/Stack-Exchange-mixedcontent.xml - modified: src/chrome/content/rules/Stack-Exchange.xml - modified: src/chrome/content/rules/Statcounter.xml - new file: src/chrome/content/rules/Steam.xml - new file: src/chrome/content/rules/Steam_Community.com.xml - modified: src/chrome/content/rules/StumbleUpon.xml - new file: src/chrome/content/rules/Suddeutsche_Zeitung.xml - modified: src/chrome/content/rules/SurveyMonkey.xml - modified: src/chrome/content/rules/TED.xml - new file: src/chrome/content/rules/TMZ.com.xml - new file: src/chrome/content/rules/Taboola.xml - modified: src/chrome/content/rules/Taleo.xml - new file: src/chrome/content/rules/Taringa.xml - modified: src/chrome/content/rules/Telegraph-Media-Group.xml - new file: src/chrome/content/rules/Template_Monster.com.xml - new file: src/chrome/content/rules/The-Verge.xml - modified: src/chrome/content/rules/ThePirateBay.xml - modified: src/chrome/content/rules/Torrentz.xml - new file: src/chrome/content/rules/Tribune-mismatches.xml - new file: src/chrome/content/rules/TripAdvisor.xml - modified: src/chrome/content/rules/Tumblr.xml - new file: src/chrome/content/rules/TutsPlus.com.xml - modified: src/chrome/content/rules/Twitter.xml - new file: src/chrome/content/rules/Typepad.xml - new file: src/chrome/content/rules/UPS.com.xml - new file: src/chrome/content/rules/USA_Today.xml - modified: src/chrome/content/rules/USPS.xml - new file: src/chrome/content/rules/Uploaded.net.xml - new file: src/chrome/content/rules/Upworthy.com.xml - new file: src/chrome/content/rules/Urban-Dictionary.xml - new file: src/chrome/content/rules/VK-old.xml - modified: src/chrome/content/rules/VK.xml - modified: src/chrome/content/rules/Verizon.xml - new file: src/chrome/content/rules/Verizon_Wireless.xml - modified: src/chrome/content/rules/Vimeo.xml - modified: src/chrome/content/rules/W3C.xml - new file: src/chrome/content/rules/Walmart.com.xml - new file: src/chrome/content/rules/We-Heart-It.xml - new file: src/chrome/content/rules/WeTransfer.xml - modified: src/chrome/content/rules/Weather-Underground.xml - new file: src/chrome/content/rules/Web-Hosting-Talk.xml - modified: src/chrome/content/rules/Web.de.xml - new file: src/chrome/content/rules/Weebly-mixed.xml - new file: src/chrome/content/rules/Weebly.xml - new file: src/chrome/content/rules/WikiHow.com.xml - new file: src/chrome/content/rules/Wikia.xml - modified: src/chrome/content/rules/Wired.xml - new file: src/chrome/content/rules/Wix.xml - new file: src/chrome/content/rules/WooThemes.xml - new file: src/chrome/content/rules/WordPress-blogs.xml - modified: src/chrome/content/rules/WordPress.xml - new file: src/chrome/content/rules/XDA-Developers.com-falsemixed.xml - modified: src/chrome/content/rules/XDA-Developers.xml - new file: src/chrome/content/rules/XE.xml - new file: src/chrome/content/rules/XHamster.com.xml - modified: src/chrome/content/rules/Xing.xml - new file: src/chrome/content/rules/Xtube.com.xml - modified: src/chrome/content/rules/Yahoo.xml - modified: src/chrome/content/rules/Yandex.xml - new file: src/chrome/content/rules/Yelp.xml - modified: src/chrome/content/rules/YouTube.xml - new file: src/chrome/content/rules/Youm7.com-falsemixed.xml - new file: src/chrome/content/rules/Youm7.com.xml - new file: src/chrome/content/rules/Zanox.xml - new file: src/chrome/content/rules/Zappos.xml - modified: src/chrome/content/rules/Zendesk.com.xml - modified: src/chrome/content/rules/Zillow.xml - modified: src/chrome/content/rules/Zoho.xml - modified: src/chrome/content/rules/eHow.xml - new file: src/chrome/content/rules/leo.xml - -Untracked files: - (use "git add ..." to include in what will be committed) - - status.log - utils/alexa07042014.txt - diff --git a/utils/alexa-ruleset-checker.py b/utils/alexa-ruleset-checker.py deleted file mode 100755 index 30318eb266fd..000000000000 --- a/utils/alexa-ruleset-checker.py +++ /dev/null @@ -1,178 +0,0 @@ -#! /usr/bin/env python3.3 - -# Copyright 2014 Claudio Moretti -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. - -# -# This little piece of software works by downloading the Alexa Top 1M website list, which freely available, -# then it uses `git diff` to generate a list of XML ruleset files that are in the master branch but not in stable. -# Finally, it compares the two and prints the file name and path of every ruleset file that -# a) is in master but not in stable and -# b) has a target in the Alexa Top1M list -# - -import sys -import csv -import xml.etree.ElementTree as etree -import subprocess -import random -import urllib.request -import urllib.error -import zipfile -import os -import time - -# Variables and constants -sitesList = [] - -# Temporary file containing the `git diff` between master and stable -tmpRulesFileName = "/tmp/rulesDiff-" + format(random.randrange(1,65535)) # Feel free to enlarge if needed - -# URL of the Alexa Top1M -alexaTop1MURL = "http://s3.amazonaws.com/alexa-static/top-1m.csv.zip" -# alexaTop1MURL = "http://127.0.0.1/top-1m.csv.zip" - -# Temporary file name, to avoid conflicts -tmpAlexaFileName = "/tmp/alexa-top1M-" + format(random.randrange(1,65535)) + ".csv" - -# Logfile. Records the same output as the script -logFileName = "/tmp/alexa-ruleset-log-" + format(random.randrange(1,65535)) + ".log" - -# Filename of the CSV file contained in the Alexa zipfile -tmpAlexaZipFileContents = 'top-1m.csv' - -# Absolute path of the git repo (the folder containing src/) -# Remember to change this accordingly to your system, if you ever move the script -# -# By default, it refers to the parent directory of the one containing the script -# because the script was put in utils/ -# -# __NEEDS A TRAILING SLASH__ -# -# gitRepositoryPath = os.path.abspath(os.path.join(os.curdir, os.pardir)) -gitRepositoryPath = os.path.abspath(os.path.join(os.curdir, os.pardir)) + "/" - -# Maximum number of websites to use in the Alexa Top 1M (i.e. it's no longer 1M but maxSitesNumber) -# Set to -1 for 'unlimited' -maxSitesNumber = 1000 - -# Functions -def ruleLookup(target): - try: # list.index(value) throus an exception for a "not found", so if it throws it, it's not found - sitesList.index(target) - return 1 - except: - return 0 - -# Fetch the Alexa Top 1M - http://stackoverflow.com/questions/1517616/stream-large-binary-files-with-urllib2-to-file -try: - print("Retrieving Alexa Top1M from", alexaTop1MURL) - tmpAlexaZipFileName, headers = urllib.request.urlretrieve(alexaTop1MURL) - print("File downloaded and stored in %s" % tmpAlexaZipFileName) -except urllib.error.URLError as e: - print("Failed to download Alexa Top 1M") - sys.exit('Error message: %s' % e) - -# Now unzip it -try: - # Extract in /tmp/ - print("Start extracting %s" % tmpAlexaZipFileName) - tmpAlexaZipFile = zipfile.ZipFile(tmpAlexaZipFileName,'r') - tmpAlexaZipFile.extractall('/tmp/') -except zipfile.BadZipfile: - sys.exit("The zip file %s is corrupted.",tmpAlexaZipFileName) - -try: - # Rename the file to match the file with the random in it - os.rename('/tmp/' + tmpAlexaZipFileContents,tmpAlexaFileName) - print("Alexa Top1M retrieved and stored in %s" % tmpAlexaFileName) -except OSError as e: - print("Failed to rename /tmp/top-1M.csv to %s." % (tmpAlexaFileName)) - sys.exit('Error message: %s' % (e)) - -# Handles reading the Alexa Top 1M and pushing all sites in a list -sitesReader = csv.reader(open(tmpAlexaFileName), delimiter=',', quotechar='"') -for row in sitesReader: - try: - # Since some Alexa sites are not FQDNs, split where there's a "/" and keep ony the first part - siteFQDN = sitesList.append(row[1].split("/",1)[0]) - # print("Line %s: %s" % (sitesReader.line_num, sitesList[len(sitesList) - 1])) # Outputs the current line - if sitesReader.line_num == maxSitesNumber: - break - except csv.Error as e: - sys.exit('file %s, line %d: %s' % (tmpAlexaFileName, sitesReader.line_num, e)) - -# `git diff` the master revision against stable, rules folder only -try: - print("Create git diff between master and stable in %s" % tmpRulesFileName) - tmpRulesFile = open(tmpRulesFileName,"w") - #subprocess.call(['git', 'diff', '--name-status', 'master..remotes/origin/stable', '../src/chrome/content/rules'], stdout=tmpRulesFile) - subprocess.call(['git', 'diff', '--name-status', 'remotes/origin/stable..master', '../src/chrome/content/rules'], stdout=tmpRulesFile) - tmpRulesFile.close() -except OSError as e: - sys.exit('An OSError exception was raised: %s' % (e)) - -rulesList = open(tmpRulesFileName, 'r') -logFile = open(logFileName,'w') -logFile.write("Log file generated on %s.\nPaths are relative to the root directory of the git repo.\n\n" % time.strftime("%Y-%m-%d %H:%M:%S")) - -# Let's keep track of how many rules were added and how many were modified -# Must be declared here or won't be available at the end of the loop -countAddedRules = 0 -countEditedRules = 0 - -# Start parsing the list -for line in rulesList: - try: - # Split into "file mode in commit + file path" - ruleFile = line.split() - found = 0 - # If file mode is "A" (add) or "M" (edited) - if ruleFile[0] == "A" or ruleFile[0] == "M": # If file was added or edited between stable and master, parse - ruleFileObject= open(gitRepositoryPath + ruleFile[1]) - ruleText = etree.parse(ruleFileObject) # ADJUST FILE PATH (here is '../') IF YOU MOVE THE SCRIPT - XXX: Obsolete warning? - for target in ruleText.findall('target'): - FQDN = target.get('host') # URL of the website - if ruleLookup(FQDN) == 1: # Look it up in the sitesList - # Message different according to file mode - if ruleFile[0] == "A": # New - found = "NEW" - countAddedRules = countAddedRules + 1 - break - elif ruleFile[0] == "M": # Edited - found = "EDITED" - countEditedRules = countEditedRules + 1 - break - - # If found, print it TABULATED - if found != 0: - print("%s:\t%s" % (found, ruleFile[1])) - logFile.write("%s:\t%s" % (found, ruleFile[1])) - - # else ignore - # There are some problems with file name encoding. So, for now, just print an error and pass - except FileNotFoundError as e: # Won't happen before line.split() is invoked - print("File not found:", ruleFile[1]) -# logFile.write ("File not found: %s\n" % ruleFile[1]) - logFile.write("%s\n" % e) - pass - except IOError as ioe: #Treated same as FileNotFoundError - print("File not found:", ruleFile[1]) -# logFile.write ("File not found: %s\n" % ruleFile[1]) - logFile.write("%s\n" % e) - pass - - - -# Print our simple statistics -print("\n\nStatistics:\nParsed rules: %s\nNewly added rules: %s\nEdited rules: %d" % (maxSitesNumber, countAddedRules, countEditedRules)) -logFile.write("\n\nStatistics:\nParsed rules: %s\nNewly added rules: %s\nEdited rules: %d" % (maxSitesNumber, countAddedRules, countEditedRules)) -print("\n\nLog file can be found at %s" % logFileName) - -# Close the rules file -rulesList.close() -# And the log file -logFile.close() diff --git a/utils/check_certs.py b/utils/check_certs.py deleted file mode 100755 index ac17dac08bea..000000000000 --- a/utils/check_certs.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python2.7 - -import sys -import re -from subprocess import Popen, PIPE - -host_targets = re.compile(r' in " + fname) - continue - successes = [] - failures = [] - for h in hosts: - h2 = h.replace("*", "www") - cmd = Popen(wget_cmd(h2), stdout=PIPE, stderr=PIPE) - out, err = cmd.communicate() - for l in err.split("\n"): - if "certificate" in l: - failures.append(l) - break - else: - successes.append(h) - if successes and not failures: - print(fname + " no cert warnings") - elif failures and not successes: - print(fname + " categorical failure:") - for f in failures: - print(" " + f) - else: - print(fname + " mixed results:") - for s in successes: - print(" " + s + " is OK") - for f in failures: - print(" " + f) - diff --git a/utils/compare-locales.sh b/utils/compare-locales.sh deleted file mode 100755 index dfcc6986fa78..000000000000 --- a/utils/compare-locales.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -set -eu; - -# For an XPI passed on the command line, check whether all locale directories -# listed in the manifest include every entity defined in the English locale DTDs. -# (Missing an entity is a fatal error.) - -status=0; - -TMPDIR="`mktemp -d -t helocalesXXXX`" -trap 'rm -r "${TMPDIR}"' EXIT -unzip -qd "${TMPDIR}" "$1" chrome/locale/* chrome.manifest -cd ${TMPDIR}/chrome/locale/; - -LANGS="`sed -n 's,^locale https-everywhere .* chrome/locale/\(.*\)/$,\1,p' ${TMPDIR}/chrome.manifest`" -grep '^ ${TMPDIR}/en_entities; - -lang_entities_list() { - grep '^0ondAf&n5h4F(A+hDe6@4FLfG1potr0S^E$f&mHwf&l>l=)`@mMlQkNteb zOV&P3%MMECqC;XvKsPAtcUz~&$-;~KG6U~CzQvXSx*eY{BrRE8RT&OBh}3EK=4kG* z{OQMEf=6drIZa4>lPzyeZF};+@ip1HX+6O&fF!^{cqa`~bpFbwdMKlx+fx=DH)zk1 z*$Rth8wW6SZA+u7gfh`bKSTj-96XKmo;T5 st$$OvWCL#=8*oSf$a=Vz0YsGPh-exa)7|Zdq);Cc>CC>> import find_rules - >>> replacer = find_rules.FindRules("/path/to/default.rulesets") - >>> replacer.find("http://en.wikipedia.org/") - 'https://en.wikipedia.org/' - >>> replacer.find("http://en.wikipedi.org/") # With a typo - >>> -""" - -import re -import xml.etree.ElementTree as ET - -class FindRules: - def __init__(self, filename): - self.extract_rulesets(filename) - - def verify_target(self, target, host): - matching_target = target.strip("*.") - matching_target = matching_target.strip(".*") - if target.startswith("*."): - if host.endswith(matching_target): - #print target, "matches", host - return True - elif target.endswith(".*"): - if host.startswith(matching_target): - #print target, "matches", host - return True - else: - if host == matching_target: - #print target, "matches", host - return True - - def convert_to_python(self, matching, replacement): - """Instead of $1 that is used by Javascript, - Python uses \1.""" - new_matching = matching.replace(")?", "|)") # to avoid "unmatched group" error - new_replacement = re.sub(r"\$(\d)", r"\\g<\1>", replacement) - return new_matching, new_replacement - - def extract_rulesets(self, filename): - tree = ET.parse(filename) - root = tree.getroot() - - self.dict = {} - for child in root: - if child.tag == "ruleset": - if "default_off" in child.attrib: - continue - ruleset_name = child.attrib['name'] - ruleset = child.getchildren() - self.dict[ruleset_name] = {} - self.dict[ruleset_name]['targets'] = [] - self.dict[ruleset_name]['rules'] = [] - self.dict[ruleset_name]['exclusions'] = [] - for rule in ruleset: - if rule.tag == "target": - self.dict[ruleset_name]['targets'].append(rule.attrib['host']) - if rule.tag == "rule": - self.dict[ruleset_name]['rules'].append((rule.attrib['from'], rule.attrib['to'])) - if rule.tag == "exclusion": - self.dict[ruleset_name]['exclusions'].append(rule.attrib['pattern']) - - def find(self, url): - hostname_regex = r"https?://([^/]+)" - try: #Remove - host = re.findall(hostname_regex, url)[0] - except IndexError, e: - print url - raise IndexError, e - - # In HTTPSEverywhere, URLs must contain a '/'. - if url.replace("http://", "").find("/") == -1: - url += "/" - - for ruleset in self.dict: - for target in self.dict[ruleset]['targets']: - if self.verify_target(target, host): - for exclusion in self.dict[ruleset]['exclusions']: - if re.findall(exclusion, url): - return None - for rule in self.dict[ruleset]['rules']: - matching_regex = rule[0] # "from" - replacement_regex = rule[1] # "to" - new_matching, new_replacement = self.convert_to_python(matching_regex, replacement_regex) - try: - replace_url = re.sub(new_matching, new_replacement, url) - except re.error, e: - print new_matching, new_replacement, url - raise re.error, e - if url != replace_url: - return replace_url - return None - -if __name__ == "__main__": - import sys - filename = sys.argv[1] - url = sys.argv[2] - script = FindRules(filename) - replaced_url = script.find(url) - print replaced_url diff --git a/utils/rule-sample.py b/utils/rule-sample.py deleted file mode 100755 index 571f8dc13718..000000000000 --- a/utils/rule-sample.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -import glob -import random -rulefiles = glob.glob("src/chrome/content/rules/*.xml") -rulefiles.sort() # determinism -random.seed(0) -count = 0 - -while count < 20: - f = random.choice(rulefiles) - ruleset = open(f).read() - if "default_off" in ruleset or 'platform="mixedcontent' in ruleset: - print "skipping", f - continue - count += 1 - print "-----------------------------------------------" - print ruleset - diff --git a/utils/single_rule_response.py b/utils/single_rule_response.py deleted file mode 100755 index aa281fca879f..000000000000 --- a/utils/single_rule_response.py +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/env python2.7 - -import sys -import re -from functools import partial - -try: - from lxml import etree -except ImportError: - sys.stderr.write("** Could not import lxml! Rule validation SKIPPED.\n") - sys.stderr.write("** Caution: A resulting build MAY CONTAIN INVALID RULES.\n") - sys.stderr.write("** Please install libxml2 and lxml to permit validation!\n") - sys.exit(0) - -try: - from requests import head - from requests.exceptions import SSLError, ConnectionError, Timeout -except ImportError: - sys.stderr.write("** Could not import requests! Rule validation SKIPPED.\n") - sys.stderr.write("** Caution: A resulting build MAY CONTAIN SITES WHICH DO NOT SUPPORT HTTPS.\n") - sys.stderr.write("** Please install requests to permit validation!\n") - sys.exit(0) - -if not (sys.argv[1:] and sys.argv[2:]): - sys.stderr.write("Usage: %s ruleset report_file\n\n" % sys.argv[0]) - sys.exit(0) - -# Error lists -certificate = [] -timeout = [] -redirect = [] - -ruleset = sys.argv[1] -report_file = sys.argv[2] - -request = partial(head, verify=True, timeout=15.0, - config={'keep_alive': False}) -# 'GET' - method, verify - verify the certificate, timeout - 5.0 seconds - -def test_response_no_redirect(to): - """destination may not support HTTPS.""" - ret = True - try: - response = request(to, allow_redirects=False) - if response.status_code in (300, 301, 302, 307, 308): - find_redirect(to) - ret = False - if response.status_code != 200: - ret = False - del response - except SSLError: - # sys.stdout.write("failure: %s certificate validity check failed.\n" % to) - certificate.append(to) - ret = False - except (ConnectionError, Timeout): - # sys.stdout.write("failure: %s can not be reached.\n" % to) - timeout.append('%s - timeout' % to) - ret = False - except Exception: - ret = False - return ret - - -def find_redirect(to): - """Prints redirects""" - try: - response = request(to, allow_redirects=True) - url_re = re.compile(re.escape(to)) - if response.status_code == 200 and not url_re.match(response.url): - # i.e. it redirected and it didn't redirect from something like: - # https://www.eff.org/ -> https://www.eff.org/index.html - # sys.stdout.write("failure: %s redirects to %s.\n" % (to, response.url)) - redirect.append('%s -> %s' % (to, response.url)) - except SSLError: - redirect.append('%s - ssl_error' % to) - except (ConnectionError, Timeout): - # sys.stdout.write("failure: %s can not be reached to complete a redirect\n" % to) - redirect.append('%s - timeout' % to) - except Exception: - pass - - -failure = 0 -#failed = [] -back_ref = re.compile('\$\d+') - -if __name__ == "__main__": - tree = etree.parse(ruleset) - - seen = [] - for rule in tree.xpath('/ruleset/rule'): - to = rule.get('to') - if back_ref.search(to): - continue - if not test_response_no_redirect(to): - #failed.append(to) - failure = 1 - seen.append(to) - - if failure: - sys.stdout.write("warning: %s failed test: %s\n" % (ruleset, test_response_no_redirect.__doc__)) - with open(report_file, 'a') as fd: - #fd.write('%s: %s\n' % (ruleset, ', '.join(failed))) - if certificate: - fd.write('[%s] Certificate Errors:\n %s\n' % - (ruleset, ', '.join(certificate))) - if redirect: - fd.write('[%s] Redirect Failures:\n %s\n' % - (ruleset, ', '.join(redirect))) - if timeout: - fd.write('[%s] Timeout Failures:\n %s\n' % - (ruleset, ', '.join(timeout))) - - sys.exit(failure) diff --git a/utils/test-generator.py b/utils/test-generator.py deleted file mode 100755 index 62bc795d5d16..000000000000 --- a/utils/test-generator.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python2.7 -""" -Help automate the process of generating test URLs for rulesets. - -Many rulesets have complicated regexes like this: - -^http://s3(?:-website)?(-ap-(?:nor|sou)theast-1|-(?:eu|us)-west-\d|-external-\d|-sa-east-1)?\.amazonaws\.com/ - -Under the new requirements for ruleset coverage testing, we need a test URL that -covers each of these branches. Fortunately, the exrex library can automate -expanding the branches of the regex. This script uses that library to generate a -set of plausible test URLs. NOTE: Usually these test URLs will need manual -verification. Some may not actually exist. Also, if a URL contains a wildcard, -e.g. '.', exrex will attempt to substitute all possible values, creating an -explosion of test URLs. We attempt to detect this by finding regexes that -generate more than a thousand test URLs, and not printing any output for those. -You will have to manually find test cases for URLs with broad wildcards. - -Usage: - -./utils/test-generator.py src/chrome/content/rules/AmazonAWS.xml -# ... Paste output into your ruleset ... -# Then test the ruleset: -python2.7 https-everywhere-checker/src/https_everywhere_checker/check_rules.py \ - https-everywhere-checker/manual.checker.config - src/chrome/content/rules/AmazonAWS.xml -""" - -import exrex -from lxml import etree -import sys - -def generate(regex): - i = 0 - urls = [] - for url in exrex.generate(regex): - i += 1 - if i > 1000: - break - urls.append(url) - if i <= 1000: - for url in urls: - print "" % url - -for xmlFname in sys.argv[1:]: - ruleset = etree.parse(file(xmlFname)).getroot() - xpath_from = etree.XPath("/ruleset/rule/@from") - for from_attrib in xpath_from(ruleset): - generate(from_attrib) - xpath_exclusion = etree.XPath("/ruleset/exclusion/@pattern") - for pattern_attrib in xpath_exclusion(ruleset): - generate(pattern_attrib) diff --git a/utils/trivial-response.py b/utils/trivial-response.py deleted file mode 100755 index bb9d173ecf73..000000000000 --- a/utils/trivial-response.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python2.7 - -import sys -import os -import subprocess -from time import sleep - -try: - from lxml import etree -except ImportError: - sys.stderr.write("** Could not import lxml! Rule validation SKIPPED.\n") - sys.stderr.write("** Caution: A resulting build MAY CONTAIN INVALID RULES.\n") - sys.stderr.write("** Please install libxml2 and lxml to permit validation!\n") - sys.exit(0) - -base_dir = os.getcwd() -rule_script = '/'.join([base_dir, 'single_rule_response.py']) -report_file = '/'.join([base_dir, 'response_report.txt']) -rule_file = '/'.join([base_dir, '%s_report.txt']) - -if sys.argv[1:]: - os.chdir(sys.argv[1]) - -failure = 0 -default_off = 0 -procs = [] -files = os.listdir('.') -PARALLELISM = 10 - -with open(report_file, 'w+') as fd: - fd.truncate(0) - -while True: - if files and (len(procs) < PARALLELISM): - fil = files.pop() - if 'mismatches' in fil: - continue - try: - tree = etree.parse(fil) - - if tree.xpath('/ruleset/@default_off'): - default_off += 1 - continue - except Exception as e: - continue - - proc = subprocess.Popen([rule_script, fil, rule_file % - fil[:-4]]) - procs.append((proc, fil[:-4])) - - for (proc, f) in procs: - proc.poll() - print("POLL'D") - if proc.returncode != None: - print("FUCKED") - with open(rule_file % f, 'r') as rule_fd: - with open(report_file, 'a') as report_fd: - print("CONTEXT") - report_fd.writelines(rule_fd) - os.unlink(rule_file % f) - procs.remove((proc, f)) - - if not (files or procs): - break - - sleep(0.75) - -sys.stdout.write("Skipped %d default_off rulesets.\n" % default_off) - -sys.exit(failure) From dce2814acd4faf8982f0eb5b5b952bdc888681d5 Mon Sep 17 00:00:00 2001 From: ivysrono Date: Fri, 23 Feb 2018 10:15:47 +0800 Subject: [PATCH 764/844] Update yousuu.com.xml (#14557) --- src/chrome/content/rules/yousuu.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/yousuu.com.xml b/src/chrome/content/rules/yousuu.com.xml index 8f7f6b8b6a9b..58fef02408b4 100644 --- a/src/chrome/content/rules/yousuu.com.xml +++ b/src/chrome/content/rules/yousuu.com.xml @@ -4,7 +4,7 @@ js ( equal to img ) --> - + From cc782241e100f6f80665a1b32ff941120c42af49 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Fri, 23 Feb 2018 10:49:47 +0100 Subject: [PATCH 765/844] Update AndroidPolice.com (#14606) * Update AndroidPolice.com * Edit rule --- src/chrome/content/rules/AndroidPolice.xml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/AndroidPolice.xml b/src/chrome/content/rules/AndroidPolice.xml index a30309fc1a13..7b184ae8c79e 100644 --- a/src/chrome/content/rules/AndroidPolice.xml +++ b/src/chrome/content/rules/AndroidPolice.xml @@ -1,16 +1,6 @@ - - + - + - From b4fe848b7c7841197516e8b945aa23f73f4e9907 Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Fri, 23 Feb 2018 11:46:58 +0100 Subject: [PATCH 766/844] Add dhbw-mannheim.de (#14379) * Add dhbw-mannheim.de * Remove duplicate * Update alumni.dhbw-mannheim.de -> invalid-certificate * Add dhbw-mannheim.de --- src/chrome/content/rules/dhbw-mannheim.de.xml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/chrome/content/rules/dhbw-mannheim.de.xml diff --git a/src/chrome/content/rules/dhbw-mannheim.de.xml b/src/chrome/content/rules/dhbw-mannheim.de.xml new file mode 100644 index 000000000000..a1af54a624e4 --- /dev/null +++ b/src/chrome/content/rules/dhbw-mannheim.de.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + From f4cc5995e267f3f254d0e483a57d02c20bef5c13 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 11:48:45 +0100 Subject: [PATCH 767/844] [AmazonAWS.com] Add exclusion (fix #14731) (#14732) --- src/chrome/content/rules/AmazonAWS.com.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml index 323fbe16e8bf..4c99904199fc 100644 --- a/src/chrome/content/rules/AmazonAWS.com.xml +++ b/src/chrome/content/rules/AmazonAWS.com.xml @@ -69,6 +69,13 @@ + + + + From 42ad67e5165b5c1f6065cfd4d0759faee3f2f030 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Fri, 23 Feb 2018 14:13:46 +0100 Subject: [PATCH 768/844] [Mandiant.com] Merge rulesets (#14592) * [Mandiant.com] Fix ruleset style * Delete Mendiant.com.xml * [Mandiant.com] Add targets --- src/chrome/content/rules/Mendiant.com.xml | 50 ----------------------- src/chrome/content/rules/mandiant.com.xml | 18 ++++++-- 2 files changed, 14 insertions(+), 54 deletions(-) delete mode 100644 src/chrome/content/rules/Mendiant.com.xml diff --git a/src/chrome/content/rules/Mendiant.com.xml b/src/chrome/content/rules/Mendiant.com.xml deleted file mode 100644 index 63933c0bd01f..000000000000 --- a/src/chrome/content/rules/Mendiant.com.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/mandiant.com.xml b/src/chrome/content/rules/mandiant.com.xml index 12f4b452208b..009b98670e36 100644 --- a/src/chrome/content/rules/mandiant.com.xml +++ b/src/chrome/content/rules/mandiant.com.xml @@ -1,8 +1,18 @@ - - - + + + + + + + + + + From abbbf7d18b6c64c2b97ec49f5621aafbcd41eb44 Mon Sep 17 00:00:00 2001 From: Justin Su Date: Fri, 23 Feb 2018 11:26:32 -0500 Subject: [PATCH 769/844] Add ruleset for cheatbook.de (#14709) * Add ruleset for cheatbook.de * Add mixed content attribute to cheatbook.de ruleset --- src/chrome/content/rules/Cheatbook.de.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/chrome/content/rules/Cheatbook.de.xml diff --git a/src/chrome/content/rules/Cheatbook.de.xml b/src/chrome/content/rules/Cheatbook.de.xml new file mode 100644 index 000000000000..c9227f41dac1 --- /dev/null +++ b/src/chrome/content/rules/Cheatbook.de.xml @@ -0,0 +1,11 @@ + + + + + + + + From 598091b1012383e4ab0725cb4063c6e42a746383 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 17:37:26 -0800 Subject: [PATCH 770/844] Convert utils/chromium-translations.py to py3.6 --- make.sh | 4 ++-- utils/chromium-translations.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make.sh b/make.sh index c88803bc4138..82f56c0f98e9 100755 --- a/make.sh +++ b/make.sh @@ -51,8 +51,8 @@ rsync -aL ../../chromium/ ./ # Turn the Firefox translations into the appropriate Chrome format: rm -rf _locales/ mkdir _locales/ -python2.7 ../../utils/chromium-translations.py ../../translations/ _locales/ -python2.7 ../../utils/chromium-translations.py ../../src/chrome/locale/ _locales/ +python3.6 ../../utils/chromium-translations.py ../../translations/ _locales/ +python3.6 ../../utils/chromium-translations.py ../../src/chrome/locale/ _locales/ do_not_ship="*.py *.xml" rm -f $do_not_ship cd ../.. diff --git a/utils/chromium-translations.py b/utils/chromium-translations.py index 2efcb5644c7e..14ab20c52ff9 100644 --- a/utils/chromium-translations.py +++ b/utils/chromium-translations.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 """ Given two directories, copy Firefox-style https-everywhere.dtd translations from the first directory into appropriately-named Chromium-style messages.json @@ -16,7 +16,7 @@ def convert(locale): target_messages = {} - with open(os.path.join(source_dir, locale, "https-everywhere.dtd")) as f: + with open(os.path.join(source_dir, locale, "https-everywhere.dtd"), 'r', encoding='utf-8') as f: for line in f: m = message_regex.search(line) if m: From 6c82452122a2cd22925d4701bfca07e2cd74ff9e Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 18:08:32 -0800 Subject: [PATCH 771/844] Convert utils/mk_client_whitelist.py and utils/dbconnect.py to py3.6 and move to utils/mk-client-whitelist/ --- utils/{ => mk-client-whitelist}/dbconnect.py | 6 +++--- .../run.py} | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) rename utils/{ => mk-client-whitelist}/dbconnect.py (87%) rename utils/{mk_client_whitelist.py => mk-client-whitelist/run.py} (86%) diff --git a/utils/dbconnect.py b/utils/mk-client-whitelist/dbconnect.py similarity index 87% rename from utils/dbconnect.py rename to utils/mk-client-whitelist/dbconnect.py index df93da56c547..e3b9032e20f1 100644 --- a/utils/dbconnect.py +++ b/utils/mk-client-whitelist/dbconnect.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 import MySQLdb try: from db_private import DB_USER @@ -7,7 +7,7 @@ try: from db_private import DB_PASS except: DB_PASS = "root" # customise -try: from db_private import DB_NAME +try: from db_private import DB_NAME except: DB_NAME = "observatory_api" TEST_DB_NAME = "tmp_TESTDB1" @@ -21,4 +21,4 @@ def dbconnecttest(): db = MySQLdb.connect(user=DB_USER, passwd=DB_PASS, db=TEST_DB_NAME) dbc = db.cursor() return db,dbc - + diff --git a/utils/mk_client_whitelist.py b/utils/mk-client-whitelist/run.py similarity index 86% rename from utils/mk_client_whitelist.py rename to utils/mk-client-whitelist/run.py index d4fb89d60956..43837d75e80a 100755 --- a/utils/mk_client_whitelist.py +++ b/utils/mk-client-whitelist/run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 # Make a list of the current top 1,000 certs to whitelist from the # Decentralized SSL Observatory's client submissions, to live in @@ -17,15 +17,15 @@ # run on the published datasets and read-only SQL servers too... q = """ -SELECT hex(reports.chain_fp), count, `Validity:Not After`, Subject -FROM reports JOIN chains ON reports.chain_fp = chains.chain_fp +SELECT hex(reports.chain_fp), count, `Validity:Not After`, Subject +FROM reports JOIN chains ON reports.chain_fp = chains.chain_fp JOIN new_parsed_certs ON reports.cert_fp = new_parsed_certs.cert_fp -WHERE count > 1000 AND - `Validity:Not After` > "%s" -GROUP BY reports.chain_fp -ORDER BY count DESC +WHERE count > 1000 AND + `Validity:Not After` > "{}" +GROUP BY reports.chain_fp +ORDER BY count DESC LIMIT 1000 -""" % (cutoff,) +""".format(cutoff) dbc.execute(q) results = dbc.fetchmany(1000) @@ -36,14 +36,14 @@ header = """ // These are SHA256 fingerprints for the most common chains observed by the -// Decentralized SSL Observatory. These should not be resubmitted. +// Decentralized SSL Observatory. These should not be resubmitted. // This file is automatically generated by utils/mk_client_whitelist.py const X509ChainWhitelist = {""" print(header) for chain_fp in sorted([row[0] for row in results]): - print(" '%s' : true," % chain_fp) + print(" '{}' : true,".format(chain_fp)) footer = "} ;" print(footer) From 5551a342423a8bbdd062d2134b96af3a5a9c0e7e Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 18:09:07 -0800 Subject: [PATCH 772/844] Convert utils/merge-rulesets.py to py3.6 --- make.sh | 2 +- utils/merge-rulesets.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/make.sh b/make.sh index 82f56c0f98e9..4b9cc5bd339d 100755 --- a/make.sh +++ b/make.sh @@ -57,7 +57,7 @@ do_not_ship="*.py *.xml" rm -f $do_not_ship cd ../.. -python2.7 ./utils/merge-rulesets.py || exit 1 +python3.6 ./utils/merge-rulesets.py || exit 1 cp src/chrome/content/rules/default.rulesets pkg/crx/rules/default.rulesets diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py index 23e72faf0468..fb9b0f980fcd 100644 --- a/utils/merge-rulesets.py +++ b/utils/merge-rulesets.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 # Merge all the .xml rulesets into a single "default.rulesets" file -- this # prevents inodes from wasting disk space, but more importantly, this works @@ -19,7 +19,7 @@ def normalize(f): OSX and Linux filesystems encode composite characters differently in filenames. We should normalize to NFC: http://unicode.org/reports/tr15/ """ - f = unicodedata.normalize("NFC", unicode(f, "utf-8")).encode("utf-8") + f = unicodedata.normalize("NFC", f) return f # commandline arguments parsing (nobody use it, though) @@ -46,12 +46,12 @@ def normalize(f): for filename in sorted(files): tree = xml.etree.ElementTree.parse(filename) root = tree.getroot() - + ruleset = {} for attr in root.attrib: ruleset[attr] = root.attrib[attr] - + for child in root: if child.tag in ["target", "rule", "securecookie", "exclusion"]: if child.tag not in ruleset: From 87841f4735fd11a96258c9d3c95dad4bb141abe4 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 18:12:45 -0800 Subject: [PATCH 773/844] Convert utils/setversion.py to py3.6 --- utils/setversion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/setversion.py b/utils/setversion.py index 0c9dbbab9e73..62239c756ce7 100755 --- a/utils/setversion.py +++ b/utils/setversion.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3.6 from datetime import date import json @@ -6,7 +6,7 @@ # Set the version in manifest.json to one based on today's date. t = date.today() -version = `t.year` +'.'+ `t.month` +'.'+ `t.day` +version = repr(t.year) +'.'+ repr(t.month) +'.'+ repr(t.day) f = open('chromium/manifest.json') manifest = json.loads(f.read()) From 65eac6c9c84627d374c185dbd88b644735444652 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 22 Feb 2018 18:21:38 -0800 Subject: [PATCH 774/844] Final conversions for py3.6 --- install-dev-dependencies.sh | 3 +-- make.sh | 20 +++++--------------- test/script.py | 2 +- utils/create_zip.py | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh index 92b5f552ba5e..b2e9273a6e27 100755 --- a/install-dev-dependencies.sh +++ b/install-dev-dependencies.sh @@ -34,9 +34,8 @@ if type apt-get >/dev/null ; then BROWSERS="iceweasel chromium" CHROMEDRIVER="chromedriver" fi - # In Debian, `python-` is assumed to be python 2.7, no need to specify - dkg $SUDO_SHIM apt-get install -y libxml2-dev libxml2-utils libxslt1-dev \ - python-dev $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \ + python3.6-dev $BROWSERS zip sqlite3 python3-pip libcurl4-openssl-dev xvfb \ libssl-dev git curl $CHROMEDRIVER if ! type geckodriver >/dev/null; then curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz" diff --git a/make.sh b/make.sh index 4b9cc5bd339d..fbb4e062542b 100755 --- a/make.sh +++ b/make.sh @@ -31,7 +31,7 @@ if [ -n "$1" -a "$1" != "--remove-update-channel" ]; then git submodule update --recursive -f fi -VERSION=`python2.7 -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"` +VERSION=`python3.6 -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"` echo "Building version" $VERSION @@ -70,15 +70,15 @@ cp -a src/META-INF pkg/xpi-eff # Remove the 'applications' manifest key from the crx version of the extension, change the 'author' string to a hash, and add the "update_url" manifest key # "update_url" needs to be present to avoid problems reported in https://bugs.chromium.org/p/chromium/issues/detail?id=805755 -python2.7 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" +python3.6 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" # Remove the 'update_url' manifest key from the xpi version of the extension delivered to AMO -python2.7 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" +python3.6 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" # If the --remove-update-channel flag is set, ensure the extension is unable to update if [ "$1" == "--remove-update-channel" -o "$2" == "--remove-update-channel" ]; then echo "Flag --remove-update-channel specified. Removing the XPI extensions' ability to update." - python2.7 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" - python2.7 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" + python3.6 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" + python3.6 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" fi if [ -n "$BRANCH" ] ; then @@ -170,16 +170,6 @@ cp $zip $xpi_eff bash utils/android-push.sh "$xpi_eff" -#rm -rf pkg/crx - -#python2.7 githubhelper.py $VERSION - -#git add chromium/updates.xml -#git commit -m "release $VERSION" -#git tag -s chrome-$VERSION -m "release $VERSION" -#git push -#git push --tags - echo >&2 "Total included rules: `find src/chrome/content/rules -name "*.xml" | wc -l`" echo >&2 "Rules disabled by default: `find src/chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`" diff --git a/test/script.py b/test/script.py index 680d9ce23493..7ac192d2397e 100644 --- a/test/script.py +++ b/test/script.py @@ -2,7 +2,7 @@ # # Run Selenium tests for HTTPS Everywhere # -# This script may be executed as `python script.py [directory of CRX]` +# This script may be executed as `python3.6 script.py [directory of CRX]` # # The script is compatible with Python 2. Python 3 is not tested. # Selenium, WebDriver and Google Chrome (or Chromium) must be installed diff --git a/utils/create_zip.py b/utils/create_zip.py index 6589b44adcb0..e4187ade2da2 100755 --- a/utils/create_zip.py +++ b/utils/create_zip.py @@ -4,7 +4,7 @@ # Author: Yan Zhu, yan@mit.edu """ -Usage: python create_zip.py -x -n +Usage: python3.6 create_zip.py -x -n """ import argparse From a3bf553e851ff0d889626c518cb5ccdfb7d849b0 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 23 Feb 2018 15:22:58 -0800 Subject: [PATCH 775/844] Change reference to python 2 --- test/script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script.py b/test/script.py index 7ac192d2397e..dac0147a6cf3 100644 --- a/test/script.py +++ b/test/script.py @@ -4,7 +4,7 @@ # # This script may be executed as `python3.6 script.py [directory of CRX]` # -# The script is compatible with Python 2. Python 3 is not tested. +# The script is compatible with Python 3.6. # Selenium, WebDriver and Google Chrome (or Chromium) must be installed # in order for the script to run successfully. A desktop version # of linux is required for the script to run correctly as well. From c87d93a6ae5753f0bd7ab5fdc47c382a54960ca6 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sat, 24 Feb 2018 07:35:14 +0800 Subject: [PATCH 776/844] Remove duplicated test urls from Sina.com.cn.xml (#14685) * Remove duplicated test urls from Sina.com.cn.xml * Update Sina.com.cn.xml * Update Sina.com.cn.xml --- src/chrome/content/rules/Sina.com.cn.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/rules/Sina.com.cn.xml b/src/chrome/content/rules/Sina.com.cn.xml index 0f56bbee41d6..2b79da1dcb5e 100644 --- a/src/chrome/content/rules/Sina.com.cn.xml +++ b/src/chrome/content/rules/Sina.com.cn.xml @@ -97,6 +97,7 @@ s3.licaishi.sina.com.cn s.img.mix.sina.com.cn storage.slide.news.sina.com.cn + help.pay.sina.com.cn rm.sina.com.cn blog.sae.sina.com.cn e.sae.sina.com.cn @@ -118,6 +119,7 @@ blog.sina.com.cn house.sina.com.cn jiaju.sina.com.cn + video.sina.com.cn uc.sina.com.cn ads.sina.com.hk @@ -130,6 +132,7 @@ + @@ -180,9 +183,9 @@ - + @@ -311,13 +314,13 @@ - + From ca7c8b46bc97b82c72d19e00d2eccb0dde5850b3 Mon Sep 17 00:00:00 2001 From: William Budington Date: Fri, 23 Feb 2018 15:46:24 -0800 Subject: [PATCH 777/844] Change references of pip to pip3 (#14737) --- Dockerfile | 1 - install-dev-dependencies.sh | 6 +++--- test/README.md | 4 ++-- test/setup_travis.sh | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index eaf31bb4a93d..2912aedc98e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,5 @@ MAINTAINER William Budington "bill@eff.org" WORKDIR /opt COPY test/rules/requirements.txt /tmp/ -RUN pip install -r /tmp/requirements.txt RUN pip3 install -r /tmp/requirements.txt RUN rm /tmp/requirements.txt diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh index b2e9273a6e27..98b45d9b799a 100755 --- a/install-dev-dependencies.sh +++ b/install-dev-dependencies.sh @@ -92,12 +92,12 @@ git submodule init git submodule update # Install Python packages -pip install --user --no-allow-insecure --no-allow-external -r requirements.txt +pip3 install --user --no-allow-insecure --no-allow-external -r requirements.txt cd test/rules -pip install --user -r requirements.txt +pip3 install --user -r requirements.txt cd - cd test/chromium -pip install --user -r requirements.txt +pip3 install --user -r requirements.txt cd - # Install git hook to run tests before pushing. diff --git a/test/README.md b/test/README.md index 34aaaf438e67..2a2dd8709e21 100644 --- a/test/README.md +++ b/test/README.md @@ -5,9 +5,9 @@ # Requirements -- Python 2.7 +- Python 3.6 - Selenium - - Install Selenium as a python package using ```pip install selenium```, or run install-dev-dependencies.sh and it will do the job + - Install Selenium as a python package using ```pip3 install selenium```, or run install-dev-dependencies.sh and it will do the job - GeckoDriver - Manually download GeckoDriver from https://github.com/mozilla/geckodriver/releases. Extract the executable to /usr/bin/, so that the pasted executable's full path becomes /usr/bin/geckodriver. diff --git a/test/setup_travis.sh b/test/setup_travis.sh index 31f0e5a9c4f9..da5e73ffb10c 100755 --- a/test/setup_travis.sh +++ b/test/setup_travis.sh @@ -27,7 +27,7 @@ function setup_firefox { function browser_setup { # install python stuff - pip install -r ${toplevel}/test/selenium/requirements.txt + pip3 install -r ${toplevel}/test/selenium/requirements.txt } function setup_lint { From 0e0a007ec9884d1e7644462de6ec55bf5a957f3b Mon Sep 17 00:00:00 2001 From: mantou <709922234@qq.com> Date: Sat, 24 Feb 2018 21:48:44 +0800 Subject: [PATCH 778/844] Update yupoo.com.xml (#14542) * Update yupoo.com.xml * Update yupoo.com.xml --- src/chrome/content/rules/yupoo.com.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/yupoo.com.xml b/src/chrome/content/rules/yupoo.com.xml index 260f6597b544..637fa2632563 100644 --- a/src/chrome/content/rules/yupoo.com.xml +++ b/src/chrome/content/rules/yupoo.com.xml @@ -13,8 +13,8 @@ - - + + From 342c0116e26133f600388cb5ead28267a3f78625 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 17:00:33 +0100 Subject: [PATCH 779/844] [GoogleAPIs.com] Add exclusion (fix #1828) (#14740) * [GoogleAPIs.com] Add exclusion (fix #1828) * [GoogleAPIs.com] Fix test urls problems * [GoogleAPIs.com] Simplify regex in rule --- src/chrome/content/rules/GoogleAPIs.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml index 5a2f50558696..92172b139230 100644 --- a/src/chrome/content/rules/GoogleAPIs.xml +++ b/src/chrome/content/rules/GoogleAPIs.xml @@ -79,6 +79,7 @@ + @@ -100,6 +101,12 @@ --> + + + + @@ -115,12 +122,14 @@ - - - + + + + - - - - - - - - diff --git a/src/chrome/content/rules/Modernrepo.com.xml b/src/chrome/content/rules/Modernrepo.com.xml deleted file mode 100644 index 82c1f020f238..000000000000 --- a/src/chrome/content/rules/Modernrepo.com.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - From ccd10fc33712d6d49e0910146c53414253352a26 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 17:06:11 +0100 Subject: [PATCH 782/844] Delete Soundowl.net.xml (#14735) Domain for sale --- src/chrome/content/rules/Soundowl.net.xml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/chrome/content/rules/Soundowl.net.xml diff --git a/src/chrome/content/rules/Soundowl.net.xml b/src/chrome/content/rules/Soundowl.net.xml deleted file mode 100644 index 0ea5434cde99..000000000000 --- a/src/chrome/content/rules/Soundowl.net.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - From 30fa2e7549a04dbd4fb285d6cea94618a45416ee Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 18:22:15 +0100 Subject: [PATCH 783/844] [MeningitisTrust.org] Simplify ruleset (#14744) * [MeningitisTrust.org] Simplify ruleset * Rename Meningitis_Trust.xml to MeningitisTrust.org.xml --- .../content/rules/MeningitisTrust.org.xml | 17 +++++++++++++++ src/chrome/content/rules/Meningitis_Trust.xml | 21 ------------------- 2 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 src/chrome/content/rules/MeningitisTrust.org.xml delete mode 100644 src/chrome/content/rules/Meningitis_Trust.xml diff --git a/src/chrome/content/rules/MeningitisTrust.org.xml b/src/chrome/content/rules/MeningitisTrust.org.xml new file mode 100644 index 000000000000..caf15b61ecc6 --- /dev/null +++ b/src/chrome/content/rules/MeningitisTrust.org.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/src/chrome/content/rules/Meningitis_Trust.xml b/src/chrome/content/rules/Meningitis_Trust.xml deleted file mode 100644 index e0a8a6a0bceb..000000000000 --- a/src/chrome/content/rules/Meningitis_Trust.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - \ No newline at end of file From c37e3348b7f9de9dcd11ce5ffc6a2969d8e48cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sat, 24 Feb 2018 19:03:01 +0100 Subject: [PATCH 784/844] Added ruleset for wetter.com (#14530) --- src/chrome/content/rules/wetter.com.xml | 103 ++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 src/chrome/content/rules/wetter.com.xml diff --git a/src/chrome/content/rules/wetter.com.xml b/src/chrome/content/rules/wetter.com.xml new file mode 100644 index 000000000000..9cf46b0a6164 --- /dev/null +++ b/src/chrome/content/rules/wetter.com.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b7d340cbeea0c695e6793a3172303a7fceb36a3a Mon Sep 17 00:00:00 2001 From: numismatika Date: Sat, 24 Feb 2018 19:27:31 +0100 Subject: [PATCH 785/844] LongTail: (#14499) * LongTail: - add a few more domains * LongTail: - add sdk subdomain back to the comments --- src/chrome/content/rules/LongTail.xml | 106 ++++++++++++++++---------- 1 file changed, 64 insertions(+), 42 deletions(-) diff --git a/src/chrome/content/rules/LongTail.xml b/src/chrome/content/rules/LongTail.xml index b91b805a3ac0..509adddddeb7 100644 --- a/src/chrome/content/rules/LongTail.xml +++ b/src/chrome/content/rules/LongTail.xml @@ -1,67 +1,89 @@ - - + + + - + + + - - - + + + - + - + + + - - + + + + - + + + + + + + + + + + + - - + From a4153b73e287322d2133b316f8fbfa232a6bfdc0 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Sat, 24 Feb 2018 18:31:02 +0000 Subject: [PATCH 786/844] redbubble.com: Remove obsolete exclusions (#8192) Also, secure cookies --- src/chrome/content/rules/RedBubble.xml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/rules/RedBubble.xml b/src/chrome/content/rules/RedBubble.xml index 19ede3c61ca8..3011580030fd 100644 --- a/src/chrome/content/rules/RedBubble.xml +++ b/src/chrome/content/rules/RedBubble.xml @@ -7,24 +7,18 @@ Nonfunctional hosts in *redbubble.com: - blog * + - shareholders (Invalid name) * WP Engine - - Problematic hosts in *redbubble.com: - - - feedback ¹ - - support ² - - ¹ Mismatched, CN: *.uservoice.com - ² Mismatched - --> + + @@ -35,12 +29,8 @@ - - - @@ -61,15 +51,10 @@ - - - - + + From 50f0fd586be315e7a0837154d86473c434dd287d Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 19:32:48 +0100 Subject: [PATCH 787/844] [Ticketmaster] Remove billettservice.no and lippulpalvelu subdomains (#14510) No subdomains work with HTTPS --- src/chrome/content/rules/Ticketmaster.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/chrome/content/rules/Ticketmaster.xml b/src/chrome/content/rules/Ticketmaster.xml index 6d6e73370328..f48dc08e661e 100644 --- a/src/chrome/content/rules/Ticketmaster.xml +++ b/src/chrome/content/rules/Ticketmaster.xml @@ -48,8 +48,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio Partially covered domains: - - (www.)billettservice.no * - - lippupalvelu.fi * - (www.)ticketmaster.com * - ticketsnow.ticketmaster.com * - reviews.ticketmaster.co.uk * @@ -69,11 +67,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio --> - - - - - @@ -90,17 +83,6 @@ Fetch error: http://ticketmaster.co.uk/ => https://www.ticketmaster.co.uk/sectio - - - - - - - From e5fa02defd13e9c4f3ae8c178965ce75992a8cd5 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 25 Feb 2018 05:24:55 +1030 Subject: [PATCH 788/844] [cimbislamic.com] New ruleset (#14051) --- src/chrome/content/rules/CIMBIslamic.com.xml | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/chrome/content/rules/CIMBIslamic.com.xml diff --git a/src/chrome/content/rules/CIMBIslamic.com.xml b/src/chrome/content/rules/CIMBIslamic.com.xml new file mode 100644 index 000000000000..c02346469c82 --- /dev/null +++ b/src/chrome/content/rules/CIMBIslamic.com.xml @@ -0,0 +1,27 @@ + + + + + + + + + + From 08768f085eece82c1eb0ee080f0176787514e889 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 25 Feb 2018 05:29:28 +1030 Subject: [PATCH 789/844] [CIMB Cambodia] Re-enable ruleset (#13948) --- src/chrome/content/rules/CIMB-Cambodia.xml | 30 +++++++--------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/rules/CIMB-Cambodia.xml b/src/chrome/content/rules/CIMB-Cambodia.xml index c2ffd3c2c7c9..27df51233446 100644 --- a/src/chrome/content/rules/CIMB-Cambodia.xml +++ b/src/chrome/content/rules/CIMB-Cambodia.xml @@ -1,33 +1,21 @@ - - - - - + - + + + - - + + to="https:" /> From 5299a84687107077e53e3d934c353c6cce8851c2 Mon Sep 17 00:00:00 2001 From: Justin Tracey Date: Sat, 24 Feb 2018 19:08:47 +0000 Subject: [PATCH 790/844] Update University-of-Waterloo.xml yet again (#14573) --- src/chrome/content/rules/University-of-Waterloo.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/University-of-Waterloo.xml b/src/chrome/content/rules/University-of-Waterloo.xml index e5b16e5fb6e5..8935745fe176 100644 --- a/src/chrome/content/rules/University-of-Waterloo.xml +++ b/src/chrome/content/rules/University-of-Waterloo.xml @@ -8,8 +8,6 @@ cacr.uwaterloo.ca cecs.uwaterloo.ca hr.uwaterloo.ca - bookings.lib.uwaterloo.ca (incomplete certificate chain) - digital.library.uwaterloo.ca (incomplete certificate chain) --> @@ -21,7 +19,10 @@ + + + From 8c5409379b9d2265667499d329aabafed30f3e63 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 20:12:25 +0100 Subject: [PATCH 791/844] [Intercom.io] Reactivate ruleset (#14713) * [Intercom.io] Reactivate ruleset * [Intercom.io] Reorder targets * [Intercom.io] Add targets * [Intercom.io] Remove preloaded subdomain --- src/chrome/content/rules/Intercom.io.xml | 54 +++++------------------- 1 file changed, 10 insertions(+), 44 deletions(-) diff --git a/src/chrome/content/rules/Intercom.io.xml b/src/chrome/content/rules/Intercom.io.xml index 7494bbef01d6..35eac20e7392 100644 --- a/src/chrome/content/rules/Intercom.io.xml +++ b/src/chrome/content/rules/Intercom.io.xml @@ -1,59 +1,25 @@ - - + - - - - - - - - + + - + - - - - + + + + From d744f32a3a52495aa837c2fbb2a8c92b93c22d95 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 20:17:11 +0100 Subject: [PATCH 792/844] [Tcl.tk] Add target and simplify rule (#14694) --- src/chrome/content/rules/Tcl.tk.xml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/rules/Tcl.tk.xml b/src/chrome/content/rules/Tcl.tk.xml index 8f5c9bf65f5a..6ad264772b01 100644 --- a/src/chrome/content/rules/Tcl.tk.xml +++ b/src/chrome/content/rules/Tcl.tk.xml @@ -1,35 +1,29 @@ + + - - - - - From cd422c55b133c53f95bda3b5d01d57f342fcb428 Mon Sep 17 00:00:00 2001 From: MilanKral Date: Sat, 24 Feb 2018 20:22:04 +0100 Subject: [PATCH 793/844] fix pluska.sk (#14532) --- src/chrome/content/rules/Pluska.sk.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/rules/Pluska.sk.xml b/src/chrome/content/rules/Pluska.sk.xml index 89fd807ac04c..e2f4c6fd6d59 100644 --- a/src/chrome/content/rules/Pluska.sk.xml +++ b/src/chrome/content/rules/Pluska.sk.xml @@ -27,6 +27,9 @@ Error 404: - dobrejedlo.pluska.sk + +pluska.sk returns certificate for www.pluska.sk + --> @@ -40,6 +43,9 @@ + + From 9bb6517c42a4ea3b2dd2ed629c9c9b51ab9dc999 Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 25 Feb 2018 05:57:29 +1030 Subject: [PATCH 794/844] [CIMB Indonesia] Update domains (#13946) --- src/chrome/content/rules/CIMB-Indonesia.xml | 59 ++++++++++----------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/src/chrome/content/rules/CIMB-Indonesia.xml b/src/chrome/content/rules/CIMB-Indonesia.xml index eb5fec6d6a1c..56be440c9ee5 100644 --- a/src/chrome/content/rules/CIMB-Indonesia.xml +++ b/src/chrome/content/rules/CIMB-Indonesia.xml @@ -1,43 +1,42 @@ - - - - - - - - - + + + + - - + + - + - + + to="https:" /> From eacc803a17b708975a8e3a6b3f347b81aaf5057c Mon Sep 17 00:00:00 2001 From: youdly Date: Sun, 25 Feb 2018 06:05:16 +1030 Subject: [PATCH 795/844] [MoE.gov.my] New ruleset (#14227) --- src/chrome/content/rules/MoE.gov.my.xml | 136 ++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 src/chrome/content/rules/MoE.gov.my.xml diff --git a/src/chrome/content/rules/MoE.gov.my.xml b/src/chrome/content/rules/MoE.gov.my.xml new file mode 100644 index 000000000000..a144dccaab0b --- /dev/null +++ b/src/chrome/content/rules/MoE.gov.my.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + From 08b6950f747b13befc7970c69402f8bd59969eee Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 21:35:14 +0100 Subject: [PATCH 796/844] [BU.edu] Remove wildcard and add subdomains (#14715) * [BU.edu] Remove wildcard * [BU.edu] Add subdomains (fix #13034) * Rename Boston_University.xml to BU.edu.xml * [BU.edu] Add exclusion --- src/chrome/content/rules/BU.edu.xml | 59 +++++++++++++++++++ .../content/rules/Boston_University.xml | 24 -------- 2 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 src/chrome/content/rules/BU.edu.xml delete mode 100644 src/chrome/content/rules/Boston_University.xml diff --git a/src/chrome/content/rules/BU.edu.xml b/src/chrome/content/rules/BU.edu.xml new file mode 100644 index 000000000000..4fb1e473e5b3 --- /dev/null +++ b/src/chrome/content/rules/BU.edu.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Boston_University.xml b/src/chrome/content/rules/Boston_University.xml deleted file mode 100644 index a184aade4598..000000000000 --- a/src/chrome/content/rules/Boston_University.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - From eb314a43931bef28e9e06acc4885529bdd59c5da Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 21:42:02 +0100 Subject: [PATCH 797/844] [Monster.com] Simplify ruleset (#14261) * [Monster.com] Simplify ruleset * [Monster.com] Simplify securecookie * [Monster.com] Remove broken target * Rename Monster.xml to Monster.com.xml * [Monster.com] Remove broken targets --- src/chrome/content/rules/Monster.com.xml | 53 +++++++++ src/chrome/content/rules/Monster.xml | 140 ----------------------- 2 files changed, 53 insertions(+), 140 deletions(-) create mode 100644 src/chrome/content/rules/Monster.com.xml delete mode 100644 src/chrome/content/rules/Monster.xml diff --git a/src/chrome/content/rules/Monster.com.xml b/src/chrome/content/rules/Monster.com.xml new file mode 100644 index 000000000000..d34849769f2d --- /dev/null +++ b/src/chrome/content/rules/Monster.com.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Monster.xml b/src/chrome/content/rules/Monster.xml deleted file mode 100644 index 006f60fe094e..000000000000 --- a/src/chrome/content/rules/Monster.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From cdff45dcbe41da37bb40db1b67b0bdfa48fd0443 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 25 Feb 2018 05:09:07 +0800 Subject: [PATCH 798/844] Update Pixiv.xml (#14674) * Update Pixiv.xml * Update Pixiv.xml --- src/chrome/content/rules/Pixiv.xml | 74 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/src/chrome/content/rules/Pixiv.xml b/src/chrome/content/rules/Pixiv.xml index b4c82c986394..951886c14fcd 100644 --- a/src/chrome/content/rules/Pixiv.xml +++ b/src/chrome/content/rules/Pixiv.xml @@ -1,32 +1,34 @@ + Non-functional hosts + Couldn't connect to server: + - inside.pixiv.net + + Timeout was reached: + - dev.pixiv.net + - help.pixiv.net + - mx.pixiv.net + + SSL peer certificate was not OK: + - iracon.pixiv.net + - genepixiv.pr.pixiv.net + - kurofune.pr.pixiv.net + - pool.pr.pixiv.net + - times.pixiv.net + Different content: + - m.pixiv.net +--> + + + + + + + @@ -34,24 +36,24 @@ + + + - - - + + - - - - - - - - - - + + + + + + From be3195b61784857e234210bb61d7a5acb80fcda7 Mon Sep 17 00:00:00 2001 From: Justin Su Date: Sat, 24 Feb 2018 16:52:32 -0500 Subject: [PATCH 799/844] Add ruleset for torontohydro.com (#14498) * Add ruleset for torontohydro.com * Add targets to Torontohydro.com ruleset * Comment out cf.torontohydro.com, missing intermediate * Add targets to torontohydro.com ruleset * Comment out powerlensbusiness.torontohydro.com: Chain issue --- src/chrome/content/rules/Torontohydro.com.xml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/chrome/content/rules/Torontohydro.com.xml diff --git a/src/chrome/content/rules/Torontohydro.com.xml b/src/chrome/content/rules/Torontohydro.com.xml new file mode 100644 index 000000000000..b1635d132373 --- /dev/null +++ b/src/chrome/content/rules/Torontohydro.com.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + From 679992e6b5db9e8eefbf8568a94392b985f3f455 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sat, 24 Feb 2018 23:11:59 +0100 Subject: [PATCH 800/844] Remove bcvs.ch subdomains from kantonalbanken.xml (#14590) Domain is already secured in Banque_Cantonale_du_Valais.xml --- src/chrome/content/rules/kantonalbanken.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/rules/kantonalbanken.xml b/src/chrome/content/rules/kantonalbanken.xml index 0741e42d28c3..6fbc41e97afc 100644 --- a/src/chrome/content/rules/kantonalbanken.xml +++ b/src/chrome/content/rules/kantonalbanken.xml @@ -33,8 +33,6 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - - @@ -92,10 +90,6 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - - - - @@ -181,7 +175,6 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - @@ -191,9 +184,9 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al - + - Date: Sat, 24 Feb 2018 23:14:32 +0100 Subject: [PATCH 801/844] [MusicBrainz.org] Add targets (#14700) * [MusicBrainz.org] Add targets * Rename MusicBrainz.xml to MusicBrainz.org.xml * [MusicBrainz.org] Simplify securecookie * [MusicBrainz.org] Add targets --- .../{MusicBrainz.xml => MusicBrainz.org.xml} | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) rename src/chrome/content/rules/{MusicBrainz.xml => MusicBrainz.org.xml} (59%) diff --git a/src/chrome/content/rules/MusicBrainz.xml b/src/chrome/content/rules/MusicBrainz.org.xml similarity index 59% rename from src/chrome/content/rules/MusicBrainz.xml rename to src/chrome/content/rules/MusicBrainz.org.xml index 8724beee751a..1a9543f71c45 100644 --- a/src/chrome/content/rules/MusicBrainz.xml +++ b/src/chrome/content/rules/MusicBrainz.org.xml @@ -3,33 +3,28 @@ - Cover_Art_Archive.org.xml - - As of 2015-01-05, known unprotected subdomains are: - - - forums - - blog - - tickets - - svn - - Other related unprotected hosts: - metabrainz.org + Refused: + freedb.musicbrainz.org + --> - + + + + + + - - - - + From 673e5fd7fa5388581765c0cfe7555abef9207b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Sun, 25 Feb 2018 02:07:40 +0100 Subject: [PATCH 802/844] Fixed and updated rsf.org ruleset. (#14696) --- .../content/rules/RSF.org-falsemixed.xml | 16 --- .../rules/Reporters_Without_Borders.xml | 99 +++++++++---------- 2 files changed, 48 insertions(+), 67 deletions(-) delete mode 100644 src/chrome/content/rules/RSF.org-falsemixed.xml diff --git a/src/chrome/content/rules/RSF.org-falsemixed.xml b/src/chrome/content/rules/RSF.org-falsemixed.xml deleted file mode 100644 index 45c9e785c16f..000000000000 --- a/src/chrome/content/rules/RSF.org-falsemixed.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Reporters_Without_Borders.xml b/src/chrome/content/rules/Reporters_Without_Borders.xml index bcb38373cfad..6049e7e1537d 100644 --- a/src/chrome/content/rules/Reporters_Without_Borders.xml +++ b/src/chrome/content/rules/Reporters_Without_Borders.xml @@ -1,68 +1,65 @@ - - + - - + + - - - - - - - + - - + From d1607c2fbe5bf353bdd70989b4410c5cee46498f Mon Sep 17 00:00:00 2001 From: DavidLiedke Date: Sun, 25 Feb 2018 02:16:53 +0100 Subject: [PATCH 803/844] Update tagesschau.de (#14681) * Update tagesschau.de * Update tagesschau.de * Update tagesschau.de * Update tagesschau.de * Add test * Update * Update * Update --- src/chrome/content/rules/tagesschau.de.xml | 73 +++++++++++----------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/src/chrome/content/rules/tagesschau.de.xml b/src/chrome/content/rules/tagesschau.de.xml index cba620ac1549..19b3edb77e5c 100644 --- a/src/chrome/content/rules/tagesschau.de.xml +++ b/src/chrome/content/rules/tagesschau.de.xml @@ -1,52 +1,53 @@ - - - - - - - - - - - + + + + + + + + + + + + - - + to="https:" /> + From 5a149ea50dbcd2087b66e304dda71eff9382cafd Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 11:24:42 +0100 Subject: [PATCH 804/844] Create BirdLife.org.xml (#14522) * Create BirdLife.org.xml * [BirdLife.org] Move broken chain targets to a separate ruleset * [BirdLife.org] Add subdomain --- .../rules/BirdLife.org-problematic.xml | 17 +++++++ src/chrome/content/rules/BirdLife.org.xml | 48 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 src/chrome/content/rules/BirdLife.org-problematic.xml create mode 100644 src/chrome/content/rules/BirdLife.org.xml diff --git a/src/chrome/content/rules/BirdLife.org-problematic.xml b/src/chrome/content/rules/BirdLife.org-problematic.xml new file mode 100644 index 000000000000..a855f45e6044 --- /dev/null +++ b/src/chrome/content/rules/BirdLife.org-problematic.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/src/chrome/content/rules/BirdLife.org.xml b/src/chrome/content/rules/BirdLife.org.xml new file mode 100644 index 000000000000..5f82076296bc --- /dev/null +++ b/src/chrome/content/rules/BirdLife.org.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + From 977493ab4e86f7a1e374f2324b4b49fe8c276d0c Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 25 Feb 2018 19:03:19 +0800 Subject: [PATCH 805/844] Simplify University-of-California-San-Diego.xml (#14639) * Delete UCSD.edu.xml and UCSD.edu-self-signed.xml * Simplify University-of-California-San-Diego.xml * Update University-of-California-San-Diego.xml * Update University-of-California-San-Diego.xml * Update University-of-California-San-Diego.xml * Update University-of-California-San-Diego.xml --- .../content/rules/UCSD.edu-self-signed.xml | 21 - src/chrome/content/rules/UCSD.edu.xml | 581 ------------------ .../University-of-California-San-Diego.xml | 204 ++++++ 3 files changed, 204 insertions(+), 602 deletions(-) delete mode 100644 src/chrome/content/rules/UCSD.edu-self-signed.xml delete mode 100644 src/chrome/content/rules/UCSD.edu.xml create mode 100644 src/chrome/content/rules/University-of-California-San-Diego.xml diff --git a/src/chrome/content/rules/UCSD.edu-self-signed.xml b/src/chrome/content/rules/UCSD.edu-self-signed.xml deleted file mode 100644 index 48e3e320f4c7..000000000000 --- a/src/chrome/content/rules/UCSD.edu-self-signed.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/UCSD.edu.xml b/src/chrome/content/rules/UCSD.edu.xml deleted file mode 100644 index 74d74ea2278b..000000000000 --- a/src/chrome/content/rules/UCSD.edu.xml +++ /dev/null @@ -1,581 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/University-of-California-San-Diego.xml b/src/chrome/content/rules/University-of-California-San-Diego.xml new file mode 100644 index 000000000000..160999323cef --- /dev/null +++ b/src/chrome/content/rules/University-of-California-San-Diego.xml @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From aaa2b4ad36c0e86bf94f39ac03875ed2add5baea Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 12:39:51 +0100 Subject: [PATCH 806/844] [IMDb] Add targets (#14760) --- src/chrome/content/rules/IMDB.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/IMDB.xml b/src/chrome/content/rules/IMDB.xml index 50e48c960259..5b6ce5e9af14 100644 --- a/src/chrome/content/rules/IMDB.xml +++ b/src/chrome/content/rules/IMDB.xml @@ -1,11 +1,7 @@ - + + + From 896ee92489bd7b8198f62832911f738fc0d0c4ed Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 12:42:27 +0100 Subject: [PATCH 807/844] [Heavy.com] Add target (fix #13157) (#14750) --- src/chrome/content/rules/Heavy.com.xml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/Heavy.com.xml b/src/chrome/content/rules/Heavy.com.xml index d48eac70eaf6..0f2bd38df346 100644 --- a/src/chrome/content/rules/Heavy.com.xml +++ b/src/chrome/content/rules/Heavy.com.xml @@ -1,23 +1,12 @@ - + - + - - - - From 8dd304c08a87b683bd0f1449ce9fda69045da5c0 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 13:39:20 +0100 Subject: [PATCH 808/844] [Blogspot] Add exclusion (fix #8113) (#14718) * [Blogspot] Add exclusion (fix #8113) * [Blogspot] Add test urls * Use stricter exclusion pattern * [Blogspot] Escape dot --- .../content/rules/Blogspot.com_blogs.xml | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/src/chrome/content/rules/Blogspot.com_blogs.xml b/src/chrome/content/rules/Blogspot.com_blogs.xml index a01b82d2f96c..60ab8353228f 100644 --- a/src/chrome/content/rules/Blogspot.com_blogs.xml +++ b/src/chrome/content/rules/Blogspot.com_blogs.xml @@ -82,6 +82,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,6 +218,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 77bee59179dcd48f33139b78692a30f437420f65 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 13:40:11 +0100 Subject: [PATCH 809/844] [Auctiva.com] Simplify rule (#14632) * [Auctiva.com] Simplify rule * [Auctiva.com] Add targets * [Auctiva.com] Add targets * [Auctiva.com] Remove broken chain cert * [Auctiva.com] Add subdomains * [Auctiva.com] Add target and test url --- src/chrome/content/rules/Auctiva.com.xml | 30 ++++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Auctiva.com.xml b/src/chrome/content/rules/Auctiva.com.xml index 8d69771df5e6..7d37f62d7f9f 100644 --- a/src/chrome/content/rules/Auctiva.com.xml +++ b/src/chrome/content/rules/Auctiva.com.xml @@ -1,15 +1,35 @@ - + + + + + + + + + + + + + - + From db02be33e31de51e92f5634528716535889b642d Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 25 Feb 2018 20:42:25 +0800 Subject: [PATCH 810/844] Update derstandard.at.xml (#14763) --- src/chrome/content/rules/derstandard.at.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/chrome/content/rules/derstandard.at.xml b/src/chrome/content/rules/derstandard.at.xml index 77d98ee40408..59aae490036d 100644 --- a/src/chrome/content/rules/derstandard.at.xml +++ b/src/chrome/content/rules/derstandard.at.xml @@ -16,9 +16,6 @@ - - - From f1eb846800a079d922b01e0b2c50c8798632c740 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 25 Feb 2018 20:42:40 +0800 Subject: [PATCH 811/844] Update LinuxFoundation.xml (#14762) --- src/chrome/content/rules/LinuxFoundation.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/rules/LinuxFoundation.xml b/src/chrome/content/rules/LinuxFoundation.xml index 4c7bfe64c777..fed747da308e 100644 --- a/src/chrome/content/rules/LinuxFoundation.xml +++ b/src/chrome/content/rules/LinuxFoundation.xml @@ -46,7 +46,6 @@ - From 3774969fb0df7f2015047ac7410c6ecf802bb679 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 13:51:40 +0100 Subject: [PATCH 812/844] [PlayerAttack.com] Simplify ruleset (#14758) * [PlayerAttack.com] Simplify ruleset * Rename Player-Attack.xml to PlayerAttack.com.xml --- src/chrome/content/rules/Player-Attack.xml | 27 ------------------- src/chrome/content/rules/PlayerAttack.com.xml | 16 +++++++++++ 2 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 src/chrome/content/rules/Player-Attack.xml create mode 100644 src/chrome/content/rules/PlayerAttack.com.xml diff --git a/src/chrome/content/rules/Player-Attack.xml b/src/chrome/content/rules/Player-Attack.xml deleted file mode 100644 index 5258fc1e507c..000000000000 --- a/src/chrome/content/rules/Player-Attack.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - diff --git a/src/chrome/content/rules/PlayerAttack.com.xml b/src/chrome/content/rules/PlayerAttack.com.xml new file mode 100644 index 000000000000..6cfa88a41f3f --- /dev/null +++ b/src/chrome/content/rules/PlayerAttack.com.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + From 0ec9676a42a9dc7e6893a72a47a0ecc3082d489f Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 15:05:42 +0100 Subject: [PATCH 813/844] [WolframAlpha.com.xml] Remove wildcard and broken rules (#14719) * [WolframAlpha.com.xml] Remove wildcard and broken rules * [WolframAlpha.com] Escape & * [WolframAlpha.com] Remove broken target * [WolframAlpha.com] Fix typo in top comment * Rename Wolfram_Alpha.xml to WolframAlpha.com.xml * Update references in related rulesets * [Wolfram.com] Remove mismatched target * Update references --- src/chrome/content/rules/Wolfram.com.xml | 7 +- src/chrome/content/rules/WolframAlpha.com.xml | 64 +++++++++++++++ src/chrome/content/rules/Wolfram_Alpha.xml | 79 ------------------- src/chrome/content/rules/Wolfram_CDN.com.xml | 6 +- src/chrome/content/rules/Wolframcloud.com.xml | 10 +-- .../content/rules/Wolframscience.com.xml | 4 + 6 files changed, 77 insertions(+), 93 deletions(-) create mode 100644 src/chrome/content/rules/WolframAlpha.com.xml delete mode 100644 src/chrome/content/rules/Wolfram_Alpha.xml diff --git a/src/chrome/content/rules/Wolfram.com.xml b/src/chrome/content/rules/Wolfram.com.xml index d8c6af5c2abd..da8b2a1c6978 100644 --- a/src/chrome/content/rules/Wolfram.com.xml +++ b/src/chrome/content/rules/Wolfram.com.xml @@ -1,9 +1,10 @@ @@ -24,7 +28,6 @@ - diff --git a/src/chrome/content/rules/WolframAlpha.com.xml b/src/chrome/content/rules/WolframAlpha.com.xml new file mode 100644 index 000000000000..8e0823fe29c5 --- /dev/null +++ b/src/chrome/content/rules/WolframAlpha.com.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Wolfram_Alpha.xml b/src/chrome/content/rules/Wolfram_Alpha.xml deleted file mode 100644 index 4b837cde66a6..000000000000 --- a/src/chrome/content/rules/Wolfram_Alpha.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Wolfram_CDN.com.xml b/src/chrome/content/rules/Wolfram_CDN.com.xml index ebd1d1ffad6d..5267c0720bd9 100644 --- a/src/chrome/content/rules/Wolfram_CDN.com.xml +++ b/src/chrome/content/rules/Wolfram_CDN.com.xml @@ -1,9 +1,5 @@ From 7b1da5dd9cb06bd8d777b7eb952945aaf820f6a0 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 15:51:03 +0100 Subject: [PATCH 814/844] Create SpringerNature.com.xml (#14401) * Create SpringerNature.com.xml * [SpringerNature.com] Add targets * [SpringerNature.com] Add target and test url * [SpringerNature.com] Remove broken target --- .../content/rules/SpringerNature.com.xml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/chrome/content/rules/SpringerNature.com.xml diff --git a/src/chrome/content/rules/SpringerNature.com.xml b/src/chrome/content/rules/SpringerNature.com.xml new file mode 100644 index 000000000000..f2c7956a43b7 --- /dev/null +++ b/src/chrome/content/rules/SpringerNature.com.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a9f95b81d168027b02e32e3eba11fedcc01ad958 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 15:55:30 +0100 Subject: [PATCH 815/844] Create Mashable.com.xml (#13998) * Create Mashable.com.xml * Create mshcdn.com.xml * [mshcdn.com] Add exclusion for travis * [Mashable.com] Add targets * [mshcdn.com] Add targets --- src/chrome/content/rules/Mashable.com.xml | 28 ++++++++++++ src/chrome/content/rules/mshcdn.com.xml | 52 +++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 src/chrome/content/rules/Mashable.com.xml create mode 100644 src/chrome/content/rules/mshcdn.com.xml diff --git a/src/chrome/content/rules/Mashable.com.xml b/src/chrome/content/rules/Mashable.com.xml new file mode 100644 index 000000000000..ffeab53ef08f --- /dev/null +++ b/src/chrome/content/rules/Mashable.com.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/mshcdn.com.xml b/src/chrome/content/rules/mshcdn.com.xml new file mode 100644 index 000000000000..5b7e0697c44c --- /dev/null +++ b/src/chrome/content/rules/mshcdn.com.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 28a51054e8e1e14e8c65422f5261745cdf1394e0 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 16:02:47 +0100 Subject: [PATCH 816/844] Delete Better-Business-Bureau-mismatches.xml (#14768) Targets already secured in Better-Business-Bureau.xml --- .../content/rules/Better-Business-Bureau-mismatches.xml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/chrome/content/rules/Better-Business-Bureau-mismatches.xml diff --git a/src/chrome/content/rules/Better-Business-Bureau-mismatches.xml b/src/chrome/content/rules/Better-Business-Bureau-mismatches.xml deleted file mode 100644 index ea3b8cc68a97..000000000000 --- a/src/chrome/content/rules/Better-Business-Bureau-mismatches.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - From c044cb65eedd99bb66eaba736a30bf9c8efaf9a6 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Sun, 25 Feb 2018 16:29:17 +0100 Subject: [PATCH 817/844] [InternetSociety.org] Simplify ruleset (#14752) * [InternetSociety.org] Simplify ruleset * Rename Internet-Society.xml to InternetSociety.org.xml * [ISOC.org] Update reference in top comment * [InternetSociety.org] Add target --- src/chrome/content/rules/ISOC.org.xml | 2 +- src/chrome/content/rules/Internet-Society.xml | 71 ------------------- .../content/rules/InternetSociety.org.xml | 36 ++++++++++ 3 files changed, 37 insertions(+), 72 deletions(-) delete mode 100644 src/chrome/content/rules/Internet-Society.xml create mode 100644 src/chrome/content/rules/InternetSociety.org.xml diff --git a/src/chrome/content/rules/ISOC.org.xml b/src/chrome/content/rules/ISOC.org.xml index 1462c9d8973e..53d6ba7ac531 100644 --- a/src/chrome/content/rules/ISOC.org.xml +++ b/src/chrome/content/rules/ISOC.org.xml @@ -3,7 +3,7 @@ Disabled by https-everywhere-checker because: Fetch error: http://ws.edu.isoc.org/ => https://ws.edu.isoc.org/: (60, 'SSL certificate problem: certificate has expired') - For other Internet Society overage, see Internet-Society.xml. + For other Internet Society overage, see InternetSociety.org.xml. Insecure cookies are set for these hosts: diff --git a/src/chrome/content/rules/Internet-Society.xml b/src/chrome/content/rules/Internet-Society.xml deleted file mode 100644 index bf99c19fcfe6..000000000000 --- a/src/chrome/content/rules/Internet-Society.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/InternetSociety.org.xml b/src/chrome/content/rules/InternetSociety.org.xml new file mode 100644 index 000000000000..76760cf00c16 --- /dev/null +++ b/src/chrome/content/rules/InternetSociety.org.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + From af851b8a63beb716af344630cbad82ae96a0c13b Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 26 Feb 2018 20:06:15 +1030 Subject: [PATCH 818/844] [ebay.com.sg] New ruleset (#14627) --- src/chrome/content/rules/ebay.com.sg.xml | 195 +++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 src/chrome/content/rules/ebay.com.sg.xml diff --git a/src/chrome/content/rules/ebay.com.sg.xml b/src/chrome/content/rules/ebay.com.sg.xml new file mode 100644 index 000000000000..1e5002954213 --- /dev/null +++ b/src/chrome/content/rules/ebay.com.sg.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b6cff342e992807629167ad9de696c36a82d604a Mon Sep 17 00:00:00 2001 From: youdly Date: Mon, 26 Feb 2018 20:06:39 +1030 Subject: [PATCH 819/844] [ebayrtm.com] New ruleset (#14625) --- src/chrome/content/rules/ebayrtm.com.xml | 83 ++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 src/chrome/content/rules/ebayrtm.com.xml diff --git a/src/chrome/content/rules/ebayrtm.com.xml b/src/chrome/content/rules/ebayrtm.com.xml new file mode 100644 index 000000000000..a73ba94bbc5b --- /dev/null +++ b/src/chrome/content/rules/ebayrtm.com.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 24c5cdcf69c92b48c08b4216cc52f1bb62873fb8 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 26 Feb 2018 10:46:51 +0100 Subject: [PATCH 820/844] [Concourse.ci] Remove duplicate test url (#14772) --- src/chrome/content/rules/concourse.ci.xml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/concourse.ci.xml b/src/chrome/content/rules/concourse.ci.xml index 0c5508bfa17c..0e1b29d2ca38 100644 --- a/src/chrome/content/rules/concourse.ci.xml +++ b/src/chrome/content/rules/concourse.ci.xml @@ -1,16 +1,22 @@ - + + + + + - - + From 84394bc9d63ac092d7cf9ab9ca8ef2adee945998 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 26 Feb 2018 10:51:37 +0100 Subject: [PATCH 821/844] [2o7.net] Add test urls (#14443) * [2o7.net] Add test urls * [2o7.net] Simplify test url * [2o7.net] Simplify securecookie * [2o7.net] Reorder test urls * [2o7.net] Simplify rule --- src/chrome/content/rules/2o7.net.xml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/rules/2o7.net.xml b/src/chrome/content/rules/2o7.net.xml index 9bc4ee728478..a6aa5fa241d6 100644 --- a/src/chrome/content/rules/2o7.net.xml +++ b/src/chrome/content/rules/2o7.net.xml @@ -1,24 +1,25 @@ - - + + + + + - + + + + + + + - + From 1e1d032867bc71e200a5f8c7bc708704ca2d0b5f Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 02:26:29 +1030 Subject: [PATCH 822/844] [CIMB Thailand] Re-enable ruleset (#13949) * [CIMB Thailand] Re-enable ruleset * Update host --- src/chrome/content/rules/CIMB-Thailand.xml | 61 ++++++++-------------- 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/src/chrome/content/rules/CIMB-Thailand.xml b/src/chrome/content/rules/CIMB-Thailand.xml index 31e1223304b3..c8d22a50feb1 100644 --- a/src/chrome/content/rules/CIMB-Thailand.xml +++ b/src/chrome/content/rules/CIMB-Thailand.xml @@ -1,52 +1,37 @@ - - + - - - - - - - - - - - - - - - - - + + - + + + + + + - + + to="https:" /> From 33b18e71d8c7f7a0ee102e2e4383c1aafdc002fc Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 02:27:22 +1030 Subject: [PATCH 823/844] [Shopee.com.my] New ruleset (#14224) * [Shopee.com.my] New ruleset * Update comment --- src/chrome/content/rules/Shopee.com.my.xml | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/chrome/content/rules/Shopee.com.my.xml diff --git a/src/chrome/content/rules/Shopee.com.my.xml b/src/chrome/content/rules/Shopee.com.my.xml new file mode 100644 index 000000000000..737b4526320d --- /dev/null +++ b/src/chrome/content/rules/Shopee.com.my.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + From 8105d38fad6c47be1647b910931ee7c3e61f87a1 Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 26 Feb 2018 16:58:33 +0100 Subject: [PATCH 824/844] [ProstoVPN.org] Remove duplicate test url (#14771) * [ProstoVPN.org] Remove duplicate test url * Rename prostovpn.org.xml to ProstoVPN.org.xml --- src/chrome/content/rules/ProstoVPN.org.xml | 18 ++++++++++++++++++ src/chrome/content/rules/prostovpn.org.xml | 16 ---------------- 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 src/chrome/content/rules/ProstoVPN.org.xml delete mode 100644 src/chrome/content/rules/prostovpn.org.xml diff --git a/src/chrome/content/rules/ProstoVPN.org.xml b/src/chrome/content/rules/ProstoVPN.org.xml new file mode 100644 index 000000000000..366f6814f1a6 --- /dev/null +++ b/src/chrome/content/rules/ProstoVPN.org.xml @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/prostovpn.org.xml b/src/chrome/content/rules/prostovpn.org.xml deleted file mode 100644 index 002c6122d088..000000000000 --- a/src/chrome/content/rules/prostovpn.org.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - From fbac6be311359e6ff590506b9cce8548cbb2054e Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 26 Feb 2018 17:02:03 +0100 Subject: [PATCH 825/844] [Nimg.jp] Add exclusion (fix #14774) (#14775) * [Nimg.jp] Add exclusion (fix #14774) * [Nimg.jp] Remove broken targets * [Nimg.jp] Remove stray test url --- src/chrome/content/rules/Nimg.jp.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/Nimg.jp.xml b/src/chrome/content/rules/Nimg.jp.xml index 831888836d90..4b391cf6f396 100644 --- a/src/chrome/content/rules/Nimg.jp.xml +++ b/src/chrome/content/rules/Nimg.jp.xml @@ -22,6 +22,9 @@ - sp.ch.res.dev.nimg.jp SSL peer certificate was not OK: + - icons.nimg.jp + - res.nimg.jp + - uni.res.nimg.jp - usericon.nimg.jp 4xx client error: @@ -36,29 +39,26 @@ - - - - - - + + + + + + + + + - - - - - - From 3cf548a2c85db21ca06cf4419f6bc5f6f67b04eb Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 02:57:40 +1030 Subject: [PATCH 826/844] [cimb.com] Add subdomains and rename ruleset (#14035) * [cimb.com] Add subdomains and rename ruleset * Temporarily remove dangling references --- src/chrome/content/rules/CIMB-Malaysia.xml | 79 ------------ src/chrome/content/rules/CIMB.com.xml | 136 +++++++++++++++++++++ 2 files changed, 136 insertions(+), 79 deletions(-) delete mode 100644 src/chrome/content/rules/CIMB-Malaysia.xml create mode 100644 src/chrome/content/rules/CIMB.com.xml diff --git a/src/chrome/content/rules/CIMB-Malaysia.xml b/src/chrome/content/rules/CIMB-Malaysia.xml deleted file mode 100644 index 8b922b151500..000000000000 --- a/src/chrome/content/rules/CIMB-Malaysia.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/CIMB.com.xml b/src/chrome/content/rules/CIMB.com.xml new file mode 100644 index 000000000000..d6f559d1c517 --- /dev/null +++ b/src/chrome/content/rules/CIMB.com.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From eaf87bf6db1d9404026464942991f264965a8560 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 03:18:28 +1030 Subject: [PATCH 827/844] [Kijiji.ca] New ruleset (#14249) * [Kijiji.ca] New ruleset * Remove non-functional hosts --- src/chrome/content/rules/Kijiji.ca.xml | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/chrome/content/rules/Kijiji.ca.xml diff --git a/src/chrome/content/rules/Kijiji.ca.xml b/src/chrome/content/rules/Kijiji.ca.xml new file mode 100644 index 000000000000..1740258e0a1d --- /dev/null +++ b/src/chrome/content/rules/Kijiji.ca.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + From 22df2a53ca516bec8cdc92b82b9ef5d7698cecdd Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 27 Feb 2018 00:52:48 +0800 Subject: [PATCH 828/844] Update Tello.xml (#14756) --- src/chrome/content/rules/Tello.xml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/Tello.xml b/src/chrome/content/rules/Tello.xml index 663023d4cdc8..5496455a5b09 100644 --- a/src/chrome/content/rules/Tello.xml +++ b/src/chrome/content/rules/Tello.xml @@ -1,16 +1,11 @@ + - - - - - - - From 4e9908adace9b8fac0d4d7ed575be06bf09d7165 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Tue, 27 Feb 2018 00:53:44 +0800 Subject: [PATCH 829/844] Update Amica.com.xml (#14754) * Update Amica.com.xml * Update Amica.com.xml * Update Amica.com.xml --- src/chrome/content/rules/Amica.com.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/rules/Amica.com.xml b/src/chrome/content/rules/Amica.com.xml index dd0efef63df0..b6b1e448212f 100644 --- a/src/chrome/content/rules/Amica.com.xml +++ b/src/chrome/content/rules/Amica.com.xml @@ -1,19 +1,16 @@ - - - - - - From 8e03daaee98a79862268ba28539054faeb4ae3fb Mon Sep 17 00:00:00 2001 From: Bisaloo Date: Mon, 26 Feb 2018 17:57:35 +0100 Subject: [PATCH 830/844] [IdeaFit.com] Remove wildcard and exclusion (#14733) * [IdeaFit.com] Remove wildcard and exclusion * Rename Idea_Fit.com.xml to IdeaFit.com.xml --- src/chrome/content/rules/IdeaFit.com.xml | 21 ++++++++++ src/chrome/content/rules/Idea_Fit.com.xml | 47 ----------------------- 2 files changed, 21 insertions(+), 47 deletions(-) create mode 100644 src/chrome/content/rules/IdeaFit.com.xml delete mode 100644 src/chrome/content/rules/Idea_Fit.com.xml diff --git a/src/chrome/content/rules/IdeaFit.com.xml b/src/chrome/content/rules/IdeaFit.com.xml new file mode 100644 index 000000000000..3cee8789d130 --- /dev/null +++ b/src/chrome/content/rules/IdeaFit.com.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Idea_Fit.com.xml b/src/chrome/content/rules/Idea_Fit.com.xml deleted file mode 100644 index 7961771ded0a..000000000000 --- a/src/chrome/content/rules/Idea_Fit.com.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - From 15c71915e59baef00a78c1bddd67c139deebc9df Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 04:34:40 +1030 Subject: [PATCH 831/844] [itradecimb.com.my] Move to a separate ruleset (#14055) --- src/chrome/content/rules/iTradeCIMB.com.my.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/chrome/content/rules/iTradeCIMB.com.my.xml diff --git a/src/chrome/content/rules/iTradeCIMB.com.my.xml b/src/chrome/content/rules/iTradeCIMB.com.my.xml new file mode 100644 index 000000000000..a46b5fbce8e4 --- /dev/null +++ b/src/chrome/content/rules/iTradeCIMB.com.my.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + From 10eab51cfc11273dcb0ee27fe908437a04b1dff4 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 04:35:42 +1030 Subject: [PATCH 832/844] [cimbpreferred.com] Move to a separate ruleset (#14052) --- src/chrome/content/rules/CIMBPreferred.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/CIMBPreferred.com.xml diff --git a/src/chrome/content/rules/CIMBPreferred.com.xml b/src/chrome/content/rules/CIMBPreferred.com.xml new file mode 100644 index 000000000000..e77609c5781c --- /dev/null +++ b/src/chrome/content/rules/CIMBPreferred.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From 1f4772ac1767583a664e37b6ab3cadb90741b793 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 04:37:00 +1030 Subject: [PATCH 833/844] [cimbclicks.com.my] Add subdomains (#14050) --- .../content/rules/CIMBClicks.com.my.xml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/chrome/content/rules/CIMBClicks.com.my.xml diff --git a/src/chrome/content/rules/CIMBClicks.com.my.xml b/src/chrome/content/rules/CIMBClicks.com.my.xml new file mode 100644 index 000000000000..e06719c0ce2c --- /dev/null +++ b/src/chrome/content/rules/CIMBClicks.com.my.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + From 7e321e65c0180173a3f2145aa14f2651f57c8bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 26 Feb 2018 20:04:11 +0100 Subject: [PATCH 834/844] Added ruleset for darc.de (#14471) * Added ruleset for darc.de * Added comment about wildcard DNS. --- src/chrome/content/rules/DARC.de.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/chrome/content/rules/DARC.de.xml diff --git a/src/chrome/content/rules/DARC.de.xml b/src/chrome/content/rules/DARC.de.xml new file mode 100644 index 000000000000..df4a88763ebe --- /dev/null +++ b/src/chrome/content/rules/DARC.de.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + From 5f9ffed7981fa805d4642b5a22cfa16443d36ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?= Date: Mon, 26 Feb 2018 20:23:57 +0100 Subject: [PATCH 835/844] =?UTF-8?q?Added=20rulesets=20for=20sonarqube.org,?= =?UTF-8?q?=20sonarsource.com,=20sonarlint.org,=20son=E2=80=A6=20(#14569)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added rulesets for sonarqube.org, sonarsource.com, sonarlint.org, sonarcloud.io * Added reference to one list. --- src/chrome/content/rules/SonarCloud.io.xml | 12 +++++++ src/chrome/content/rules/SonarLint.org.xml | 18 ++++++++++ src/chrome/content/rules/SonarQube.org.xml | 16 +++++++++ src/chrome/content/rules/SonarSource.com.xml | 36 ++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 src/chrome/content/rules/SonarCloud.io.xml create mode 100644 src/chrome/content/rules/SonarLint.org.xml create mode 100644 src/chrome/content/rules/SonarQube.org.xml create mode 100644 src/chrome/content/rules/SonarSource.com.xml diff --git a/src/chrome/content/rules/SonarCloud.io.xml b/src/chrome/content/rules/SonarCloud.io.xml new file mode 100644 index 000000000000..116470aa6aee --- /dev/null +++ b/src/chrome/content/rules/SonarCloud.io.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/SonarLint.org.xml b/src/chrome/content/rules/SonarLint.org.xml new file mode 100644 index 000000000000..811b8769ac74 --- /dev/null +++ b/src/chrome/content/rules/SonarLint.org.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/SonarQube.org.xml b/src/chrome/content/rules/SonarQube.org.xml new file mode 100644 index 000000000000..00a318654cdf --- /dev/null +++ b/src/chrome/content/rules/SonarQube.org.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/src/chrome/content/rules/SonarSource.com.xml b/src/chrome/content/rules/SonarSource.com.xml new file mode 100644 index 000000000000..6e70e2c8691a --- /dev/null +++ b/src/chrome/content/rules/SonarSource.com.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + From 4653ba312a8550c30608c8f68ab638af71ff989b Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 06:20:08 +1030 Subject: [PATCH 836/844] [eipocimb.com] Move to a separate ruleset (#14056) --- src/chrome/content/rules/eIPOCIMB.com.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/chrome/content/rules/eIPOCIMB.com.xml diff --git a/src/chrome/content/rules/eIPOCIMB.com.xml b/src/chrome/content/rules/eIPOCIMB.com.xml new file mode 100644 index 000000000000..cd979f9bb32d --- /dev/null +++ b/src/chrome/content/rules/eIPOCIMB.com.xml @@ -0,0 +1,13 @@ + + + + + + + + + + From 0e29875e6abf91a3c5b253158742ff851e1281ad Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 07:34:50 +1030 Subject: [PATCH 837/844] [cimb-principal.com.my] New ruleset (#14053) --- .../content/rules/CIMB-Principal.com.my.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/chrome/content/rules/CIMB-Principal.com.my.xml diff --git a/src/chrome/content/rules/CIMB-Principal.com.my.xml b/src/chrome/content/rules/CIMB-Principal.com.my.xml new file mode 100644 index 000000000000..fc71e0b000b2 --- /dev/null +++ b/src/chrome/content/rules/CIMB-Principal.com.my.xml @@ -0,0 +1,24 @@ + + + + + + + From e8aca1c5e47742cc15815b085c7293a1b93ad983 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 08:43:25 +1030 Subject: [PATCH 838/844] [cimbbank.com.my] Add subdomains (#14049) --- src/chrome/content/rules/CIMBBank.com.my.xml | 58 ++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/chrome/content/rules/CIMBBank.com.my.xml diff --git a/src/chrome/content/rules/CIMBBank.com.my.xml b/src/chrome/content/rules/CIMBBank.com.my.xml new file mode 100644 index 000000000000..0332c0753a72 --- /dev/null +++ b/src/chrome/content/rules/CIMBBank.com.my.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From ead32a8af85a5705e6e0883f11523089fcf913a9 Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 08:52:23 +1030 Subject: [PATCH 839/844] [Maybank2e.com] New ruleset (#14068) --- src/chrome/content/rules/Maybank2e.com.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Maybank2e.com.xml diff --git a/src/chrome/content/rules/Maybank2e.com.xml b/src/chrome/content/rules/Maybank2e.com.xml new file mode 100644 index 000000000000..f3f29d70cfd1 --- /dev/null +++ b/src/chrome/content/rules/Maybank2e.com.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 9a5797890e1cb6d40fc7784be8157965c867d71f Mon Sep 17 00:00:00 2001 From: youdly Date: Tue, 27 Feb 2018 08:58:54 +1030 Subject: [PATCH 840/844] [KETrade.com.sg] New ruleset (#14076) --- src/chrome/content/rules/KETrade.com.sg.xml | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/chrome/content/rules/KETrade.com.sg.xml diff --git a/src/chrome/content/rules/KETrade.com.sg.xml b/src/chrome/content/rules/KETrade.com.sg.xml new file mode 100644 index 000000000000..4db5f4fcba78 --- /dev/null +++ b/src/chrome/content/rules/KETrade.com.sg.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + From a3cdbe76483c9b383bb1a3fd14a0e73d8861855e Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 26 Feb 2018 14:56:33 -0800 Subject: [PATCH 841/844] Remove references to trivial-validate.py, replace with new script location --- CONTRIBUTING.md | 2 +- docs/en_US/development.md | 6 +++--- hooks/precommit | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85808ff04ebb..148b383c872c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -104,7 +104,7 @@ Some `rulesets` have the attribute `platform="mixedcontent"`. These `rulesets` ## New Rulesets -If you want to create new `rulesets` to submit to us, we expect them to be in the `src/chrome/content/rules` directory. That directory also contains a useful script, `make-trivial-rule`, to create a simple `ruleset` for a specified domain. There is also a script called `utils/trivial-validate.py`, to check all the pending `rulesets` for several common errors and oversights. For example, if you wanted to make a `ruleset` for the `example.com` domain, you could run: +If you want to create new `rulesets` to submit to us, we expect them to be in the `src/chrome/content/rules` directory. That directory also contains a useful script, `make-trivial-rule`, to create a simple `ruleset` for a specified domain. There is also a script in `test/validations/special/run.py`, to check all the pending `rulesets` for several common errors and oversights. For example, if you wanted to make a `ruleset` for the `example.com` domain, you could run: ``` cd src/chrome/content/rules bash ./make-trivial-rule example.com diff --git a/docs/en_US/development.md b/docs/en_US/development.md index d6e068582ee3..ea2cd107ea79 100644 --- a/docs/en_US/development.md +++ b/docs/en_US/development.md @@ -42,9 +42,9 @@ HTTP to HTTPS. You can read more about how to write these rules If you want to create new rules to submit to us, we expect them to be in the src/chrome/content/rules directory. That directory also contains a useful script, make-trivial-rule, to create a simple rule for a specified domain. -There is also a script called trivial-validate.py, to check all the pending -rules for several common errors and oversights. For example, if you wanted to -make a rule for the example.com domain, you could run +There is also a script in test/validations/special/run.py, to check all the +pending rules for several common errors and oversights. For example, if you +wanted to make a rule for the example.com domain, you could run bash ./make-trivial-rule example.com diff --git a/hooks/precommit b/hooks/precommit index 0f2873b9ca42..b57ed3bcbc0f 100755 --- a/hooks/precommit +++ b/hooks/precommit @@ -39,7 +39,7 @@ if [ "$CHANGED_RULESETS" ]; then continue fi - ./utils/trivial-validate.py --quiet $FILE + python3.6 test/validations/special/run.py --quiet $FILE RESULT=$? if [ $RESULT -ne 0 ]; then From 451426bdff6a5748e817e7a36b07e2821107efdd Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 26 Feb 2018 14:48:03 -0800 Subject: [PATCH 842/844] Update translations. --- translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations b/translations index a318dfa5a476..8834998d67ec 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit a318dfa5a476f063f4e2153dace1a98c9c8fa4d1 +Subproject commit 8834998d67ec47b2ab71878ac7d34811456bcaf1 From cf02547a77211b741a4471e0f1a8647d670b69e1 Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 26 Feb 2018 15:23:42 -0800 Subject: [PATCH 843/844] Release: 2018.2.26 --- chromium/manifest.json | 2 +- src/Changelog | 129 ++++++++++-------- .../special/duplicate-whitelist.txt | 14 -- utils/ruleset-whitelist.csv | 36 ----- 4 files changed, 71 insertions(+), 110 deletions(-) diff --git a/chromium/manifest.json b/chromium/manifest.json index 192f44523bb3..cf4596818708 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -47,5 +47,5 @@ "storage", "*://*/*" ], - "version": "2018.1.29" + "version": "2018.2.26" } \ No newline at end of file diff --git a/src/Changelog b/src/Changelog index ccbe2ce9ca18..b2d9289b6814 100644 --- a/src/Changelog +++ b/src/Changelog @@ -1,3 +1,14 @@ +2018.2.26 + * Many/most mixed content blocking issues are solved when enabling the + "Block all unencrypted requests" option thanks to the injection of the + upgrade-insecure-requests header. This means this option can be more + easily used for daily browsing with less site breakage. + * Rulesets are alphabetically sorted in HTTPS Everywhere popup, with the + first-party site (if covered) at the top. + * Fixes an obscure Android bug where rulesets don't appear in popup for the + first window that is opened after restart. + * Many ruleset bugs have been solved (some dating 3 years back!) + 2018.1.29 * Ruleset updates @@ -445,10 +456,10 @@ chrome-2014.1.3 * Pseudorelease, just for Tor Browser Bundle usage * Tiny ruleset tweaks (XKCD is back)! * Create an about:config setting that overrules mixedcontent ruleset disablement - + 3.4.3 (2013-12-03) * Fixes: Cloudfront / Amazon MP3 player, Cornell/Arxiv, FlickR, - AmazonAWS/spiegel.tv + AmazonAWS/spiegel.tv * Disable broken: Barns and Noble, Behance, Boards.ie, Elsevier, Kohls, OpenDNS, Spin.de, Svenskakyrkan * Deprecate the ContentPolicy API, fixing a crash bug @@ -521,10 +532,10 @@ chrome-2014.1.3 the stable branch, and changed many stable rules chrome-2013.8.17 - * Urgent bugfix release for + * Urgent bugfix release for https://trac.torproject.org/projects/tor/ticket/9507 - release from the stable / 3.0 branch, not master - - don't ship the development ruleset library, it's not ready for prime + - don't ship the development ruleset library, it's not ready for prime time yet - avoid performance hits from repeatedly re-testing rulesets - other possible weirdness @@ -594,7 +605,7 @@ chrome-2013-8.16 * Includes all fixes from 3.3 3.3 - * This major release fixed the following mixed content blocker (MCB) + * This major release fixed the following mixed content blocker (MCB) related bugs in time for Firefox 23: https://trac.torproject.org/projects/tor/ticket/9196 https://trac.torproject.org/projects/tor/ticket/8774 @@ -644,14 +655,14 @@ chrome-2012.6.4 * Fix broken ruleset dialog in Firefox 22+ https://trac.torproject.org/projects/tor/ticket/8997 * The toolbar button changes to indicate active rulesets: - https://trac.torproject.org/projects/tor/ticket/4886 + https://trac.torproject.org/projects/tor/ticket/4886 * Ship 31 new rulesets * New translations: Japanese and Sinhala * Updated translations: Hungarian, Lithuanian, Slovenian * Ruleset fixes from 3.2.2: https://www.eff.org/r.5bSj * Observatory cert whitelist update - + 3.2.2 (2013-05-22) * Quick turn-around release to unbreak support.apple.com * Fixes for a number of other ruleset bugs: @@ -735,7 +746,7 @@ chrome-2012.3.7 https://trac.torproject.org/projects/tor/ticket/8199 https://trac.torproject.org/projects/tor/ticket/8198 * Disable broken: - American Public Media (for real this time), Asymmetric Publications, + American Public Media (for real this time), Asymmetric Publications, Salsa Labs, Vimeo https://trac.torproject.org/projects/tor/ticket/7650 https://trac.torproject.org/projects/tor/ticket/8280 @@ -751,7 +762,7 @@ chrome-2013.1.18 * Fix the implementation of safeToSecureCookie - Get https://trac.torproject.org/projects/tor/ticket/7491 right(er) - Fix https://trac.torproject.org/projects/tor/ticket/7855 - * Fix a ruleset processing bug, which would prevent + * Fix a ruleset processing bug, which would prevent from matching x.y.z.com * Ship all ruleset fixes from 3.1.2 and 3.1.3 - Except Etsy, where we're trying to fix rather than disable the ruleset @@ -762,7 +773,7 @@ chrome-2013.1.18 3.1.3 (2013-1-18) * Internet Freedom Day stable bugfix release - * Fixes: CloudFront/Spotify, AmazonAWS (Amazon MP3s and product images), Libav, + * Fixes: CloudFront/Spotify, AmazonAWS (Amazon MP3s and product images), Libav, Google Maps, UserEcho https://trac.torproject.org/projects/tor/ticket/7931 https://trac.torproject.org/projects/tor/ticket/7888 @@ -804,7 +815,7 @@ chrome-2012.12.17 * Additionally disable: Automattic 4.0development.4 (2012-12-17) - * Fix nasty bug that prevented Firefox downloads from Mozilla's CDN + * Fix nasty bug that prevented Firefox downloads from Mozilla's CDN https://trac.torproject.org/projects/tor/ticket/7717 * Fix download from qt-project.org * Ship 72 new rulesets @@ -862,8 +873,8 @@ chrome-2012.10.31 * Work around a nasty bug that was affecting some high-volume Live Youtube streams (but not other live YouTube streams) https://trac.torproject.org/projects/tor/ticket/7127 - * Other Fixes: - AdaCore, Akamai/MTV3 Katsomo, Akamai/HP, Atlassian, Bahn.de, MySQL, NPR, PBS, + * Other Fixes: + AdaCore, Akamai/MTV3 Katsomo, Akamai/HP, Atlassian, Bahn.de, MySQL, NPR, PBS, Phronoix Media/Openbenchmarking, SSRN, Spoki https://trac.torproject.org/projects/tor/ticket/7219 https://trac.torproject.org/projects/tor/ticket/7180 @@ -879,12 +890,12 @@ chrome-2012.10.31 https://trac.torproject.org/projects/tor/ticket/7114 https://trac.torproject.org/projects/tor/ticket/7138 https://trac.torproject.org/projects/tor/ticket/7107 - + 3.0.3 (2012-10-29) * Work around a nasty bug that was affecting some high-volume Live Youtube streams (but not other live YouTube streams) https://trac.torproject.org/projects/tor/ticket/7127 - * Other Fixes: + * Other Fixes: AdaCore, Akamai/MTV3 Katsomo, Akamai/HP, Atlassian, Bahn.de, DemocracyNow, MySQL, NuGet, PBS, Phronoix Media/Openbenchmarking, SSRN, Spoki https://trac.torproject.org/projects/tor/ticket/7219 @@ -925,7 +936,7 @@ chrome-2012.10.31 chrome-2012.10.18 * The "even more perfect" chromium alpha - * Fixes from the last two Firefox releases: + * Fixes from the last two Firefox releases: Microsoft (Bing login button), ZeniMax, Ubuntuone, TrueCrypt, Springer, Optical Society, IMDB, Facebook, EzineArticles, Broadband Reports, Apache, Akamai (exclude Zynga content to prevent breakage of some Zynga games), @@ -949,8 +960,8 @@ chrome-2012.10.18 hundreds of others 3.0.1 and 4.0development.1: - * Fixes: adition.com, Akamai/SVTplay.se, Bahn.de, European Southern Observatory, - IEEE, Indeed, Java, Librivox, Pinterest, New York Times, Springer, Vimeo, + * Fixes: adition.com, Akamai/SVTplay.se, Bahn.de, European Southern Observatory, + IEEE, Indeed, Java, Librivox, Pinterest, New York Times, Springer, Vimeo, Shannon Health, O'Reilly Media https://trac.torproject.org/projects/tor/ticket/7080 https://mail1.eff.org/pipermail/https-everywhere/2012-October/001583.html @@ -975,7 +986,7 @@ chrome-2012.10.9 3.0 (2012-10-04) * Since version 2.x: * 1,455 new active rulesets - * UI improvements: + * UI improvements: - right-click to view ruleset source in the config window - translate some untranslated menus - better icons in a few places (breaking/redirecting rules, @@ -989,7 +1000,7 @@ chrome-2012.10.9 * Relative to 3.0development.8: * Only promote the Decentralized SSL Observatory to 5% of non-Tor users * Update the SSL Observatory whitelist of common cert chains - * Fixes, mostly in the CDN/media playback department: + * Fixes, mostly in the CDN/media playback department: Akamai/CNN, GO.com/ABC, AWS/Amazon Zeitgeist MP3 player, AWS/Spiegel.tv, Technology Review, Cloudfront/Tunein, Akamai/Discovery Channel, Beyond Security, OCaml, Gentoo, @@ -1025,14 +1036,14 @@ chrome-2012.9.21 https://trac.torproject.org/projects/tor/ticket/6848 * Replace jsURI with URI.js, fixing a number of bugs in the Chrome port - https://trac.torproject.org/projects/tor/ticket/6197 - - Also breakage on other random pages like + - Also breakage on other random pages like http://venturebeat.com/2012/09/13/how-do-not-track-could-destroy-the-internet-as-you-know-it/ * Fixes: AOL, Antispam.de, BBC, BitTorrent, Facebook, Gearhog, LinkPlus Catalog, Microsoft, Mother Jones, Mozilla, Office.co.uk, OpenDNS, PassThePopcorn, Piriform, WhatCD, uTorrent * Disable broken: Paper.li, SVT.se, Soton.ac.uk * Reenable: Referly - + chrome-2012.9.10 * The "just add eleven" chromium alpha * Time to test the updating mechanism from direct -> Chrome Web Store @@ -1120,7 +1131,7 @@ chrome-2012.8.15 Jottit * Disable broken: Project Syndicate, Alton Towers, Network for Good https://trac.torproject.org/projects/tor/ticket/6222 - * The Decentralized SSL Observatory client now saves up some certificates if + * The Decentralized SSL Observatory client now saves up some certificates if the network blocks or MITMs attempts to submit them. chrome-2012.6.21 @@ -1136,8 +1147,8 @@ chrome-2012.6.21 https://trac.torproject.org/projects/tor/ticket/5893 * Ship 217 new rulesets (frozen; new rulesets now have to wait until 4.0 development) - * Fixes: numerous, including: Boxee, CiteULike, MozillaMessaging, - Yandex, Demonoid, Pirate Party, Gentoo, NYTimes, Microsoft, + * Fixes: numerous, including: Boxee, CiteULike, MozillaMessaging, + Yandex, Demonoid, Pirate Party, Gentoo, NYTimes, Microsoft, Wikipedia, Lenovo, MyWOT https://trac.torproject.org/projects/tor/ticket/5912 https://trac.torproject.org/projects/tor/ticket/6091 @@ -1148,12 +1159,12 @@ chrome-2012.6.21 https://mail1.eff.org/pipermail/https-everywhere-rules/2012-June/001190.html https://mail1.eff.org/pipermail/https-everywhere-rules/2012-May/001186.html https://mail1.eff.org/pipermail/https-everywhere/2012-May/001433.html - * Disable broken: MarketWatch, Disqus, Magento, Lavasoft, + * Disable broken: MarketWatch, Disqus, Magento, Lavasoft, Typepad/Say Media, Thomas Cook, Thomson Reuters clients, Science Daily, BinRev, Ikea, Interpol https://trac.torproject.org/projects/tor/ticket/5899 https://trac.torproject.org/projects/tor/ticket/5496 - + chrome-2012.6.18 * The Divisible By Six Chromium Beta Release * Ship 444 new Rulesets @@ -1192,11 +1203,11 @@ chrome-2012.5.1 Everywhere protection for cookies on some domains. https://trac.torproject.org/projects/tor/ticket/5676 https://trac.torproject.org/projects/tor/ticket/2199 - * More efficient ruleset storage shrinks the .crx download by a factor of + * More efficient ruleset storage shrinks the .crx download by a factor of about 4 (thanks fauxfaux) https://trac.torproject.org/projects/tor/ticket/5275 * Disable buggy rulesets: IBM, Scribd, Wunderground, ReadWriteWeb, - Pastebin.ca + Pastebin.ca https://trac.torproject.org/projects/tor/ticket/5344 https://trac.torproject.org/projects/tor/ticket/5435 https://trac.torproject.org/projects/tor/ticket/5630 @@ -1210,7 +1221,7 @@ chrome-2012.5.1 3.0development.2 (2012-04-26) - * License change: the tree now includes some code from Convergence, which + * License change: the tree now includes some code from Convergence, which is GPL v3+. Other code remains licensable as GPLv2+ * Ship 696 new rulesets (!!!), thanks to a lot of amazing work by Negres * Fix a downgrade attack that might allow attackers to deny HTTPS @@ -1237,9 +1248,9 @@ chrome-2012.5.1 * Separate Observatory option to control self-signed cert submission * Numerous other ruleset enhancements, fixes, and probably exciting new bugs in Negres's ruleset changes - + 3.0development.1 (2012-03-14) - * By default, use https://google.co.cctld instead of + * By default, use https://google.co.cctld instead of encrypted.google.com https://trac.torproject.org/projects/tor/ticket/5152 * Add an optional ruleset to use https://www.google.com @@ -1259,7 +1270,7 @@ chrome-2012.3.14 * Add an optional ruleset to search on https://www.google.com instead of encrypted.google.com * Switch non-US google searches to country sites by default - * Better chrome context UI + * Better chrome context UI 2.2.3 (2012-09-25) * Workaround for breakage in Amazon Look Inside the Book (via Cloudfront) @@ -1268,7 +1279,7 @@ chrome-2012.3.14 * Other fixes: PassThePopcorn, WhatCD, Antispam.de, RFCeditor, Weatherspark / GoogleMaps * Disable broken: SVT.se - + 2.2.1 (2012-08-17) * Fix a configuration-parsing bug in 2.2 that would ignore default_off rules if this was a first install @@ -1304,7 +1315,7 @@ chrome-2012.3.14 2.0.5 (2012-05-16) * Rebuild 2.0.4 without a bug in the release scripts that prevented all the rulesets from being absent - + 2.0.4 (2012-05-16) * Fix for compatibility with some other Firefox extensions: https://trac.torproject.org/projects/tor/ticket/5682 @@ -1367,7 +1378,7 @@ chrome-2012.2.27 * Split Google Translate out of the Google APIs rule, and turn it off by default on Chrome only: Fixes https://trac.torproject.org/projects/tor/ticket/5196 - * Ship 19 new rulesets since last Chromium release + * Ship 19 new rulesets since last Chromium release chrome-2012.2.9 * make rulesets elements work in the Chrome version @@ -1403,9 +1414,9 @@ chrome-2012.02.06{,.01} * Ship 126 new rulesets * Fixes: Wikipedia, Identi.ca, Verizon, CCC.de, UserScripts, Yandex, Hidemyass, Mozilla, Pogo, Google, Google Images, Google Video, - The Pirate Bay, AK Vorrat, JBoss + The Pirate Bay, AK Vorrat, JBoss * Improvements: EFF, Flickr, RedHat, Diaspora, PrivatePaste, KDE, - Portugese Govt + Portugese Govt * Disable broken: NSF.gov, WHO.int, Economist * New experimental Yahoo! ruleset (off by default) * New translations: Spanish, Nederlands @@ -1420,8 +1431,8 @@ chrome-2012.02.06{,.01} * Fixes: Java.com, Yandex, Wordpress, Wikipedia, Bahn.de, UNSW, Apache, DuckDuckGo, Google Images * Improvements: Debian, Tumblr, Apple, Facebook, VeriSign, Google Services, - Flickr, Youtu.be - * Disable broken: Target, OpenUniversity, TV.com, Radio Shack, + Flickr, Youtu.be + * Disable broken: Target, OpenUniversity, TV.com, Radio Shack, Yahoo Mail :( :(, Google Cache coverage in Google Services :( :( :( @@ -1465,7 +1476,7 @@ chrome-2012.02.06{,.01} (currently opt-in, with a popup prompt if you have Tor Button installed) * Ship 164 new rulesets * Enable Google Maps by default - * Pending translations: Arabic, Dutch, German, Portugese, Latvian, Russian, + * Pending translations: Arabic, Dutch, German, Portugese, Latvian, Russian, Swedish * Fixes: OpenDNS, WordPress, Flickr * Expansions & Improvements: Google Services, Twitter, Gowalla, Apple, Bit.ly @@ -1518,9 +1529,9 @@ chrome-2012.02.06{,.01} 1.0.2 (2011-09-20) * Major improvements to the Wikipedia ruleset - * Disable broken/buggy rulesets: DeviantArt, eHow, About.me, Bandcamp, + * Disable broken/buggy rulesets: DeviantArt, eHow, About.me, Bandcamp, StudiVZ, Securityfocus, BankofAmerica :( :( :( - * Small fixes: OpenDNS, WordPress, links in the "About" page + * Small fixes: OpenDNS, WordPress, links in the "About" page * Declare incompatibility with Firefox 7 & 8 until Mozilla fixes this: https://bugzilla.mozilla.org/show_bug.cgi?id=677643 @@ -1564,7 +1575,7 @@ chrome-2012.02.06{,.01} https://trac.torproject.org/projects/tor/ticket/2199 * By default, move context menu from toolbar to addons bar * Ship 22 new rulesets - * Add support for Google Plus, Accounts and AdWdords + * Add support for Google Plus, Accounts and AdWdords * Improvements to Microsoft, Twitter and Gitorious 1.0.0development.1: (2011-06-27) @@ -1572,7 +1583,7 @@ chrome-2012.02.06{,.01} applicable to the current page (we can now stabilise the dev branch!) * Ship 42 new rulesets * Support for Google Image Search (except the very first landing page :/) - * Fixes: Netflix, Plone + * Fixes: Netflix, Plone * Improvements: Google APIs, Google Services, Mediawiki * Disable broken rules: OKCupid, Surveymonkey * Declare compatibility with recent Seamonkey releases @@ -1580,29 +1591,29 @@ chrome-2012.02.06{,.01} 0.9.9.development.6: * Optimistically declare compatibility with Firefoxes up to v 7.* * Ship 193 new rulesets - * Fixes & Improvements: Wikipedia, AmazonAWS, Google Images, Microsoft, - Mozilla, Netflix, Google User Content, Twitter, Gitorious, AdBlock Plus, + * Fixes & Improvements: Wikipedia, AmazonAWS, Google Images, Microsoft, + Mozilla, Netflix, Google User Content, Twitter, Gitorious, AdBlock Plus, Youtube, he.net, Bitcoin - * Remove broken rules: Match.com + * Remove broken rules: Match.com 0.9.9.development.5: * Compatible with Firefox 4.0.1+ * New ruleset management UI (thanks to katmagic and Stefan Tomanek) * Ship 136 new rulesets - * Fixes: reCAPTCHA, Google Images, Gentoo, Gitorious - * Improvements: Bit.ly, Yahoo, Nokia - * Disable: WashingtonPost :(, Doubleclick, OpenSSL.org (!) - + * Fixes: reCAPTCHA, Google Images, Gentoo, Gitorious + * Improvements: Bit.ly, Yahoo, Nokia + * Disable: WashingtonPost :(, Doubleclick, OpenSSL.org (!) + 0.9.9.development.4: * Ship 117 new rulesets - * Fixes: MySQL, GroupOn, country-specific Google news sites, + * Fixes: MySQL, GroupOn, country-specific Google news sites, * Improvements: mail.com, WordPress * Leave WashingtonPost ruleset on in the hope that it gets fixed soon :/ * Disable broken rules: HTC, I2P ... 0.9.9.development.3: - * In the settings dialogue, offer "Reset defaults" instead of "Enable all" + * In the settings dialogue, offer "Reset defaults" instead of "Enable all" * Merge fixes from NoScript that avoid some torbutton bugs * Ship 56 new rulesets * Numerous tweaks + fixes, including NYTimes and AddThis @@ -1610,10 +1621,10 @@ chrome-2012.02.06{,.01} 0.9.9.development.2: * Prevent the preferences window from swallowing the screen on OS X / Windows - * Stop the StartCom rule from breaking StartCom OCSP/CRLs (which can't be HTTPS) + * Stop the StartCom rule from breaking StartCom OCSP/CRLs (which can't be HTTPS) * Attempt to do the same for for CAcert * Fixes to: Reddit, Drupal.org - * Disable some problematic rulesets: Cisco, Opera + * Disable some problematic rulesets: Cisco, Opera * Enable: Reddit * Ship another 62 rulesets @@ -1661,7 +1672,7 @@ chrome-2012.02.06{,.01} * Support global installation for OS distributions (thanks dm0) 0.9.2: - * Fix a bug in our redirection loop detection that was causing trouble with + * Fix a bug in our redirection loop detection that was causing trouble with some parts of NYTimes, Facebook, and other sites (closes: https://trac.torproject.org/projects/tor/ticket/2217) @@ -1674,7 +1685,7 @@ chrome-2012.02.06{,.01} improvements! * Split the stricter parts of the Facebook rule into a "Facebook+" rule. It's what's required to protect Facebook from Firesheep and similar cookie - theft attacks, but it may break apps, because apps.facebook.com currently + theft attacks, but it may break apps, because apps.facebook.com currently has the wrong cert. * Allow rulesets to specify that the secure flag should be set on some cookies even if the site operator failed to do so @@ -1713,7 +1724,7 @@ chrome-2012.02.06{,.01} https://trac.torproject.org/projects/tor/ticket/1672 https://trac.torproject.org/projects/tor/ticket/1673 The patch breaks toolbar search suggestions. And who knows what else? - * Don't send some country homepages to https://www.google.com/webhp?hl= ; + * Don't send some country homepages to https://www.google.com/webhp?hl= ; use https://encrypted.google.com instead * Cleanup and refactor the URI replacement and rewriting code. Should hopefully fix https://trac.torproject.org/projects/tor/ticket/1649 diff --git a/test/validations/special/duplicate-whitelist.txt b/test/validations/special/duplicate-whitelist.txt index 44d395015706..dfd97c354b6a 100644 --- a/test/validations/special/duplicate-whitelist.txt +++ b/test/validations/special/duplicate-whitelist.txt @@ -6,14 +6,10 @@ feedback.adroll.com adyadvantage.com aftenposten.no www1.arun.gov.uk -*.bcvs.ch -bcvs.ch -cccure.training mailing.channel4.com training.citrix.com consumerreports.org c-spanvideo.org -davidsontutoring.com dell.com www.dell.com investors.demandware.com @@ -21,10 +17,8 @@ dice.com www.dice.com drownedinsound.com now.eloqua.com -emergingthreats.net *.eveonline.com eveonline.com -fishwrapper.com foxydeal.com foxydeal.de freeporngif.com @@ -39,7 +33,6 @@ forums.girlsoutwest.com a.abcnews.go.com gsu.edu code.highcharts.com -hometheaterreview.com hostoople.com ieeexplore.ieee.org inc.com @@ -55,9 +48,7 @@ liberalamerica.org liftdna.com linbit.com server.iad.liveperson.net -mandiant.com mediciglobal.com -mirrorbingo.com fundusze-emerytalne.money.pl fundusze-inwestycyjne.money.pl karty-kredytowe.money.pl @@ -71,10 +62,8 @@ npmawesome.com nydailynews.com webmail.nyi.net nykeurope.com -oag.com careers.peopleclick.com pdu.edu -plusme.net www.rackspace.com redbullmobile.at reddpics.com @@ -82,12 +71,10 @@ www.cits.ruhr-uni-bochum.de www.ruhr-uni-bochum.de savethechildren.org.uk www2.scribblelive.com -*.shopping.com sparxtrading.com suppliesfordreams.org www.techrepublic.com tesco.com -test-ipv6.cz thefederalistpapers.org thompsonhotels.com ti.com @@ -107,7 +94,6 @@ members.webs.com digitalcommons.wustl.edu openscholarship.wustl.edu www.blogsmithmedia.com -www.cccure.training www.hostingcatalog.com zylon.net www.zylon.net diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index ed973df1eab1..c76a255c1fd4 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -12,7 +12,6 @@ d5e0185eea0bec011afe6fbe1b9db732939209a70d73a6bbe38e6b12311282cc,0,1,24-7_Custom 4209813635498e7b1f9c944d648173507b41e0e3260e16b3fdb6f3f945ffc28a,1,1,24-7-Media.xml a17a8a5bd129ea9a79f7c6d799d48fdd65cd41a3d68f588851130e5dab380c89,1,1,2GIS.ru.xml feb478f3b2f281637dc660c70688a7002af3e4c8643f49bc2a45dc451a2fe450,1,0,2K.com.xml -eb32831b72d8e99401053f1a2815b3b34101705ec5c179ca953216f37c889f7f,1,1,2o7.net.xml 499b05dc40b7451e3ad52d6bb7e8c33a0359e35747772e71cbd40d0762495a1c,1,1,32Red_Online_Casino.xml a7d9ec08bb6294184d95da57900409f22eaf2ef1a49b66ea4c9e33cb77829167,1,1,33Across.xml 7fe27a3812a67c0645171e96582c54e60bf00bc1462eca19b78ae0fe04c70869,1,1,360Cities.xml @@ -251,7 +250,6 @@ ac5a54b2ad0e2ef5b7e15c485b7b55e0c6f39db0c92f5786ca8a565e32e243b5,1,1,Atipso.com. b55717bc37ee20155b475aa7b894c1f0d94913990f90d78845f67e7d7e36cb35,0,1,ATrpms.net.xml 7daeec92cfabfe03ea028f3a505424a98e5d2839917e297d7ef0ebc87a03e713,1,1,Attorney-GeneralsDepartment.xml 7e1bd356281faac59994835afd58be5ccda705aabdba47270324bc345f251d8c,1,1,Attracta.xml -112ebbd49a5e8309a3c97c2a1945bbd23dc9a07093b9b088cd7c83d12c411b4b,0,1,Auctiva.com.xml 4fc77210623751086453fe0a5d228673843cf6c03d6428b69dddf5b04b37f032,1,0,Audemars_Piguet.com.xml 9958965c85c1e2203fa9c29932aba3627a4c783c532451f5e361d6eaef334d4c,1,1,Audible.de.xml f1e1d94408e9b68398d42e729019d1813b0a87bd4ddde260b6bcab12e5044edc,0,1,Audience_Amplify.com.xml @@ -403,7 +401,6 @@ c532f455966d1864042489e42a050a7d2f7c59dcb18deb69de94d6a18599565b,0,1,BlockScript 1f156e7ffe3c3a4cd612b99433221f8138dd8f2789dc983bcdcb0d7a373c899e,1,1,BlogCatalog.xml 0345c0f4ef1e2c9b07dd7af1ef177809cb3437ca02fe2d6e4eeff5bc45d8c2b9,1,1,Blogg.se.xml 8fbcb0293f6b69cccc5ee005717d13b0c07bdcadeb8d4956cc07ee4ebd189f6f,1,1,Blogo.xml -b1edb730a701fd91046e91447f3e753ef58801073ef89b3304d6eb080fdf2cd2,1,0,Blogspot.com_blogs.xml 1f133fbee8bcb5a78a7b039865a38c14c1e6435f48d93a61a9125ccc4d83f90c,1,1,BlogTalkRadio.xml 3958f7571262401df5596dc64eb26c150ccc8e8cb412301000e4c13d5561b13e,0,1,Blottr.xml 7f8d5059120ac4bc4b0db885a258acbf9264b9d9c90e64dd3d029ce789fbf078,1,1,BLOX.xml @@ -434,7 +431,6 @@ f68cbe5a7566d885e719495209b6492cdd2d7f5e9a22cd09912a08a5b9ec6865,1,1,Boots.no.xm d217680bd681c4891a8a378e8d0cf86ddbb1248ffb73cc4b63499cc5177dd4fd,1,1,Born_This_Way_Foundation.xml cd5d99534f588512306421c08f2731bd2e8f7bf28d34a8ff58ccc0ce90db9d0c,0,1,Bosch.com.xml 33fdd006644fc9144ab8e95658080cc6a7a02dbd974d3ef819a370534b3af584,1,1,Bosch-Sensortec.com.xml -c6c18a71ab271826941d7f1c532b9b26be9ee8f7dd0c32925bdbe6203746c42f,1,1,Boston_University.xml 309241ac7c972b6682c8ada9ee98789e395848d7ea1a1f3b6b97eb309be1ac07,1,1,BoxOffice.xml 7c899ec80cc19d4ae8e2999849a3624f6891c104df4058edd230652897815e28,0,1,BrainBench.xml 1d53d0a63f2280c5e360c716028d5e3cc3cc47fd94ad17573feed81e5ee2d13a,1,1,Brainshark.xml @@ -551,7 +547,6 @@ dce47057289512712f6a81473c0392ebeec435bede445e2418949d20001d4c5b,1,1,CBS_Store.x fa4b5cc10eda4105a919a14355ee198140034cf659b4de8d84c4db1b2e0d0647,1,1,CBS.xml 30013485574b054268bdaee6655f649027c836449bbea345526fde438960fe73,1,1,CCAvenue.xml dded44f856c5b22d92e7be6fc15b90dce78ce9a0c565ef54ba0fe815e78cdbcf,1,1,CC.com.xml -2d265021229b69c10311b29249bbac63a42cdbbf79f925a44ba9559e7a7f9bf7,1,1,CCCure.training.xml 7955a0d3d6af6b18aca473a36e0f62d93db444b63e032c8022673c2dae949c0a,1,0,ccczh.ch.xml 1c4096e30615c3d13b6ecac18f42304e15922a35c07ef669ec8f3dc245701606,0,1,Cchtml.com.xml db451c15ae5f229be88b4de367c9a6a0589742ddf7a26b1eacd518efc87527d4,1,1,CCH.xml @@ -560,7 +555,6 @@ dadc27805296e0616502f8dab61f19e1101e29bceeb58be4d7628fffe56f0a8d,1,1,CDN77.com.x 12021169f7500a9698c21fb42390772f04504964944dfc3a2e7d709980879cee,1,0,cdngc.net.xml f20f66759481152d644ac6d66b0beb2c0c6294a7f5c3931b3ddab5c43aa95551,0,1,Cdngeek.net.xml e3d1fbf663250b13e6cec1485aa7fe068e14180f6883b42fa9681f007004852f,1,1,Cdnme.se.xml -5878f1e899db043e9b127a9e795b3f99e54bbbf4b5edf4087282657af37fa5d9,1,1,CDON.COM.xml c2c8b3ebec631dda1317ae648abdb8820843f2008bfb084ddd40867f5942ee35,1,1,CD_Universe.xml cf5327ce99f02ed18d5249e6578f78a7584c6f43c05d2cd4ddf8a1aef16a1223,0,1,CDWG.xml b09ee57848b20dc5f0edde7dff31b6dd704d171d7494f0b4e566b62c8587cded,1,1,CeBIT.de.xml @@ -786,7 +780,6 @@ ecc5224bdf13e70d53652f6f917ddaf3525b293a3b014583a7e366f04851145c,1,0,cwrap.org.x b17c5b6f92f191120aa22ec936beae3a2e3d78e5da93467bff6013eba2ad8f25,1,1,Cxt.ms.xml ecb6609b54104e170eccfb8b213b46ef8571ed159691b69cd4e38ef28887120b,1,1,Cyando.xml 62f9443ccedff68a2edfe57cbd28c734eaaa8a90177ec3ef972c51a0a7441715,0,1,CyberAgent.xml -8d0dee876d4bfab07ec23efe97e2f11fa140c227ec76a08ae9bb6af931ae5b84,0,1,Cyberciti.org.xml f31a224781a44616ce4b02e2f73ae07661d790019f81c90b1a0dcba209a1de37,1,1,CyberGhost.xml 760cd650faf849e6b19245755eefd6460eb401ad4e174983e7dc5a28a50cffef,0,1,Cybermill.xml c5f1993198ebf0755d6d2b884f09cca076a78cd635c91810e60e6d0c36938638,1,1,Cyber-Security-Challenge.xml @@ -828,8 +821,6 @@ c938b7f96b109a0488d5408bf9ff59dd325df519710ce2a786cc712cb86d951f,1,0,datafile.co 1e3a6e9548c4695e497f2c70b8e140a688d130c1aa832f6ee57dc3d40db76f01,0,1,DataSphere.com.xml 3313bd09107db392a871be91a9de6944cb93895ae79e67fef855166adef81c96,1,1,DatStat.xml 61b1cee10b27a9b8e031b2b4ad79ff61d242091833f4dacba9ff9595cf7636b2,0,1,David_Gold.xml -4629315336c43061242bd362a2e859852e14635f6dd9f83244aad1217bab4681,1,1,Davidson_Tutoring.com-falsemixed.xml -e1a0066617d2024182cc30bf849782e20e6ba3a89bac047901a2dc961801763e,1,1,Davidson_Tutoring.com.xml 12910fbfa21be2b1e6c8d237c720fb5b8b6ff1adcee00d90cc7922cccaae0f82,1,1,Davis_Instruments.xml a57ae2eea0e68d85ded9207e3de25e2e19bb21187e9ffa2ef3c0c4e1f2e95727,1,1,Davpack.co.uk.xml 7b9a385cac34756530787bef70a0eb04727c5cdb270609c2e487ffc181f07e2b,1,1,DaWanda.xml @@ -1108,7 +1099,6 @@ c3187433dbd4e12c9601d6e430156eeea8288466cb27eff31b4505881707bded,1,1,EzineArticl dbcecf1c78f18bfa326267e0ca37f8f94debb98236913d73092883b39df4f204,1,1,F3images.com.xml 03aee00629e0916b9627f907484ae885e2b9e783dd789c7b928dff3dee8da925,0,1,F9-Distribution.xml b775d1948ffe06ecc74d13e8d848fcf29e33f2acfb5d8c799f86fb300196a02a,1,1,Factory_Expo_Home_Centers.xml -4a92ff9d921991ed19d736e4a949785ed0d552507c4e119a2d63cdf6451bc9c1,1,1,fail0verflow.xml cba3793bd310eece3add728dc772c0c7f787935f717bd45cde44971041dc88b5,1,1,Fairfax_Public_Access.xml 40df368dc0fe51e760a55b921447ddf863c15c59432124f7871688c0b713239d,1,1,FairWorkCommission.xml 2720b3927f1899938a11c2ed29befd009d6de512bc85a56b924a91df4778b087,1,1,FairWorkOmbudsman.xml @@ -1168,7 +1158,6 @@ c2a6e87647595dd9487c3959ff5cc3b598bcf08ccbd358f24f90b988c478d8be,1,1,Firedrive.c 03e5723aabe6c8aaf1cd4f50bfd7796d1434c774178cd04e445714ca33c448d2,1,1,FireEye.xml 265ad3eacbfd50c7c49f935afb3673fa55071a44114e1ee782e21f8f25a29f84,1,0,First-Central-State-Bank.xml 711d4855340b3dcaad02671121099aa096bea856730eebec67c4231c89ed2a2f,0,1,Firstfloor-Electronix.xml -913044ed60c86459293dc58bffb73faafe062040562e99683547bfb0efecdbc0,1,1,Fishwrapper.com.xml 875a6bee375333a5648a79ae88a5850bc492a276a55fe8d7d13cef47a90784db,1,1,Fitness_Market.xml 698d76438e1237c5c6c2e2645d5ef1ed3872510a0856110e4576123d8375113a,1,1,Flashtalking.xml 9eda8209afff61900e1b48f9864a11eba047613312f2a7dc0b644da1e26ed4b8,1,1,Flaska.net.xml @@ -1349,7 +1338,6 @@ a274061c2d10fe93f56a7434e7f541897c64f1749bf842bb7d167eed03b32155,1,0,GoGetSSL.co 9224e11b4b259be1d60b4d65c3903a9b2fe7403753ce0b1a540bc526cdb8e21c,0,1,Golf_Course_Industry.xml ae0c17b4f9b2118b92c083f5b024f659a2b5bed3501b6fcfecc889f139b07c95,1,0,GolfLink.com.xml 7fc9cf927c9b92789e3d57fde87b70aaf938b68e6b71adf4319411e2af1c67f5,1,1,Goodsearch.xml -4e34d2d1ae795f5f1f4967dc035fea1bffe66c10b9be5c480ef5c479c0e97e18,1,0,GoogleAPIs.xml 894a38a1bfa54c3a04c42e941902cca0f0710f90f7775aef31e5c27ea9fac6fc,1,0,Google_App_Engine.xml 0c725c221c4a8e11d3bce46b3913dcc855ff0d8155a559d7dedcb06179079d4b,1,0,Google.tld_Subdomains.xml b6f212028d6d4c769e74c2a583a04e9387edf79312d44599a8e9a699554f6f20,1,1,Gotmerchant.com.xml @@ -1411,7 +1399,6 @@ d97fb94656263a08627931829f3707297aaad16a2780d7efbc08d9a0e240af5f,0,1,Habbo.fi.xm 7d8606707ee04231db6b0d4851ab973945fabaa28907734507adcacff32f6095,0,1,Halebop.se.xml dac5301bebe14f1ee9837b4c5a6625f8cac9103160009bb80208d40085a88c16,1,1,Halifax.xml f6db5eb6d184772ca7b3555d4e88f0a3432ec670229ff8901d31ea9fd4ec977d,1,1,Hammacher-Schlemmer.xml -4d0eaa91de4e6754869abdf15c274f35381f5bf1afe0e9fc9052bf4104b34cf0,0,1,Ham_Radio_Science.com.xml c4c6765b82c3995fe1018d07d514748b3b1dc77463bd7f9745d4f81c89729b7f,1,1,Handmade_Kultur.de.xml a8183b3aee9c2ef8f331f6d2b4a65f99819fec523ff1df7d10cb69ed6fd7c746,0,1,Handsome_Code.com.xml 971d2e3a417a2054d72f3c1fc7282cde9352fc682a4d49a41928eb88e1467e4f,1,1,Handy.de.xml @@ -1483,8 +1470,6 @@ f6b2d8963d38550c2dbaf89a83f410d46d2e8a2550e7c10bb6e935323775dda5,1,1,Hochschule- 338e8194a619447d5b6188ffe7ec92abe2edfdb81aaa618a04cb38f9f63635ac,0,1,Home_Depot_Foundation.org.xml 578f4bb8f6049f8a710575d2cd6745abacdd758fdb9898236fdec1de1eb8435e,1,1,Homeless_Veterans.co.uk-falsemixed.xml bb05f17daee3073ec173b76d03df68b328b8f2e002052788c00f83e7d1e25001,1,1,Home.pl.xml -2a749798febdf66cd6ec4ef005ccf4582f6933089a92ace7e8a16076fa0a020e,1,1,Home_Theater_Review.com-falsemixed.xml -df969ad273e8172206d03ca88b4364ccf3e6d2a4845c0cf0af679df21643d1e9,1,1,Home_Theater_Review.com.xml a259a3473fffa759dda3cebf532eece1bd5c6f0aaa9779ddbc946eff7955f5bc,1,1,Honest.com.xml 2a0ae89908e8f949c6d795d70f1c330db51e91027ed35620c29c343d7067ffc6,0,1,Hoover_Institution.xml 8424d16e90d4f392b330a853e9dbba7677c71be3a173955f5f1d593fd5d5afa6,0,1,Hoovers.xml @@ -1535,7 +1520,6 @@ d44de59e34457e8ca6ea85aef7ac9db366d5bf1f0f174e5089aad9fb97ef6407,1,1,IClick_Inte f18922a305bc3be951a93339bd0045ab5ca5b9741009636154eea681291cfcee,1,1,ICommons.xml 459c2616c37ab24f3cb76f67f308f3e275f69c7f57af5d4d277720641f62c078,1,1,Icsdelivery.com.xml 01ce71e4cc4fb37d2563eb033d05b04889e3c8838cb8acc1e9c464bfaf632235,1,1,IDC.xml -9cd416d67882d8ca5a6a85768c1e9efe5851c8547886e0a5ef64f3537d9bd5d1,1,1,Idea_Fit.com.xml 047c2947f163b74bcfa7c71e4cbaf7b19e2c4fb951dc2bf975446720dd35fb3d,0,1,Ideas_on_board.com.xml 201db5adb55514cb0d85c5312456f1e1aae6e433e9831a3ef712d9dd524186f5,1,1,IDG.com.au.xml 068471ee0af35f0b5f19a2fbce1c23d98772d18b84d8c2f3ca2de29249535c68,0,1,I-Do-Foundation.xml @@ -1737,7 +1721,6 @@ a6ca9f9ad95e7e241678458d14169a02757c470fbb891504853b72a2ce450cb7,1,1,JunoRecords 4b35e98b981f9df97de267679053b07d243573d98a3b6c6ccb0cd6398c50fd35,0,1,Jusek.se.xml 4f66a213e609f141d907611e755bf0e4379e737428775635060e8cb0bd91ef8c,0,1,Jussieu.fr-problematic.xml 8e25f54e02aadf3128841a9ea2f14f2096a975a4cb6578297be4bb2d78e4d9a1,1,1,Justia.xml -3ffc4c90eb55a5902906b2548756880e99f8852f53cc333c8771882eda6e392c,1,0,JW_Platform.com.xml fb593e8ddf88bcb1d1508da06196adc76706e4a163a0e8ceabace9e8a5bbf42c,0,1,K2s.cc.xml 18bd1f18f953302be45bf882bd9b3b8f6a738d8f6e1f844dab416d95b018b248,0,1,Kable_Packaging_and_Fulfillment_Services.xml 8f18453e3c720bfbebfb1708243a5a25fb7434df4e016246e8ea288eca398952,1,1,Kaiser_Systeme.xml @@ -2052,8 +2035,6 @@ b5541e596d343de6ac7f39223a9fc7c06ce47c438d9defe9116ba674062af063,1,1,Mellanox.xm eaef01e50024132334d995f459f0f3fcc9e56637833c501e91dcbd8dfec3073b,1,1,MemberClicks.net.xml e47e56fc2167bb71faaff4eaf4662649906521bd26184dcb825797080cda7f60,1,1,Meme_Center.xml a7b15f22f33f9e813d7f180f35ff06455b5e6e0edeeef8c25afe80d49275ddf6,1,0,Memset.xml -c5de1e13613e8eeb7384ecf45b27d4803aade3abba654ca1905db8daa2b0db54,1,1,Mendiant.com.xml -794669fb05be6a00a168ef208dd01ff274bf97b4fceb70bbd042f028553962c0,1,1,Meningitis_Trust.xml 83b98fb018f5e976e289dfcefce50a3c9760aa54f0559c78e653a3091594d38d,1,1,Mentalhealth.asn.au.xml d9d780181e6b685923ce463960f139165dd4b6a6abb333a07572740b8eb10ef7,1,1,MentalHealthServicesinAustralia.xml b6ac17c4eb8e7ef94bfc420b28afa15310ad85f56084302c595ebdd204b039be,1,1,Mentor-Graphics.xml @@ -2100,7 +2081,6 @@ f3a697540aaef0be6325b039f1a9ba7dc726832ee3eb7f859294443cebc119f0,1,1,Minnesota-P 6c223b9ce65007f261214b35fcf2159a01f0f18dce768bf330106f9a954a07db,1,1,Mirantis.com.xml 09cb67edc92fabdfd6ce3ad9ed0a50a6fe0176b9a963ac378e71b5e28c8eba71,1,1,MIRC.xml 1c912cdd8a192d284723cd6aa022312be9af7d9d0f153ebd9332012212f7edd0,0,1,Miretail.com.xml -061236d61478786e14d8053a3363db41586052cc3c914520a4abd6853467f347,1,1,Mirror_Bingo.com.xml 9d8fab8adee46ed120024adf277f77a07f8b7e20949e017f80f9697faee06667,1,1,Mirror_Image_Internet.xml 2fab3b5ae13f2fa84cac1b55ad4db417d235bb8c5b29182ba71fed019e20fe3e,0,1,Mirror_Reader_Offers.co.uk.xml 2ff3585db12a09dcc7ce2218ddb43eba82e33b365d5f9071f14ca094566b0f6a,1,1,Misco.co.uk.xml @@ -2140,7 +2120,6 @@ ffbf6ec6cfeef71b445211a87e4abe5ef1794e3d4fadb7d684ac90ac68533790,1,1,Money_Advic 36b5b18cec1c6053b839b2494fe6a9cc04677550a912ae7c47a8798e061720df,1,1,Mongabay.com.xml 5815a878524ef05df0e2e12eac100fdbb8ed34fde5bb861c2cd87813d647d42c,1,1,Monoprice.xml aae2b974d06ff8cada6f693625e967c89ed2c4dbfcac0885da285be6b1f2a4b5,1,1,Monsoon.xml -45ca54c8645155a251323a04e5676b32605facc832b8ac1d3cbdb11fd1257ef4,1,0,Monster.xml 16b17f054165cde5317da14eabc04cf40ed40f40f187a46a39a7107e46877ffb,1,1,MOOC-List.com-falsemixed.xml d5fd944719061d5c68cad846b8b479a3010bdd26ea072f677c0e77b09ce61746,1,1,MOOC-List.com.xml d81ecd8589db295fffab19937fe47ed705feaee2204af4290985b544c6f36cf4,1,1,Moonfruit.com.xml @@ -2330,7 +2309,6 @@ e5e9c8fba237ed6d57e7648a12033fda436f40959a5876ec4fed7b1fe419f112,0,1,Northwest_S d88941553216a375019bef623617831cfed119f7e9a45de9c09e31cf9259c4ca,1,1,Norton_Online_Backup.xml 208eea5047faaae533aa5050a7401770c5aa48183eb4835ec2d044898c666123,1,1,Norwalk_Reflector.xml 70ff96450eacf3dc60037726f4a4fb075c8227e7d102758ec4d3860dc3fde0a1,1,1,No_Starch_Press.xml -810d45a0584894225fd3c3e66c707a791528729a596c246aeba0b1e69c5ffe68,1,1,NoTex.xml 0c6c06f058c319c6c3d20b95c033c01e344f10179b032110a16706bc2333d3a1,0,1,Novartisart.com.xml 65f54df3f15bdf0f223df2a16aee88e2f7c86595a22855e25e02f5bfd8fe209a,0,1,Nowy_BIP.xml 6c9a823e3a18a17c3ecc62249c7849fb7205d4a3914bd90a63a55d388f44b207,1,1,NPario.xml @@ -2357,7 +2335,6 @@ abdf7c3d9a2a343830e5249d3df8cedeb901479020f51d82dd4b814d2d309f08,1,1,NYDailyNews 5c89823371187d2f4ce51cd50e123987b1ef5759c98b3696c3e6634fbcf9a373,1,1,NZBMatrix.xml de36e0b17ee514a0df985867ae86c2d541221b07758c981e8cb0531f6f05fc5a,0,1,NZ_Herald.co.nz-problematic.xml e1a3d986985d25415f778a47600e667ad8e9bd40fc84210cf071cc8402d01060,1,1,O2_online.de.xml -51d4745d946951d441a19db2b3ca4b677f850270df45f0241565bb8950527710,1,1,OAG.xml e79232198ecd818d2c8984bcb40357ff099f8916aee9743b4ab5cd29856f0b30,0,1,Obermassing.at.xml 7a6389ef271a9d5a4dd6cc58ca95d36ee4fd49f8166edb672462ea728bee070d,0,1,Object_Security.xml 74bd810666ffdb4fb2893f61b6ec93bac1fb8d2bdad9562cde970cece038f8e6,0,1,Ocron_USA.net.xml @@ -2458,7 +2435,6 @@ ff199168eef28407f5f4ec85c4a28f7c4bb363a2b1902a775788789754cde2e4,0,1,Oversee-mis ec9f53ceaec2456fb948c8a5eb1457115b6493829f0c3924f3c8b9191462efcb,1,1,Ovi.com.xml abd84a1bd03337f09f42247bb9513e11cd227c36a62e212ffcf035388923e208,0,1,Ovid.xml 3ef27ffb6b59429f3141e44fa25d541563857b34023b5af2a3f1c54676b1181b,1,1,OVPN.xml -ad5542092112d567a1f242111e90dc2478c0f9f27ac6c47613f6869b716b0d32,0,1,Owl.English.Purdue.edu.xml b3811d1dffe75b829ae7b3e3502df1a9e74bf01a4f58bc96f863e6ff5a7c5a78,0,1,Ow.ly.xml 85829651a7aac63d0796f06fce34bc598e0db69ee307923c0dd4a4a0988b83e0,0,1,oyoony.xml a2a23af5c2ae4a75d2bc089e535640eeeecc2dc198cd238a388b41feb8da12bb,0,1,Oyunhizmetleri.com.xml @@ -2581,7 +2557,6 @@ d008a6ff2c3b16c6fbe4d134d1c1aa6b7f333d343d9e3fab3f88f9cd69599cca,1,0,plarium.com 287e64d55238846fb01707c87d7d0b7620816da9059a63b0eae64cf45e7a0428,1,0,plasso.co.xml 1094a99b5e8a0abb9fb46b17654826e1a8387207caa3278f89949c8b6d0f2ead,1,1,Platinum_Skin_Care.com.xml 41ffeb380bd1fb5d7972c790667fa5c0d2ccd2afda7a269651a65372b52cfe04,0,1,Plati.ru.xml -af326d89812059824699a52128eb9ce5c046bdd8157ba00fb9a306927ba82aef,1,1,Player-Attack.xml f17442d3412d38817ddf3cdd8ec7f104b45f54d6175505b0a315d5d655d05be6,1,1,Player.FM.xml f8eb1c5b920d861d39f2f49cc5b1b5b781034d05a5c5970492e2ca678feefb37,0,1,Playlists.net.xml 5ad21240dc02ce7be71f92e97e1f63262e6e839d605135c4b82ca69d20115d56,1,1,Please_Ignore.com.xml @@ -2792,7 +2767,6 @@ ac063b2055bee50d03408a58042831dbed04f36cfe06e464a9ab053b262db8a2,1,1,RHUL.ac.uk. ee3295274e717ecaaf0d99b9b99610049b00df35e27bbd1d91b219c65a5be2e9,0,1,Riksgalden.se.xml ec0851667677ff8540dd4ea8454573e8d97df70843756980d2f1d6db93586f8b,0,1,RingtoneMatcher.com.xml bf59bcd24750fce1e1b920a8626d7ff5fb298dcb0a958e7397f9068f35214f6b,0,1,RISCOS.com.xml -40c3057198595bd588d189d5177158b4d586158746d3bc7e1e215fc7ebd553af,0,1,RISI.xml 6e88581ddeba07d75b4981e54492a29299b1f8156fd7ba4e99081b05d53288ff,1,1,River_Island.xml cb8b94399027893807adc9cefd84a64463afce56865fbe8a7cc757ceff822488,1,0,rns.online.xml 1c4ecd5ee6961bc004080667e3b8d84872a002463135edc292ff5bd8faf7d6dd,1,1,RNW.nl.xml @@ -2848,7 +2822,6 @@ f63a6ea74e32500fa23e7e6c33d5b88cf6e5055f226cf73fae995bb6ca13f268,1,1,SailfishOS. a67b67cba419c9c60f5af4693ade3ab0f4dcb71c0447e14eeccf5d9f8ccce305,1,1,Salesforce.com.xml 70625d04b2bfb69c56b1dc93d19eed236e18e861c8d0134b164f8a348ade9116,1,1,Salesforce_Live_Agent.com.xml 223be5286839874afef4638f6b87c51f4cb2d2ecc551bf4e994ba0a022b78fd1,1,1,Salsa-Labs.xml -f92e7fb57b22d52399e4c0d35b3dbe0c92199f74c3dd8e162c1471c1e129cfdd,1,0,saltpack.org.xml 75108b7344354283a053208b4b002cfb64ca61e7a0fa3ac8932dae09d438e700,1,1,SAMBA.xml 4fe8a655c2e05111677d094899b626987d18679aad18ffd1e17ea5447c3818fe,1,1,Sam_Harris.org.xml 01dba19f9f9788ae453c69f33547f44f9ce790306025dca03d3a164d40a62dd6,1,0,Sam_Whited.com.xml @@ -2906,7 +2879,6 @@ fb80a2a8a1de294899f5a0615851aa20d733698590215f4fa5306b9786ecebe9,1,1,Secure-paym 9525a6188a7e9f5b3c1c275dd102918e5bf2e0be9561ce805c76515560e3686b,1,1,Securepicssl.com.xml e90bb893efdea1ec9c5bb9495ee3f16b99b88f068d8ebbe8577bb184967d07aa,1,1,Secure-secure.co.uk.xml 5168a7a30822faffc7e43d14f7f2914acefdd418f2e49375600c5efe60117cb9,1,1,Secure-zone.net.xml -8d5924a73c465922a620bb20ca5434c669b38cdb4d64fbbceaa5d6d5a4ba81eb,0,1,Security-Database.com.xml 6b20be37aeafe97b9c0449d7815f06e73d80c685be3fad2d6d6a97ef625f3727,1,0,Secusmart.xml 28bdc6b9c0d2041fc5fca0b87c6c88e524efc63ecf62bb07c9433ee7fca42194,1,1,See-Group.xml 016140d2cd3e7f46335c1e8c10c52d963c71a2c4cfcf2c5de0773d0304ee8b84,1,1,Seguros_Universales.xml @@ -2928,7 +2900,6 @@ d81422829b52421b14bfca59b79fb365db842a0b397034e091479e98b3b20992,1,1,Sferra.xml 918a1e0571e6f44defc2bf02af57fbf8810a3d199b9c410689c99fad66b3f10b,1,1,SFM-Group.xml 90e39924d85b911e9ab7c92ec676692a6f3cc4253ed1c5cd48ac62b788bd4d08,0,1,SF.se.xml b1ddc8eafc9185d502e8c25fa3239d0ece0bf86bf9dcf471af0dd11ffb792f4a,1,1,SGNO.org.xml -4879203052c968a23bf9bd2d905629b0e4f1673d8261980d38548edfe94f8e99,0,1,Sharedcount.com-API.xml c63ba028a20f75448202f03fb3e41640315b2ed13e1688c1d3de758805546912,1,1,sharetobuy.com.xml 52619008e0a398517bd3ed4b130df71beda4b92d61fc2261ebbcb4a4d9489a83,1,0,Shaw.ca.xml 7da57b9006c6ffa8d0b351327d1fe45ebf7c956d087d4428afe41f92f6525389,1,1,Sheet-Music-Plus.xml @@ -3052,7 +3023,6 @@ b5fef9d252b9d468bb4a06cb784eb0689306edb43caf7f52fa0924fb9124a51c,1,1,Sonic.net.x bf0300e1945b14a33128707161ddd15d8744caac395131caebb69d6388005502,1,1,Sonos.com.xml f6596e850c1c453085e611473b2611a58f4146e6b34cc4264189a66a0e373e18,1,1,SotT.net.xml f141656339ca12f96352ed3819bbbbb35311d5bd2e0d452076254e352d9ff7b3,0,1,Sound_on_Sight.org.xml -619dcaab20e0e5e15a6a0431ff33a3c370287dad679d9e71056e1c3adec4068e,0,1,Soundowl.net.xml 332bd57c7b60f5d23b775ce135ca931d9d5c37508ac7295cc655e0f90f5b0f37,1,1,Sounds-True.xml 59cfd7776a8d4bce0bd6e2645e2c76d072a8ff62b965aa2999fea197c839f393,0,1,SoundViz.com.xml b92e96074327a0dcca5d00643ed1fd4a4e5cc464d810283d4c9e9295a3eb5190,1,1,SourceCoast.xml @@ -3223,8 +3193,6 @@ fa340bfec44c43f86207ca9f60d2b470bd94c4b4b2eb8886e58fd20688f4eea8,0,1,TelVue.com. 068c6ab7bad10838f3256658455b0c882ee2d2cf27415bf6c64b2843c88011ce,0,1,Terveysportti.fi.xml 80a2b0d54ed1eabf4ff9c4d5b2d7955a37a11eb7ea64736afefe5df15052f142,0,1,Tesco_Bank.com.xml 1a0f294d147c61084bca26e4d51d13c0f5abe9ae3065b7940718a9a07c9e1b01,1,1,Tesco.com-falsemixed.xml -575eb3af9769d0ce1f20cc9cee5ff5acb28ab6f44ec60d859178a256e6100862,1,1,Test-IPv6.cz-falsemixed.xml -31e9f9460a5bda894fb347fb2f5530ebe65a74bc06abce265502c32a8ecad2fa,1,1,Test-IPv6.cz.xml 0bdd9de6f132176da1797d3ef1d413079dd56859ceb2941d363e9b312ac79103,1,1,Texaco.com.xml 33075ff0e10375dbb062e8d90fd798a3f81191feb017bbfb5528f1b7187da08e,1,1,Texas_A_and_M_University.xml 1b947bc4c20e6b67ba9c208a49aa0e2fbeaafa70ed3000d9c30e43f07ee54eca,1,1,Texas-Association-of-School-Boards.xml @@ -3276,7 +3244,6 @@ a9de1d33f1d38bbc31b35dc0963ce198eb843d292d2ee9fa9f6341d54b993f8b,1,1,Thinking_Ch 7ebfe09e0a8949490a8587707a0432e4c9ecc6b38305d3f11014c757c302672c,0,1,ThirdPresence.com.xml f984c8bfe7914af11862ac7153e159855cb7d3e1a595680c956728afbcde57fa,1,1,Thirty_Meter_Telescope.xml 67e41bce1db89ec4e09f46c662ca6a2c7b126f6d57052abfebdd25316a9282c1,1,1,Thomas-Krenn.com.xml -4a9d2df9e9f0b9bcefb9c1e2b49d8279f452e0519f697004dd78004126488f2a,1,1,Thompson_Hotels.com.xml eb2a659b523e5b8dc3ed7f51cce652abac536d52c86bfc6aa421408330b64963,0,1,Thp.io.xml ed8e09d2aa2ec5b033c3c629ff5848b8ccaf666077a033ff24db674a987c002d,1,0,Thumbshots.xml c572a5c33cd5817863bcea276085297977e5d272aec438c1c73c00d1c85efc35,1,1,TIBCO.com.xml @@ -3398,7 +3365,6 @@ d34257489620d9704f3ec14ff12a39809baeb7c02949733582eb599f0de93e07,0,1,UberTags.xm 0b1b418c73486bc0dadc747306a39b269d9cda91ef3292cc4149aab30e0f43b1,1,1,UCAR.edu.xml 49c96678bc86a99b01c12892885c4fcf38f81dd5ff32f582af605567f64fd5b8,1,1,UCLA.edu.xml 995aa7cdbe60994801ee5330b1ed5f89e56b12fa300fdd71deacc89cb1e21d51,1,1,UCM.es.xml -3edef7d6624a72e587670864119d5587024b70b17a9d360dd391cf6163afb74d,0,1,UCSD.edu-self-signed.xml ea8f9bf69a5d5029ab1c217760e6e27c3b5a4e9672ace704a2f9f7d8332bb497,1,1,UD_Media.de.xml de858af31abe4402e1eaa36359f7c8b42140cd93c64fe782cff904c0d017796e,1,1,UFies.org.xml eb6933d91ead523edc38dbd9150d966f34dec36a99de379f08e2df51f1e94139,0,1,Ugandan-government.xml @@ -3417,7 +3383,6 @@ d4aebf02f3bc14f99eb5edd840295f9a9ea83a9da8590405750ad92cd27a399b,1,1,Uma.es.xml 1fb81f92216ff932aa6f19d86d881e1787d534499a3de722e4422a269e346e35,1,0,Umbel.com.xml d0c3484003d83f62d4d3a818a40dcc0d92ab8c1ccc926cb54c42bd7270d80cd7,1,1,Umea_University.xml 5b2e32e00cef0ba0a625b106e51304e2f1432b8eec6915189e2c20ff889b4210,1,1,UMonitor.xml -a75901d1280859f2ba4c333fdf95af3c18e54c071710400658d67851599372a7,0,1,Unblocked.xml 828127811d074dc9ef16975754dad838fa0174cc97ebcbdbd4dad31574e584f7,1,1,UNC.edu.xml abde55d39d54436f83a19a822428de73e001bc42b5bf7a6846ecf331b8786696,0,1,Underwear_Expert.xml 3980ab0dcdb98b47939dfb35d9b10c9b1ed6266f4a7f93aedb305004afb8e550,0,1,Uniblue.xml @@ -3713,7 +3678,6 @@ ae329e6dccdf72e9be85e53412a7f7a5a53fd44ae853a3e77a20bfeb506b7ea8,1,0,Westoxon.go f6818c41df99bdc8cb6885f67c27d91672a516cc1a15610b5c301a9d6ac62bbd,1,1,Wg_cdn.net.xml a8ee7b73785bf6447ac322a7af90fba115d2e75bd6a0ef6e7a90e387727b3035,0,1,Whamcat.xml 6752c99fd0b439b67c13d1ee1063aad8dcf1eeab6e963e406d5a7d6f60af26ab,0,1,Whatbox.ca.xml -d669b7329d3d77ae1b7ea27a18d05c702e30146dd819f21fd6385c13fe879390,1,1,Where_2_Get_It.xml d7537f7e21858dae64562a4f7e64eb14ad7608c4cd25e133a867f51bfd3a0ac9,1,1,Which.xml 50c7f973e9fcfc2ac8b4f4e7a496a4219b21d97805a22d7fa46f978271a45de5,1,1,WhippleHill.xml 4e1e48a6d64b79dbafb4bc50032a7e7cd1d71d8782f4c67baa2c1000f2ad0a54,1,1,Whisper-Gifts.xml From 37369143fb9c8f0608cec4aab404aedfaedf596c Mon Sep 17 00:00:00 2001 From: William Budington Date: Mon, 26 Feb 2018 15:29:57 -0800 Subject: [PATCH 844/844] Signing data from AMO. --- src/META-INF/manifest.mf | 736 +++++++++++++++++++-------------------- src/META-INF/mozilla.rsa | Bin 4185 -> 4210 bytes src/META-INF/mozilla.sf | 4 +- 3 files changed, 370 insertions(+), 370 deletions(-) diff --git a/src/META-INF/manifest.mf b/src/META-INF/manifest.mf index a84e08a980fa..086a5cfe2b4d 100644 --- a/src/META-INF/manifest.mf +++ b/src/META-INF/manifest.mf @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Name: background.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: R27Ir4kxKIWgy9yBlLC2AA== -SHA1-Digest: vZ94ALa52F6K7950Ry52JH2pXDE= +MD5-Digest: KanHtwKR6dg0/32M0cIhNA== +SHA1-Digest: hW3opiUMGfWBukU6GFWpI0MCrbM= Name: bootstrap.js Digest-Algorithms: MD5 SHA1 @@ -52,8 +52,8 @@ SHA1-Digest: yb8hDRKxyRv4VfPLW3qXO+PxkWA= Name: manifest.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: x1WcixBsIHN3Sq/RlNCskg== -SHA1-Digest: fdOnj00W9u1OvMQPUak86yufIxQ= +MD5-Digest: xcQwXzQdG510EWd1HjLkVQ== +SHA1-Digest: +FiEIb0jk5pFCL3VuufXYlbk7Og= Name: options.css Digest-Algorithms: MD5 SHA1 @@ -87,8 +87,8 @@ SHA1-Digest: IwxDUDsW/rcGQUfYLbrSUtsSiFI= Name: popup.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: rpqnrEmp2w9brb4o1gBhCw== -SHA1-Digest: nGqFLZ4y51lfdMabaxOP2ySKYQc= +MD5-Digest: 6c3y7XCZd+9TL8qxhiJ53Q== +SHA1-Digest: QT3wnPn+TdGzTBr6vGpcad4p4cY= Name: remove.png Digest-Algorithms: MD5 SHA1 @@ -102,8 +102,8 @@ SHA1-Digest: N7QeKrLGibRCy43GTd2Sp/wIy5c= Name: send-message.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: OLqYbvChNYvDXmNu1RVcSQ== -SHA1-Digest: c3gJM8jessaip1UCKp2TPtpqHBw= +MD5-Digest: rmSGFp68ayWKmwhFExLZEQ== +SHA1-Digest: +UrGk9ru4aqjp2UREPivEVNbk+Y= Name: store.js Digest-Algorithms: MD5 SHA1 @@ -132,898 +132,898 @@ SHA1-Digest: lLZr1VxIu65mjm+SB1F7f9dhSdE= Name: _locales/ach/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ady/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/af/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DRbkAVx8Gj3oeRXZNwS3Jg== -SHA1-Digest: iTHCvsgSqP9ipTpDucVit0R3PrI= +MD5-Digest: QrP8qP/ik06SaFcRjeXJiw== +SHA1-Digest: 8iDooeI8hlA2C0p3TyLTFws09VA= Name: _locales/af_ZA/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: C3rsjMopt60Go5RGI7QV5Q== -SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw= +MD5-Digest: fvpiFgE+kh6+hbEU30UZSQ== +SHA1-Digest: ISyE3JH9f7NG5eIVN6pUORAmesI= Name: _locales/ak/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/am/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: o/drBPHjjR//E5b94CS8MQ== -SHA1-Digest: YQpJPI9SY0Q+GhGWrwhsnKSIqxw= +MD5-Digest: ao2nZ+mpr831ud+LF5+7Ww== +SHA1-Digest: 4O0qbV73S9T82r/xMpkYLUrg5tw= Name: _locales/am_ET/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: jc5+c7ZSijXJ6G9lDHntsA== -SHA1-Digest: O/N2Bx4h2BvY0k1U6sR5WpA1uIE= +MD5-Digest: hZHp/bXG9mmRkN2uzrb+5w== +SHA1-Digest: Tu3kgpVVO5uV/C/zRBD2W87pLgo= Name: _locales/ar/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 4p3fquiAsZdNSt6PNhY6vQ== -SHA1-Digest: cyX8HCqoF5nf38HRZ3Fc5X/eTZs= +MD5-Digest: TK5Xk+k8dMCLhCmstRFsmA== +SHA1-Digest: s3rkRnq644zii6MqpSGR45ymJgM= Name: _locales/ar_AA/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DARP7ysqdZQvIQQkbs0eIA== -SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ= +MD5-Digest: 6zP0AK747FsOwwOJugfYvQ== +SHA1-Digest: mdM7LrdnOH2mxzWkiwS9o0gDwFM= Name: _locales/arn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ast/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: y3rto/Fr5Zy0VwMDQLCv0w== -SHA1-Digest: GeT6fNKPjLnGuE5zzX1f0b7RgtA= +MD5-Digest: jsfwDX72OXxkxfF9+N6ssQ== +SHA1-Digest: X8REK3uLUdmPgToFD2nzZxkPqWQ= Name: _locales/az/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Rr3423WvKcSeBhR5mYHLWg== -SHA1-Digest: fAUF+znZxwwdJEVRgZsQimkaKuk= +MD5-Digest: 9+DO97Y3O4GLP9CW5uoH+A== +SHA1-Digest: eU7BuXyoQjXPzbENMt66oORs+aI= Name: _locales/ba/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/bal/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w== -SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM= +MD5-Digest: BNI3d+r1Z00iZD7FNjCs9Q== +SHA1-Digest: RzXQoy5Wr29tYchTAc8/i8NIf9M= Name: _locales/be/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: BG56IqbbUeKJg9Mo4XeMfA== -SHA1-Digest: vCUFlC290mGBZw+KLHofklaQ8uY= +MD5-Digest: Kv6cApccBSMjk744cSBguA== +SHA1-Digest: kTtU6C4q+hZfDyISjk/aO/ZwDRk= Name: _locales/bg/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 5M63Iwlw98OqkI99sKfjqQ== -SHA1-Digest: 3lFzCC7DoI+U4wnMzj3/3XuBHuc= +MD5-Digest: nP/pWtUIZUPp8qL2KrV/Xw== +SHA1-Digest: P282Sd9mi34cEzZQfIOGf6aSTp4= Name: _locales/bg_BG/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: C3rsjMopt60Go5RGI7QV5Q== -SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw= +MD5-Digest: fvpiFgE+kh6+hbEU30UZSQ== +SHA1-Digest: ISyE3JH9f7NG5eIVN6pUORAmesI= Name: _locales/bn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: qmBLnnEoDavEelOkIbq8NA== -SHA1-Digest: rtf2CDbvsyDkEvYqtJks3dj9O4s= +MD5-Digest: EUpkXGzHgTkKo7C4npBk3Q== +SHA1-Digest: kvA4LJ1qSDfLT+cYtX9yz37yaAg= Name: _locales/bn_BD/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: +Fxhg2HKov6iOLFwCpVRAQ== -SHA1-Digest: sZwa5KjWChdMIqg8JstDXMJ4a2o= +MD5-Digest: JOajenS85iBCVyB24cVDfA== +SHA1-Digest: nr7kQt+DFmALA/WnuQyff5754nU= Name: _locales/bn_IN/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/bo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: ErOLX/uqDydIibxJ/BGiuA== +SHA1-Digest: rxaTbB51XiPMMDiP6t8dLtPzPHk= Name: _locales/br/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: TtmZdpt2wgS/gM5VguCa5Q== -SHA1-Digest: 3be8pASueWuMkqbGpWrNsKgGOnE= +MD5-Digest: tn0Mcn8pIVhGvH+JG8mvoA== +SHA1-Digest: wjeH2NiI3UrBWeYZL63yHSFFS5o= Name: _locales/brx/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: BF4EDryoZx9fjdjR3/2h0g== +SHA1-Digest: qp3R5mu3xKnBImiAXf+MLz38UCA= Name: _locales/bs/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: bY0RHTln+zmaJHs3y6vy8Q== -SHA1-Digest: IunKatiMDIq1R8ExPVu3O2vdqvk= +MD5-Digest: wtf9+57xMNVJ+U7OZU2IUw== +SHA1-Digest: OGK1P5EnDT7q8GWEwjM1/7aPTWU= Name: _locales/ca/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: lUqlkznSO7atQrHXUwtMgA== -SHA1-Digest: tpGAgpc1SFNY/AhWzX8G301zEmM= +MD5-Digest: xUTRdXiMEOD9Z6e8ywYGNg== +SHA1-Digest: /I0Fwl0cBg+Zyc8GQeOBrtlrfKg= Name: _locales/ca_ES/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: xg1eQj0qTl0n/MtyCIAzVA== -SHA1-Digest: 00AuDH7V+k8mRjeImQ9OU4zdMI8= +MD5-Digest: 7oECuvydKqgfx01QhHuBnA== +SHA1-Digest: OO2Rq0nIhgpW93YPU/5yin1CEWw= Name: _locales/ceb/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/co/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w== -SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM= +MD5-Digest: BNI3d+r1Z00iZD7FNjCs9Q== +SHA1-Digest: RzXQoy5Wr29tYchTAc8/i8NIf9M= Name: _locales/cs/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: CnHU5Pd1xSvemH6jnYPKUg== -SHA1-Digest: sCqGMSAjIL6aPxymvuHhuNv+HEw= +MD5-Digest: qIwkcmab+0QG4r44Sd5i9w== +SHA1-Digest: 5Qx7aXI8Tq5YTGQ7eddOpvnKBKU= Name: _locales/cs_CZ/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DARP7ysqdZQvIQQkbs0eIA== -SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ= +MD5-Digest: 6zP0AK747FsOwwOJugfYvQ== +SHA1-Digest: mdM7LrdnOH2mxzWkiwS9o0gDwFM= Name: _locales/csb/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/cv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/cy/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: zM6yUS3o+LBsTNRyNSl/nA== -SHA1-Digest: /wAVqNc7XeDhtdJp1WlU4H8z4R4= +MD5-Digest: YDebH6XuvkVYw9OprgWmkw== +SHA1-Digest: vHI2Obg5ycdNglheir3U+S4gel4= Name: _locales/cy_GB/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DARP7ysqdZQvIQQkbs0eIA== -SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ= +MD5-Digest: 6zP0AK747FsOwwOJugfYvQ== +SHA1-Digest: mdM7LrdnOH2mxzWkiwS9o0gDwFM= Name: _locales/da/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: HJ6ZF5oQS6u6qaaQBROZGQ== -SHA1-Digest: c7CjAoWGcLcHDQKhTbde3uALlcU= +MD5-Digest: mp7vlYQ+NzZW/liDR2kp5w== +SHA1-Digest: qLVBy2K2+u2uTnyRpDm4KdPCIFk= Name: _locales/da_DK/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DARP7ysqdZQvIQQkbs0eIA== -SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ= +MD5-Digest: 6zP0AK747FsOwwOJugfYvQ== +SHA1-Digest: mdM7LrdnOH2mxzWkiwS9o0gDwFM= Name: _locales/de/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: tgZ/4eZ2RkcZeoMxFpJWEA== -SHA1-Digest: C6YGHTiDg7UUe0ePlLKU6rQ7biw= +MD5-Digest: rb/qDPi+8zd6JiZvyzok8w== +SHA1-Digest: P32Es3QFMUTxDYKAXTWkwxTXAdw= Name: _locales/dz/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/el/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DLO6pF7MhiGXGTUH6uiUMQ== -SHA1-Digest: QMgrT02LFDoLBybZGuBbNLl4p1E= +MD5-Digest: E0vVWcsI3JyCUMgrfEbRRQ== +SHA1-Digest: zo/cib0Z2EjwNoqCTxGAf02I/Pw= Name: _locales/el_GR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: C3rsjMopt60Go5RGI7QV5Q== -SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw= +MD5-Digest: fvpiFgE+kh6+hbEU30UZSQ== +SHA1-Digest: ISyE3JH9f7NG5eIVN6pUORAmesI= Name: _locales/en/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/en_GB/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/eo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: MR6vUO9Fr6VVB6FGTUUF3Q== -SHA1-Digest: A4hQgcI4uWwHv71HjeiJSi5xurI= +MD5-Digest: bhFCOi7W4NusIeXhgn0H8g== +SHA1-Digest: /dGB1dGACuNGB2wfLInXL18Li04= Name: _locales/es/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: TP7LwQDo02Y6AKOfmaNWQA== -SHA1-Digest: oOcr98qUOknShf286kzOScvedhc= +MD5-Digest: c3ASoZIBIIywtlz4z+tAXQ== +SHA1-Digest: EZr2+gL33D9p6pIHaQ2BK81ht1s= Name: _locales/es_AR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: i8hDlH0K/U5QxcB7u+zfeA== -SHA1-Digest: /lcSR/DYoCmjHG0QtAHimzmOIZE= +MD5-Digest: qNvpoOjTHLvDwvvdfW96wg== +SHA1-Digest: Fb1M9NvI4ZupNIyVhtbOLYOULzA= Name: _locales/es_CL/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: QWya5iwFXT8B1XvyZQBbKg== -SHA1-Digest: AZkLdHhP7k6OXaclzlTH22sivxs= +MD5-Digest: GFcsjPbhub/ONamhrunV0w== +SHA1-Digest: inHnYtnw3TXhTmUnqn3gCchQk64= Name: _locales/es_CO/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Id7wiaUdcX0F2Sjhjlba7g== -SHA1-Digest: qK6x6goz6XYybj708m5wPP5YL34= +MD5-Digest: Ezdifm/evZq/sIf0t2cB6A== +SHA1-Digest: rEi7WwqG+vAX4vheRUtziL/Ej9I= Name: _locales/es_MX/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: u+un2pERqRGF2Ll4TdBVCg== -SHA1-Digest: WBrI/uE/wY9lOTCGrOWvCKdXf0s= +MD5-Digest: KDLWWlYlvbVR6wgVDm/Ogw== +SHA1-Digest: DiixGruOLspweqMVyrqpca/2Q/U= Name: _locales/es_NI/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: C3rsjMopt60Go5RGI7QV5Q== -SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw= +MD5-Digest: fvpiFgE+kh6+hbEU30UZSQ== +SHA1-Digest: ISyE3JH9f7NG5eIVN6pUORAmesI= Name: _locales/et/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Nq7rhtZMoHbY5JAd1hARJA== -SHA1-Digest: HGBqRBX/8OMtz7WXl3YrP0Wa5Lw= +MD5-Digest: LIXii2G8s8yqPPD5ZIteGQ== +SHA1-Digest: 6HyGFX7XszHt52Ml81storTP/h0= Name: _locales/eu/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: D4sn87pJGYS+q52hI5MdJg== -SHA1-Digest: uC+G76C2cs5K7uXewnBTgov1Zho= +MD5-Digest: SPmYmvkSDlUjNdpYkKukww== +SHA1-Digest: tiQXxEwrmXVXCMf74NdXtP2PldA= Name: _locales/fa/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 2zwAgyaECJXMUvRff4elPA== -SHA1-Digest: 6u2PI/NBrBHbJjO/ms5IswtoFxc= +MD5-Digest: Jr4cZCUzLgqGz6VNFCRpyw== +SHA1-Digest: q2kQUhZvRQKIeSejNoenWh3FWxo= Name: _locales/fi/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: xNbF3R+kEAcDoPFBDfbgPw== -SHA1-Digest: Bh0JPIUBNRgO0GFrt/o1/2fIXKA= +MD5-Digest: hfAgoFte8Y4+9BKi8C8QGg== +SHA1-Digest: M2gujDfYLtq2qNvNwp45181WoGU= Name: _locales/fil/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: mVMTkZsPu3fS5tP8GNUU8Q== -SHA1-Digest: K8BT5etTl+iZf57/4x8gnSBfyKw= +MD5-Digest: tsVi9AvgYCUViOP4RuOvpg== +SHA1-Digest: iweucF9wOyW9Gww9vNE1zOiKyIs= Name: _locales/fo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: TX5sq1YAWC2+8y2ghMEYDw== -SHA1-Digest: P2B+mVgwBTMU4enJ1P7y+mrAvTc= +MD5-Digest: l6pkmEC3Cilq8D+GZ6huXA== +SHA1-Digest: HT7UegyWR2gV4JaIfsyXJNwIF9Y= Name: _locales/fr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 8UE1N6cjR1dtXhmsZupScQ== -SHA1-Digest: oHFxQhW6JfZu06Ws34nVZF/3oPw= +MD5-Digest: +BCGPQ/D3gf6ZDnWMyR+vA== +SHA1-Digest: C8mLp1l5f0VSywLMAGguAp5Xdhc= Name: _locales/fr_CA/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: yuJHET6210PgBqtl0bcX/g== -SHA1-Digest: MwxMft6YzNpXi1HpZyLk3aTtLUM= +MD5-Digest: 1VAElquNzHTgaf6TEPBQ1w== +SHA1-Digest: cZJEsG8J84m/isy3VTlKjEd4lMs= Name: _locales/fur/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/fy/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 0HHLQ4vO3bSFV48wzYvTqQ== -SHA1-Digest: AGs588E92Gni3uIBneq+C34eVGU= +MD5-Digest: iJIoo14CqjDaufhMeHEg1Q== +SHA1-Digest: PBN35fca7cY2Yw6yguDHOe2D3mI= Name: _locales/ga/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: C/z8EGP5uQDW9oaacxkRTg== -SHA1-Digest: eQvEB9Xhk8XtqLKzxSr08AtLteA= +MD5-Digest: bLbOmbLuu5C0yz4v9fR0qw== +SHA1-Digest: xjTFA/Pyz4SLyNah5j49TRB58a4= Name: _locales/gd/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/gl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 154o38YQOMC6B1c1IaKDiQ== -SHA1-Digest: moUaisv4vuHp1KfLFD/nEN9oi8U= +MD5-Digest: hfsh9zYrgSLzLwbNbEqkjQ== +SHA1-Digest: 1B2nPsH4tqrZyjZXFQuIO7fA57M= Name: _locales/gu/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: PuGvgHNuAxl7IeGsEUnVuw== -SHA1-Digest: 5ZVlhPHAoLpUNOccVeKYCGB9hI0= +MD5-Digest: 1bcQgj8xIGaVHMx60b/34A== +SHA1-Digest: ZA/9elyHRdJe+iWGsYUK8p4J5EY= Name: _locales/gu_IN/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: eKvJNhbDUGYAtBw48jCB8w== -SHA1-Digest: oJWDRND8u+W3g3lHtIeu4eWNSrI= +MD5-Digest: PswWEObOjz/JWK6HnwcuDg== +SHA1-Digest: tLY+bCELqZMh7zsH1dwrww7jALo= Name: _locales/gun/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ha/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/he/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: NTOHUD7r99WJfexqovtZag== -SHA1-Digest: rviNcNcf1vxGW8Mly+QAbE3B82U= +MD5-Digest: I4VQv8JPTpYsiTC9zxJI3w== +SHA1-Digest: IYj+JIjS4b14Ls+CMMu1Ok2qf3Y= Name: _locales/hi/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: jGoeudpwuZTMz1mY5vChrg== -SHA1-Digest: mTlAA8ggJM9SMuUVA70fC555Gg0= +MD5-Digest: BbjFGeNyp6qNSA1yPMTbDQ== +SHA1-Digest: jX4kOPeOVmHs8DZAY2qNVITIYIk= Name: _locales/hr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 4tLPvGdXG8e6seOf0EBOBg== -SHA1-Digest: 0iQ1pKEsZmbw92IzCYAVNjE+S7M= +MD5-Digest: eyt5Q+WVy88GABWBVZ9Scw== +SHA1-Digest: rULT8xOZivVGd8EmIZTIHdbl9xg= Name: _locales/hr_HR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WQE7FFzzeHy42j7rt7q1oQ== -SHA1-Digest: VhVMMJQm9fafW0yHHwLA/l4LQLc= +MD5-Digest: LcyrmuY6JuBIWSlZ+HI+gA== +SHA1-Digest: msxkwNPM88QPVDiePqhwH7yRnao= Name: _locales/ht/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/hu/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: s/Tbsyll/JcjI0LF8bVNdA== -SHA1-Digest: xSr0fnT9J6WtfLcvDbqcLyhM7ig= +MD5-Digest: dxETChbUwA08tJYSSer8cQ== +SHA1-Digest: 68UcUd2etljz+iUZkl+2TqlrUbM= Name: _locales/hy/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: g8Rw1lIpA5prQbGb6RxRog== -SHA1-Digest: 9PJv5Ot0X9QYZqj9pa0hxaWCvGs= +MD5-Digest: MNm6Jay2dpP/5K6SmgfsNw== +SHA1-Digest: ZTaWRGL/mUcsPzO8PY04OzRpxXk= Name: _locales/hy_AM/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w== -SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM= +MD5-Digest: BNI3d+r1Z00iZD7FNjCs9Q== +SHA1-Digest: RzXQoy5Wr29tYchTAc8/i8NIf9M= Name: _locales/ia/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Rvl6xzKS0/2m/DcmkZLiZA== -SHA1-Digest: tbIv/BmQ2jBDQ3NTCrOKbzqxvBo= +MD5-Digest: wvd/jCKGuplM5zJ+CVVC3Q== +SHA1-Digest: kKE/lrnNBI7ObgTVtHlJpnlkqMI= Name: _locales/id/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 7dLZyCol2VchgVjHAT+Law== -SHA1-Digest: Ltj91tOYYRH+0vvnGtDucHgCbNQ= +MD5-Digest: ASwud1XKYzKzfWv4FoI+aw== +SHA1-Digest: DZK6I6t2bdVGKezjx2mn8NPTYCQ= Name: _locales/is/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: UhSsbk1anjN7v+dqvxDHmA== -SHA1-Digest: RcgwoP9G1AV/RfwqZUcTls3UC7w= +MD5-Digest: KqgD8sAcINl1E0soHKwwBA== +SHA1-Digest: sNsfxmgxE0S5yHD0egcenjFek6M= Name: _locales/it/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: iAxmBKMo22L5ehrw1SZ58g== -SHA1-Digest: /ucFdyJtKzS3Xq2k5gNhcUpXA3g= +MD5-Digest: r0xo9tBV4jsi/fpCMsZGxg== +SHA1-Digest: tavF+CnStNfZoVMjsXnrqSSGZWg= Name: _locales/ja/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: YZIviaHbnOQsu6g9RDffvw== -SHA1-Digest: a+rOJPet+WMVb4A9HNoWANjMlF4= +MD5-Digest: Gc+Rx51ScMIzYsjTe0mgUg== +SHA1-Digest: /Ej5kRSu9loAFjfygI6J6qduxrc= Name: _locales/jbo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w== -SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM= +MD5-Digest: BNI3d+r1Z00iZD7FNjCs9Q== +SHA1-Digest: RzXQoy5Wr29tYchTAc8/i8NIf9M= Name: _locales/jv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ka/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 5uLcHOfFiVvvp9VD1zzRXw== -SHA1-Digest: HZL9ljlY2zYj2wvx+v+yOzedI0o= +MD5-Digest: 7VFThqiob0oCGVOfdVZ2aw== +SHA1-Digest: cfBqzfKw+Eg+IJr5duhmD8/TOkU= Name: _locales/kk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: uflCz901UdkYCT2AeGrFPw== -SHA1-Digest: DenWUH1joMtOLAzqdoPDF3ba9jc= +MD5-Digest: O3M56FMB9l32RlZVqVGMPg== +SHA1-Digest: l3IMd/C2XCae9QyMHcMn6oZOI6s= Name: _locales/km/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: FA6fez7nHccUQFmqkBhzEQ== -SHA1-Digest: D+TBW7Yz3OLhLM1STmUu57O1WUU= +MD5-Digest: vBt++Unhr120qpT5C08RKQ== +SHA1-Digest: f2stiqfStjrfea2n2Ai6UAMuRuQ= Name: _locales/kn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: gt8csChP1x5gskzYIQmS1Q== -SHA1-Digest: PSfEYTC3ayXPng16di5bapumDNM= +MD5-Digest: poaYhKzsynJ0hPYWq6mwEA== +SHA1-Digest: VEdkrJ2/bq8XbYw70wORLCUzzuU= Name: _locales/ko/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: MMN1Sf1gC0de5moD/0g6eA== -SHA1-Digest: 4im/aJrO3cVrNBFFkanJozswPTc= +MD5-Digest: BdOBLLKOwODWkoHbRZf4kw== +SHA1-Digest: brzgWZZX+6R8SL4zlFAXipjMNWc= Name: _locales/ko_KR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: JcGzScF7MFhcmzwgxeP9wg== -SHA1-Digest: YONseXbEHvYAG94Cb29XzU+bIuM= +MD5-Digest: ZkSzzV6oid0zbWewFw5a4g== +SHA1-Digest: LzPVfFuYMG7oDxjvyoqKmV8dH7A= Name: _locales/ku/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ku_IQ/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: UyKZwau2LAH6fKOQ7GNDfA== -SHA1-Digest: fkhg2lHbVO9CIWThWxs+hL2xsfQ= +MD5-Digest: +mfOW1DpBWbVc5tKHjFzrg== +SHA1-Digest: hdOaiNz9qI01Fhe85JLuKAZ8Sts= Name: _locales/kw/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ky/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 1+5VFH+EipBmDx7zwKhinQ== -SHA1-Digest: E54eUkttC8lG6fsqMqMPIcvdBVg= +MD5-Digest: 1v3bahI+TyArzQxHbo+tvg== +SHA1-Digest: rC20iCFOKIdMsmzfaKooA9am6Ok= Name: _locales/la/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: AtKntqi6Ku7LtdpzsKBCmQ== -SHA1-Digest: k1HEnKL1qMj0hAK/OUOq/2gdgFU= +MD5-Digest: zE+5E32rDzAVQ1pFNKcFLg== +SHA1-Digest: W64o4lqxA5DwVUt0Bu7ubDL5XSw= Name: _locales/lb/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: eSg/KUtsCGzyT3L6K3BLPg== -SHA1-Digest: 54HMWmM+nWqIjgIc9yYdHkxMQP4= +MD5-Digest: 4wP3a0aHlO9J08ouUVukeg== +SHA1-Digest: Ff8nGZdQVFHBriEvZvhMxOF1K6g= Name: _locales/lg/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: CmANA1mgHtYuLoR+8lUA8A== +SHA1-Digest: usBIvuGGx+HjW08UpHGYUaTqurE= Name: _locales/ln/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/lo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Rvi7CvhoPCXF7O4T3z5Pwg== -SHA1-Digest: xe0gTHbQApklgy+N55AtBHlKYPg= +MD5-Digest: JZZf5z4YuSGzohZ1kOQWew== +SHA1-Digest: uZRyqDYiIPJt9vq5awMEsS6/OQE= Name: _locales/lt/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: e7z6iwFKoKfs4PTuke/3wQ== -SHA1-Digest: OxawAJIP1gqKX87GeVrMkUWKwtE= +MD5-Digest: YCpenKEi1oZwkaaLo8GKeA== +SHA1-Digest: toCINniRqBQbbqVpo61nfxNh8pY= Name: _locales/lv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: lxv3HBEJ6JIujDtuNM1ZZw== -SHA1-Digest: NGWrKHZBEm3i/fZVqgDnb9unysc= +MD5-Digest: TEnA7pp5vL/43tRsKp5lWQ== +SHA1-Digest: IS1UXx0G335XhJuSy8s7noAhlOw= Name: _locales/mg/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/mi/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/mk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WUeQgMtao5r1+qpsgWYTsA== -SHA1-Digest: bt5rIy3qge0nCZSf1dUaXHhgUEE= +MD5-Digest: Uq0EdUWxU3HD51cyyUnC5g== +SHA1-Digest: gMjPDneI+GxOq2LgWJbWe/k+O5g= Name: _locales/ml/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: nno8lLTvVAxdRkmZZrqI2g== -SHA1-Digest: Mb0dyQwuP/iYtJpleqMeFm++Lq0= +MD5-Digest: SCjN2cay7y1IqQnGkgSeBQ== +SHA1-Digest: lhgluzQrNJmxkqQQXARwoXc34Z4= Name: _locales/mn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OWnkYxWWcP6cqXUSAkMn2A== -SHA1-Digest: +rDEViK6Lh8R1rv/se5Mt+enymo= +MD5-Digest: /hqCpCUwJHnha1ryd7omBg== +SHA1-Digest: XzWi3+mPz9MFbsSZoW9vvHdb3MM= Name: _locales/mr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: +uYGj0MelzDYqCCg8YwM1A== -SHA1-Digest: 37w/UXj+uGLW52Zf1ph95hQREfs= +MD5-Digest: kCW07Im7fa4kTgfczYaCjw== +SHA1-Digest: V8WrKBf4irdmtV8yIJxKuAWwN2I= Name: _locales/ms/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: nncMdJtLDd94XtqIXeKqZA== -SHA1-Digest: CvaJH1jojZgUrS5YxQ0OH+6Y7og= +MD5-Digest: g4pwZCtIupPAWr29rE/4ow== +SHA1-Digest: D93mOzJsMCSIwc1TS1w0PrEZkRQ= Name: _locales/ms_MY/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: X0lBU66orvc5FyhGKayUNg== -SHA1-Digest: VJCkmb4b+kc1ytFN9lzwt6/0iEg= +MD5-Digest: BGoQZkS9c46AbglBLOhAgw== +SHA1-Digest: fa+eXftLxpxfxyAyJPVts26w7/c= Name: _locales/mt/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/my/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 2prdCNfY+hEtD+5RhYujGA== -SHA1-Digest: Sylysr0dDR6/M5Zr19xTQNwT7p4= +MD5-Digest: 9UKY1Eot/+MtFGFqtW6Y5A== +SHA1-Digest: Ng5XzEbt/smtdmIrWzl4i2p2M+c= Name: _locales/nah/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/nap/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/nb/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 2sgYMN3RYenYEeX4MuiFmw== -SHA1-Digest: x/RHxcSRpCtuYrLXYHHyP04gTlI= +MD5-Digest: 3itx4NBLkRWkENTTZ+ndpQ== +SHA1-Digest: dt8XNR0BBtp6SQbq8TgLsA3PODs= Name: _locales/nds/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ne/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/nl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: z9cyNlm21U6wSLRso+9dcQ== -SHA1-Digest: Dn91Pch4bdG+/+zVTHPJ1kumatc= +MD5-Digest: abplyRXjWNjJ89AwJzKs0A== +SHA1-Digest: 6IEvo3Br79iZ73eZHgcwOxXkKDc= Name: _locales/nl_BE/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: ZvYi/D5sDFM6XOxOivhWXQ== -SHA1-Digest: HCxNv37H86EufsLLBB4QkCRrCSU= +MD5-Digest: 5wv0KXVYdmXBI1NSAj6jng== +SHA1-Digest: p7Rz3DBrbRm+y4rj/JmuF7uRmuA= Name: _locales/nn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: AHZBRxPK0rk6aBnS+F8BpQ== -SHA1-Digest: gg7ksA7dUBo9fUK/6bYlCUNv/Qg= +MD5-Digest: 2DqPRPC1O1+qoeElC703Vw== +SHA1-Digest: P79yjSSPaVjDuOjOQuoumw75Et4= Name: _locales/nso/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/oc/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: Z4hbybrcED70sGH2RzuLwQ== +SHA1-Digest: SQPjV3A7fPlrKOZSvVBoBdI8+iw= Name: _locales/om/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: IxuENjd9fcrvgHzPUR0ZLg== +SHA1-Digest: EgxjV0iwvwFxNHnzjovujskjk2M= Name: _locales/or/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/pa/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: P1CkBUYvUODvT4mJHQjOrw== -SHA1-Digest: 3MNWT2czX9PNWuz6cPJJLcPjBzQ= +MD5-Digest: mUZlfhnBeBYSikNTZqB5Rw== +SHA1-Digest: 62VFBoisOvsp4XDwT5fCQtx7gQg= Name: _locales/pap/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/pl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: LNN/7DXRmFpownmSWu5ZKQ== -SHA1-Digest: DqX2eDLPa/+Z39dg9XVB55Vx69E= +MD5-Digest: 4sA18FnxtCt89rz7JTFshw== +SHA1-Digest: 5sNxW9Ch0+qzm/JfpfBWUNzMuUI= Name: _locales/pl_PL/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 3MaorGP93lUpZgCyNy7evQ== -SHA1-Digest: ZqhyMN29VqIF5zQbqf6rC5JIGko= +MD5-Digest: RuTxzGDKeiPVDy2zU/RWkQ== +SHA1-Digest: 7RYUMXFRNqPPEH3KbsA2b1cW32M= Name: _locales/pms/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ps/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/pt/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: q4Qkjz193c+U4faYXjfn6Q== -SHA1-Digest: erJicYlskKpHSxYIqN13CYIQ0yQ= +MD5-Digest: vlQ9+/ARMb2KvfZ7Ze57Pg== +SHA1-Digest: lh/4m13pwEe64clTzyx0gpGHPEw= Name: _locales/pt_BR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: L+yLbmSSC9GHxb4lJxfX7A== -SHA1-Digest: vJhTPFjHLs7UGMoT/P1LXzyDlTQ= +MD5-Digest: +zQ4qCHHKhYMUHpaDsHMIg== +SHA1-Digest: xNkYxiqeUxeIhEaQzLJemBN3wEY= Name: _locales/ro/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 88+3ifHcBeiSAn8XR3VIfw== -SHA1-Digest: Lvc7H7Vo+0QZ5Ib0Vp6d1BZJbT0= +MD5-Digest: 0VHFiF1eRFtU+l9g3mGqCA== +SHA1-Digest: ZscSfNKMWekiS+74TIeq9dNBOhs= Name: _locales/ru/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: m7VKc2CM3Kf0UC/KY1+R6Q== -SHA1-Digest: lyfGzvXNOrRs60v3/2BMujSfnUw= +MD5-Digest: Yt7avr9ldbfeBsXNOsR4uw== +SHA1-Digest: rnNEcTGzt17JvVTRk+H4o2ILxoI= Name: _locales/ru@petr1708/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: fN60maP+k2/9vJym7kPO3Q== -SHA1-Digest: rc1EUt8UO/hNYJF4lB46djCm2JY= +MD5-Digest: TJNVp1IANDmTHiyclptswA== +SHA1-Digest: h8uZrghIyZscpZsqYv5SdMrbFLk= Name: _locales/sa/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w== -SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM= +MD5-Digest: BNI3d+r1Z00iZD7FNjCs9Q== +SHA1-Digest: RzXQoy5Wr29tYchTAc8/i8NIf9M= Name: _locales/scn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/sco/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/si/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w== -SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM= +MD5-Digest: BNI3d+r1Z00iZD7FNjCs9Q== +SHA1-Digest: RzXQoy5Wr29tYchTAc8/i8NIf9M= Name: _locales/si_LK/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: k5PFzPJYlGvxdMtumgpsVw== -SHA1-Digest: mppNy8lcRVJICOx5T6r4LCx8/n0= +MD5-Digest: kUuX2SgcfTuse4wGpT0x1A== +SHA1-Digest: dY27kocNzMcqjo/kks/MC7js6gU= Name: _locales/sk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Uida8b6VsY/UN9bxQrr8eA== -SHA1-Digest: 4tKZ7d7Xbf+td78bu23DbaT/gNM= +MD5-Digest: ox7wpB0btiGyo901TwQaPQ== +SHA1-Digest: Q88eNJanMA693MVUEso8GGYSOHE= Name: _locales/sk_SK/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: qGDOhoGPZhutL3QI9aI2RA== -SHA1-Digest: igCMeOXHyl0ACX45zxmCpG+rekM= +MD5-Digest: 7u+uHl+BFyiZupsixcvV4A== +SHA1-Digest: 54TyczGz8/MjIqY93YrTmf7Btuw= Name: _locales/sl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: w+iSkW90O6JUqNUzEskkYQ== -SHA1-Digest: rrNBbiXy2d/RFwYqpnNG3yhKQsE= +MD5-Digest: Y7L2vZzvfPGDWYVF2bmdHA== +SHA1-Digest: EJjXz8x5sbee9C/wwvaL2C3obA8= Name: _locales/sl_SI/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: mkn4yzvZhUs/wR2jEBJdMQ== -SHA1-Digest: 7tnSyLCD7xHYNezUExRY4yrMkPE= +MD5-Digest: 2+bUwfW+m03lHSiFBVScfg== +SHA1-Digest: 4DaQj7zyVsPP03v/6WoKbuMLHG4= Name: _locales/sn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: TyHB/45DhL+a9sGv5s2uMw== +SHA1-Digest: aTzYUZe4fLKEhfRMrMGLTYKMZlk= Name: _locales/so/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/son/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/sq/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: vsI7qD7EOj/vMfvuM4dVaQ== -SHA1-Digest: +p9DOBL0N3uveBZYits5BNI10m8= +MD5-Digest: urCNCbBYbdEysOykOEtSRg== +SHA1-Digest: fbGgddA7OH30Pkb04qknTE8sJJQ= Name: _locales/sq_AL/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: DARP7ysqdZQvIQQkbs0eIA== -SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ= +MD5-Digest: 6zP0AK747FsOwwOJugfYvQ== +SHA1-Digest: mdM7LrdnOH2mxzWkiwS9o0gDwFM= Name: _locales/sr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Gx67FlT55lApI7RxyleZlA== -SHA1-Digest: nK0vaw3TpIPigmGgRzTgM6d+nis= +MD5-Digest: 1R+nYFv0qIrteSnIuUiI5Q== +SHA1-Digest: UoPvYUdD4qLvRmRFlaX0aoO3+BM= Name: _locales/sr@latin/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: bY0RHTln+zmaJHs3y6vy8Q== -SHA1-Digest: IunKatiMDIq1R8ExPVu3O2vdqvk= +MD5-Digest: tgQyS518t/gNYtPezA7xQw== +SHA1-Digest: KGud290mx33wFXHJWv4dqT9kiHA= Name: _locales/st/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/su/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/sv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: G8sDIND8G5pgmDsLOddtOw== -SHA1-Digest: 9/ZvfXAMpvEZvrZNNAxnRxJrZcc= +MD5-Digest: mO+o12EhfsVOnTo8/RzA9A== +SHA1-Digest: o17nkWGm4ogNxnr8dxONuG4D4gE= Name: _locales/sw/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/szl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ta/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 8txHJO2eiftfXVPSXb/V1w== -SHA1-Digest: Cf7BpBNQv4U06LOoBnwgdAP4JGQ= +MD5-Digest: vEUSCprIkYTaIwT/ukaQTw== +SHA1-Digest: 9uXYs0g/4UZFq8fZEA9NeboH3y0= Name: _locales/te/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: PtZJS+4G+0xPOk//MbkNsQ== -SHA1-Digest: Of/avbdR7Ck3XOdpXd1TTMtw0Uk= +MD5-Digest: LnmcFrCI7hF7bIOR0qqqVQ== +SHA1-Digest: dlidJV2WZUJmhQ9oih0wpCLCn80= Name: _locales/te_IN/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/templates/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/tg/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: TJNVp1IANDmTHiyclptswA== +SHA1-Digest: h8uZrghIyZscpZsqYv5SdMrbFLk= Name: _locales/th/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: nhEbvFcAMGm6E2fcO6/ubw== -SHA1-Digest: RI1UzNi090sWDc5w4PK9wfW3iSg= +MD5-Digest: kUe3lQJq/HsA64W1w6vsJA== +SHA1-Digest: ACYF31xWuSfe630yH7rWTtDZAas= Name: _locales/ti/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: SfsSgBGFHzQHSFBdJ1FmMA== +SHA1-Digest: 1D5ELxbJ9kHDBwGvkV84RtCmnDY= Name: _locales/tk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: GxLfo2IwRJ3Or0RQcGjVZw== +SHA1-Digest: AnZg+hULS0QcS/YcCY2uZi/3qpI= Name: _locales/tl_PH/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: lhpAKx7UadONNJc9NjJqVw== -SHA1-Digest: Q5SYWHUziW+WZDR4WC/L2DRtt1g= +MD5-Digest: 3yy2claPfVAbBjnmoKapNA== +SHA1-Digest: NcE6Ykg9Gf3GCxvKtKRWDn5xNho= Name: _locales/tr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: kiqFJzz9PB9a5dz4R4zvKA== -SHA1-Digest: zG/LHIsCwmh5ENFm68ML06R/LHE= +MD5-Digest: /1ylQWUMUumPzXFaog1ypw== +SHA1-Digest: 3wcnp0yx6a44RQAzLse0YdGOymk= Name: _locales/tzm/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/ug@Arab/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: nUTLhDgeo+A5lSge0FINLQ== -SHA1-Digest: ybbDEdtgm/U1A3Iy4WovuH/e+aw= +MD5-Digest: 9lYm7K0Nklj7ZW5S+lyDJg== +SHA1-Digest: 1WHZbRzVnvk8AZgYWszV0ifV3LE= Name: _locales/uk/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: lpVodIOAsObNznAKGiiJ2A== -SHA1-Digest: LvFYOJErxgVOLc9zysn7DtrM/ok= +MD5-Digest: YyDuJ8LMRmQqAnmndvR78g== +SHA1-Digest: uK2BipzA5MUtXMmGXX4KiptqN+E= Name: _locales/ur/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: wZrkCHi9S2xKERECoDJBQg== -SHA1-Digest: SWl+NUhtUH71zGkllKiUHcW9UMI= +MD5-Digest: moR6QFSzEonnQHYqFTkYQA== +SHA1-Digest: 2Jix6FpdJ3yO8Wk2X9gN+zI+sbE= Name: _locales/ur_PK/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 8kavljYriOUqXxgaRJgm3g== -SHA1-Digest: gDAaMGHf0inPLa0O8mkDU4CAPy8= +MD5-Digest: jAjtZxYZtx8nJwyTyd7wuA== +SHA1-Digest: 3L7oJOisCbhMwxq/vCTcqtm3fc4= Name: _locales/uz/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: oPI13APazNDZkJAOCvHIaA== -SHA1-Digest: y2LtEtm1BLttxgsIVgt7mmK06ow= +MD5-Digest: pzYqqcsvhjyMSTyouT73DQ== +SHA1-Digest: q7baT29sZ7kXIXfYRbHRt1JipYI= Name: _locales/ve/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/vi/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: M/USAY8DSPzQZvCmzfXMzw== -SHA1-Digest: KCiArHd3qHtxwWQRbNpa5outcpM= +MD5-Digest: eXi915ZcclI3DLek3k2xow== +SHA1-Digest: EvB1C2LBw98y3hpRXdhTdo1d5vg= Name: _locales/wa/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/wo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: _locales/yo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 64O/rshBUXPeaQOqX9sJUg== -SHA1-Digest: OaF+IFszompPxiSDf2XvJ0DNU9c= +MD5-Digest: rPTs5xH7W1hEzS345TyH+A== +SHA1-Digest: 7yyv3puI51sM2PGXsCtM0KaMt7w= Name: _locales/zh/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: C3rsjMopt60Go5RGI7QV5Q== -SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw= +MD5-Digest: fvpiFgE+kh6+hbEU30UZSQ== +SHA1-Digest: ISyE3JH9f7NG5eIVN6pUORAmesI= Name: _locales/zh-CN/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: LakdBy+4Q9jIQeKbsxV7Qw== -SHA1-Digest: 5wUQ124LnkjFpdGnsex3fAJnf/0= +MD5-Digest: yfCyijSdHrnvzFX/jutVUA== +SHA1-Digest: JqCcBuncKuLM4j7LRowdaDPeMKM= Name: _locales/zh_CN/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: NFw1qyTQ31rjaP7MvbcC1A== -SHA1-Digest: 5zrsnhAlcZmVxnXfKbljG7VIN30= +MD5-Digest: A9gQQ/2mTEfWxZsWPCUhnw== +SHA1-Digest: gqGIRIB5xYrJuuv75gHZ95h8f0I= Name: _locales/zh_HK/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 4UxKVpKgVW1lWA8Ar2wmYg== -SHA1-Digest: UsgWmWANv7RSL5ubk9SFg7kUvwU= +MD5-Digest: OsJ8mG1XMX7f8McZRvaptQ== +SHA1-Digest: T5ycQtNgMBBduviQzSUTiViUSr4= Name: _locales/zh_TW/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: frIXkXkah+8b/VRiPzv/9g== -SHA1-Digest: Ott9FKJ3g9lVTAJNJZt2dZPqEpw= +MD5-Digest: HkC6Fuatilw7IYbtLA6lFg== +SHA1-Digest: OwcKOCrB+GpPgjobUX6Ns/TdbQg= Name: _locales/zu/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OUCnp/dRaYyMziaOw/sZCw== -SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k= +MD5-Digest: vnA2rbN22t65WXuBlguZmw== +SHA1-Digest: CwB1TFaZsKXNUxYEje83thW9Ez8= Name: external/README.md Digest-Algorithms: MD5 SHA1 @@ -1072,8 +1072,8 @@ SHA1-Digest: PJqzR54BFgNofExLbYn8DMEyvzE= Name: rules/default.rulesets Digest-Algorithms: MD5 SHA1 -MD5-Digest: uj5vcK9EAmxborR/8AmDaQ== -SHA1-Digest: Ev3cJfs0OeM4H66W2s+4UrJWCOk= +MD5-Digest: 1POUbrXhSXBic/Momt3atg== +SHA1-Digest: nFJBb8RhrUo/W31TD735iqbVfOU= Name: test/.eslintrc Digest-Algorithms: MD5 SHA1 diff --git a/src/META-INF/mozilla.rsa b/src/META-INF/mozilla.rsa index f8a7877264f4be02d5e665daa8ce2bdf75813302..e2d4693ce0419a7616370a5ce08655378a11daa0 100644 GIT binary patch delta 3377 zcmbuBX*kqtAIHrM#;(aWjAgP+RQL}wmXjeVX^y=JSz=_YGm)M8n^Bf5r9rZE3=#?@ z3ZWs{WjU2H_CzwuR#f7t({s-0d9LSr-kg`;`~Ke7eZTl!pZoI?y^MAP=-Vi~{JY}J z;?{&AaA-b#+xMm8PzVIe55ReOc8kEEGJxRU6-Yi^7y{6FdH_1CIv)mwK%smRQn1z5 ziY5dg{8tYm#KQ&9Zlt-nfEYlT7iPx|6O%jbL#Fsp$Ru~HhP$UHm2z4mfEwxJ@9(Zb z4I*QA01AH{=Z8pc_o9ZMK1tg5XN5!!0OX~Fv3h`(mX4OTmOh~G^eyWD6af$`2=ITu zj8_b5cjQNa+i~-WK~0Pq-jH4LVgTa%wxF1Rbr97vgcR&UrC?P6r9U1h#3+Fnf;Xyt z&%dwG|L`bw*t8;t{=PC;HZc46!?ci8ZO$%c-SDY|bMFY2X|F8#*JChS??-T3Ogqhy z##*JACFgEdjcaMK*qrp(dz}0EXR7MroN|WvU(~f!O zIbICoo$NR#oAwKNg0Gy?C!Z`T3Y|RM8(|WrOd%! z=Vu-}Y1U1>8OJQPnT>~-f+Dh*y>fOg1gerT>^Mi#RZ_rvvwQ>vU-tT}eh*)V@ft+S zXl#W|riCsFKUs$i?#p(RW4;k*?H#S_VP9C^9*sq9!tH{dKObncM&r)9xkUKC*G?M# z41VG2QrbcH>o*S>JHX}hu?PJi>P*31FKfkzOu5=BTbC&>U+GZ;aAE;H1cgDkAcac6 z_mPCz$tiIo0m&F~Ny9I)TSB`T>p2ob>V+*c;qD^~|26V3Iuyd?J|UNQ4&Bj7SsQC} z&Tvs-n8YH+@H{ViIs1xf-usqUZPWH$m}`@IVe`pA)gj@2da93t>ISK_REcTp1nTGX zu?)Q(Q+&1=;KZIf0j4&UvA~5GNoO zD+4D4F^ry6CfFu);JMx*5!O=CE1xpx5t^#R@ks9W{%7qvaaamATKY92B!AXKCv0|7 zVr$AvNE^2;tA6IK{k$t`4C5IK=A`x?rU;S4Yp=5AXCkw*424y{l4!?gnBfs|p%9t< z@*cCc$sCV@*DaiYZoj})X?J6Fz9n9zeVoAM+~NMzE?F;I50S}qX>^@J$_Vy0e&V{9 zm5%2t)TrO=K`GH8%X?6Ae?uEp@NszZ*nOKc4Lm1X^wYea($TS#)L=qaAUOwG%WEFUyooot%v z%jh)DHzb67hN&&D1{u6$Ig`gOTwJU?^>Ax-jlG~Y%1h=q-np|k^g$o zG+JNou6)4_LoNO8L8(01vxJ^5T)cEN7yMPlTb?caSHal`fDTvxMoEbugoJJ5;$|Rt z8S=US9>4(rppVn}0k6N~4_X@jGg>mD;OgMRvf~8_7jN$^i-RS#FEqb*`Y;!|w-FP? zZi!@j_`BB--F~eU40zEd!~Sw$^Zc{$LsqfkW1GCS-PaY2^&CH5&uOo`)40H$Zmzrx zRXKZ!BUc5>iaUP3`BBzbzhN8pU}E zGM+5PT^{E6F5C+Lo!Z@Kq1=?iH`xU5Tcp1%_dZQc+v=>vh}ORFPD>EJ_*}%dhIXua zbd}jkAZWQ*an5WMUPX!5u_w(>5}Vj!IBpbmz?6oZPOsyUXW5l zAseD6A3>&BaqOrfHH*V$WgB?lleHoEk~si+1sW&a0p6OFeeT#A-RRuQ4$)>n9N4mFWcegin%J5*`VMp(&f~l?E*^Ma0L6tFcQ7JbPPzi{tA7hsiF; zQJd7xJ4v-0CK)>;RiUi>c9oBO#>0N&aFei>%?hW`t_Miw&CjvLedkjhQkt4t=1UWf zf{hjC@k$zTG3QlUnp#&{cRiZE6h2fMUuZ^pVx@T@nAB3xP`JKxwBcTM$O`nG?DG!P zjEt?Ny|qr{7UkaateOv|*2}8#h}Q8TwI2kdLlOZx-}ryhiyztz7!vOtc%~siLEw1-{%vi!LSpy1vmM2j`Z#ei{+E-I zHuD}5UHR2VR^|dl1(b%@8t8eZ_{qeT9z%_iJGuAvBf^VVp{bUdHL^+VVb=77p ztfbZGpaNOFLw&@{WXP|jamO?25$v*2-RdjFPmOkYWnmHm&BXZdzIt83J2&NP?su-| zDQBp7%JuEe-YpDXqCid=-LIGtTYL3(0}_I5XHilR6&)E;OL|G|?EqJ=)pb4{LBHFP zxo!Q-jJ9{3^hi)U;r$nWWnrDBlsrQEl4w;XVpq|Q)67iqr?HE+q%1p8^LE}N%at(M zV$EA!YENVn?T~Ta~I#BoYe&X~&Q+sS=&Fh`7OgBfk%^IbfV#&sn ziw4(iQf>uQS;W$cC{$(hP@0p7b5&92pup6F7Z~-YV-r|9O!u2JYJXEpfL8sDcK>#@ zG%tIXe+Ipu74at-{nK6Ic!)q8EHA2q$R)u@(h*L~0P>CL8*!0fj{vI@To1$0$!b{o z0-?EA(6sneOUGG^X6jVhrDLdO5Zp5*8<%QLV%OA)JWp9kZ6;5=Tn{TDWJlZ09*L(S_1+L)S^?7~2(oNu7RIh*^7ZZ`BQ zH4;9=)+sV+e}umpaq!JDIP)y&n0olZw@UL!*(1xp4c?gueRJ+?qx~gXn$s6%)$MqP z!!UBP(=^NMve&+Gm-&mX9lnT;BP9fcmGal;&Cw<2`S5o?yv09sERTe2uJ delta 3302 zcma);c{CJ?7st&E69$nrq_Jfg!^|-DEy%H^)>;3t?=iYPgJ?Eb9{d|Mcpsolaw>_9mKEWhmlM`?V zSWM(LItUp60RSWf!3Ji5ae;usEKCT<-${UCB1aE`$kK@*g6}nG4vJ#Bvs_({BN0kqkUcYqSN76noM$K|1d9uV2V;E#v4K8tjC08mx5vLo}ReCzw-41aCq#+i|&dTTmV8$kQ1qnK%z8ID6~2X@rNKM zO8G#l|0NLwBrk&JS8E6_yY=tZf9`b<1oHyzZIJ>9J}`)60+15;weCTfl^1yGBvKk7 z`RB}hq-20Dp*zUgMI1XVIt1vQstEud!gdJ*sh#SxXVs@I|T*1 zE$}>4GXOdZqYSZ2I5lfoCAX%}^qBsLr0QhZck8RU3u%87GYoQf*>ADgU2R@VLuAKS zb&pZkCaoKULV~E`KpjeD%QRb**jG{?kmt|7K!!$ zoO$Rn1y>VW=;J37lqJVY(aqZ$tsb6{Jtn_7roKUzIN2~b*w%tcfsy^)LmkTcjJqbH^hnRADGXW4zVI*g&k>u7fq4*9f9Vmton$j`&49x8 z1u4h7p2ZD+kPfdaowlH4G})3X;1}*kIG$;-E(?;}I8W`O%S{WpXeSL79c2i|qo4K= zb}9s^KoEcl@P7vmA_4(SlxB4A_fOwDm~0d`7;etTW&D=!f-#r{V}%f9T~bg-aMj|b z?7*7uHfe`t+M~xJ(54RP(w*&haOF|^6)r_gZ@1muYowf&i-vp?p{F(nV_4m_o=WA4 z6#M0oey*?T8WG+?A^sM#N~PeW^7k6huE*0LgngarLWY$aakE-S(^J4tc`^O<-&^}y^e7~fV4Xhs7(k#oD)^Oxn zHva?s$1m^vAN^R{Fq-$s>hq}oa#l8A=e29<7q1I|h%EvT3uIX*foZQ9w;m}E!vA2R zI{}cLZ#Ip1PFh3T>-T&la9PQ#xf=fAl~cy1b}3gl5pJ=!E}RW+{FIHu*8`TyqEpB( zJ5XTtNK1x8lw;!iA5BA^F+^>gkEbNoSJL4_KBr3aj)(92w68~9mYI4c*tn0LlA4VM zzTM_NW)<=ndP=Ve3sHNQB`<&r2w zvvl5?hi96)tX@M9MDQ+x$UO63Hw1Ar0ZBq&k{BAHj8sD@qfsiTU*_~ns{AGYwKvNB zYi}fZ9)c4n1In}}(IeCBlC611G3E2NiNe7*|ODr9|~*Zz3i_EQ~d$XwxKi>umK zcottID-4a7JG6e8SF*fDwekD)%i|*nmxjGaXY##W6_%p2xFRK9P0l|sUdiD|p48lV z6`dWc<$eF5bN%CuR+Aj19W(17Gqo$7T5eI37-7N--BjppMclQZbFM0t+Ls)R&sTRq zSdDT=M>(MeNj(;zx-%z8Pl{8+7Hqp|q0%9TsULd@+S4h?Hcy_=TC2!iy_%uC>;TKy ztRJPYuwbWF>8dw}dqfA`MBScoh053Ds3wnA>=9kQwV%Grt&Cs${8MF&*>Dp|mtaL^ z9Y4*p)NKR@g247_r9^-Rf(Ss93fWHbg+#gXl{3n3%rpdm@5LWeH55F4owUX_P58&d z=3rs^)6Z(g+M~zceMYK;U+v9kv75@7Fq3t9-z9E;?UBIY%%6Ukt>NSTYLYgLQIL_I zd%lk7GCpHg|K1Alr{I8I+^L2)s7jGFQM9IMILNTJR{g#WwQdaFJ;kq&lQI+!(3_rP zaI16a9qluy7wjY~DwHq_wMiuM?9lqOVYyZjkDt^qr#&3V{FbnHF{)MmnAoA*o@_>bCHr?b=Xwh#<^zAf{apOgq+Hb?1CMip12%O`zUh%lJomymR(ZCk z;EN^qvdamD4T=8JtZRbMXQH{^9V*Jp6htD23lL(HMh_$q)lIg$^yq|BMWA_&tzE`-mLaV$LZKujRF_BZ-ODZ7a?ufm=#6=} zz1XvEm#($m?r`kUK)bD1u@j*pMdFBr$!1+}B{QEa`b{*s9ln&m?h0snQlXW8)AEsh z5O^F(1UVkio$UbzB4URBwO5(^Yp?nz$Ni?qzj2cUzv1ana+3UBQ`AZody5=%>WiAW+IRY;}(Xz-Lvma^FT#A>zoDS(9?HsP^pjveRv< z{+ESnHCJZxIzQeljYK9Djc{sDTv{x@MaiStDZPv^)lo@d{RT`9;~070*!tB;C!1SP zvCPzc<$Q##LGz(=A0#R)&|LbVqvn|-*5uFS>toQ{)rT6yApX_;c%;@`9yyNXbhB(i zFT?FlX1oW#B|#fqYP4+4eiMGvWAAkXj}QUK)0Y2y?0Sh3QEQSl|8_g2LB@HL>ilTb z8qc=h$eO#W?w&Mr{eY zGxZ6}Teyow<&f%p%&0LRr86eOzQi)_yQ(p#<8Z^)G+}LV?pjOKG}M6*_==XMv3!@I zP4By~uhC00eUg-;T#I7kCw<5kW-KLXjl0Q&&3}0){L|Z>rebBZDylQtEOD7DI98ZH zWh)nx?BHr4?$3*&u10A$4uw52SD>arIAL6>BJMnmfc50iHuzzCun@h^@27M9z58ccVto9kc4?`^BXLMCU^oVq*Aap`$s$8uEc c;^3^lr}XNmgKOc*(hv=2T+h4sIGW3U0JJaDC;$Ke diff --git a/src/META-INF/mozilla.sf b/src/META-INF/mozilla.sf index 7297b92e48d4..73f7c8f38338 100644 --- a/src/META-INF/mozilla.sf +++ b/src/META-INF/mozilla.sf @@ -1,4 +1,4 @@ Signature-Version: 1.0 -MD5-Digest-Manifest: 9HCE0INabhFIhGXJQSt2iw== -SHA1-Digest-Manifest: mEoqjIgdGVffhoedGtfYkqVYKTM= +MD5-Digest-Manifest: RTNjP2xGPL2DIFWiZTkK2w== +SHA1-Digest-Manifest: TzlMh8Ubgzi8AhXy0qL4X3rUZqk=