From 3197d97e2e9a40f5c5727579ca3a8298121d4c2a Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 05:35:44 +0000
Subject: [PATCH 001/167] Create decentraleyes.org.xml (#11839)
---
src/chrome/content/rules/decentraleyes.org.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/decentraleyes.org.xml
diff --git a/src/chrome/content/rules/decentraleyes.org.xml b/src/chrome/content/rules/decentraleyes.org.xml
new file mode 100644
index 000000000000..53cddfca30dd
--- /dev/null
+++ b/src/chrome/content/rules/decentraleyes.org.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From e1352ad3fa94aacd40b4342a51c29c793d6cb94a Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 20 Aug 2017 13:38:38 +0800
Subject: [PATCH 002/167] Update and rename Discover-Magazine.xml to
DiscoverMagazine.com.xml (#11832)
---
.../content/rules/Discover-Magazine.xml | 53 -------------------
.../content/rules/DiscoverMagazine.com.xml | 22 ++++++++
2 files changed, 22 insertions(+), 53 deletions(-)
delete mode 100644 src/chrome/content/rules/Discover-Magazine.xml
create mode 100644 src/chrome/content/rules/DiscoverMagazine.com.xml
diff --git a/src/chrome/content/rules/Discover-Magazine.xml b/src/chrome/content/rules/Discover-Magazine.xml
deleted file mode 100644
index ca051c78c962..000000000000
--- a/src/chrome/content/rules/Discover-Magazine.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/DiscoverMagazine.com.xml b/src/chrome/content/rules/DiscoverMagazine.com.xml
new file mode 100644
index 000000000000..cb1532fe60f9
--- /dev/null
+++ b/src/chrome/content/rules/DiscoverMagazine.com.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
From 66bceedd20669421221aeff38c99225eb9b94009 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 05:41:55 +0000
Subject: [PATCH 003/167] Create kitaabun.com.xml (#11844)
---
src/chrome/content/rules/kitaabun.com.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 src/chrome/content/rules/kitaabun.com.xml
diff --git a/src/chrome/content/rules/kitaabun.com.xml b/src/chrome/content/rules/kitaabun.com.xml
new file mode 100644
index 000000000000..6d1530ad61d2
--- /dev/null
+++ b/src/chrome/content/rules/kitaabun.com.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
From d2386d06bb48e9b102a1e053b8e41677732db2ba Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 05:45:54 +0000
Subject: [PATCH 004/167] Create FederalShariatCourt.gov.pk.xml (#11847)
---
src/chrome/content/rules/FederalShariatCourt.gov.pk.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/FederalShariatCourt.gov.pk.xml
diff --git a/src/chrome/content/rules/FederalShariatCourt.gov.pk.xml b/src/chrome/content/rules/FederalShariatCourt.gov.pk.xml
new file mode 100644
index 000000000000..433665e35a48
--- /dev/null
+++ b/src/chrome/content/rules/FederalShariatCourt.gov.pk.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From 1f486b4603471956cc0b6ab1500520ea74cf7f63 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 05:46:48 +0000
Subject: [PATCH 005/167] Create CedricVillani.org.xml (#11919)
---
src/chrome/content/rules/CedricVillani.org.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/CedricVillani.org.xml
diff --git a/src/chrome/content/rules/CedricVillani.org.xml b/src/chrome/content/rules/CedricVillani.org.xml
new file mode 100644
index 000000000000..d9918d4e32c7
--- /dev/null
+++ b/src/chrome/content/rules/CedricVillani.org.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From f0db78551ce1f1c39ddf4af18d259f91060966cf Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 08:57:21 +0300
Subject: [PATCH 006/167] Create GenusDebatten.se.xml (#11927)
---
src/chrome/content/rules/GenusDebatten.se.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 src/chrome/content/rules/GenusDebatten.se.xml
diff --git a/src/chrome/content/rules/GenusDebatten.se.xml b/src/chrome/content/rules/GenusDebatten.se.xml
new file mode 100644
index 000000000000..510cbaef67cf
--- /dev/null
+++ b/src/chrome/content/rules/GenusDebatten.se.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
From 9ec1aa36aa1c33f974656607e4247170959fe155 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 20 Aug 2017 13:58:52 +0800
Subject: [PATCH 007/167] Delete Swiss-VA.com.xml (#11976)
---
src/chrome/content/rules/Swiss-VA.com.xml | 24 -----------------------
1 file changed, 24 deletions(-)
delete mode 100644 src/chrome/content/rules/Swiss-VA.com.xml
diff --git a/src/chrome/content/rules/Swiss-VA.com.xml b/src/chrome/content/rules/Swiss-VA.com.xml
deleted file mode 100644
index 1137d225471b..000000000000
--- a/src/chrome/content/rules/Swiss-VA.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
From ccf271fb614a6dfed798362611de92e4e9f583ad Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 20 Aug 2017 14:01:12 +0800
Subject: [PATCH 008/167] Delete BitcoinStore.com.xml (#11881)
---
src/chrome/content/rules/BitcoinStore.com.xml | 21 -------------------
1 file changed, 21 deletions(-)
delete mode 100644 src/chrome/content/rules/BitcoinStore.com.xml
diff --git a/src/chrome/content/rules/BitcoinStore.com.xml b/src/chrome/content/rules/BitcoinStore.com.xml
deleted file mode 100644
index a9e0fbd5be66..000000000000
--- a/src/chrome/content/rules/BitcoinStore.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 51b39095968ee0d81b8f534f470054ef8c5cf100 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 20 Aug 2017 18:29:32 +0800
Subject: [PATCH 009/167] Simplify MyUS.com.xml (#11627)
* Simplify MyUS.com.xml
* Update MyUS.com.xml
---
src/chrome/content/rules/MyUS.com.xml | 67 ++++-----------------------
1 file changed, 8 insertions(+), 59 deletions(-)
diff --git a/src/chrome/content/rules/MyUS.com.xml b/src/chrome/content/rules/MyUS.com.xml
index 5a05f542f377..be7d4d8c851c 100644
--- a/src/chrome/content/rules/MyUS.com.xml
+++ b/src/chrome/content/rules/MyUS.com.xml
@@ -1,64 +1,13 @@
+
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
From a17515b7cfb5570cce3b62f7ed6090fed1a2401c Mon Sep 17 00:00:00 2001
From: J0WI
Date: Sun, 20 Aug 2017 15:54:09 +0200
Subject: [PATCH 010/167] add Incometaxindiaefiling.gov.in.xml (#11968)
* add Incometaxindiaefiling.gov.in.xml
* remove blank comment block
---
src/chrome/content/rules/Incometaxindiaefiling.gov.in.xml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 src/chrome/content/rules/Incometaxindiaefiling.gov.in.xml
diff --git a/src/chrome/content/rules/Incometaxindiaefiling.gov.in.xml b/src/chrome/content/rules/Incometaxindiaefiling.gov.in.xml
new file mode 100644
index 000000000000..d91b9a0846d4
--- /dev/null
+++ b/src/chrome/content/rules/Incometaxindiaefiling.gov.in.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
From 956e60c167fb3b687585edfa46fc00c253a4ec81 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 17:01:17 +0300
Subject: [PATCH 011/167] Re-enable and add Costco.xml to ruleset-whitelist.csv
(#11133)
* Update Costco.xml
* Update ruleset-whitelist.csv
---
src/chrome/content/rules/Costco.xml | 37 ++++-------------------------
utils/ruleset-whitelist.csv | 1 +
2 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/src/chrome/content/rules/Costco.xml b/src/chrome/content/rules/Costco.xml
index ecfecc985023..a358e6189370 100644
--- a/src/chrome/content/rules/Costco.xml
+++ b/src/chrome/content/rules/Costco.xml
@@ -1,16 +1,10 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index f1c36fccb3cb..decc3630cb2d 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -728,6 +728,7 @@ d7baeaa6bec397bdc80535854950e1df5da6e87e37f1d852df3fab12c5764f42,1,1,CoreMotives
2da557485b91db2cd8fd822d4f0c1d8c9d260f035f75827b8721576abb34bf18,1,1,Corporate-ir.net.xml
71251e0392f89cae88afb7ade08bb4679832258a9110d272f04cb4aadd3be46b,1,1,Corporation_Service_Company.xml
96a1e4d8a7a151bf30f2ce5bdbcb762f5322add6297e6a17c1d26ede3953146a,1,1,COSMOS_magazine.xml
+d1698155b22b3b7f5f0ca643cea078451d79ab6779f6f261d8ca54805b3db3e9,0,1,Costco.xml
2468f6840c6141631608ec3bf75e9fb94e1704cfd757a0f331ef2d89376cf59e,1,1,Cotera.xml
14f57a9f712732f4a7d072faea9dd8debb34ac651083459dadd90d2f7b611d3f,1,1,Couchbase.xml
51e4dfd5e80d3187c34dbae64ea978a12df199da807108618c0db357d608742f,1,1,CouncilofAustralianGovernments.xml
From e4315ed24d5bd98ef87b5e37ab855a69ea31114e Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 17:02:39 +0300
Subject: [PATCH 012/167] Add keyserver.ubuntu.com to Ubuntu.xml (#11995)
(#12001)
---
src/chrome/content/rules/Ubuntu.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/chrome/content/rules/Ubuntu.xml b/src/chrome/content/rules/Ubuntu.xml
index 2d151e8bc727..e726fa9c4bcc 100644
--- a/src/chrome/content/rules/Ubuntu.xml
+++ b/src/chrome/content/rules/Ubuntu.xml
@@ -72,6 +72,7 @@
+
From 26fab60559e2e4a843578dddbaf440f1aff795d2 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 17:06:54 +0300
Subject: [PATCH 013/167] Update OpenSUSE.xml (#12004)
---
src/chrome/content/rules/OpenSUSE.xml | 90 ++++++++++-----------------
1 file changed, 32 insertions(+), 58 deletions(-)
diff --git a/src/chrome/content/rules/OpenSUSE.xml b/src/chrome/content/rules/OpenSUSE.xml
index c83e0b712b0e..a5ab2b41d139 100644
--- a/src/chrome/content/rules/OpenSUSE.xml
+++ b/src/chrome/content/rules/OpenSUSE.xml
@@ -1,75 +1,49 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 7f3a4a0a5eb06144bc74c1216e5cb301ba296d73 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 17:07:33 +0300
Subject: [PATCH 014/167] Update Nic.cz.xml (#12005)
---
src/chrome/content/rules/Nic.cz.xml | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/chrome/content/rules/Nic.cz.xml b/src/chrome/content/rules/Nic.cz.xml
index 32418cd95527..346aaeb34fbe 100644
--- a/src/chrome/content/rules/Nic.cz.xml
+++ b/src/chrome/content/rules/Nic.cz.xml
@@ -8,23 +8,13 @@
- MojeID.cz.xml
- Turris.cz.xml
- Observed cookie domains:
- - .
- - .labs *
- - stats ¹
- - www ¹
- ¹ Not secured by server
- * Tracking cookies only
-
- Mixed content:
- - Bugs on knihy from i.creativecommons.org *
- * Secured by us
-
Mismatched:
- jsns.nic.cz
-->
+
+
@@ -35,6 +25,7 @@
+
@@ -43,9 +34,8 @@
-
-
+
From 872861a2f4d66a119d65c04976846053989f4590 Mon Sep 17 00:00:00 2001
From: ivysrono
Date: Sun, 20 Aug 2017 22:08:05 +0800
Subject: [PATCH 015/167] Update Weibo.com.xml (#11928)
* Update Weibo.com.xml
* Update Weibo.com-mixedcontent.xml
* Update Weibo.com.xml
---
.../content/rules/Weibo.com-mixedcontent.xml | 1 -
src/chrome/content/rules/Weibo.com.xml | 38 +++++--------------
2 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/src/chrome/content/rules/Weibo.com-mixedcontent.xml b/src/chrome/content/rules/Weibo.com-mixedcontent.xml
index 3fea4fb7f963..935e82deecaa 100644
--- a/src/chrome/content/rules/Weibo.com-mixedcontent.xml
+++ b/src/chrome/content/rules/Weibo.com-mixedcontent.xml
@@ -6,7 +6,6 @@
-
diff --git a/src/chrome/content/rules/Weibo.com.xml b/src/chrome/content/rules/Weibo.com.xml
index 3fb2c3f1d0c4..caf1d600832e 100644
--- a/src/chrome/content/rules/Weibo.com.xml
+++ b/src/chrome/content/rules/Weibo.com.xml
@@ -10,15 +10,17 @@
sg2.game.weibo.com
yahoo.tw.weibo.com
+ Expired:
+ vdisk.weibo.com
+
MCB:
chart.weibo.com ( Too many redirects )
- e.weibo.com ( https://e.weibo.com/register/register with inline-script http://weibo.com/signup/signup.php )
game.weibo.com
gouwu.weibo.com
s.weibo.com
- widget.weibo.com ( find test in help.sina.com.cn )
Invalid certificate:
+ www.weibo.com ( Mismatched by some strange CDNs. Equal to ^.)
app.weibo.com
book.weibo.com
static.book.weibo.com
@@ -32,13 +34,10 @@
service.weibo.com
vgirl.weibo.com
x.weibo.com
-
- Redirect to http:
- ^
- www.weibo.com
- vdisk.weibo.com
-->
+
+
@@ -48,33 +47,16 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
From f940c5e87c6b29e08e0a6fb93c3b1ff41ffe85c6 Mon Sep 17 00:00:00 2001
From: ivysrono
Date: Sun, 20 Aug 2017 22:09:20 +0800
Subject: [PATCH 016/167] Update QQ.xml (#12013)
---
src/chrome/content/rules/QQ.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/chrome/content/rules/QQ.xml b/src/chrome/content/rules/QQ.xml
index ac2086567ba1..a03e737636d0 100644
--- a/src/chrome/content/rules/QQ.xml
+++ b/src/chrome/content/rules/QQ.xml
@@ -229,6 +229,7 @@
+
From ae90128ab0a9ce63daf546b92635c9ad2f9d4b04 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 17:18:10 +0300
Subject: [PATCH 017/167] Add keys.fedoraproject.org to Fedora_Project.org.xml
(#11995) (#12003)
* Add keys.fedoraproject.org to Fedora_Project.org.xml (#11995)
* Update Fedora_Project.org.xml
---
src/chrome/content/rules/Fedora_Project.org.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/chrome/content/rules/Fedora_Project.org.xml b/src/chrome/content/rules/Fedora_Project.org.xml
index bdec7b03b3ba..9b0ddbad63a7 100644
--- a/src/chrome/content/rules/Fedora_Project.org.xml
+++ b/src/chrome/content/rules/Fedora_Project.org.xml
@@ -2,7 +2,7 @@
Remark: Fedora maintains a list of sub-domains of some services on
https://github.com/fedora-infra/apps.fp.o/blob/develop/data/apps.yaml
- Non-functional hosts
+ Non-functional hosts:
HSTS preloaded:
- admin.fedoraproject.org
- apps.fedoraproject.org
@@ -10,6 +10,7 @@
- badges.fedoraproject.org
- darkserver.fedoraproject.org
- geoip.fedoraproject.org
+ - keys.fedoraproject.org
- lists.fedoraproject.org
- meetbot.fedoraproject.org
- paste.fedoraproject.org
@@ -28,9 +29,10 @@
Peer certificate cannot be authenticated with given CA certificates:
- pkgs.fedoraproject.org
- Mixed content blocking (MCB) tiggered:
+ Mixed content blocking (MCB) triggered:
- boot.fedoraproject.org
-->
+
From 08a11356119b1387c6831590359f14b27d9fafd8 Mon Sep 17 00:00:00 2001
From: Rotzbua
Date: Sun, 20 Aug 2017 16:21:05 +0200
Subject: [PATCH 018/167] Update/fix opencaching.pl.xml (#11991)
* Update opencaching.pl.xml
fix for https-everywhere-checker
* Update opencaching.pl.xml
add blog to comment
---
src/chrome/content/rules/opencaching.pl.xml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/chrome/content/rules/opencaching.pl.xml b/src/chrome/content/rules/opencaching.pl.xml
index d073eb81a1c9..7d0b68201510 100644
--- a/src/chrome/content/rules/opencaching.pl.xml
+++ b/src/chrome/content/rules/opencaching.pl.xml
@@ -1,19 +1,24 @@
-
-
+
-
-
+
+
From 72ed543bb933a0e8f9106355ff658851d4cfa7d0 Mon Sep 17 00:00:00 2001
From: Rotzbua
Date: Sun, 20 Aug 2017 16:22:15 +0200
Subject: [PATCH 019/167] Update opencaching.de.xml (#11990)
---
src/chrome/content/rules/opencaching.de.xml | 32 ++++++++++++---------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/chrome/content/rules/opencaching.de.xml b/src/chrome/content/rules/opencaching.de.xml
index 5830b49adaf9..9b414938fe53 100644
--- a/src/chrome/content/rules/opencaching.de.xml
+++ b/src/chrome/content/rules/opencaching.de.xml
@@ -1,19 +1,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
From ef181f456672399df83b09c31bc6c809f9561075 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 17:28:05 +0300
Subject: [PATCH 020/167] Update PopCash.net.xml (#11123)
* Update PopCash.net.xml
* Update PopCash.net.xml
---
src/chrome/content/rules/PopCash.net.xml | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/chrome/content/rules/PopCash.net.xml b/src/chrome/content/rules/PopCash.net.xml
index d697b77ac200..8112d6a68fe5 100644
--- a/src/chrome/content/rules/PopCash.net.xml
+++ b/src/chrome/content/rules/PopCash.net.xml
@@ -1,16 +1,9 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
From fb641ef8665011bedeeae95d3ffcbd0ad023e39a Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 18:04:00 +0300
Subject: [PATCH 021/167] Remove preloaded domains from PayPal.xml and move
PayPal.co.uk into a separate ruleset (#10992)
* Update PayPal.xml
* Create PayPal.co.uk.xml
---
src/chrome/content/rules/PayPal.co.uk.xml | 11 +++++++++++
src/chrome/content/rules/PayPal.xml | 21 +++------------------
2 files changed, 14 insertions(+), 18 deletions(-)
create mode 100644 src/chrome/content/rules/PayPal.co.uk.xml
diff --git a/src/chrome/content/rules/PayPal.co.uk.xml b/src/chrome/content/rules/PayPal.co.uk.xml
new file mode 100644
index 000000000000..8bb3838ff11c
--- /dev/null
+++ b/src/chrome/content/rules/PayPal.co.uk.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/PayPal.xml b/src/chrome/content/rules/PayPal.xml
index 67a3527b6aad..d7a8746695f1 100644
--- a/src/chrome/content/rules/PayPal.xml
+++ b/src/chrome/content/rules/PayPal.xml
@@ -4,19 +4,14 @@
- PayPal_Forward.xml
- paypalobjects.com.xml
- Where.com.xml
-
+ - PayPal.co.uk.xml
CDN buckets:
- paypal.112.2o7.net
- where-spotlight.s3.amazonaws.com
-
-->
-
-
-
-
@@ -26,18 +21,8 @@
-
-
-
-
-
-
-
-
-
-
+
+
From 55f877719dac91e1ef6732a38c5fa649437ddaef Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 18:07:30 +0300
Subject: [PATCH 022/167] Update and rename Travis_CI.xml to Travis-CI.org.xml
(#11431)
---
.../{Travis_CI.xml => Travis-CI.org.xml} | 41 +++++++------------
1 file changed, 15 insertions(+), 26 deletions(-)
rename src/chrome/content/rules/{Travis_CI.xml => Travis-CI.org.xml} (50%)
diff --git a/src/chrome/content/rules/Travis_CI.xml b/src/chrome/content/rules/Travis-CI.org.xml
similarity index 50%
rename from src/chrome/content/rules/Travis_CI.xml
rename to src/chrome/content/rules/Travis-CI.org.xml
index 83909c2524e3..37a6e1410450 100644
--- a/src/chrome/content/rules/Travis_CI.xml
+++ b/src/chrome/content/rules/Travis-CI.org.xml
@@ -1,19 +1,19 @@
-
+
@@ -29,19 +29,8 @@
-
-
-
-
-
-
-
-
-
-
+
+
From d6d4808d926195de620e5e6439b7ead58a10af2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:09:00 +0200
Subject: [PATCH 023/167] Added AfB. (#12012)
---
src/chrome/content/rules/AfB-Group.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 src/chrome/content/rules/AfB-Group.xml
diff --git a/src/chrome/content/rules/AfB-Group.xml b/src/chrome/content/rules/AfB-Group.xml
new file mode 100644
index 000000000000..9ec6b28a1482
--- /dev/null
+++ b/src/chrome/content/rules/AfB-Group.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 077c7b206cf33415f7705acecbcb55316eec806c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:18:17 +0200
Subject: [PATCH 024/167] Updated menshealth.de. (#10838)
---
src/chrome/content/rules/Menshealth.de.xml | 46 +++++++++++++++++++++-
1 file changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/chrome/content/rules/Menshealth.de.xml b/src/chrome/content/rules/Menshealth.de.xml
index f2f8b6f6b993..1b252673566c 100644
--- a/src/chrome/content/rules/Menshealth.de.xml
+++ b/src/chrome/content/rules/Menshealth.de.xml
@@ -1,5 +1,47 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
From f723f76e4e88599123814a78dd61e45d18dec84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:20:45 +0200
Subject: [PATCH 025/167] Added elwis.de (#11956)
---
src/chrome/content/rules/elwis.de.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 src/chrome/content/rules/elwis.de.xml
diff --git a/src/chrome/content/rules/elwis.de.xml b/src/chrome/content/rules/elwis.de.xml
new file mode 100644
index 000000000000..8ae0830a0fe9
--- /dev/null
+++ b/src/chrome/content/rules/elwis.de.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
From 459e7d6e12586a7ed2b4c6e3581c7256a69c3d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:21:54 +0200
Subject: [PATCH 026/167] Added bafg.de (#11955)
---
src/chrome/content/rules/bafg.de.xml | 39 ++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 src/chrome/content/rules/bafg.de.xml
diff --git a/src/chrome/content/rules/bafg.de.xml b/src/chrome/content/rules/bafg.de.xml
new file mode 100644
index 000000000000..4df3e7ac53b3
--- /dev/null
+++ b/src/chrome/content/rules/bafg.de.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
From 431ec0ad69b0da950547128bc27dee0a05c32079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:24:41 +0200
Subject: [PATCH 027/167] Added DGzRS Die Seenotretter (#11861)
---
.../content/rules/DGzRS_Die_Seenotretter.xml | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 src/chrome/content/rules/DGzRS_Die_Seenotretter.xml
diff --git a/src/chrome/content/rules/DGzRS_Die_Seenotretter.xml b/src/chrome/content/rules/DGzRS_Die_Seenotretter.xml
new file mode 100644
index 000000000000..5b1abc650481
--- /dev/null
+++ b/src/chrome/content/rules/DGzRS_Die_Seenotretter.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From f120250db0bcb648e00eefcf5ed87eb0206c9239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:25:37 +0200
Subject: [PATCH 028/167] Added dts-nachrichtenagentur.de (#11957)
---
src/chrome/content/rules/dts-nachrichtenagentur.de.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 src/chrome/content/rules/dts-nachrichtenagentur.de.xml
diff --git a/src/chrome/content/rules/dts-nachrichtenagentur.de.xml b/src/chrome/content/rules/dts-nachrichtenagentur.de.xml
new file mode 100644
index 000000000000..ff1f87d64926
--- /dev/null
+++ b/src/chrome/content/rules/dts-nachrichtenagentur.de.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
From 05a56c5d4686260adde9869c5be832588025a629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:29:11 +0200
Subject: [PATCH 029/167] Added ajhackett.com (#11566)
---
src/chrome/content/rules/ajhackett.com.xml | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 src/chrome/content/rules/ajhackett.com.xml
diff --git a/src/chrome/content/rules/ajhackett.com.xml b/src/chrome/content/rules/ajhackett.com.xml
new file mode 100644
index 000000000000..6648a8574549
--- /dev/null
+++ b/src/chrome/content/rules/ajhackett.com.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
From ce9dcc760962b6c363b245560b391b616fac1310 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 18:30:51 +0300
Subject: [PATCH 030/167] Update OnlineSBI.com.xml (#11120)
* Update OnlineSBI.com.xml
* Update OnlineSBI.com.xml
* Update OnlineSBI.com.xml
* Update OnlineSBI.com.xml
---
src/chrome/content/rules/OnlineSBI.com.xml | 74 ++++------------------
1 file changed, 11 insertions(+), 63 deletions(-)
diff --git a/src/chrome/content/rules/OnlineSBI.com.xml b/src/chrome/content/rules/OnlineSBI.com.xml
index 26bfd61dea92..0a807e7fa2e1 100644
--- a/src/chrome/content/rules/OnlineSBI.com.xml
+++ b/src/chrome/content/rules/OnlineSBI.com.xml
@@ -1,57 +1,19 @@
-
-
-
+
+
+
-
+
@@ -65,24 +27,10 @@ Fetch error: http://cmp.onlinesbi.com/ => https://cmp.onlinesbi.com/: (28, 'Conn
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
From bb37b867369d9e43809f4ac02e72c8e19e0563f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 17:35:03 +0200
Subject: [PATCH 031/167] Added bafin.de (#11958)
---
src/chrome/content/rules/bafin.de.xml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 src/chrome/content/rules/bafin.de.xml
diff --git a/src/chrome/content/rules/bafin.de.xml b/src/chrome/content/rules/bafin.de.xml
new file mode 100644
index 000000000000..977970a6e674
--- /dev/null
+++ b/src/chrome/content/rules/bafin.de.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 619996592d0ef430080a7580f1de73d6fbadbc35 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 20 Aug 2017 23:36:50 +0800
Subject: [PATCH 032/167] Update and rename Perform.xml to PerformGroup.com.xml
(#11937)
---
src/chrome/content/rules/Perform.xml | 29 -------------------
src/chrome/content/rules/PerformGroup.com.xml | 19 ++++++++++++
2 files changed, 19 insertions(+), 29 deletions(-)
delete mode 100644 src/chrome/content/rules/Perform.xml
create mode 100644 src/chrome/content/rules/PerformGroup.com.xml
diff --git a/src/chrome/content/rules/Perform.xml b/src/chrome/content/rules/Perform.xml
deleted file mode 100644
index 8a804e53397f..000000000000
--- a/src/chrome/content/rules/Perform.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PerformGroup.com.xml b/src/chrome/content/rules/PerformGroup.com.xml
new file mode 100644
index 000000000000..90c4dff6a321
--- /dev/null
+++ b/src/chrome/content/rules/PerformGroup.com.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
From fac4e1b7d82ecfdb3ba533cfae59f7b1fcbe4151 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 20 Aug 2017 15:42:04 +0000
Subject: [PATCH 033/167] Create TheTrevorProject.org.xml (#11984)
---
.../content/rules/TheTrevorProject.org.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 src/chrome/content/rules/TheTrevorProject.org.xml
diff --git a/src/chrome/content/rules/TheTrevorProject.org.xml b/src/chrome/content/rules/TheTrevorProject.org.xml
new file mode 100644
index 000000000000..cf405f9a2168
--- /dev/null
+++ b/src/chrome/content/rules/TheTrevorProject.org.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
From 196b5a8f9bf947f5ffca65c027e76d0e2aae9733 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 20 Aug 2017 15:42:35 +0000
Subject: [PATCH 034/167] Create ssi.gouv.fr.xml (#11985)
---
src/chrome/content/rules/ssi.gouv.fr.xml | 25 ++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 src/chrome/content/rules/ssi.gouv.fr.xml
diff --git a/src/chrome/content/rules/ssi.gouv.fr.xml b/src/chrome/content/rules/ssi.gouv.fr.xml
new file mode 100644
index 000000000000..49cb491603aa
--- /dev/null
+++ b/src/chrome/content/rules/ssi.gouv.fr.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
From 52797934bf3b1f77bfc395d752dd92d2d920932d Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 20 Aug 2017 15:44:29 +0000
Subject: [PATCH 035/167] Create AMuseWiki.org.xml (#11999)
---
src/chrome/content/rules/AMuseWiki.org.xml | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 src/chrome/content/rules/AMuseWiki.org.xml
diff --git a/src/chrome/content/rules/AMuseWiki.org.xml b/src/chrome/content/rules/AMuseWiki.org.xml
new file mode 100644
index 000000000000..8c5e4bd1b9d0
--- /dev/null
+++ b/src/chrome/content/rules/AMuseWiki.org.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From cc55eb4b32639783583429eccd0492ae3a6ac637 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 20 Aug 2017 15:47:24 +0000
Subject: [PATCH 036/167] [Zataz.com] Simplify and reactivate ruleset (#11833)
* [Zataz.com] Simplify and reactivate ruleset
* Delete Zataz.com-falsemixed.xml
* Rename Zataz.xml to Zataz.com.xml
---
.../content/rules/Zataz.com-falsemixed.xml | 13 ---
src/chrome/content/rules/Zataz.com.xml | 25 ++++++
src/chrome/content/rules/Zataz.xml | 80 -------------------
3 files changed, 25 insertions(+), 93 deletions(-)
delete mode 100644 src/chrome/content/rules/Zataz.com-falsemixed.xml
create mode 100644 src/chrome/content/rules/Zataz.com.xml
delete mode 100644 src/chrome/content/rules/Zataz.xml
diff --git a/src/chrome/content/rules/Zataz.com-falsemixed.xml b/src/chrome/content/rules/Zataz.com-falsemixed.xml
deleted file mode 100644
index 89b645c3a654..000000000000
--- a/src/chrome/content/rules/Zataz.com-falsemixed.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Zataz.com.xml b/src/chrome/content/rules/Zataz.com.xml
new file mode 100644
index 000000000000..12834e245beb
--- /dev/null
+++ b/src/chrome/content/rules/Zataz.com.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Zataz.xml b/src/chrome/content/rules/Zataz.xml
deleted file mode 100644
index 986de4b8b5f5..000000000000
--- a/src/chrome/content/rules/Zataz.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 5eaffb402198f38e28d9ceddbfbaec0d3fb54c2c Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 20 Aug 2017 15:50:37 +0000
Subject: [PATCH 037/167] [Ondarossa.info] Reactivate ruleset and remove
platform (#11607)
* [Ondarossa.info] Reactivate ruleset
* [Ondarossa.info] Remove platform="cacert"
---
src/chrome/content/rules/Ondarossa.info.xml | 35 ++++++++++++---------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/chrome/content/rules/Ondarossa.info.xml b/src/chrome/content/rules/Ondarossa.info.xml
index 7a60f8d64b0d..7a8126aa5436 100644
--- a/src/chrome/content/rules/Ondarossa.info.xml
+++ b/src/chrome/content/rules/Ondarossa.info.xml
@@ -1,24 +1,31 @@
-
-
+
-
-
+
+
+
+
From 06450f6cd95376a47196438f706de0452470f0f5 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 20 Aug 2017 16:07:43 +0000
Subject: [PATCH 038/167] [Directbox] Remove right wildcard and reactivate
ruleset (#11246)
* [Directbox] Remove right wildcard and reactivate ruleset
* [Directbox] Reactivate ruleset
---
src/chrome/content/rules/Directbox.xml | 56 +++++++++++++++++---------
1 file changed, 37 insertions(+), 19 deletions(-)
diff --git a/src/chrome/content/rules/Directbox.xml b/src/chrome/content/rules/Directbox.xml
index d2c7164d4387..aa4a16d83f1d 100644
--- a/src/chrome/content/rules/Directbox.xml
+++ b/src/chrome/content/rules/Directbox.xml
@@ -1,24 +1,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 81789b9d8b4624476f02b5e683593af72325ad50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 18:08:19 +0200
Subject: [PATCH 039/167] Added rechenkraft.net (#11393)
* Added rechenkraft.net
* Changed comment about invalid certificates (wildcard).
---
src/chrome/content/rules/rechenkraft.net.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 src/chrome/content/rules/rechenkraft.net.xml
diff --git a/src/chrome/content/rules/rechenkraft.net.xml b/src/chrome/content/rules/rechenkraft.net.xml
new file mode 100644
index 000000000000..543b8d9d67b7
--- /dev/null
+++ b/src/chrome/content/rules/rechenkraft.net.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
From f0f755c3c06ee29031de8fedc658b7795512fef1 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 16:10:44 +0000
Subject: [PATCH 040/167] Create BitMitigate.com.xml (#12010)
* Create BitMitigate.com.xml
* Update BitMitigate.com.xml
---
src/chrome/content/rules/BitMitigate.com.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 src/chrome/content/rules/BitMitigate.com.xml
diff --git a/src/chrome/content/rules/BitMitigate.com.xml b/src/chrome/content/rules/BitMitigate.com.xml
new file mode 100644
index 000000000000..d1bcd56b9d48
--- /dev/null
+++ b/src/chrome/content/rules/BitMitigate.com.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
From aa8b522c74f5594781da71bf2402c23a6aac9906 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 16:11:52 +0000
Subject: [PATCH 041/167] Create 50gameslike.com.xml (#12007)
---
src/chrome/content/rules/50gameslike.com.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/50gameslike.com.xml
diff --git a/src/chrome/content/rules/50gameslike.com.xml b/src/chrome/content/rules/50gameslike.com.xml
new file mode 100644
index 000000000000..80d3ebe20c9e
--- /dev/null
+++ b/src/chrome/content/rules/50gameslike.com.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From dc1e728e04b6a1a8578015b5068d532ba0e716a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jochen=20A=2E=20F=C3=BCrbacher?=
Date: Sun, 20 Aug 2017 18:31:48 +0200
Subject: [PATCH 042/167] Added rules for technik-museum.de. (#10167)
* Added rules for technik-museum.de.
* Changed comment about invalid certificates (wildcard).
---
.../content/rules/technik-museum.de.xml | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 src/chrome/content/rules/technik-museum.de.xml
diff --git a/src/chrome/content/rules/technik-museum.de.xml b/src/chrome/content/rules/technik-museum.de.xml
new file mode 100644
index 000000000000..bf98ee55336c
--- /dev/null
+++ b/src/chrome/content/rules/technik-museum.de.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 828c81519b59a216578763569b4783a712181fc2 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sun, 20 Aug 2017 19:48:14 +0300
Subject: [PATCH 043/167] Update Groupon.com.xml (#10836)
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update Groupon.com.xml
* Update ruleset-whitelist.csv
---
src/chrome/content/rules/Groupon.com.xml | 66 +++---------------------
utils/ruleset-whitelist.csv | 1 +
2 files changed, 8 insertions(+), 59 deletions(-)
diff --git a/src/chrome/content/rules/Groupon.com.xml b/src/chrome/content/rules/Groupon.com.xml
index d980fd31d231..e4cff7f980f6 100644
--- a/src/chrome/content/rules/Groupon.com.xml
+++ b/src/chrome/content/rules/Groupon.com.xml
@@ -1,84 +1,32 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index decc3630cb2d..57f5ffbcf65c 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -1375,6 +1375,7 @@ d1857ccfe2226d57004bc300c14230b337e7c84e7f38465e80fb6cfb56a8ac5f,1,1,Grnh.se.xml
71f3030e11d49c8922e89dea8d5a86e94e94c45203a8e8017120588f415653bb,1,1,Grocery_Server.com.xml
68b3f815d64c7aea3a15a66b4b7cc6cb3a939652049f0f19acdfcaafd922e8fe,1,1,Grok_Learning.com.xml
d748494d96923aadd849f3a42805350a89e64afb6226bc9e9fac55e6843aa41a,1,1,Grok.org.uk.xml
+9fa1fec5b01de3f893162bb05593529fc9b9f40bdf02f4b00b6ffaf7a0d385dc,0,1,Groupon.com.xml
37102eaee8fe084f69ddb6c5e2c752055312bdbdc57c4a68e12f0d7be7dd2007,1,1,Growery.xml
1167fd0b3a0a006633e2593b352ae55057fdeef558d5dd32a06e3c1b3b1a72af,1,1,Grupo_Avante.org.xml
a06c8510285353ee578bd10abfa9d0972ed9a2fe1f7932226a8a15a9b16a148e,1,1,Gsfacket.se.xml
From 3c4980481b672491e0aeeca3e09e996e77e1f616 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 20:48:59 +0000
Subject: [PATCH 044/167] Update SPL_Center.org.xml (#11917)
* Update SPL_Center.org.xml
* Update SPL_Center.org.xml
---
src/chrome/content/rules/SPL_Center.org.xml | 28 ++++++---------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/chrome/content/rules/SPL_Center.org.xml b/src/chrome/content/rules/SPL_Center.org.xml
index 183d8b65d527..a6d1e6e830b0 100644
--- a/src/chrome/content/rules/SPL_Center.org.xml
+++ b/src/chrome/content/rules/SPL_Center.org.xml
@@ -1,33 +1,19 @@
-
+ Mismatch:
+ - selma.splcenter.org
-
+-->
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Mendeley.xml b/src/chrome/content/rules/Mendeley.xml
deleted file mode 100644
index 77f48e51d377..000000000000
--- a/src/chrome/content/rules/Mendeley.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From eaca53b71e60ac232a1b2de940ed70047a527911 Mon Sep 17 00:00:00 2001
From: Devices
Date: Sun, 20 Aug 2017 23:57:36 +0200
Subject: [PATCH 046/167] Updated theanarchistlibrary (#11966)
* Added subdomains and other domains part of the library.
* Update TheAnarchistLibrary.org.xml
* Update TheAnarchistLibrary.org.xml
Added www and non-www versions
---
src/chrome/content/rules/TheAnarchistLibrary.org.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/chrome/content/rules/TheAnarchistLibrary.org.xml b/src/chrome/content/rules/TheAnarchistLibrary.org.xml
index c2c84f9ae67e..946c5c1e1b6c 100644
--- a/src/chrome/content/rules/TheAnarchistLibrary.org.xml
+++ b/src/chrome/content/rules/TheAnarchistLibrary.org.xml
@@ -13,7 +13,15 @@
+
+
+
+
+
+
+
+
From 845c69036f299a33ea8d3f91dc3bd305065f532d Mon Sep 17 00:00:00 2001
From: Mertsch
Date: Sun, 20 Aug 2017 23:58:50 +0200
Subject: [PATCH 047/167] Create Massengeschmack.tv (#7271)
* Create Massengeschmack.tv.xml
* Update Massengeschmack.tv.xml
* Update Massengeschmack.tv.xml
Removed wildcart and replaced it with specific domains
* Update Massengeschmack.tv.xml
Added www.
* Update Massengeschmack.tv.xml
Added alpha and beta, excluded forum
* Update Massengeschmack.tv.xml
Added some tests
* Update Massengeschmack.tv.xml
Fix typo
* Update Massengeschmack.tv.xml
Attempt to use platform="mixedcontent"
* Update Massengeschmack.tv.xml
Test
* Update Massengeschmack.tv.xml
uncommented
---
.../content/rules/Massengeschmack.tv.xml | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 src/chrome/content/rules/Massengeschmack.tv.xml
diff --git a/src/chrome/content/rules/Massengeschmack.tv.xml b/src/chrome/content/rules/Massengeschmack.tv.xml
new file mode 100644
index 000000000000..811d829aeea4
--- /dev/null
+++ b/src/chrome/content/rules/Massengeschmack.tv.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 4c767efc1462c661b2def10bccad238558183ea7 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 22:27:11 +0000
Subject: [PATCH 048/167] Create alayam24.com.xml (#11920)
* Create alayam24.com.xml
* Update alayam24.com.xml
---
src/chrome/content/rules/alayam24.com.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 src/chrome/content/rules/alayam24.com.xml
diff --git a/src/chrome/content/rules/alayam24.com.xml b/src/chrome/content/rules/alayam24.com.xml
new file mode 100644
index 000000000000..b926c3b8fcaa
--- /dev/null
+++ b/src/chrome/content/rules/alayam24.com.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
From 44262ee8245933150e5758e76421423a7d720aea Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 20 Aug 2017 22:27:53 +0000
Subject: [PATCH 049/167] Create al-sunan.net.xml (#11845)
* Create al-sunan.net.xml
* Update al-sunan.net.xml
---
src/chrome/content/rules/al-sunan.net.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 src/chrome/content/rules/al-sunan.net.xml
diff --git a/src/chrome/content/rules/al-sunan.net.xml b/src/chrome/content/rules/al-sunan.net.xml
new file mode 100644
index 000000000000..e43beaef7a8f
--- /dev/null
+++ b/src/chrome/content/rules/al-sunan.net.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
From c75ca94c8b416fc9882760426e8e8f352a1da5bb Mon Sep 17 00:00:00 2001
From: J0WI
Date: Mon, 21 Aug 2017 00:29:19 +0200
Subject: [PATCH 050/167] Update Flipkart.com.xml (#11969)
* Update Flipkart.com.xml
* add more targets
---
src/chrome/content/rules/Flipkart.com.xml | 95 ++++++-----------------
1 file changed, 23 insertions(+), 72 deletions(-)
diff --git a/src/chrome/content/rules/Flipkart.com.xml b/src/chrome/content/rules/Flipkart.com.xml
index 79e1d55e3c59..d2fea52ce178 100644
--- a/src/chrome/content/rules/Flipkart.com.xml
+++ b/src/chrome/content/rules/Flipkart.com.xml
@@ -6,83 +6,34 @@
Nonfunctional subdomains:
- - blog *
-
- * Refused
-
-
- Problematic subdomains:
-
- - ads *
-
- * Server sends no certificate chain
-
-
- Fully covered subdomains:
-
- - ^
- - seller
-
-
- Insecure cookies are set for these domains and hosts:
-
- - .flipkart.com
- - seller.flipkart.com
-
-
- Mixed content:
-
- - css on seller from fonts.googleapis.com
-
- - Ads/bugs, on:
-
- - www from flipkart-prd.112.2o7.net
- - www from ads.flipkart.com
- - www from b.scorecardresearch.com
-
- - Images on www from img\da.flixcart.com
+ - img[2-9].flipkart.com (m)
+ m: mismatch
-->
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
From 454fb4a9a8f60ed7db6e0624637574b0534a6a14 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Mon, 21 Aug 2017 08:33:04 +1000
Subject: [PATCH 051/167] [Pinterest] Remove preloaded ruleset. (#11693)
* [Pinterest] Remove preloaded ruleset.
* [Pinimg.com] Fix broken ruleset.
---
src/chrome/content/rules/Pinimg.com.xml | 34 +-----
src/chrome/content/rules/Pinterest.xml | 137 ------------------------
2 files changed, 3 insertions(+), 168 deletions(-)
delete mode 100644 src/chrome/content/rules/Pinterest.xml
diff --git a/src/chrome/content/rules/Pinimg.com.xml b/src/chrome/content/rules/Pinimg.com.xml
index 3dac26bbb9d6..8ac814412924 100644
--- a/src/chrome/content/rules/Pinimg.com.xml
+++ b/src/chrome/content/rules/Pinimg.com.xml
@@ -1,36 +1,8 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/src/chrome/content/rules/Pinterest.xml b/src/chrome/content/rules/Pinterest.xml
deleted file mode 100644
index 07fd8459897d..000000000000
--- a/src/chrome/content/rules/Pinterest.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 4964511b068b0cf772835eaf98dd7aedf97adf7a Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Wed, 23 Aug 2017 03:31:53 +0800
Subject: [PATCH 052/167] Update https_everywhere_checker/check_rules.py, Fix
#10877 (#11187)
---
test/rules/coverage.checker.config | 1 +
test/rules/requirements.txt | 1 +
.../https_everywhere_checker/check_rules.py | 22 +++++++++-
.../src/https_everywhere_checker/rules.py | 40 +++++++++++++++++++
4 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/test/rules/coverage.checker.config b/test/rules/coverage.checker.config
index f269915cf93b..9979c664513a 100644
--- a/test/rules/coverage.checker.config
+++ b/test/rules/coverage.checker.config
@@ -4,6 +4,7 @@
[rulesets]
rulesdir = src/chrome/content/rules
check_coverage = true
+check_target_validity = true
check_nonmatch_groups = true
check_test_formatting = true
include_default_off = false
diff --git a/test/rules/requirements.txt b/test/rules/requirements.txt
index 144287114bb8..702314f7fcf3 100644
--- a/test/rules/requirements.txt
+++ b/test/rules/requirements.txt
@@ -2,3 +2,4 @@ pycurl
regex
bsdiff4
python-Levenshtein
+tldextract
diff --git a/test/rules/src/https_everywhere_checker/check_rules.py b/test/rules/src/https_everywhere_checker/check_rules.py
index bf78a22c3382..d2461cfde838 100644
--- a/test/rules/src/https_everywhere_checker/check_rules.py
+++ b/test/rules/src/https_everywhere_checker/check_rules.py
@@ -130,11 +130,18 @@ def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, rul
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.
+ # 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,
@@ -290,6 +297,9 @@ def cli():
checkCoverage = False
if config.has_option("rulesets", "check_coverage"):
checkCoverage = config.getboolean("rulesets", "check_coverage")
+ checkTargetValidity = False
+ if config.has_option("rulesets", "check_target_validity"):
+ checkTargetValidity = config.getboolean("rulesets", "check_target_validity")
checkNonmatchGroups = False
if config.has_option("rulesets", "check_nonmatch_groups"):
checkNonmatchGroups = config.getboolean("rulesets", "check_nonmatch_groups")
@@ -341,6 +351,7 @@ def cli():
rulesets = []
coverageProblemsExist = False
+ targetValidityProblemExist = False
nonmatchGroupProblemsExist = False
testFormattingProblemsExist = False
for xmlFname in xmlFnames:
@@ -363,6 +374,12 @@ def cli():
for problem in problems:
coverageProblemsExist = True
logging.error(problem)
+ if checkTargetValidity:
+ logging.debug("Checking target validity for '%s'." % ruleset.name)
+ problems = ruleset.getTargetValidityProblems()
+ for problem in problems:
+ targetValidityProblemExist = True
+ logging.error(problem)
if checkNonmatchGroups:
logging.debug("Checking non-match groups for '%s'." % ruleset.name)
problems = ruleset.getNonmatchGroupProblems()
@@ -445,6 +462,9 @@ def cli():
if checkCoverage:
if coverageProblemsExist:
return 1 # exit with error code
+ if checkTargetValidity:
+ if targetValidityProblemExist:
+ return 1 # exit with error code
if checkNonmatchGroups:
if nonmatchGroupProblemsExist:
return 1 # exit with error code
diff --git a/test/rules/src/https_everywhere_checker/rules.py b/test/rules/src/https_everywhere_checker/rules.py
index 41040b4e74e1..10b4aae4482b 100644
--- a/test/rules/src/https_everywhere_checker/rules.py
+++ b/test/rules/src/https_everywhere_checker/rules.py
@@ -1,6 +1,8 @@
+from tldextract import tldextract
from urlparse import urlparse
import regex
+import socket
class Rule(object):
"""Represents one from->to rule element."""
@@ -179,6 +181,44 @@ def _determineTestApplication(self):
self.determine_test_application_run = True
return self.test_application_problems
+ def getTargetValidityProblems(self):
+ """Verify that each target has a valid TLD in order to prevent problematic rewrite
+ as stated in EFForg/https-everywhere/issues/10877. In particular,
+ right-wildcard target are ignored from this test.
+
+ Returns an array of strings reporting any coverage problems if they exist,
+ or empty list if coverage is sufficient.
+ """
+ problems = self._determineTestApplication()
+ # Next, make sure each target has a valid TLD
+ for target in self.targets:
+ # Ignore right-wildcard targets
+ if target.endswith(".*"):
+ continue
+
+ # Ignore if target is an ipv4 address
+ try:
+ socket.inet_aton(target)
+ continue
+ except:
+ pass
+
+ # Ignore if target is an ipv6 address
+ try:
+ socket.inet_pton(socket.AF_INET6, target)
+ continue
+ except:
+ pass
+
+ # Extract TLD from target if possible
+ res = tldextract.extract(target)
+ if res.suffix == "":
+ problems.append("%s: Target '%s' missing eTLD" % (self.filename, target))
+ elif res.domain == "":
+ problems.append("%s: Target '%s' containing entire eTLD" % (self.filename, target))
+
+ return problems
+
def getCoverageProblems(self):
"""Verify that each rule and each exclusion has the right number of tests
that applies to it. TODO: Also check that each target has the right
From 46418256b5b3625a0c51febb377c290ab2a9e602 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Wed, 23 Aug 2017 03:34:39 +0800
Subject: [PATCH 053/167] Update utils/ruleset-whitelist.csv, Related #11187
(#11597)
---
utils/ruleset-whitelist.csv | 2 ++
1 file changed, 2 insertions(+)
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index 57f5ffbcf65c..8d245580b5ca 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -1,4 +1,6 @@
hash,auto-pass coverage test,auto-pass fetch test,filename
+7404da7bb08bb04c2ce7d138aa2c1672488e99d9af5097c656f7cc2cd2a36cfb,1,0,GOV.UK.xml
+b18aaa63b24e4333450a6523704e29e485506972e8fc4be497e890e79ecef4bf,1,0,PoliceUK.xml
86e2ab8f682d7b1cdc7b8e44fb871ac1241e3d93736d8dc3bb977cb41269028d,1,1,0nl1ne.at.xml
fbb2d56d33f886b53c314eac3446eed8bad7916660ad0709367936fe8335d987,1,1,112_Cafe.com.xml
49120e478094762f6fc73e19a4cde0780b0337ab95a8aa9fc6771608263697b0,1,1,123-reg.xml
From 6e89bb2141391e9b8a18a3cf8ce8767794505704 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Wed, 23 Aug 2017 23:57:34 +0000
Subject: [PATCH 054/167] [Gyazo.com] Add targets (#12058)
---
src/chrome/content/rules/Gyazo.com.xml | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/chrome/content/rules/Gyazo.com.xml b/src/chrome/content/rules/Gyazo.com.xml
index cdbdad367fc4..8f7ee7e07d66 100644
--- a/src/chrome/content/rules/Gyazo.com.xml
+++ b/src/chrome/content/rules/Gyazo.com.xml
@@ -1,27 +1,29 @@
-
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
From dac62c912536b2480794f58a49aa447e25f66290 Mon Sep 17 00:00:00 2001
From: William Budington
Date: Wed, 23 Aug 2017 17:24:20 -0700
Subject: [PATCH 055/167] Standardizing 2-space indentation for chromium/ path
---
chromium/.eslintrc.json | 4 +-
chromium/background.js | 56 ++++++++++++++--------------
chromium/devtools-panel.js | 8 ++--
chromium/devtools.js | 8 ++--
chromium/incognito-cache-clearing.js | 36 +++++++++---------
chromium/rules.js | 28 +++++++-------
chromium/util.js | 14 +++----
7 files changed, 78 insertions(+), 76 deletions(-)
diff --git a/chromium/.eslintrc.json b/chromium/.eslintrc.json
index cf42849defba..172f709bdcd9 100644
--- a/chromium/.eslintrc.json
+++ b/chromium/.eslintrc.json
@@ -6,9 +6,11 @@
"node": true,
"webextensions": true
},
-
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "script"
+ },
+ "rules": {
+ "indent": [2, 2]
}
}
diff --git a/chromium/background.js b/chromium/background.js
index 1e28a4f8c534..200f46929571 100644
--- a/chromium/background.js
+++ b/chromium/background.js
@@ -280,11 +280,11 @@ function onBeforeRequest(details) {
// analysis process
var using_credentials_in_url = false;
if (uri.password || uri.username) {
- using_credentials_in_url = true;
- var tmp_user = uri.username;
- var tmp_pass = uri.password;
- uri.username = null;
- uri.password = null;
+ using_credentials_in_url = true;
+ var tmp_user = uri.username;
+ var tmp_pass = uri.password;
+ uri.username = null;
+ uri.password = null;
}
var canonical_url = uri.href;
@@ -332,10 +332,10 @@ function onBeforeRequest(details) {
// HTTP URIs by parent hostname, along with the resource type.
if (switchPlannerEnabledFor[details.tabId] && uri.protocol !== "https:") {
writeToSwitchPlanner(details.type,
- details.tabId,
- canonical_host,
- details.url,
- newuristr);
+ details.tabId,
+ canonical_host,
+ details.url,
+ newuristr);
}
if (httpNowhereOn) {
@@ -457,28 +457,28 @@ function onCookieChanged(changeInfo) {
if (!changeInfo.removed && !changeInfo.cookie.secure && isExtensionEnabled) {
if (all_rules.shouldSecureCookie(changeInfo.cookie)) {
var cookie = {name:changeInfo.cookie.name,
- value:changeInfo.cookie.value,
- path:changeInfo.cookie.path,
- httpOnly:changeInfo.cookie.httpOnly,
- expirationDate:changeInfo.cookie.expirationDate,
- storeId:changeInfo.cookie.storeId,
- secure: true};
+ value:changeInfo.cookie.value,
+ path:changeInfo.cookie.path,
+ httpOnly:changeInfo.cookie.httpOnly,
+ expirationDate:changeInfo.cookie.expirationDate,
+ storeId:changeInfo.cookie.storeId,
+ secure: true};
// Host-only cookies don't set the domain field.
if (!changeInfo.cookie.hostOnly) {
- cookie.domain = changeInfo.cookie.domain;
+ cookie.domain = changeInfo.cookie.domain;
}
// The cookie API is magical -- we must recreate the URL from the domain and path.
if (changeInfo.cookie.domain[0] == ".") {
- cookie.url = "https://www" + changeInfo.cookie.domain + cookie.path;
+ cookie.url = "https://www" + changeInfo.cookie.domain + cookie.path;
} else {
- cookie.url = "https://" + changeInfo.cookie.domain + cookie.path;
+ cookie.url = "https://" + changeInfo.cookie.domain + cookie.path;
}
// We get repeated events for some cookies because sites change their
// value repeatedly and remove the "secure" flag.
log(DBUG,
- "Securing cookie " + cookie.name + " for " + changeInfo.cookie.domain + ", was secure=" + changeInfo.cookie.secure);
+ "Securing cookie " + cookie.name + " for " + changeInfo.cookie.domain + ", was secure=" + changeInfo.cookie.secure);
chrome.cookies.set(cookie);
}
}
@@ -489,17 +489,17 @@ function onCookieChanged(changeInfo) {
* @param details details for the redirect (see chrome doc)
* */
function onBeforeRedirect(details) {
- // Catch redirect loops (ignoring about:blank, etc. caused by other extensions)
- var prefix = details.redirectUrl.substring(0, 5);
- if (prefix === "http:" || prefix === "https") {
- if (details.requestId in redirectCounter) {
- redirectCounter[details.requestId] += 1;
- log(DBUG, "Got redirect id "+details.requestId+
+ // Catch redirect loops (ignoring about:blank, etc. caused by other extensions)
+ var prefix = details.redirectUrl.substring(0, 5);
+ if (prefix === "http:" || prefix === "https") {
+ if (details.requestId in redirectCounter) {
+ redirectCounter[details.requestId] += 1;
+ log(DBUG, "Got redirect id "+details.requestId+
": "+redirectCounter[details.requestId]);
- } else {
- redirectCounter[details.requestId] = 1;
- }
+ } else {
+ redirectCounter[details.requestId] = 1;
}
+ }
}
// Registers the handler for requests
diff --git a/chromium/devtools-panel.js b/chromium/devtools-panel.js
index 27fc7bef683b..b329fe268c57 100644
--- a/chromium/devtools-panel.js
+++ b/chromium/devtools-panel.js
@@ -8,8 +8,8 @@ function e(id) {
*/
function sendMessage(type) {
chrome.runtime.sendMessage({
- type: type,
- tabId: chrome.devtools.inspectedWindow.tabId,
+ type: type,
+ tabId: chrome.devtools.inspectedWindow.tabId,
});
}
@@ -41,8 +41,8 @@ function disableSwitchPlanner() {
*/
function display() {
chrome.runtime.sendMessage({
- type: "getHosts",
- tabId: chrome.devtools.inspectedWindow.tabId,
+ type: "getHosts",
+ tabId: chrome.devtools.inspectedWindow.tabId,
}, function(response) {
var resources = e("resources");
var switch_planner_details = e("SwitchPlannerDetails");
diff --git a/chromium/devtools.js b/chromium/devtools.js
index 343bee094295..77c69e6e6727 100644
--- a/chromium/devtools.js
+++ b/chromium/devtools.js
@@ -1,6 +1,6 @@
chrome.devtools.panels.create("HTTPS Everywhere",
- "icons/icon-active-38.png",
- "devtools-panel.html",
- function(panel) {
- }
+ "icons/icon-active-38.png",
+ "devtools-panel.html",
+ function(panel) {
+ }
);
diff --git a/chromium/incognito-cache-clearing.js b/chromium/incognito-cache-clearing.js
index c0125a2bb5cf..d00a40213492 100644
--- a/chromium/incognito-cache-clearing.js
+++ b/chromium/incognito-cache-clearing.js
@@ -10,9 +10,9 @@ let incognito_session_exists = false;
* @param window: A standard Window object.
*/
function detect_incognito_creation(window) {
- if (window.incognito === true) {
- incognito_session_exists = true;
- }
+ if (window.incognito === true) {
+ incognito_session_exists = true;
+ }
}
/**
@@ -20,9 +20,9 @@ function detect_incognito_creation(window) {
* Called if an incognito session is destroyed.
*/
function destroy_caches() {
- log(DBUG, "Destroying caches.");
- all_rules.cookieHostCache.clear();
- all_rules.ruleCache.clear();
+ log(DBUG, "Destroying caches.");
+ all_rules.cookieHostCache.clear();
+ all_rules.ruleCache.clear();
}
/**
@@ -30,15 +30,15 @@ function destroy_caches() {
* @param arrayOfWindows: A array of all open Window objects.
*/
function check_for_incognito_session(arrayOfWindows) {
- for (let window of arrayOfWindows) {
- if (window.incognito === true) {
- // An incognito window still exists, so don't destroy caches yet.
- return;
- }
+ for (let window of arrayOfWindows) {
+ if (window.incognito === true) {
+ // An incognito window still exists, so don't destroy caches yet.
+ return;
}
- // All incognito windows have been closed.
- incognito_session_exists = false;
- destroy_caches();
+ }
+ // All incognito windows have been closed.
+ incognito_session_exists = false;
+ destroy_caches();
}
/**
@@ -47,10 +47,10 @@ function check_for_incognito_session(arrayOfWindows) {
* @param windowId: Ignored.
*/
function detect_incognito_destruction(windowId) {
- if (incognito_session_exists) {
- // Are any current windows incognito?
- chrome.windows.getAll(check_for_incognito_session);
- }
+ if (incognito_session_exists) {
+ // Are any current windows incognito?
+ chrome.windows.getAll(check_for_incognito_session);
+ }
}
diff --git a/chromium/rules.js b/chromium/rules.js
index 5de01015ba96..ac596f716225 100644
--- a/chromium/rules.js
+++ b/chromium/rules.js
@@ -100,7 +100,7 @@ RuleSet.prototype = {
// Okay, now find the first rule that triggers
for (let rule of this.rules) {
returl = urispec.replace(rule.from_c,
- rule.to);
+ rule.to);
if (returl != urispec) {
return returl;
}
@@ -269,8 +269,8 @@ RuleSets.prototype = {
}
var rule_set = new RuleSet(ruletag.getAttribute("name"),
- default_state,
- note.trim());
+ default_state,
+ note.trim());
// Read user prefs
if (rule_set.name in this.ruleActiveStates) {
@@ -280,7 +280,7 @@ RuleSets.prototype = {
var rules = ruletag.getElementsByTagName("rule");
for (let rule of rules) {
rule_set.rules.push(new Rule(rule.getAttribute("from"),
- rule.getAttribute("to")));
+ rule.getAttribute("to")));
}
var exclusions = ruletag.getElementsByTagName("exclusion");
@@ -304,11 +304,11 @@ RuleSets.prototype = {
var targets = ruletag.getElementsByTagName("target");
for (let target of targets) {
- var host = target.getAttribute("host");
- if (!(host in this.targets)) {
- this.targets[host] = [];
- }
- this.targets[host].push(rule_set);
+ var host = target.getAttribute("host");
+ if (!(host in this.targets)) {
+ this.targets[host] = [];
+ }
+ this.targets[host].push(rule_set);
}
},
@@ -321,8 +321,8 @@ RuleSets.prototype = {
// Have we cached this result? If so, return it!
var cached_item = this.ruleCache.get(host);
if (cached_item !== undefined) {
- log(DBUG, "Ruleset cache hit for " + host + " items:" + cached_item.length);
- return cached_item;
+ log(DBUG, "Ruleset cache hit for " + host + " items:" + cached_item.length);
+ return cached_item;
}
log(DBUG, "Ruleset cache miss for " + host);
@@ -392,7 +392,7 @@ RuleSets.prototype = {
}
if (!this.safeToSecureCookie(hostname)) {
- return null;
+ return null;
}
var potentiallyApplicable = this.potentiallyApplicableRulesets(hostname);
@@ -433,8 +433,8 @@ RuleSets.prototype = {
}
var cached_item = this.cookieHostCache.get(domain);
if (cached_item !== undefined) {
- log(DBUG, "Cookie host cache hit for " + domain);
- return cached_item;
+ log(DBUG, "Cookie host cache hit for " + domain);
+ return cached_item;
}
log(DBUG, "Cookie host cache miss for " + domain);
diff --git a/chromium/util.js b/chromium/util.js
index 6ecb52b6b2c9..9d926dc1e76e 100644
--- a/chromium/util.js
+++ b/chromium/util.js
@@ -16,12 +16,12 @@ console.log("Type this into the console: DEFAULT_LOG_LEVEL=VERB");
console.log("Accepted levels are VERB, DBUG, INFO, NOTE and WARN, default is NOTE");
function log(level, str) {
- if (level >= DEFAULT_LOG_LEVEL) {
- if (level === WARN) {
- // Show warning with a little yellow icon in Chrome.
- console.warn(str);
- } else {
- console.log(str);
- }
+ if (level >= DEFAULT_LOG_LEVEL) {
+ if (level === WARN) {
+ // Show warning with a little yellow icon in Chrome.
+ console.warn(str);
+ } else {
+ console.log(str);
}
+ }
}
From 91febbf4274564da5c8065a68737dadf1c7c4736 Mon Sep 17 00:00:00 2001
From: William Budington
Date: Wed, 23 Aug 2017 17:37:13 -0700
Subject: [PATCH 056/167] Standardizing 2-space indentation for rest of the
project
---
rewriter/rewriter.js | 44 ++--
src/bootstrap.js | 12 +-
utils/convert-hsts/index.js | 98 ++++-----
utils/hsts-prune/index.js | 56 ++---
utils/labeller/index.js | 2 +-
utils/merge-rulesets.js | 68 +++----
utils/trivialize-rules/trivialize-rules.js | 226 ++++++++++-----------
7 files changed, 253 insertions(+), 253 deletions(-)
diff --git a/rewriter/rewriter.js b/rewriter/rewriter.js
index 180468c227eb..3fbda2938bdd 100644
--- a/rewriter/rewriter.js
+++ b/rewriter/rewriter.js
@@ -15,14 +15,14 @@
// git diff
var path = require("path"),
- fs = require("fs"),
- DOMParser = require('xmldom').DOMParser,
- readdirp = require('readdirp'),
- es = require('event-stream'),
+ fs = require("fs"),
+ DOMParser = require('xmldom').DOMParser,
+ readdirp = require('readdirp'),
+ es = require('event-stream'),
- rules = require("../chromium/rules"),
+ rules = require("../chromium/rules"),
- URI = require("urijs");
+ URI = require("urijs");
var ruleSets = null;
@@ -35,26 +35,26 @@ function processDir(dir) {
var stream = readdirp({
root: dir,
fileFilter: ['*.html', '*.js', '*.rb', '*.erb', '*.mustache',
- '*.scala', '*.c', '*.cc', '*.cpp', '*.cxx',
- '*.java', '*.go', '*.php', '*.css', '*.pl', '*.py',
- '*.rhtml', '*.sh', '*.yaml']
+ '*.scala', '*.c', '*.cc', '*.cpp', '*.cxx',
+ '*.java', '*.go', '*.php', '*.css', '*.pl', '*.py',
+ '*.rhtml', '*.sh', '*.yaml']
});
stream
- .on('warn', function (err) {
- console.error('non-fatal error', err);
+ .on('warn', function (err) {
+ console.error('non-fatal error', err);
// Optionally call stream.destroy() here in order to abort and cause 'close' to be emitted
- })
- .on('error', function (err) { console.error('fatal error', err); })
- .pipe(es.mapSync(function (entry) {
- var filename = path.join(dir, entry.path);
- console.log("Rewriting " + filename);
- try {
- processFile(filename);
- } catch(e) {
- console.log(filename, e);
- }
- }));
+ })
+ .on('error', function (err) { console.error('fatal error', err); })
+ .pipe(es.mapSync(function (entry) {
+ var filename = path.join(dir, entry.path);
+ console.log("Rewriting " + filename);
+ try {
+ processFile(filename);
+ } catch(e) {
+ console.log(filename, e);
+ }
+ }));
}
/**
diff --git a/src/bootstrap.js b/src/bootstrap.js
index bffa4646d87a..c55cb440ba7d 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -5,7 +5,7 @@ const CC = Components.classes;
function get_prefs(branch_name){
let o_prefs = CC["@mozilla.org/preferences-service;1"]
- .getService(CI.nsIPrefService);
+ .getService(CI.nsIPrefService);
let o_branch = o_prefs.getBranch(branch_name);
return o_branch;
}
@@ -14,9 +14,9 @@ function get_custom_rulesets_array(){
var loc = "ProfD"; // profile directory
var dir =
CC["@mozilla.org/file/directory_service;1"]
- .getService(CI.nsIProperties)
- .get(loc, CI.nsILocalFile)
- .clone();
+ .getService(CI.nsIProperties)
+ .get(loc, CI.nsILocalFile)
+ .clone();
dir.append("HTTPSEverywhereUserRules");
// Check for existence, if not, create.
if (!dir.exists()) {
@@ -35,9 +35,9 @@ function get_custom_rulesets_array(){
for(let file of files){
var data = "";
var fstream = CC["@mozilla.org/network/file-input-stream;1"]
- .createInstance(CI.nsIFileInputStream);
+ .createInstance(CI.nsIFileInputStream);
var sstream = CC["@mozilla.org/scriptableinputstream;1"]
- .createInstance(CI.nsIScriptableInputStream);
+ .createInstance(CI.nsIScriptableInputStream);
fstream.init(file, -1, 0, 0);
sstream.init(fstream);
diff --git a/utils/convert-hsts/index.js b/utils/convert-hsts/index.js
index 42922f649e02..6b374505e290 100644
--- a/utils/convert-hsts/index.js
+++ b/utils/convert-hsts/index.js
@@ -17,59 +17,59 @@ _(push => {
push(null, _.nil);
});
})
-.flatMap(_)
-.pipe(_.pipeline(
- base64.decode(),
- _.split(),
- _.filter(line => !/^\s*\/\//.test(line)),
- JSONStream.parse('entries.*')
-))
-.reduce({
- xml: xmlBuilder.create('rulesetlibrary'),
- rulesets: new Map(),
- greedyInclusions: '(?!)',
- potentialExclusions: new Map()
-}, (acc, { name, mode = '', include_subdomains = false }) => {
- if (mode === 'force-https') {
- const ruleset = acc.xml.ele('ruleset', { name });
- acc.rulesets.set(name, ruleset);
- ruleset.ele('target', {
- host: name
- });
- if (include_subdomains) {
- acc.greedyInclusions += `|${hostToRegex(name)}`;
+ .flatMap(_)
+ .pipe(_.pipeline(
+ base64.decode(),
+ _.split(),
+ _.filter(line => !/^\s*\/\//.test(line)),
+ JSONStream.parse('entries.*')
+ ))
+ .reduce({
+ xml: xmlBuilder.create('rulesetlibrary'),
+ rulesets: new Map(),
+ greedyInclusions: '(?!)',
+ potentialExclusions: new Map()
+ }, (acc, { name, mode = '', include_subdomains = false }) => {
+ if (mode === 'force-https') {
+ const ruleset = acc.xml.ele('ruleset', { name });
+ acc.rulesets.set(name, ruleset);
ruleset.ele('target', {
- host: `*.${name}`
- });
- }
- ruleset.ele('rule', {
- from: '^http:',
- to: 'https:'
- });
- } else {
- acc.potentialExclusions.set(name, include_subdomains);
- }
- return acc;
-})
-.map(acc => {
- const regexp = new RegExp(`\.(${acc.greedyInclusions})$`);
- for (const [ name, include_subdomains ] of acc.potentialExclusions) {
- const match = name.match(regexp);
- if (match) {
- const ruleset = acc.rulesets.get(match[1]);
- ruleset.ele('exclusion', {
- pattern: `^http://${include_subdomains ? '(?:[\\w-]+\\.)*' : ''}${hostToRegex(name)}/`
- });
- ruleset.ele('test', {
- url: `http://${name}/`
+ host: name
});
if (include_subdomains) {
+ acc.greedyInclusions += `|${hostToRegex(name)}`;
+ ruleset.ele('target', {
+ host: `*.${name}`
+ });
+ }
+ ruleset.ele('rule', {
+ from: '^http:',
+ to: 'https:'
+ });
+ } else {
+ acc.potentialExclusions.set(name, include_subdomains);
+ }
+ return acc;
+ })
+ .map(acc => {
+ const regexp = new RegExp(`\.(${acc.greedyInclusions})$`);
+ for (const [ name, include_subdomains ] of acc.potentialExclusions) {
+ const match = name.match(regexp);
+ if (match) {
+ const ruleset = acc.rulesets.get(match[1]);
+ ruleset.ele('exclusion', {
+ pattern: `^http://${include_subdomains ? '(?:[\\w-]+\\.)*' : ''}${hostToRegex(name)}/`
+ });
ruleset.ele('test', {
- url: `http://host-part.${name}/`
+ url: `http://${name}/`
});
+ if (include_subdomains) {
+ ruleset.ele('test', {
+ url: `http://host-part.${name}/`
+ });
+ }
}
}
- }
- return acc.xml.end({ pretty: true });
-})
-.pipe(fs.createWriteStream(`${__dirname}/hsts.xml`));
+ return acc.xml.end({ pretty: true });
+ })
+ .pipe(fs.createWriteStream(`${__dirname}/hsts.xml`));
diff --git a/utils/hsts-prune/index.js b/utils/hsts-prune/index.js
index 661f8c697c94..f5d1b5d9fe5c 100644
--- a/utils/hsts-prune/index.js
+++ b/utils/hsts-prune/index.js
@@ -41,7 +41,7 @@ const firefox_version_fetch = version_url => {
return cb => {
https.get(version_url, res => {
cb(null, res.headers.location
- .match(/firefox-(.*).tar.*/)[1].replace(/\./g, "_"));
+ .match(/firefox-(.*).tar.*/)[1].replace(/\./g, "_"));
});
};
};
@@ -142,7 +142,7 @@ const check_header_directives = (check_domain, cb) => {
max_age = Number(max_age_match[1]);
}
cb(null,
- preload && include_subdomains && max_age >= 10886400);
+ preload && include_subdomains && max_age >= 10886400);
sent_callback = true;
} else {
cb(null, false);
@@ -193,38 +193,38 @@ function remove_target_from_xml(source, target) {
const files =
read_dir(rules_dir)
- .tap(rules => {
- bar = new ProgressBar(':bar', { total: rules.length, stream: process.stdout });
- })
- .sequence()
- .filter(name => {
- if(rulesets_changed){
- return ~rulesets_changed.indexOf(name);
- } else {
- return name.endsWith('.xml');
- }
- });
+ .tap(rules => {
+ bar = new ProgressBar(':bar', { total: rules.length, stream: process.stdout });
+ })
+ .sequence()
+ .filter(name => {
+ if(rulesets_changed){
+ return ~rulesets_changed.indexOf(name);
+ } else {
+ return name.endsWith('.xml');
+ }
+ });
const sources =
files.fork()
- .map(name => read_file(`${rules_dir}/${name}`, 'utf-8'))
- .parallel(10);
+ .map(name => read_file(`${rules_dir}/${name}`, 'utf-8'))
+ .parallel(10);
const rules =
sources.fork()
- .flatMap(parse_xml)
- .errors((err, push) => {
- push(null, { err });
- })
- .zip(files.fork())
- .map(([ { ruleset, err }, name ]) => {
- if (err) {
- err.message += ` (${name})`;
- this.emit('error', err);
- } else {
- return ruleset;
- }
- });
+ .flatMap(parse_xml)
+ .errors((err, push) => {
+ push(null, { err });
+ })
+ .zip(files.fork())
+ .map(([ { ruleset, err }, name ]) => {
+ if (err) {
+ err.message += ` (${name})`;
+ this.emit('error', err);
+ } else {
+ return ruleset;
+ }
+ });
// This async call determines the current versions of the supported browsers
diff --git a/utils/labeller/index.js b/utils/labeller/index.js
index 6d5f9306abd8..99da8f848df6 100644
--- a/utils/labeller/index.js
+++ b/utils/labeller/index.js
@@ -65,7 +65,7 @@ function get_most_recent_pr(alexa, recent_cb){
function github_process_prs(res, pr_cb){
var alexa = res[0],
- most_recent_pr_checked = res[1];
+ most_recent_pr_checked = res[1];
var github = new GitHubApi();
var wildcard_www_regex = /^(www|\*)\.(.+)/
diff --git a/utils/merge-rulesets.js b/utils/merge-rulesets.js
index 7cc96abe2fe2..52b803eefad7 100644
--- a/utils/merge-rulesets.js
+++ b/utils/merge-rulesets.js
@@ -6,11 +6,11 @@
var fs = new ActiveXObject("Scripting.FileSystemObject"),
-shell = new ActiveXObject("WScript.Shell"),
-args = WScript.Arguments,
-scriptFullPath = WScript.ScriptFullName,
-sourceDir = args[0],
-targetFile = args[1];
+ shell = new ActiveXObject("WScript.Shell"),
+ args = WScript.Arguments,
+ scriptFullPath = WScript.ScriptFullName,
+ sourceDir = args[0],
+ targetFile = args[1];
var msg="";
@@ -18,21 +18,21 @@ var msg="";
var enginefile=WScript.FullName;
var stdout=null;
if(enginefile.toLowerCase().indexOf("cscript.exe")>-1){
- stdout=WScript.StdOut;
+ stdout=WScript.StdOut;
}
function getDir(a) {
- return a.substring(0, a.lastIndexOf("\\") || a.lastIndexOf("/"))
+ return a.substring(0, a.lastIndexOf("\\") || a.lastIndexOf("/"))
}
//checking input
var scriptPath = getDir(WScript.ScriptFullName.toString());
if (!sourceDir) {
- sourceDir = sourceDir || (getDir(scriptPath) + "\\src\\chrome\\content\\rules");
+ sourceDir = sourceDir || (getDir(scriptPath) + "\\src\\chrome\\content\\rules");
}
var defaultFileName="default.rulesets";
if (!targetFile) {
- targetFile = sourceDir + "\\" + defaultFileName;
+ targetFile = sourceDir + "\\" + defaultFileName;
}
//shell.Popup(sourceDir, 0, "HTTPS Everywhere Rules Merger",64);
@@ -40,42 +40,42 @@ if (!targetFile) {
if(stdout)
- stdout.WriteLine("Merging rulesets... and removing whitespaces and comments...");
+ stdout.WriteLine("Merging rulesets... and removing whitespaces and comments...");
var infldr = fs.GetFolder(sourceDir);
var res,fileI;
targetFile=fs.CreateTextFile(targetFile);
function clean_up(rulefile){
- //Remove extra whitespace and comments from a rulesets
- rulefile = rulefile.replace(//ig,'');
- rulefile = rulefile.replace(/\s+/ig,' ');
- //rulefile = rulefile.replace(/\s*(to=|from=)/ig," $1");
- rulefile = rulefile.replace(/>\s*, "><");
- //rulefile = rulefile.replace(/<\/ruleset>\s*/ig, "\n");
- rulefile = rulefile.replace(/\s*(\/>|/ig,'');
+ rulefile = rulefile.replace(/\s+/ig,' ');
+ //rulefile = rulefile.replace(/\s*(to=|from=)/ig," $1");
+ rulefile = rulefile.replace(/>\s*, "><");
+ //rulefile = rulefile.replace(/<\/ruleset>\s*/ig, "\n");
+ rulefile = rulefile.replace(/\s*(\/>|');
+ targetFile.Write('');
else
- targetFile.Write('');
+ targetFile.Write('');
var fileNameRx=/\.xml$/i;
for(fileI = new Enumerator(infldr.Files); !fileI.atEnd(); fileI.moveNext()){
- if (file = fileI.item()) {
- var name = file.Name;
- if(!fileNameRx.test(name))continue;
- if(stdout)stdout.WriteLine("Processing file "+name+"...");
- var currentFileStream=file.OpenAsTextStream(1);
- var ruleset = currentFileStream.ReadAll();
- currentFileStream.Close();
- delete currentFileStream;
- ruleset = ruleset.replace("\n");
targetFile.Close();
@@ -84,10 +84,10 @@ delete targetFile;
var currentStageMsg="Merging has been FINISHED!";
if(stdout){
- stdout.WriteLine(currentStageMsg);
+ stdout.WriteLine(currentStageMsg);
}else{
- msg+="\n"+currentStageMsg;
- shell.Popup(msg, 1, "HTTPS Everywhere Rules Merger", 64);
+ msg+="\n"+currentStageMsg;
+ shell.Popup(msg, 1, "HTTPS Everywhere Rules Merger", 64);
}
diff --git a/utils/trivialize-rules/trivialize-rules.js b/utils/trivialize-rules/trivialize-rules.js
index de289eb27158..2bc2a61e8ad5 100644
--- a/utils/trivialize-rules/trivialize-rules.js
+++ b/utils/trivialize-rules/trivialize-rules.js
@@ -15,158 +15,158 @@ const hostPartRe = VerEx().anyOf(/\w\-/).oneOrMore();
const hostPartWithDotRe = VerEx().find(hostPartRe).then('\\.');
const staticRegExp = VerEx()
- .startOfLine()
- .then('^http://(')
- .beginCapture()
- .multiple(VerEx().find(hostPartWithDotRe).then('|'))
- .then(hostPartWithDotRe)
- .endCapture()
- .then(')')
- .beginCapture()
- .maybe('?')
- .endCapture()
- .beginCapture()
- .multiple(hostPartWithDotRe)
- .then(hostPartRe)
- .endCapture()
- .then('/')
- .endOfLine()
- .stopAtFirst()
- .searchOneLine();
+ .startOfLine()
+ .then('^http://(')
+ .beginCapture()
+ .multiple(VerEx().find(hostPartWithDotRe).then('|'))
+ .then(hostPartWithDotRe)
+ .endCapture()
+ .then(')')
+ .beginCapture()
+ .maybe('?')
+ .endCapture()
+ .beginCapture()
+ .multiple(hostPartWithDotRe)
+ .then(hostPartRe)
+ .endCapture()
+ .then('/')
+ .endOfLine()
+ .stopAtFirst()
+ .searchOneLine();
const tagsRegExps = new Map();
function createTagsRegexp(tag) {
- let re = tagsRegExps.get(tag);
- if (!re) {
- const tagRe = `<${tag}(?:\\s+\\w+=".*?")*\\s*\\/>`;
- re = new RegExp(`(?:${tagRe}\\s*)*${tagRe}`, 'g');
- tagsRegExps.set(tag, re);
- }
- return re;
+ let re = tagsRegExps.get(tag);
+ if (!re) {
+ const tagRe = `<${tag}(?:\\s+\\w+=".*?")*\\s*\\/>`;
+ re = new RegExp(`(?:${tagRe}\\s*)*${tagRe}`, 'g');
+ tagsRegExps.set(tag, re);
+ }
+ return re;
}
function replaceXML(source, tag, newXML) {
- let pos;
- let re = createTagsRegexp(tag);
- source = source.replace(re, (match, index) => {
- if (pos === undefined) {
- pos = index;
- }
- return '';
- });
- if (pos === undefined) {
- throw new Error(`${re}: <${tag} /> was not found in ${source}`);
- }
- return source.slice(0, pos) + newXML + source.slice(pos);
+ let pos;
+ let re = createTagsRegexp(tag);
+ source = source.replace(re, (match, index) => {
+ if (pos === undefined) {
+ pos = index;
+ }
+ return '';
+ });
+ if (pos === undefined) {
+ throw new Error(`${re}: <${tag} /> was not found in ${source}`);
+ }
+ return source.slice(0, pos) + newXML + source.slice(pos);
}
const files =
readDir(rulesDir)
- .tap(rules => {
- bar = new ProgressBar(':bar', { total: rules.length, stream: process.stdout });
- })
- .sequence()
- .filter(name => name.endsWith('.xml'));
+ .tap(rules => {
+ bar = new ProgressBar(':bar', { total: rules.length, stream: process.stdout });
+ })
+ .sequence()
+ .filter(name => name.endsWith('.xml'));
const sources =
files.fork()
- .map(name => readFile(`${rulesDir}/${name}`, 'utf-8'))
- .parallel(10);
+ .map(name => readFile(`${rulesDir}/${name}`, 'utf-8'))
+ .parallel(10);
const rules =
sources.fork()
- .flatMap(parseXML)
- .errors((err, push) => {
- push(null, { err });
- })
- .zip(files.fork())
- .map(([ { ruleset, err }, name ]) => {
- if (err) {
- err.message += ` (${name})`;
- this.emit('error', err);
- } else {
- return ruleset;
- }
- });
+ .flatMap(parseXML)
+ .errors((err, push) => {
+ push(null, { err });
+ })
+ .zip(files.fork())
+ .map(([ { ruleset, err }, name ]) => {
+ if (err) {
+ err.message += ` (${name})`;
+ this.emit('error', err);
+ } else {
+ return ruleset;
+ }
+ });
function isTrivial(rule) {
- return rule.from === '^http:' && rule.to === 'https:';
+ return rule.from === '^http:' && rule.to === 'https:';
}
files.fork().zipAll([ sources.fork(), rules ]).map(([name, source, ruleset]) => {
- bar.tick();
+ bar.tick();
- let target = ruleset.target.map(target => target.$.host);
- let rule = ruleset.rule.map(rule => rule.$);
+ let target = ruleset.target.map(target => target.$.host);
+ let rule = ruleset.rule.map(rule => rule.$);
- if (rule.length === 1 && isTrivial(rule[0])) {
- return;
- }
+ if (rule.length === 1 && isTrivial(rule[0])) {
+ return;
+ }
- let targetRe = new RegExp(`^${target.map(target => `(${target.replace(/\./g, '\\.').replace(/\*/g, '.*')})`).join('|')}$`);
- let domains = [];
+ let targetRe = new RegExp(`^${target.map(target => `(${target.replace(/\./g, '\\.').replace(/\*/g, '.*')})`).join('|')}$`);
+ let domains = [];
- function isStatic(rule) {
- if (isTrivial(rule)) {
- domains = domains.concat(target);
- return true;
- }
+ function isStatic(rule) {
+ if (isTrivial(rule)) {
+ domains = domains.concat(target);
+ return true;
+ }
- const { from, to } = rule;
+ const { from, to } = rule;
- const match = from.match(staticRegExp);
+ const match = from.match(staticRegExp);
- if (!match) {
- // console.error(from);
- return false;
- }
+ if (!match) {
+ // console.error(from);
+ return false;
+ }
- const subDomains = match[1].split('|').map(item => item.slice(0, -2));
- const baseDomain = match[3].replace(/\\(.)/g, '$1');
- const localDomains = subDomains.map(sub => `${sub}.${baseDomain}`);
+ const subDomains = match[1].split('|').map(item => item.slice(0, -2));
+ const baseDomain = match[3].replace(/\\(.)/g, '$1');
+ const localDomains = subDomains.map(sub => `${sub}.${baseDomain}`);
- if (to !== `https://$1${baseDomain}/`) {
- console.error(from, to);
- return false;
- }
+ if (to !== `https://$1${baseDomain}/`) {
+ console.error(from, to);
+ return false;
+ }
- let mismatch = false;
+ let mismatch = false;
- for (const domain of localDomains) {
- if (!targetRe.test(domain)) {
- console.error(target, domain, from);
- mismatch = true;
- }
- }
-
- if (mismatch) {
- return false;
- }
-
- if (match[2] || targetRe.test(baseDomain)) {
- localDomains.unshift(baseDomain);
- }
+ for (const domain of localDomains) {
+ if (!targetRe.test(domain)) {
+ console.error(target, domain, from);
+ mismatch = true;
+ }
+ }
+
+ if (mismatch) {
+ return false;
+ }
+
+ if (match[2] || targetRe.test(baseDomain)) {
+ localDomains.unshift(baseDomain);
+ }
- domains = domains.concat(localDomains);
+ domains = domains.concat(localDomains);
- return true;
- }
+ return true;
+ }
- if (!rule.every(isStatic)) return;
+ if (!rule.every(isStatic)) return;
- domains = Array.from(new Set(domains));
+ domains = Array.from(new Set(domains));
- if (domains.slice().sort().join('\n') !== target.sort().join('\n')) {
- source = replaceXML(source, 'target', domains.map(domain => ``).join('\n\t'));
- }
+ if (domains.slice().sort().join('\n') !== target.sort().join('\n')) {
+ source = replaceXML(source, 'target', domains.map(domain => ``).join('\n\t'));
+ }
- source = replaceXML(source, 'rule', '');
+ source = replaceXML(source, 'rule', '');
- return writeFile(`${rulesDir}/${name}`, source);
+ return writeFile(`${rulesDir}/${name}`, source);
})
-.filter(Boolean)
-.parallel(10)
-.reduce(0, count => count + 1)
-.each(count => console.log(`Rewritten ${count} files.`));
+ .filter(Boolean)
+ .parallel(10)
+ .reduce(0, count => count + 1)
+ .each(count => console.log(`Rewritten ${count} files.`));
From e373c18f63447f8eb01566cfb27ce870af5b0038 Mon Sep 17 00:00:00 2001
From: William Budington
Date: Wed, 23 Aug 2017 17:37:58 -0700
Subject: [PATCH 057/167] Specify 2-space indentation for js in .editorconfig
---
.editorconfig | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.editorconfig b/.editorconfig
index 1ccf04d6210d..d677601d7011 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,7 @@ charset = utf-8
[src/chrome/content/rules/*.xml]
indent_style = tab
-indent_size = 4
\ No newline at end of file
+indent_size = 4
+
+[*.js]
+indent_size = 2
From 5ed94996527111886ab8ca00b139b1a942ce63fa Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 07:15:07 +0000
Subject: [PATCH 058/167] [Smithsonianmag.com] Simplify ruleset and add test
urls (fix #10705) (#10706)
* [Smithsonianmag.com] Simplify ruleset and add test urls (fix #10705)
* [Smithsonianmag.com] Fix typo
---
.../content/rules/Smithsonianmag.com.xml | 57 ++++---------------
1 file changed, 12 insertions(+), 45 deletions(-)
diff --git a/src/chrome/content/rules/Smithsonianmag.com.xml b/src/chrome/content/rules/Smithsonianmag.com.xml
index aec55bd810a3..7993445dbb70 100644
--- a/src/chrome/content/rules/Smithsonianmag.com.xml
+++ b/src/chrome/content/rules/Smithsonianmag.com.xml
@@ -1,56 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
+
From 5e87f78e48977d29fb31d51d5643d35fbd0a1378 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Thu, 24 Aug 2017 16:03:39 +0800
Subject: [PATCH 059/167] Delete RAUR.xml (Gone from DNS) (#11915)
---
src/chrome/content/rules/RAUR.xml | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 src/chrome/content/rules/RAUR.xml
diff --git a/src/chrome/content/rules/RAUR.xml b/src/chrome/content/rules/RAUR.xml
deleted file mode 100644
index 9cc31b521151..000000000000
--- a/src/chrome/content/rules/RAUR.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
From 2ff7e87786ff67bde99ee52abc7c71f42de24e30 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Thu, 24 Aug 2017 16:05:13 +0800
Subject: [PATCH 060/167] Delete Northern-Indymedia.org.xml (cacert) (#11700)
* Delete Northern-Indymedia.org.xml
all `target` timeout over plaintext and secure connections
* Update Indymedia.xml
---
src/chrome/content/rules/Indymedia.xml | 1 -
.../content/rules/Northern-Indymedia.org.xml | 27 -------------------
2 files changed, 28 deletions(-)
delete mode 100644 src/chrome/content/rules/Northern-Indymedia.org.xml
diff --git a/src/chrome/content/rules/Indymedia.xml b/src/chrome/content/rules/Indymedia.xml
index 6d420e8bd21b..f3644b90567e 100644
--- a/src/chrome/content/rules/Indymedia.xml
+++ b/src/chrome/content/rules/Indymedia.xml
@@ -3,7 +3,6 @@
- Indymedia.nl.xml
- Indymedia.org.uk.xml
- - Northern-Indymedia.org.xml
Nonfunctional hosts in *indymedia.org:
diff --git a/src/chrome/content/rules/Northern-Indymedia.org.xml b/src/chrome/content/rules/Northern-Indymedia.org.xml
deleted file mode 100644
index 465aedca5725..000000000000
--- a/src/chrome/content/rules/Northern-Indymedia.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 61229ab702005ad40c95ba5f688b1719c04fe766 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Thu, 24 Aug 2017 23:15:07 +1000
Subject: [PATCH 061/167] [Federal_Trade_Commission] Reactivate ruleset.
(#11085)
---
.../rules/Federal_Trade_Commission.xml | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/chrome/content/rules/Federal_Trade_Commission.xml b/src/chrome/content/rules/Federal_Trade_Commission.xml
index 039dd73c57c0..d437b183b929 100644
--- a/src/chrome/content/rules/Federal_Trade_Commission.xml
+++ b/src/chrome/content/rules/Federal_Trade_Commission.xml
@@ -1,13 +1,5 @@
-
+
-
-
@@ -42,14 +34,11 @@ Fetch error: http://new.ftc.gov/ => https://new.ftc.gov/: (6, 'Could not resolve
-
-
-
-
+
Date: Thu, 24 Aug 2017 23:15:28 +1000
Subject: [PATCH 062/167] [adfoc.us] Add ruleset. (#11081)
---
.../content/rules/adfoc.us-mixedcontent.xml | 13 +++++++++++++
src/chrome/content/rules/adfoc.us.xml | 15 +++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 src/chrome/content/rules/adfoc.us-mixedcontent.xml
create mode 100644 src/chrome/content/rules/adfoc.us.xml
diff --git a/src/chrome/content/rules/adfoc.us-mixedcontent.xml b/src/chrome/content/rules/adfoc.us-mixedcontent.xml
new file mode 100644
index 000000000000..7dc6de9c72f2
--- /dev/null
+++ b/src/chrome/content/rules/adfoc.us-mixedcontent.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/adfoc.us.xml b/src/chrome/content/rules/adfoc.us.xml
new file mode 100644
index 000000000000..6291b9e1311f
--- /dev/null
+++ b/src/chrome/content/rules/adfoc.us.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
From 7eacfd4c8f08b3b457acb60c9877d0752b009b98 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Thu, 24 Aug 2017 23:16:11 +1000
Subject: [PATCH 063/167] [Aulo.in] Cleanup and reactivate. (#10938)
---
src/chrome/content/rules/Aulo.in.xml | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/chrome/content/rules/Aulo.in.xml b/src/chrome/content/rules/Aulo.in.xml
index bdec16b64274..cf84b4ef3ea6 100644
--- a/src/chrome/content/rules/Aulo.in.xml
+++ b/src/chrome/content/rules/Aulo.in.xml
@@ -1,9 +1,20 @@
-
+
+
+
-
+
From 6f9536e73f58c6ac32e9ee3004834a14a3ee1b60 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Thu, 24 Aug 2017 23:17:49 +1000
Subject: [PATCH 064/167] [Twitter-Counter] Update and de-whitelist rule.
(#11697)
---
src/chrome/content/rules/Twitter-Counter.xml | 33 ++++++++++----------
utils/ruleset-whitelist.csv | 1 -
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/chrome/content/rules/Twitter-Counter.xml b/src/chrome/content/rules/Twitter-Counter.xml
index 3b18e070ddf2..af838959d95c 100644
--- a/src/chrome/content/rules/Twitter-Counter.xml
+++ b/src/chrome/content/rules/Twitter-Counter.xml
@@ -1,25 +1,26 @@
-
+
+
+
+
+
+
+
-
-
-
+
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index 8d245580b5ca..12b8058dbb85 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -3376,7 +3376,6 @@ e1f76e0ccf48b6a764b85cb52644e4f2f569d08b74ea01ff28e0eb4d99111b19,1,1,TV_Tropes.x
e8496bac50ff5ca0aaf25d9a0a49f895c246f8b7d7941ad7e6cf2c8d6439580d,1,1,Tweegy.nl.xml
b35b35365733082ecebdf86f03de9cd93bd738bd52a0239bb07d4507ad792b5d,1,1,Twilight-Laboratories.xml
0b70c89a0d79e5caccad6e3be40dbc99a9c3885b5b59c01c57d775b28546b1bf,1,1,Twinings.xml
-c7c0b0037aa46dbb29cf62af4e7edad4f3745538e64a06b39d41309be61949c4,1,1,Twitter-Counter.xml
7b77852a18ebceedc2978095db85af92d28db9913d71634ba4d68a5f64802c08,1,1,Two_Roads.xml
b6e20e58a85db551dc6b49cef5e67546f73246773c61d31d86c69986ef9a489a,1,1,Tyndall.ie.xml
deae2b1c6be69bae7b6ec4895e585099a2f5374b53776ed4f075d45f4c1cfa6c,1,1,Typepad.xml
From 88632ca2f9c7500c3e618efc8e6ada16bca846e0 Mon Sep 17 00:00:00 2001
From: Christian Heinrichs
Date: Thu, 24 Aug 2017 22:08:27 +0200
Subject: [PATCH 065/167] Create ogdb.eu.xml (#12017)
---
src/chrome/content/rules/ogdb.eu.xml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 src/chrome/content/rules/ogdb.eu.xml
diff --git a/src/chrome/content/rules/ogdb.eu.xml b/src/chrome/content/rules/ogdb.eu.xml
new file mode 100644
index 000000000000..d17d5080440d
--- /dev/null
+++ b/src/chrome/content/rules/ogdb.eu.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
From 7c9197cb1281e60bacc5aca1072d0a2b92ca5d89 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 04:13:38 +0800
Subject: [PATCH 066/167] Delete POP.xml (#11887)
---
src/chrome/content/rules/POP.xml | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 src/chrome/content/rules/POP.xml
diff --git a/src/chrome/content/rules/POP.xml b/src/chrome/content/rules/POP.xml
deleted file mode 100644
index abbed0e1ffaa..000000000000
--- a/src/chrome/content/rules/POP.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
From 2dca9c10f6e4df2554eccbbea0115f706481fcd7 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 04:51:09 +0800
Subject: [PATCH 067/167] Create PCPD.org.hk.xml (#9799)
---
src/chrome/content/rules/PCPD.org.hk.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 src/chrome/content/rules/PCPD.org.hk.xml
diff --git a/src/chrome/content/rules/PCPD.org.hk.xml b/src/chrome/content/rules/PCPD.org.hk.xml
new file mode 100644
index 000000000000..efbbf4a3aa3e
--- /dev/null
+++ b/src/chrome/content/rules/PCPD.org.hk.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
From f12708c004551a5f5e67f0bc63c42733cbf397f3 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 04:52:49 +0800
Subject: [PATCH 068/167] Create SPCA.org.hk.xml (#9798)
---
src/chrome/content/rules/SPCA.org.hk.xml | 27 ++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 src/chrome/content/rules/SPCA.org.hk.xml
diff --git a/src/chrome/content/rules/SPCA.org.hk.xml b/src/chrome/content/rules/SPCA.org.hk.xml
new file mode 100644
index 000000000000..ea4fd2aef649
--- /dev/null
+++ b/src/chrome/content/rules/SPCA.org.hk.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 8024741fa516fd51e029e8e4a64e0d9d3a90865c Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 05:09:29 +0800
Subject: [PATCH 069/167] Create hkicl.com.hk.xml (#8117)
---
src/chrome/content/rules/hkicl.com.hk.xml | 55 +++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 src/chrome/content/rules/hkicl.com.hk.xml
diff --git a/src/chrome/content/rules/hkicl.com.hk.xml b/src/chrome/content/rules/hkicl.com.hk.xml
new file mode 100644
index 000000000000..05238e15c447
--- /dev/null
+++ b/src/chrome/content/rules/hkicl.com.hk.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 12ffb46e594018390ba4814a05c0012449c6481f Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 00:24:13 +0300
Subject: [PATCH 070/167] Create Un4seen.com.xml (#12023)
* Create Un4seen.com.xml
* Update Un4seen.com.xml
* Update Un4seen.com.xml
---
src/chrome/content/rules/Un4seen.com.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 src/chrome/content/rules/Un4seen.com.xml
diff --git a/src/chrome/content/rules/Un4seen.com.xml b/src/chrome/content/rules/Un4seen.com.xml
new file mode 100644
index 000000000000..2829169edb8f
--- /dev/null
+++ b/src/chrome/content/rules/Un4seen.com.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
From b285796eaaadf2ee4d59aee5476b7f1f3406b45c Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 05:33:16 +0800
Subject: [PATCH 071/167] Re-activate and Update
University_of_Tennessee_Knoxville.xml (#10275)
---
.../University_of_Tennessee_Knoxville.xml | 86 ++++++++-----------
1 file changed, 37 insertions(+), 49 deletions(-)
diff --git a/src/chrome/content/rules/University_of_Tennessee_Knoxville.xml b/src/chrome/content/rules/University_of_Tennessee_Knoxville.xml
index acf26cc28bdf..c45275ae2ea0 100644
--- a/src/chrome/content/rules/University_of_Tennessee_Knoxville.xml
+++ b/src/chrome/content/rules/University_of_Tennessee_Knoxville.xml
@@ -1,53 +1,41 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From efd1c20d22cc19a0f2a04f9d8c10170786070a4d Mon Sep 17 00:00:00 2001
From: numismatika
Date: Thu, 24 Aug 2017 23:38:47 +0200
Subject: [PATCH 072/167] add test urls to the Meetrics ruleset (#11284)
---
src/chrome/content/rules/Meetrics.xml | 54 +++++++++++++++++++++------
1 file changed, 42 insertions(+), 12 deletions(-)
diff --git a/src/chrome/content/rules/Meetrics.xml b/src/chrome/content/rules/Meetrics.xml
index 738b20cd58e4..fa5439fe0dad 100644
--- a/src/chrome/content/rules/Meetrics.xml
+++ b/src/chrome/content/rules/Meetrics.xml
@@ -1,20 +1,50 @@
-
-
-
+
+
+
-
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 065938ae6263ca96adb42cc0a2ab1cd331c97d20 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:47:23 +0000
Subject: [PATCH 073/167] Create https.cat.xml (#12067)
* Create https.cat.xml
* Update https.cat.xml
---
src/chrome/content/rules/https.cat.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 src/chrome/content/rules/https.cat.xml
diff --git a/src/chrome/content/rules/https.cat.xml b/src/chrome/content/rules/https.cat.xml
new file mode 100644
index 000000000000..b28e0bedbe24
--- /dev/null
+++ b/src/chrome/content/rules/https.cat.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
From 357500a225ea34bc2cc5da3a117a267d9666a21c Mon Sep 17 00:00:00 2001
From: numismatika
Date: Thu, 24 Aug 2017 23:47:56 +0200
Subject: [PATCH 074/167] add rule for SphereUp.com (#11858)
---
src/chrome/content/rules/SphereUp.xml | 64 +++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
create mode 100644 src/chrome/content/rules/SphereUp.xml
diff --git a/src/chrome/content/rules/SphereUp.xml b/src/chrome/content/rules/SphereUp.xml
new file mode 100644
index 000000000000..88a52f4297bd
--- /dev/null
+++ b/src/chrome/content/rules/SphereUp.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 3e3d8f576935c6758f239f94d96ca95ec4839a47 Mon Sep 17 00:00:00 2001
From: numismatika
Date: Thu, 24 Aug 2017 23:49:34 +0200
Subject: [PATCH 075/167] add rule for Whitepaper DB GmbH (#11859)
---
src/chrome/content/rules/Whitepaperdb.de.xml | 28 ++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 src/chrome/content/rules/Whitepaperdb.de.xml
diff --git a/src/chrome/content/rules/Whitepaperdb.de.xml b/src/chrome/content/rules/Whitepaperdb.de.xml
new file mode 100644
index 000000000000..8024aa589fa2
--- /dev/null
+++ b/src/chrome/content/rules/Whitepaperdb.de.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From ca2035c3d2f78553c534333fb0074bf18d3c933e Mon Sep 17 00:00:00 2001
From: numismatika
Date: Fri, 25 Aug 2017 00:00:31 +0200
Subject: [PATCH 076/167] add rule for VisualDNA (#11925)
---
src/chrome/content/rules/VisualDNA.com.xml | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 src/chrome/content/rules/VisualDNA.com.xml
diff --git a/src/chrome/content/rules/VisualDNA.com.xml b/src/chrome/content/rules/VisualDNA.com.xml
new file mode 100644
index 000000000000..4a169273b3c2
--- /dev/null
+++ b/src/chrome/content/rules/VisualDNA.com.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 25103bf81ad788402e6eaae2a7a5a1427bca84be Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:07:50 +0000
Subject: [PATCH 077/167] [Volgistics.com] Simplify ruleset (#12055)
* [Volgistics.com] Simplify ruleset
* Rename Volgistics.xml to Volgistics.com.xml
* [Volgistics.com] Add rule for invalid certificate
---
src/chrome/content/rules/Volgistics.com.xml | 24 +++++++++++++++++++++
src/chrome/content/rules/Volgistics.xml | 7 ------
2 files changed, 24 insertions(+), 7 deletions(-)
create mode 100644 src/chrome/content/rules/Volgistics.com.xml
delete mode 100644 src/chrome/content/rules/Volgistics.xml
diff --git a/src/chrome/content/rules/Volgistics.com.xml b/src/chrome/content/rules/Volgistics.com.xml
new file mode 100644
index 000000000000..2feff7a140c0
--- /dev/null
+++ b/src/chrome/content/rules/Volgistics.com.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Volgistics.xml b/src/chrome/content/rules/Volgistics.xml
deleted file mode 100644
index 0ea5d320edcb..000000000000
--- a/src/chrome/content/rules/Volgistics.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
From 785eaacd550ead94e5a11df2a3dd5e1f051ede73 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:10:15 +0000
Subject: [PATCH 078/167] Create RegardsCitoyens.fr.xml (#11815)
* Create RegardsCitoyens.fr.xml
* [RegardsCitoyens.fr] Add target
---
.../content/rules/RegardsCitoyens.fr.xml | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 src/chrome/content/rules/RegardsCitoyens.fr.xml
diff --git a/src/chrome/content/rules/RegardsCitoyens.fr.xml b/src/chrome/content/rules/RegardsCitoyens.fr.xml
new file mode 100644
index 000000000000..978df4edd9d2
--- /dev/null
+++ b/src/chrome/content/rules/RegardsCitoyens.fr.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
From 0ba83bcc9b5166f76186b76937038c30cc365b77 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:12:10 +0000
Subject: [PATCH 079/167] [PrintFriendly.com] Simplify ruleset (#11540)
* [PrintFriendly.com] Simplify ruleset
* [PrintFriendly.com] Reorder targets
---
src/chrome/content/rules/PrintFriendly.xml | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/chrome/content/rules/PrintFriendly.xml b/src/chrome/content/rules/PrintFriendly.xml
index ff79d9749bd1..5f1ad3fd2912 100644
--- a/src/chrome/content/rules/PrintFriendly.xml
+++ b/src/chrome/content/rules/PrintFriendly.xml
@@ -1,28 +1,28 @@
-
+
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
From 5ea7c81235bb510f1357327412bd7fec0d7a6fb7 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:16:31 +0000
Subject: [PATCH 080/167] [BestOliveOils.com] Simplify ruleset (#11549)
* [BestOliveOils.com] Simplify ruleset
* Rename Best_Olive_Oils.xml to BestOliveOils.com.xml
* [BestOliveOils.com] Add target and test urls
---
.../content/rules/BestOliveOils.com.xml | 19 ++++++++++++++++
src/chrome/content/rules/Best_Olive_Oils.xml | 22 -------------------
2 files changed, 19 insertions(+), 22 deletions(-)
create mode 100644 src/chrome/content/rules/BestOliveOils.com.xml
delete mode 100644 src/chrome/content/rules/Best_Olive_Oils.xml
diff --git a/src/chrome/content/rules/BestOliveOils.com.xml b/src/chrome/content/rules/BestOliveOils.com.xml
new file mode 100644
index 000000000000..b30954e14ecd
--- /dev/null
+++ b/src/chrome/content/rules/BestOliveOils.com.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Best_Olive_Oils.xml b/src/chrome/content/rules/Best_Olive_Oils.xml
deleted file mode 100644
index 545dddd9479f..000000000000
--- a/src/chrome/content/rules/Best_Olive_Oils.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
From 6a851c88a34c8934870b646d4a17136ba471198e Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:24:59 +0000
Subject: [PATCH 081/167] Delete Bretagne-web.eu.xml (#11518)
Domain for sale
---
src/chrome/content/rules/Bretagne-web.eu.xml | 31 --------------------
1 file changed, 31 deletions(-)
delete mode 100644 src/chrome/content/rules/Bretagne-web.eu.xml
diff --git a/src/chrome/content/rules/Bretagne-web.eu.xml b/src/chrome/content/rules/Bretagne-web.eu.xml
deleted file mode 100644
index d4e14d29961a..000000000000
--- a/src/chrome/content/rules/Bretagne-web.eu.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
From c531d941fcc43e0c6c0bd5a6cd3926b8a97556a1 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:26:45 +0000
Subject: [PATCH 082/167] Delete T411.xml (#11517)
---
src/chrome/content/rules/T411.xml | 67 -------------------------------
1 file changed, 67 deletions(-)
delete mode 100644 src/chrome/content/rules/T411.xml
diff --git a/src/chrome/content/rules/T411.xml b/src/chrome/content/rules/T411.xml
deleted file mode 100644
index 1382b7d41a75..000000000000
--- a/src/chrome/content/rules/T411.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 93211bf57421f6101a2b490fbd2c869341cd2f92 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:27:43 +0000
Subject: [PATCH 083/167] Delete ScriptObservatory.org.xml (#11467)
Gone from DNS.
From 822b49b3ee6ffeecd443ae5cc9ac30fbd003f2b5 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:30:23 +0000
Subject: [PATCH 084/167] [Spice-space.org] Reactivate ruleset (#11524)
---
src/chrome/content/rules/Spice-space.org.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/chrome/content/rules/Spice-space.org.xml b/src/chrome/content/rules/Spice-space.org.xml
index f394a7134d28..74615a202112 100644
--- a/src/chrome/content/rules/Spice-space.org.xml
+++ b/src/chrome/content/rules/Spice-space.org.xml
@@ -1,18 +1,15 @@
-
+
-
-
From 174b86a0de6ecea497d6af3980cc717d1be0153e Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:33:45 +0000
Subject: [PATCH 085/167] [FreeUtopia.org] Simplify and activate ruleset
(#11522)
* [FreeUtopia.org] Simplify and activate ruleset
* Rename Free_Utopia.org.xml to FreeUtopia.org.xml
---
src/chrome/content/rules/FreeUtopia.org.xml | 11 +++++++++++
src/chrome/content/rules/Free_Utopia.org.xml | 17 -----------------
2 files changed, 11 insertions(+), 17 deletions(-)
create mode 100644 src/chrome/content/rules/FreeUtopia.org.xml
delete mode 100644 src/chrome/content/rules/Free_Utopia.org.xml
diff --git a/src/chrome/content/rules/FreeUtopia.org.xml b/src/chrome/content/rules/FreeUtopia.org.xml
new file mode 100644
index 000000000000..da63e77a6454
--- /dev/null
+++ b/src/chrome/content/rules/FreeUtopia.org.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Free_Utopia.org.xml b/src/chrome/content/rules/Free_Utopia.org.xml
deleted file mode 100644
index 1e372cd84a03..000000000000
--- a/src/chrome/content/rules/Free_Utopia.org.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
From 372e995a22732f624b23134c3215264b9dd4351f Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:34:53 +0000
Subject: [PATCH 086/167] [De-centralize.com] Reactivate ruleset (#11521)
* [De-centralize.com] Reactivate ruleset
* [De-centralize.com] Remove extra slash
---
.../content/rules/De-Centralize.com.xml | 22 ++++---------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/chrome/content/rules/De-Centralize.com.xml b/src/chrome/content/rules/De-Centralize.com.xml
index 00a1016203d4..0b7dbe2fb167 100644
--- a/src/chrome/content/rules/De-Centralize.com.xml
+++ b/src/chrome/content/rules/De-Centralize.com.xml
@@ -1,28 +1,14 @@
-
+
-
-
+
From 8022d4e0aa9de903e1c29a9ac35eb9907c56a401 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:37:25 +0000
Subject: [PATCH 087/167] [CJS-CDKeys.com] Merge rulesets (#11468)
* [CJS-CDKeys.com] Remove exclusion
* Delete CJS-CDKeys.com-mixed.xml
* [CJS-CDKeys.com] Add securecookie
---
.../content/rules/CJS-CDKeys.com-mixed.xml | 12 ---------
src/chrome/content/rules/CJS-CDKeys.com.xml | 25 ++-----------------
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 src/chrome/content/rules/CJS-CDKeys.com-mixed.xml
diff --git a/src/chrome/content/rules/CJS-CDKeys.com-mixed.xml b/src/chrome/content/rules/CJS-CDKeys.com-mixed.xml
deleted file mode 100644
index d8c093cf06f9..000000000000
--- a/src/chrome/content/rules/CJS-CDKeys.com-mixed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/CJS-CDKeys.com.xml b/src/chrome/content/rules/CJS-CDKeys.com.xml
index cd8e9b0c4b2e..9546cd3b9899 100644
--- a/src/chrome/content/rules/CJS-CDKeys.com.xml
+++ b/src/chrome/content/rules/CJS-CDKeys.com.xml
@@ -1,30 +1,9 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
From 34103678f89499019ef2d2ec7aee4d20fd4ab184 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:38:56 +0000
Subject: [PATCH 088/167] [Svbtle.com] Simplify ruleset and add test urls
(#11563)
---
src/chrome/content/rules/Svbtle.com.xml | 30 ++++++++++---------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/chrome/content/rules/Svbtle.com.xml b/src/chrome/content/rules/Svbtle.com.xml
index 464a23d80067..79404e8c6e23 100644
--- a/src/chrome/content/rules/Svbtle.com.xml
+++ b/src/chrome/content/rules/Svbtle.com.xml
@@ -1,31 +1,25 @@
+
+
+
+
+
+
+
-
-
-
-
+
-
+
From 5c9b91aa8e0dd42df232d7b4dff1371c1f3c4c5a Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:41:21 +0000
Subject: [PATCH 089/167] [UMW.edu] Remove wildcard (#11381)
* [UMW.edu] Convert wildcard to targets
* [UMW.edu] Remove broken target
* [UMW.edu] Add targets from University-of-Mary-Washington-blogs.xml
* [UMWBlogs.org] Remove UMW.edu targets
---
.../University-of-Mary-Washington-blogs.xml | 8 +---
.../rules/University-of-Mary-Washington.xml | 43 ++++++++++++++-----
2 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/chrome/content/rules/University-of-Mary-Washington-blogs.xml b/src/chrome/content/rules/University-of-Mary-Washington-blogs.xml
index 395ebeb6bbdb..840f63dfa0b0 100644
--- a/src/chrome/content/rules/University-of-Mary-Washington-blogs.xml
+++ b/src/chrome/content/rules/University-of-Mary-Washington-blogs.xml
@@ -7,21 +7,15 @@
-
-
+
-
-
-
-
diff --git a/src/chrome/content/rules/University-of-Mary-Washington.xml b/src/chrome/content/rules/University-of-Mary-Washington.xml
index b4d3682292e5..d1b0bfa7078b 100644
--- a/src/chrome/content/rules/University-of-Mary-Washington.xml
+++ b/src/chrome/content/rules/University-of-Mary-Washington.xml
@@ -4,25 +4,46 @@
- University-of-Mary-Washington-blogs.xml
- eagleeye.umw.edu & jamesfarmer.umw.edu are handled in University-of-Mary-Washington-blogs.xml.
-
-
Nonfunctional domains:
- www.library.umw.edu
- (www.)umweagles.com
+ Mixed content:
+ eagleeye.umw.edu
+
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 006b6bdc647b9a07704e66792a8be04cf5d77ef2 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 01:42:25 +0300
Subject: [PATCH 090/167] Create Skins.cash.xml (#12027)
---
src/chrome/content/rules/Skins.cash.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 src/chrome/content/rules/Skins.cash.xml
diff --git a/src/chrome/content/rules/Skins.cash.xml b/src/chrome/content/rules/Skins.cash.xml
new file mode 100644
index 000000000000..5a71aea0bc01
--- /dev/null
+++ b/src/chrome/content/rules/Skins.cash.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
From 1f48efbb8bae6763ab6d6828c0947f719e39fb83 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 01:54:09 +0300
Subject: [PATCH 091/167] Update and rename KF_Webs.net.xml to KFWebs.net.xml
(#12032)
* Update and rename KF_Webs.net.xml to KFWebs.net.xml
* Update KFWebs.net.xml
---
src/chrome/content/rules/KFWebs.net.xml | 13 ++++++++
src/chrome/content/rules/KF_Webs.net.xml | 40 ------------------------
2 files changed, 13 insertions(+), 40 deletions(-)
create mode 100644 src/chrome/content/rules/KFWebs.net.xml
delete mode 100644 src/chrome/content/rules/KF_Webs.net.xml
diff --git a/src/chrome/content/rules/KFWebs.net.xml b/src/chrome/content/rules/KFWebs.net.xml
new file mode 100644
index 000000000000..854e95b3eda5
--- /dev/null
+++ b/src/chrome/content/rules/KFWebs.net.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/KF_Webs.net.xml b/src/chrome/content/rules/KF_Webs.net.xml
deleted file mode 100644
index 089e76666dbc..000000000000
--- a/src/chrome/content/rules/KF_Webs.net.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 71b4fe4aa675faa83c7fd0ab0427bfdbca753029 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 01:56:01 +0300
Subject: [PATCH 092/167] Update Freie-Universitat-Berlin.xml (#12030)
* Update Freie-Universitat-Berlin.xml
* Update and rename Freie-Universitat-Berlin.xml to FU-Berlin.de.xml
* Update FU-Berlin.de.xml
---
...reie-Universitat-Berlin.xml => FU-Berlin.de.xml} | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
rename src/chrome/content/rules/{Freie-Universitat-Berlin.xml => FU-Berlin.de.xml} (68%)
diff --git a/src/chrome/content/rules/Freie-Universitat-Berlin.xml b/src/chrome/content/rules/FU-Berlin.de.xml
similarity index 68%
rename from src/chrome/content/rules/Freie-Universitat-Berlin.xml
rename to src/chrome/content/rules/FU-Berlin.de.xml
index 85dc1fb02cab..cac23874cef5 100644
--- a/src/chrome/content/rules/Freie-Universitat-Berlin.xml
+++ b/src/chrome/content/rules/FU-Berlin.de.xml
@@ -1,24 +1,19 @@
-
-
+
+
-
-
-
+
From 3f1e5b6c769759fd8ee565de5883dc67f4d64236 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 22:59:37 +0000
Subject: [PATCH 093/167] [Amahi.org] Remove wildcard and reactivate ruleset
(#11490)
* [Amahi.org] Remove wildcard and reactivate ruleset
* [Amahi.org] Reactivate ruleset
* [Amahi.org] Add talk.amahi.org
* [Amahi.org] Add dummy test url
* [Amahi.org] Fix mismatch
---
src/chrome/content/rules/Amahi.org.xml | 100 ++++++++++---------------
1 file changed, 39 insertions(+), 61 deletions(-)
diff --git a/src/chrome/content/rules/Amahi.org.xml b/src/chrome/content/rules/Amahi.org.xml
index 1411c3560eeb..3c62463a1d02 100644
--- a/src/chrome/content/rules/Amahi.org.xml
+++ b/src/chrome/content/rules/Amahi.org.xml
@@ -1,78 +1,56 @@
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
From 00277f9c058c937cd37179c6a4543939a7e96af4 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:01:40 +0000
Subject: [PATCH 094/167] [HRW.org] Reactivate ruleset (#11515)
---
.../content/rules/Human_Rights_Watch.xml | 65 ++++---------------
1 file changed, 13 insertions(+), 52 deletions(-)
diff --git a/src/chrome/content/rules/Human_Rights_Watch.xml b/src/chrome/content/rules/Human_Rights_Watch.xml
index 12469d7a4225..c8bf440819a0 100644
--- a/src/chrome/content/rules/Human_Rights_Watch.xml
+++ b/src/chrome/content/rules/Human_Rights_Watch.xml
@@ -1,66 +1,27 @@
-
-
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
From 77ad7fdac9143430192636013b2dbf2840315ff3 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:08:02 +0000
Subject: [PATCH 095/167] [Vates.fr] Reactivate ruleset (#11320)
---
src/chrome/content/rules/Vates.fr.xml | 49 +++++++++------------------
1 file changed, 16 insertions(+), 33 deletions(-)
diff --git a/src/chrome/content/rules/Vates.fr.xml b/src/chrome/content/rules/Vates.fr.xml
index d1ef09d0697e..5f3c3713d48f 100644
--- a/src/chrome/content/rules/Vates.fr.xml
+++ b/src/chrome/content/rules/Vates.fr.xml
@@ -1,43 +1,26 @@
-
-
+
-
-
+
-
-
-
-
-
-
+
From f5faaf1f5c5c2829ff580e74045bb29eee9d9dea Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:10:34 +0000
Subject: [PATCH 096/167] [LUGoNS.org] Update and reactivate ruleset (#11062)
* [LuGoNS.org] Update and reactivate ruleset
* [LuGoNS.org] Remove broken chains
* [LUGoNS.org] Remove broken target
---
src/chrome/content/rules/LUGoNS.org.xml | 56 +++++++++++++------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/chrome/content/rules/LUGoNS.org.xml b/src/chrome/content/rules/LUGoNS.org.xml
index dcd194df6649..9dcf44de4bb9 100644
--- a/src/chrome/content/rules/LUGoNS.org.xml
+++ b/src/chrome/content/rules/LUGoNS.org.xml
@@ -1,42 +1,44 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
From 2ba108613caec6c461d34e745bc481f362cf62cd Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:12:02 +0000
Subject: [PATCH 097/167] [Lithium-clients] Remove broken target (#11323)
---
src/chrome/content/rules/Lithium-clients.xml | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/chrome/content/rules/Lithium-clients.xml b/src/chrome/content/rules/Lithium-clients.xml
index f3e08dd56baf..64c08bcec1f1 100644
--- a/src/chrome/content/rules/Lithium-clients.xml
+++ b/src/chrome/content/rules/Lithium-clients.xml
@@ -11,26 +11,15 @@
-->
-
-
-
+
-
-
-
-
-
-
-
+
-
\ No newline at end of file
+
From 1be7bee6ddc36a493e77b09d765f447cf54d7ac6 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:13:10 +0000
Subject: [PATCH 098/167] Create IRIS.edu.xml (#10892)
* Create IRIS.edu.xml
* [IRIS.edu] Comment out chain issues
---
src/chrome/content/rules/IRIS.edu.xml | 44 +++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 src/chrome/content/rules/IRIS.edu.xml
diff --git a/src/chrome/content/rules/IRIS.edu.xml b/src/chrome/content/rules/IRIS.edu.xml
new file mode 100644
index 000000000000..d0e782addef0
--- /dev/null
+++ b/src/chrome/content/rules/IRIS.edu.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 5c4d1bfe1dbf7bda76c390ccc14cb69d8d7f982f Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:15:31 +0000
Subject: [PATCH 099/167] [MyFBO.com] Remove wildcard (#11508)
---
src/chrome/content/rules/MyFBO.com.xml | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/chrome/content/rules/MyFBO.com.xml b/src/chrome/content/rules/MyFBO.com.xml
index df8a9b9ff358..e5205ca39968 100644
--- a/src/chrome/content/rules/MyFBO.com.xml
+++ b/src/chrome/content/rules/MyFBO.com.xml
@@ -1,9 +1,28 @@
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
\ No newline at end of file
+
+
From 6517f0ff7ffb2ba6b92ce1d405c1c6c2c5334fb6 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:19:01 +0000
Subject: [PATCH 100/167] [OsmAnd.net] Update and reactivate ruleset (#10722)
* [OsmAnd.net] Update and reactivate ruleset
* [OsmAnd.net] Remove trailing slash
---
src/chrome/content/rules/OsmAnd.net.xml | 52 ++++++++++---------------
1 file changed, 21 insertions(+), 31 deletions(-)
diff --git a/src/chrome/content/rules/OsmAnd.net.xml b/src/chrome/content/rules/OsmAnd.net.xml
index 0eb3193bdf28..cdfebe58f0b7 100644
--- a/src/chrome/content/rules/OsmAnd.net.xml
+++ b/src/chrome/content/rules/OsmAnd.net.xml
@@ -1,44 +1,34 @@
-
-
-
-
-
-
-
+
-
+
+
+
+
+
-
+
From 5f5c1514e0e223803befb89035fe9ca9038b62cb Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:30:52 +0000
Subject: [PATCH 101/167] [Centrify.com] Update and reactivate ruleset (#11558)
* [Centrify.com] Update and reactivate ruleset
* [Centrify.com] Add target
---
src/chrome/content/rules/centrify.com.xml | 97 +++--------------------
1 file changed, 11 insertions(+), 86 deletions(-)
diff --git a/src/chrome/content/rules/centrify.com.xml b/src/chrome/content/rules/centrify.com.xml
index b965239e08b0..455f6f557e74 100644
--- a/src/chrome/content/rules/centrify.com.xml
+++ b/src/chrome/content/rules/centrify.com.xml
@@ -1,37 +1,16 @@
-
-
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ to="https://centrify.statuspage.io/" />
From b9972620ddbc812d4b622f5ac79b3e5876f4ab1a Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 02:35:22 +0300
Subject: [PATCH 102/167] Create CSGO-Skins.com.xml (#12024)
---
src/chrome/content/rules/CSGO-Skins.com.xml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 src/chrome/content/rules/CSGO-Skins.com.xml
diff --git a/src/chrome/content/rules/CSGO-Skins.com.xml b/src/chrome/content/rules/CSGO-Skins.com.xml
new file mode 100644
index 000000000000..fdbd357e5529
--- /dev/null
+++ b/src/chrome/content/rules/CSGO-Skins.com.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
From 3914aeb5c91600e71bf89eff5854e4e04ef120e1 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 02:35:47 +0300
Subject: [PATCH 103/167] Create CSGOStash.com.xml (#12025)
---
src/chrome/content/rules/CSGOStash.com.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/CSGOStash.com.xml
diff --git a/src/chrome/content/rules/CSGOStash.com.xml b/src/chrome/content/rules/CSGOStash.com.xml
new file mode 100644
index 000000000000..e6fb6e67fd25
--- /dev/null
+++ b/src/chrome/content/rules/CSGOStash.com.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From 7804d5af6a57c25fe00fa44ea08ff3cd30f71d19 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 02:35:55 +0300
Subject: [PATCH 104/167] Create CSGOItems.pro.xml (#12026)
---
src/chrome/content/rules/CSGOItems.pro.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 src/chrome/content/rules/CSGOItems.pro.xml
diff --git a/src/chrome/content/rules/CSGOItems.pro.xml b/src/chrome/content/rules/CSGOItems.pro.xml
new file mode 100644
index 000000000000..2c1259e45bc1
--- /dev/null
+++ b/src/chrome/content/rules/CSGOItems.pro.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
From f770c84537d3434f18658b1dd040eb7e666bcc8c Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:53:58 +0000
Subject: [PATCH 105/167] [SnapEngage.com] Simplify, reactivate and merge
rulesets (#11372)
* [SnapEngage.com] Simplify and reactivate ruleset
* Delete SnapEngage.com-falsemixed.xml
---
.../rules/SnapEngage.com-falsemixed.xml | 18 ---
src/chrome/content/rules/SnapEngage.xml | 128 ++++--------------
2 files changed, 27 insertions(+), 119 deletions(-)
delete mode 100644 src/chrome/content/rules/SnapEngage.com-falsemixed.xml
diff --git a/src/chrome/content/rules/SnapEngage.com-falsemixed.xml b/src/chrome/content/rules/SnapEngage.com-falsemixed.xml
deleted file mode 100644
index 343baf4ef359..000000000000
--- a/src/chrome/content/rules/SnapEngage.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SnapEngage.xml b/src/chrome/content/rules/SnapEngage.xml
index be91c1b6984a..867fe6fea035 100644
--- a/src/chrome/content/rules/SnapEngage.xml
+++ b/src/chrome/content/rules/SnapEngage.xml
@@ -1,82 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
+ No working URL known:
+ code.snapengage.com
+ Invalid certificate:
+ info.snapengage.com
-
-
-
-
-
-
+-->
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From cf30dcc1f0ac7a67458d3e36236b6c561318dc7e Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 02:54:32 +0300
Subject: [PATCH 106/167] Update NIIF.xml (#12034)
* Update NIIF.xml
* Update NIIF.xml
---
src/chrome/content/rules/NIIF.xml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/chrome/content/rules/NIIF.xml b/src/chrome/content/rules/NIIF.xml
index 0874bac9fbd0..c6969e285ff6 100644
--- a/src/chrome/content/rules/NIIF.xml
+++ b/src/chrome/content/rules/NIIF.xml
@@ -1,14 +1,13 @@
-
-
-
+
+
+
+
-
-
+
From 716d9ed468c8b83251e2691bb630be21d5150d8d Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Thu, 24 Aug 2017 23:57:22 +0000
Subject: [PATCH 107/167] [Thumbshots] Simplify ruleset (#11765)
* [Thumbshots] Remove right wildcard
* [Thumbshots] Remove left wildcards
* [Thumbshots] Add test urls
* [Thumbshots] XML-encode &
* [Thumbshots] Simplify rewrite rule
* [Thumbshots] Fix tests
* [Thumbshots] Exclude implicit test urls
---
src/chrome/content/rules/Thumbshots.xml | 49 ++++++++++++++++++-------
1 file changed, 36 insertions(+), 13 deletions(-)
diff --git a/src/chrome/content/rules/Thumbshots.xml b/src/chrome/content/rules/Thumbshots.xml
index b33a41879e07..1ab762317ada 100644
--- a/src/chrome/content/rules/Thumbshots.xml
+++ b/src/chrome/content/rules/Thumbshots.xml
@@ -1,20 +1,43 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
+
-
+
From 7337f8b14489ca13fc36eb819955e8cd235bf8da Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 03:18:35 +0300
Subject: [PATCH 108/167] Update GeForce.com.xml (#11545)
* First run Travis
* Update GeForce.com.xml
* Update GeForce.com.xml
* Update GeForce.com.xml
* Update GeForce.com.xml
* Update GeForce.com.xml
* Update GeForce.com.xml
* Update GeForce.com.xml
---
src/chrome/content/rules/GeForce.com.xml | 71 +++++++++---------------
1 file changed, 27 insertions(+), 44 deletions(-)
diff --git a/src/chrome/content/rules/GeForce.com.xml b/src/chrome/content/rules/GeForce.com.xml
index 42dacffa6669..eb9effb1b885 100644
--- a/src/chrome/content/rules/GeForce.com.xml
+++ b/src/chrome/content/rules/GeForce.com.xml
@@ -1,51 +1,34 @@
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 5a5fe24a59310ce4e1d973de4a8236baeac51b59 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 03:46:39 +0300
Subject: [PATCH 109/167] Update Secure-u.de.xml (#12036)
* Update Secure-u.de.xml
* Update Secure-u.de.xml
* Update Secure-u.de.xml
---
src/chrome/content/rules/Secure-u.de.xml | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/chrome/content/rules/Secure-u.de.xml b/src/chrome/content/rules/Secure-u.de.xml
index 39f5de3e062a..f902f1b67328 100644
--- a/src/chrome/content/rules/Secure-u.de.xml
+++ b/src/chrome/content/rules/Secure-u.de.xml
@@ -1,16 +1,14 @@
-
-
-
-
-
+
+
+
+
+
From b67f7cd6abc6f9dbd75969c7521e210b08bff47c Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 03:46:49 +0300
Subject: [PATCH 110/167] Update and rename Calyx-Institute.xml to
CalyxInstitute.xml (#12029)
* Update and rename Calyx-Institute.xml to CalyxInstitute.xml
* Update CalyxInstitute.xml
* Update CalyxInstitute.xml
---
src/chrome/content/rules/Calyx-Institute.xml | 13 -------------
src/chrome/content/rules/CalyxInstitute.xml | 14 ++++++++++++++
2 files changed, 14 insertions(+), 13 deletions(-)
delete mode 100644 src/chrome/content/rules/Calyx-Institute.xml
create mode 100644 src/chrome/content/rules/CalyxInstitute.xml
diff --git a/src/chrome/content/rules/Calyx-Institute.xml b/src/chrome/content/rules/Calyx-Institute.xml
deleted file mode 100644
index f53ae738042a..000000000000
--- a/src/chrome/content/rules/Calyx-Institute.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/CalyxInstitute.xml b/src/chrome/content/rules/CalyxInstitute.xml
new file mode 100644
index 000000000000..4f54c3e3e356
--- /dev/null
+++ b/src/chrome/content/rules/CalyxInstitute.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
From 6eeacfc57037644916e4d70e01cb08c91bcdf6ef Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 03:49:13 +0300
Subject: [PATCH 111/167] Create SpaceBattles.com.xml (#12051)
* Create SpaceBattles.com.xml
* Update SpaceBattles.com.xml
---
src/chrome/content/rules/SpaceBattles.com.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 src/chrome/content/rules/SpaceBattles.com.xml
diff --git a/src/chrome/content/rules/SpaceBattles.com.xml b/src/chrome/content/rules/SpaceBattles.com.xml
new file mode 100644
index 000000000000..e3a5e0c41ea9
--- /dev/null
+++ b/src/chrome/content/rules/SpaceBattles.com.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
From 64599f894744d1836b3e898ae1a98c47f32de61f Mon Sep 17 00:00:00 2001
From: ivysrono
Date: Fri, 25 Aug 2017 08:50:36 +0800
Subject: [PATCH 112/167] Update 163.com.xml (#12066)
* Update 163.com-problematic.xml
* Update 163.com.xml
---
.../content/rules/163.com-problematic.xml | 35 -------------------
src/chrome/content/rules/163.com.xml | 2 ++
2 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/src/chrome/content/rules/163.com-problematic.xml b/src/chrome/content/rules/163.com-problematic.xml
index 9d23de002dfb..7414b1ab2690 100644
--- a/src/chrome/content/rules/163.com-problematic.xml
+++ b/src/chrome/content/rules/163.com-problematic.xml
@@ -1,16 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/163.com.xml b/src/chrome/content/rules/163.com.xml
index f62d8d91e9a8..ddf5322468af 100644
--- a/src/chrome/content/rules/163.com.xml
+++ b/src/chrome/content/rules/163.com.xml
@@ -128,6 +128,8 @@
+
+
From f4063d825b7162ebf193e12ee350e696118a71a1 Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy
Date: Fri, 25 Aug 2017 03:51:50 +0300
Subject: [PATCH 113/167] snta.ru (#11890)
---
src/chrome/content/rules/snta.ru.xml | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 src/chrome/content/rules/snta.ru.xml
diff --git a/src/chrome/content/rules/snta.ru.xml b/src/chrome/content/rules/snta.ru.xml
new file mode 100644
index 000000000000..a9c47ccaee51
--- /dev/null
+++ b/src/chrome/content/rules/snta.ru.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
From ea8911975cc5493f7ed53d69bc65edf9ac3a1f89 Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy
Date: Fri, 25 Aug 2017 03:52:16 +0300
Subject: [PATCH 114/167] bicotender.ru (#11891)
---
src/chrome/content/rules/bicotender.ru.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 src/chrome/content/rules/bicotender.ru.xml
diff --git a/src/chrome/content/rules/bicotender.ru.xml b/src/chrome/content/rules/bicotender.ru.xml
new file mode 100644
index 000000000000..b71c483de320
--- /dev/null
+++ b/src/chrome/content/rules/bicotender.ru.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
From 4b1f2ef69d49269a1e8d7b2299df28e58f6e11c5 Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy
Date: Fri, 25 Aug 2017 03:53:37 +0300
Subject: [PATCH 115/167] meb-biz.ru (#11888)
---
src/chrome/content/rules/meb-biz.ru.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 src/chrome/content/rules/meb-biz.ru.xml
diff --git a/src/chrome/content/rules/meb-biz.ru.xml b/src/chrome/content/rules/meb-biz.ru.xml
new file mode 100644
index 000000000000..8c92a602a373
--- /dev/null
+++ b/src/chrome/content/rules/meb-biz.ru.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
From 0ecffae035acb71dfde3c06f6f8e89deaaf4f283 Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy
Date: Fri, 25 Aug 2017 03:55:19 +0300
Subject: [PATCH 116/167] stylershop.ru (#11899)
---
src/chrome/content/rules/stylershop.ru.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 src/chrome/content/rules/stylershop.ru.xml
diff --git a/src/chrome/content/rules/stylershop.ru.xml b/src/chrome/content/rules/stylershop.ru.xml
new file mode 100644
index 000000000000..847630a76c23
--- /dev/null
+++ b/src/chrome/content/rules/stylershop.ru.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
From 8781de4670f67cb82bc2a328a259ae0e092177a6 Mon Sep 17 00:00:00 2001
From: koops76
Date: Fri, 25 Aug 2017 03:56:12 +0300
Subject: [PATCH 117/167] Show icon badge (without unrelated changes) (#12073)
---
chromium/background.js | 78 ++++++++++++++++++++++++++++++-----------
chromium/options.html | 18 ++++++----
chromium/options.js | 9 +++++
chromium/popup.js | 3 ++
chromium/translation.js | 4 ---
5 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/chromium/background.js b/chromium/background.js
index 200f46929571..98a84ab457d7 100644
--- a/chromium/background.js
+++ b/chromium/background.js
@@ -55,31 +55,42 @@ var switchPlannerEnabledFor = {};
// rw / nrw stand for "rewritten" versus "not rewritten"
var switchPlannerInfo = {};
-// Is HTTPSe enabled, or has it been manually disabled by the user?
+/**
+ * Load preferences. Structure is:
+ * {
+ * httpNowhere: Boolean,
+ * showCounter: Boolean,
+ * isExtensionEnabled: Boolean
+ * }
+ */
+var httpNowhereOn = false;
+var showCounter = true;
var isExtensionEnabled = true;
-storage.get({globalEnabled: true}, function(item) {
- isExtensionEnabled = item.globalEnabled;
- updateState();
-});
-// Load prefs about whether http nowhere is on. Structure is:
-// { httpNowhere: true/false }
-var httpNowhereOn = false;
-storage.get({httpNowhere: false}, function(item) {
+storage.get({
+ httpNowhere: false,
+ showCounter: true,
+ globalEnabled: true
+}, function(item) {
httpNowhereOn = item.httpNowhere;
+ showCounter = item.showCounter;
+ isExtensionEnabled = item.globalEnabled;
updateState();
});
chrome.storage.onChanged.addListener(function(changes, areaName) {
if (areaName === 'sync' || areaName === 'local') {
- for (var key in changes) {
- if (key === 'httpNowhere') {
- httpNowhereOn = changes[key].newValue;
- updateState();
- } else if (key === 'globalEnabled') {
- isExtensionEnabled = changes[key].newValue;
- updateState();
- }
+ if ('httpNowhere' in changes) {
+ httpNowhere = changes.httpNowhere.newValue;
+ updateState();
+ }
+ if ('showCounter' in changes) {
+ showCounter = changes.showCounter.newValue;
+ updateState();
+ }
+ if ('globalEnabled' in changes) {
+ isExtensionEnabled = changes.globalEnabled.newValue;
+ updateState();
}
}
});
@@ -125,6 +136,25 @@ var loadStoredUserRules = function() {
loadStoredUserRules();
+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
* inactive: extension is enabled, but no rules were triggered on this page.
@@ -136,17 +166,17 @@ var updateState = function() {
if (!chrome.tabs) {
return;
}
- chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
+ chrome.tabs.query({ active: true, currentWindow: true }, function(tabs) {
if (!tabs || tabs.length === 0) {
return;
}
- var applied = activeRulesets.getRulesets(tabs[0].id)
- var iconState = "inactive";
+ const activeCount = getActiveRulesetCount(tabs[0].id);
+ let iconState = "inactive";
if (!isExtensionEnabled) {
iconState = "disabled";
} else if (httpNowhereOn) {
iconState = "blocking";
- } else if (applied) {
+ } else if (activeCount > 0) {
iconState = "active";
}
chrome.browserAction.setIcon({
@@ -157,6 +187,12 @@ var updateState = function() {
chrome.browserAction.setTitle({
title: "HTTPS Everywhere (" + iconState + ")"
});
+
+ chrome.browserAction.setBadgeBackgroundColor({ color: "#00cc00" });
+
+ const showBadge = activeCount > 0 && isExtensionEnabled && showCounter;
+
+ chrome.browserAction.setBadgeText({ text: showBadge ? String(activeCount) : "" });
});
}
diff --git a/chromium/options.html b/chromium/options.html
index 3a7ae116aa33..66ee30982e9c 100644
--- a/chromium/options.html
+++ b/chromium/options.html
@@ -1,22 +1,26 @@
-
+
-
-
-
-
+
+
-
+
+
+
+
+
+
+
diff --git a/chromium/options.js b/chromium/options.js
index d979c504e0f2..7c51a6d4d175 100644
--- a/chromium/options.js
+++ b/chromium/options.js
@@ -25,4 +25,13 @@ document.addEventListener("DOMContentLoaded", () => {
});
document.querySelector("form").addEventListener("submit", import_json);
+
+ const showCounter = document.getElementById("showCounter");
+
+ sendMessage("get_option", { showCounter: true }, item => {
+ showCounter.checked = item.showCounter;
+ showCounter.addEventListener("change", event => {
+ sendMessage("set_option", { showCounter: showCounter.checked });
+ });
+ });
});
diff --git a/chromium/popup.js b/chromium/popup.js
index 430b6fc99c15..89dfc86dc011 100644
--- a/chromium/popup.js
+++ b/chromium/popup.js
@@ -192,6 +192,9 @@ document.addEventListener("DOMContentLoaded", function () {
httpNowhereCheckbox.setAttribute('checked', '');
}
});
+
+ e("aboutTitle").setAttribute("title", chrome.i18n.getMessage("about_title"));
+ e("add-rule-link").addEventListener("click", addManualRule);
});
diff --git a/chromium/translation.js b/chromium/translation.js
index 68eaae85a4e5..d4d65f925b4e 100644
--- a/chromium/translation.js
+++ b/chromium/translation.js
@@ -4,8 +4,4 @@ document.addEventListener("DOMContentLoaded", function () {
for (let el of elem) {
el.innerText = chrome.i18n.getMessage(el.getAttribute("i18n"));
}
-
- // other translations
- e("aboutTitle").setAttribute("title", chrome.i18n.getMessage("about_title"));
- e("add-rule-link").addEventListener("click", addManualRule);
});
From e4620f3f057573ae36d7ffed86916d1de7ed2846 Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy
Date: Fri, 25 Aug 2017 03:57:11 +0300
Subject: [PATCH 118/167] avto.ru (#11897)
---
src/chrome/content/rules/avto.ru.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 src/chrome/content/rules/avto.ru.xml
diff --git a/src/chrome/content/rules/avto.ru.xml b/src/chrome/content/rules/avto.ru.xml
new file mode 100644
index 000000000000..895689d21d75
--- /dev/null
+++ b/src/chrome/content/rules/avto.ru.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
From ae498ecf8468a8875258199540637b1a96139358 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 19:05:33 +0800
Subject: [PATCH 119/167] Update University-of-Cambridge.xml (#11825)
* Update University-of-Cambridge.xml
* Update University-of-Cambridge.xml
* Update University-of-Cambridge.xml
* Update University-of-Cambridge.xml
* Update University-of-Cambridge.xml
---
.../content/rules/Cam.ac.uk-falsemixed.xml | 18 -
.../content/rules/Cam.ac.uk-problematic.xml | 22 -
.../content/rules/University-of-Cambridge.xml | 646 ++++++++++--------
3 files changed, 369 insertions(+), 317 deletions(-)
delete mode 100644 src/chrome/content/rules/Cam.ac.uk-falsemixed.xml
delete mode 100644 src/chrome/content/rules/Cam.ac.uk-problematic.xml
diff --git a/src/chrome/content/rules/Cam.ac.uk-falsemixed.xml b/src/chrome/content/rules/Cam.ac.uk-falsemixed.xml
deleted file mode 100644
index cba1418ab221..000000000000
--- a/src/chrome/content/rules/Cam.ac.uk-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Cam.ac.uk-problematic.xml b/src/chrome/content/rules/Cam.ac.uk-problematic.xml
deleted file mode 100644
index e9b7d5f6ad1d..000000000000
--- a/src/chrome/content/rules/Cam.ac.uk-problematic.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/University-of-Cambridge.xml b/src/chrome/content/rules/University-of-Cambridge.xml
index 8dbd6b6a1143..1eeb2b2792c2 100644
--- a/src/chrome/content/rules/University-of-Cambridge.xml
+++ b/src/chrome/content/rules/University-of-Cambridge.xml
@@ -1,333 +1,425 @@
-
-
+
+
+
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
From a981645415141472b0992c0a5ef1a018db10be8b Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 19:06:57 +0800
Subject: [PATCH 120/167] Create FLOSS-Shop.de.xml and Delete
Kernel_concepts.xml (cacert) (#11435)
* Delete Kernel_concepts.xml
* Create FLOSS-Shop.de.xml
---
src/chrome/content/rules/FLOSS-Shop.de.xml | 15 +++++++++++++++
src/chrome/content/rules/Kernel_concepts.xml | 18 ------------------
2 files changed, 15 insertions(+), 18 deletions(-)
create mode 100644 src/chrome/content/rules/FLOSS-Shop.de.xml
delete mode 100644 src/chrome/content/rules/Kernel_concepts.xml
diff --git a/src/chrome/content/rules/FLOSS-Shop.de.xml b/src/chrome/content/rules/FLOSS-Shop.de.xml
new file mode 100644
index 000000000000..f587776330c3
--- /dev/null
+++ b/src/chrome/content/rules/FLOSS-Shop.de.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Kernel_concepts.xml b/src/chrome/content/rules/Kernel_concepts.xml
deleted file mode 100644
index f3b3ca99ec20..000000000000
--- a/src/chrome/content/rules/Kernel_concepts.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From b916a33a53f23413407c5ffe877772e0eddf9a56 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 19:07:04 +0800
Subject: [PATCH 121/167] Create 6Scan_Security.com.xml and Delete
6Scan.com.xml (#11452)
* Update 6Scan.com.xml
* Create 6Scan_Security.com.xml
* Delete 6Scan.com.xml
---
src/chrome/content/rules/6Scan.com.xml | 15 ---------------
src/chrome/content/rules/6Scan_Security.com.xml | 8 ++++++++
2 files changed, 8 insertions(+), 15 deletions(-)
delete mode 100644 src/chrome/content/rules/6Scan.com.xml
create mode 100644 src/chrome/content/rules/6Scan_Security.com.xml
diff --git a/src/chrome/content/rules/6Scan.com.xml b/src/chrome/content/rules/6Scan.com.xml
deleted file mode 100644
index d055c4f04fe6..000000000000
--- a/src/chrome/content/rules/6Scan.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/6Scan_Security.com.xml b/src/chrome/content/rules/6Scan_Security.com.xml
new file mode 100644
index 000000000000..f3cd6c21a7c9
--- /dev/null
+++ b/src/chrome/content/rules/6Scan_Security.com.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From 2cce6b5386400f894aa332ea81257acc76e27cdb Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 19:07:23 +0800
Subject: [PATCH 122/167] Re-activate, Rename and Update Duke.edu.xml (#10102)
* Re-activate, Rename and Update Duke.edu.xml
* Add 'mclibrary.duke.edu'
* Update Duke.edu.xml
---
.../rules/Duke-University-mismatches.xml | 16 --
src/chrome/content/rules/Duke-University.xml | 132 ----------------
src/chrome/content/rules/Duke.edu.xml | 149 ++++++++++++++++++
3 files changed, 149 insertions(+), 148 deletions(-)
delete mode 100644 src/chrome/content/rules/Duke-University-mismatches.xml
delete mode 100644 src/chrome/content/rules/Duke-University.xml
create mode 100644 src/chrome/content/rules/Duke.edu.xml
diff --git a/src/chrome/content/rules/Duke-University-mismatches.xml b/src/chrome/content/rules/Duke-University-mismatches.xml
deleted file mode 100644
index aac6085826a3..000000000000
--- a/src/chrome/content/rules/Duke-University-mismatches.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Duke-University.xml b/src/chrome/content/rules/Duke-University.xml
deleted file mode 100644
index 1c2b51215965..000000000000
--- a/src/chrome/content/rules/Duke-University.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Duke.edu.xml b/src/chrome/content/rules/Duke.edu.xml
new file mode 100644
index 000000000000..e560790321e7
--- /dev/null
+++ b/src/chrome/content/rules/Duke.edu.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From bc54249d42bdf79c39812a3617787606ae3409e8 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 19:07:46 +0800
Subject: [PATCH 123/167] Update Michal_Hrusecky.xml (#11430)
---
src/chrome/content/rules/Michal_Hrusecky.xml | 50 ++++++++++++--------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/chrome/content/rules/Michal_Hrusecky.xml b/src/chrome/content/rules/Michal_Hrusecky.xml
index edfadf295a6a..6a0c9a95218b 100644
--- a/src/chrome/content/rules/Michal_Hrusecky.xml
+++ b/src/chrome/content/rules/Michal_Hrusecky.xml
@@ -1,23 +1,33 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
\ No newline at end of file
+
+
From d0ae3aeff68be9c21b7824696b52f6bf8e52e23a Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Fri, 25 Aug 2017 11:08:36 +0000
Subject: [PATCH 124/167] [CakeCentral.com] Simplify ruleset (#11542)
* [CakeCentral.com] Simplify ruleset
* Rename Cake_Central.com.xml to CakeCentral.com.xml
* [CakeCentral.com] Add targets
---
src/chrome/content/rules/CakeCentral.com.xml | 15 ++++++++++++++
src/chrome/content/rules/Cake_Central.com.xml | 20 -------------------
2 files changed, 15 insertions(+), 20 deletions(-)
create mode 100644 src/chrome/content/rules/CakeCentral.com.xml
delete mode 100644 src/chrome/content/rules/Cake_Central.com.xml
diff --git a/src/chrome/content/rules/CakeCentral.com.xml b/src/chrome/content/rules/CakeCentral.com.xml
new file mode 100644
index 000000000000..13d68acf6388
--- /dev/null
+++ b/src/chrome/content/rules/CakeCentral.com.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Cake_Central.com.xml b/src/chrome/content/rules/Cake_Central.com.xml
deleted file mode 100644
index ef5a9e1251dc..000000000000
--- a/src/chrome/content/rules/Cake_Central.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
From be6c0dbe33ed376b1bd80c5153c52f4b534f40e8 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Fri, 25 Aug 2017 19:17:01 +0800
Subject: [PATCH 125/167] Simplify FinancialContent.com.xml (#12020)
* Simplify FinancialContent.com.xml
* Update FinancialContent.com.xml
---
src/chrome/content/rules/Financial-Content.xml | 15 ---------------
.../content/rules/FinancialContent.com.xml | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 15 deletions(-)
delete mode 100644 src/chrome/content/rules/Financial-Content.xml
create mode 100644 src/chrome/content/rules/FinancialContent.com.xml
diff --git a/src/chrome/content/rules/Financial-Content.xml b/src/chrome/content/rules/Financial-Content.xml
deleted file mode 100644
index a5896cef6476..000000000000
--- a/src/chrome/content/rules/Financial-Content.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/FinancialContent.com.xml b/src/chrome/content/rules/FinancialContent.com.xml
new file mode 100644
index 000000000000..c4c929f39af7
--- /dev/null
+++ b/src/chrome/content/rules/FinancialContent.com.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
From aa0b7c3d9a82ae9a90aa8aeef19a99e2eb699cbe Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Fri, 25 Aug 2017 11:21:14 +0000
Subject: [PATCH 126/167] Create sosmedecins-lille.fr.xml (#12039)
---
src/chrome/content/rules/sosmedecins-lille.fr.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/sosmedecins-lille.fr.xml
diff --git a/src/chrome/content/rules/sosmedecins-lille.fr.xml b/src/chrome/content/rules/sosmedecins-lille.fr.xml
new file mode 100644
index 000000000000..a75277e5e459
--- /dev/null
+++ b/src/chrome/content/rules/sosmedecins-lille.fr.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From 06025aadafd10fd13372202e6456b94e001c04f3 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sat, 26 Aug 2017 00:39:24 +0800
Subject: [PATCH 127/167] Simplify Hitachi_Data_Systems.xml (#12019)
* Simplify Hitachi_Data_Systems.xml
* Update Hitachi_Data_Systems.xml
---
.../content/rules/Hitachi_Data_Systems.xml | 48 +++++++++++++------
1 file changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/chrome/content/rules/Hitachi_Data_Systems.xml b/src/chrome/content/rules/Hitachi_Data_Systems.xml
index a6abe4e73679..1bad50cb91cb 100644
--- a/src/chrome/content/rules/Hitachi_Data_Systems.xml
+++ b/src/chrome/content/rules/Hitachi_Data_Systems.xml
@@ -1,20 +1,38 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 2fe5e05349b54fac6ad3d22f7a374f68586d5056 Mon Sep 17 00:00:00 2001
From: William Budington
Date: Fri, 25 Aug 2017 14:41:20 -0700
Subject: [PATCH 128/167] Fix: s/httpNowhere/httpNowhereOn
---
chromium/background.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chromium/background.js b/chromium/background.js
index 98a84ab457d7..79bf1274df81 100644
--- a/chromium/background.js
+++ b/chromium/background.js
@@ -80,8 +80,8 @@ storage.get({
chrome.storage.onChanged.addListener(function(changes, areaName) {
if (areaName === 'sync' || areaName === 'local') {
- if ('httpNowhere' in changes) {
- httpNowhere = changes.httpNowhere.newValue;
+ if ('httpNowhere' in changes) {
+ httpNowhereOn = changes.httpNowhere.newValue;
updateState();
}
if ('showCounter' in changes) {
From e2f93d02fe08ef461c1d7260c9290eedbcd63907 Mon Sep 17 00:00:00 2001
From: koops76
Date: Sat, 26 Aug 2017 02:27:57 +0300
Subject: [PATCH 129/167] Make fetch test work with .onion domains (#11988)
---
test/rules/src/https_everywhere_checker/http_client.py | 4 ++++
test/travis.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/test/rules/src/https_everywhere_checker/http_client.py b/test/rules/src/https_everywhere_checker/http_client.py
index a04d35b6270b..422ce749acbf 100644
--- a/test/rules/src/https_everywhere_checker/http_client.py
+++ b/test/rules/src/https_everywhere_checker/http_client.py
@@ -306,6 +306,8 @@ def staticFetch(url, options, platformPath):
buf = cStringIO.StringIO()
headerBuf = cStringIO.StringIO()
+ urlParts = urlparse.urlparse(url)
+
c = pycurl.Curl()
c.setopt(c.URL, url)
c.setopt(c.WRITEFUNCTION, buf.write)
@@ -325,6 +327,8 @@ def staticFetch(url, options, platformPath):
c.setopt(c.SSLVERSION, options.sslVersion)
c.setopt(c.VERBOSE, options.curlVerbose)
c.setopt(c.SSL_CIPHER_LIST, options.cipherList)
+ if urlParts.hostname[-6:] == '.onion':
+ c.setopt(c.PROXY, 'socks5h://127.0.0.1:9050')
c.perform()
bufValue = buf.getvalue()
diff --git a/test/travis.sh b/test/travis.sh
index c47970f2cc04..83ced9246353 100755
--- a/test/travis.sh
+++ b/test/travis.sh
@@ -77,7 +77,7 @@ if [ "$RULESETS_CHANGED" ]; then
echo >&2 "Testing test URLs in all changed rulesets."
docker_build
# --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 && test/fetch.sh"
+ 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
From 61481cb25509e3f19430649206fd1957f8796f0c Mon Sep 17 00:00:00 2001
From: William Budington
Date: Fri, 25 Aug 2017 16:41:50 -0700
Subject: [PATCH 130/167] Remove platform="mixedcontent" rule-skipping
attribute, now that we can test onion URLs with the fetch test (#12093)
---
src/chrome/content/rules/Blockchainbdgpzk.onion.xml | 2 +-
src/chrome/content/rules/Cyphdbyhiddenbhs.onion.xml | 11 +----------
src/chrome/content/rules/FacebookCoreWWWi.onion.xml | 8 +-------
src/chrome/content/rules/Protonirockerxow.onion.xml | 8 +-------
src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml | 6 +-----
5 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/src/chrome/content/rules/Blockchainbdgpzk.onion.xml b/src/chrome/content/rules/Blockchainbdgpzk.onion.xml
index 0bed62be86c3..918dbfe99e75 100644
--- a/src/chrome/content/rules/Blockchainbdgpzk.onion.xml
+++ b/src/chrome/content/rules/Blockchainbdgpzk.onion.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/src/chrome/content/rules/Cyphdbyhiddenbhs.onion.xml b/src/chrome/content/rules/Cyphdbyhiddenbhs.onion.xml
index 3dea4d2581d3..3b18d95fa85d 100644
--- a/src/chrome/content/rules/Cyphdbyhiddenbhs.onion.xml
+++ b/src/chrome/content/rules/Cyphdbyhiddenbhs.onion.xml
@@ -3,19 +3,10 @@
For other Cyph coverage, see Cyph.com.xml.
-
- Note: This should be something like platform=tor, to indicate
- that these rules should not go through the fetch tester on the
- non-Tor Internet because they will fail. As an approximation to
- that, we just use platform="mixedcontent", since Tor Browser is a
- mixedcontent platform, and the https-everywhere-checker will skip
- non-default platforms.
-
-
www.cyphdbyhiddenbhs.onion: Mismatched
-->
-
+
diff --git a/src/chrome/content/rules/FacebookCoreWWWi.onion.xml b/src/chrome/content/rules/FacebookCoreWWWi.onion.xml
index 2e24792b2bbc..9badef5da955 100644
--- a/src/chrome/content/rules/FacebookCoreWWWi.onion.xml
+++ b/src/chrome/content/rules/FacebookCoreWWWi.onion.xml
@@ -4,12 +4,6 @@
For other Facebook coverage, see Facebook.xml.
This ruleset covers Facebook hidden services on Tor.
- Note: This should be something like platform=tor, to indicate
- that these rules should not go through the fetch tester on the
- non-Tor Internet because they will fail. As an approximation to
- that, we just use platform="mixedcontent", since Tor Browser is a
- mixedcontent platform, and the https-everywhere-checker will skip
- non-default platforms.
Fully covered hosts:
@@ -44,7 +38,7 @@
- .facebookcorewwwi.onion
-->
-
+
diff --git a/src/chrome/content/rules/Protonirockerxow.onion.xml b/src/chrome/content/rules/Protonirockerxow.onion.xml
index 2fad1ccdac99..2956b3515809 100644
--- a/src/chrome/content/rules/Protonirockerxow.onion.xml
+++ b/src/chrome/content/rules/Protonirockerxow.onion.xml
@@ -8,15 +8,9 @@
- *.protonirockerxow.onion
This ruleset covers ProtonMail hidden services on Tor.
- Note: This should be something like platform=tor, to indicate
- that these rules should not go through the fetch tester on the
- non-Tor Internet because they will fail. As an approximation to
- that, we just use platform="mixedcontent", since Tor Browser is a
- mixedcontent platform, and the https-everywhere-checker will skip
- non-default platforms.
-->
-
+
diff --git a/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml b/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml
index f6547ecab034..398da03f6224 100644
--- a/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml
+++ b/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml
@@ -3,12 +3,8 @@
For other Intercept coverage, see First_Look.org.xml.
-
- There isn't really any mixed content - it's
- just for fetch testing to be skipped.
-
-->
-
+
From 63cb8b6d6120336db30f6333fab7a5aaff457124 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Sat, 26 Aug 2017 19:24:50 +1000
Subject: [PATCH 131/167] [Eltartar_War] Delete dead ruleset. (#12107)
---
src/chrome/content/rules/Eltartar_War.xml | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 src/chrome/content/rules/Eltartar_War.xml
diff --git a/src/chrome/content/rules/Eltartar_War.xml b/src/chrome/content/rules/Eltartar_War.xml
deleted file mode 100644
index 26a6d8bc5617..000000000000
--- a/src/chrome/content/rules/Eltartar_War.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 7b421a6830a6d3276915c79c0bf4fbf032ba98d1 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Sat, 26 Aug 2017 19:33:10 +1000
Subject: [PATCH 132/167] [AJs_Ski_and_Sports] Fix ruleset. (#12104)
---
.../content/rules/AJs_Ski_and_Sports.xml | 22 +++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/chrome/content/rules/AJs_Ski_and_Sports.xml b/src/chrome/content/rules/AJs_Ski_and_Sports.xml
index dbebd3d54c27..eeb1614bde8d 100644
--- a/src/chrome/content/rules/AJs_Ski_and_Sports.xml
+++ b/src/chrome/content/rules/AJs_Ski_and_Sports.xml
@@ -1,21 +1,11 @@
-
-
-
+
-
-
-
-
+
+
-
+
-
\ No newline at end of file
+
From eb571d4862db428a4e09a13f4fe0d62d27e49d85 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sat, 26 Aug 2017 17:42:55 +0800
Subject: [PATCH 133/167] Remove 'platform=mixedcontent' from HKGOLDEN.com.xml
(#12103)
* Remove 'platform=mixedcontent' from HKGOLDEN.com.xml
* Update HKGOLDEN.com.xml
---
src/chrome/content/rules/HKGOLDEN.com.xml | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/chrome/content/rules/HKGOLDEN.com.xml b/src/chrome/content/rules/HKGOLDEN.com.xml
index 01954b25376e..78e718fae129 100644
--- a/src/chrome/content/rules/HKGOLDEN.com.xml
+++ b/src/chrome/content/rules/HKGOLDEN.com.xml
@@ -1,26 +1,21 @@
-
+
-
From 08413cd2c06d5729acc11f667e1632692fe369ae Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Sat, 26 Aug 2017 20:06:17 +1000
Subject: [PATCH 134/167] [Webstaurant_Store] Simplify ruleset. (#12106)
---
.../content/rules/Webstaurant_Store.xml | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/chrome/content/rules/Webstaurant_Store.xml b/src/chrome/content/rules/Webstaurant_Store.xml
index 86637d0b1a46..9ebc5a662d4d 100644
--- a/src/chrome/content/rules/Webstaurant_Store.xml
+++ b/src/chrome/content/rules/Webstaurant_Store.xml
@@ -1,18 +1,20 @@
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
\ No newline at end of file
+
From a48ed7f48e7ac13f4d977e4e1faa2d1d68190681 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Sat, 26 Aug 2017 20:49:20 +1000
Subject: [PATCH 135/167] [CreativeCommons] Remove some preloaded domains.
(#12084)
---
src/chrome/content/rules/CreativeCommons.xml | 44 -------------------
.../content/rules/creativecommons.net.xml | 8 ++++
2 files changed, 8 insertions(+), 44 deletions(-)
delete mode 100644 src/chrome/content/rules/CreativeCommons.xml
create mode 100644 src/chrome/content/rules/creativecommons.net.xml
diff --git a/src/chrome/content/rules/CreativeCommons.xml b/src/chrome/content/rules/CreativeCommons.xml
deleted file mode 100644
index 8dcf038c28a9..000000000000
--- a/src/chrome/content/rules/CreativeCommons.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/creativecommons.net.xml b/src/chrome/content/rules/creativecommons.net.xml
new file mode 100644
index 000000000000..0634e8c4f327
--- /dev/null
+++ b/src/chrome/content/rules/creativecommons.net.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
From cb16d231508ef9e2ab8df969d920676c5bb12da6 Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Sat, 26 Aug 2017 20:57:57 +1000
Subject: [PATCH 136/167] [104.com.tw] Update ruleset. (#12102)
---
src/chrome/content/rules/104.com.tw.xml | 35 +++++++++++++------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/chrome/content/rules/104.com.tw.xml b/src/chrome/content/rules/104.com.tw.xml
index 0ec1152f43d3..5133450c3139 100644
--- a/src/chrome/content/rules/104.com.tw.xml
+++ b/src/chrome/content/rules/104.com.tw.xml
@@ -1,44 +1,45 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
From 9fc210480d0b02305502af44f8c7fdfd20bb3647 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sat, 26 Aug 2017 18:59:04 +0800
Subject: [PATCH 137/167] Delete cscportal.org.uk.xml (#11483)
---
src/chrome/content/rules/cscportal.org.uk.xml | 20 -------------------
1 file changed, 20 deletions(-)
delete mode 100644 src/chrome/content/rules/cscportal.org.uk.xml
diff --git a/src/chrome/content/rules/cscportal.org.uk.xml b/src/chrome/content/rules/cscportal.org.uk.xml
deleted file mode 100644
index 32de35c41ddf..000000000000
--- a/src/chrome/content/rules/cscportal.org.uk.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From eba361418a1337011b8dacd6322a9a2f9199ee63 Mon Sep 17 00:00:00 2001
From: Richard
Date: Sat, 26 Aug 2017 04:03:54 -0700
Subject: [PATCH 138/167] [Color Of Change] Enable ruleset, remove unsupported
subdomains (#11565)
---
src/chrome/content/rules/Color-Of-Change.xml | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/chrome/content/rules/Color-Of-Change.xml b/src/chrome/content/rules/Color-Of-Change.xml
index 102d5f37caf6..27bf56b51098 100644
--- a/src/chrome/content/rules/Color-Of-Change.xml
+++ b/src/chrome/content/rules/Color-Of-Change.xml
@@ -1,21 +1,10 @@
-
-
-
+
-
-
-
-
Date: Sun, 27 Aug 2017 06:11:04 +0800
Subject: [PATCH 139/167] Update and rename Serverloft.xml to
Serverloft.com.xml (#12018)
---
src/chrome/content/rules/Serverloft.com.xml | 14 ++++++++++++++
src/chrome/content/rules/Serverloft.xml | 18 ------------------
2 files changed, 14 insertions(+), 18 deletions(-)
create mode 100644 src/chrome/content/rules/Serverloft.com.xml
delete mode 100644 src/chrome/content/rules/Serverloft.xml
diff --git a/src/chrome/content/rules/Serverloft.com.xml b/src/chrome/content/rules/Serverloft.com.xml
new file mode 100644
index 000000000000..abb9d22d5c61
--- /dev/null
+++ b/src/chrome/content/rules/Serverloft.com.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Serverloft.xml b/src/chrome/content/rules/Serverloft.xml
deleted file mode 100644
index 42cc9768b3c3..000000000000
--- a/src/chrome/content/rules/Serverloft.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
From 1b835c74daf08117b765ba84c25b5b3a86cc4377 Mon Sep 17 00:00:00 2001
From: J0WI
Date: Sun, 27 Aug 2017 00:12:58 +0200
Subject: [PATCH 140/167] re-enable green.ch.xml (#12054)
---
src/chrome/content/rules/green.ch.xml | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/chrome/content/rules/green.ch.xml b/src/chrome/content/rules/green.ch.xml
index fa4bd23c7f0a..bd5a35e14ac4 100644
--- a/src/chrome/content/rules/green.ch.xml
+++ b/src/chrome/content/rules/green.ch.xml
@@ -1,36 +1,41 @@
-
-
+
-
+
+
-
+
+
+
+
Date: Sun, 27 Aug 2017 01:04:40 +0200
Subject: [PATCH 141/167] add Fail2ban.org.xml (#12094)
* add Fail2ban.org.xml
* ^ does not exist, secure cookies
---
src/chrome/content/rules/Fail2ban.org.xml | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 src/chrome/content/rules/Fail2ban.org.xml
diff --git a/src/chrome/content/rules/Fail2ban.org.xml b/src/chrome/content/rules/Fail2ban.org.xml
new file mode 100644
index 000000000000..73c64973a6bc
--- /dev/null
+++ b/src/chrome/content/rules/Fail2ban.org.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
From 5b851fc9e339ed891c6304e2f56bf0db00afe396 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 27 Aug 2017 07:05:08 +0800
Subject: [PATCH 142/167] Update OpenX.org.xml (#12111)
* Update OpenX.org.xml
* Update OpenX.org.xml
---
src/chrome/content/rules/OpenX.org.xml | 77 +++++++-------------------
1 file changed, 21 insertions(+), 56 deletions(-)
diff --git a/src/chrome/content/rules/OpenX.org.xml b/src/chrome/content/rules/OpenX.org.xml
index c9cdf05998d3..46782c0ebece 100644
--- a/src/chrome/content/rules/OpenX.org.xml
+++ b/src/chrome/content/rules/OpenX.org.xml
@@ -1,60 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
From 8c33594efde733e0237721832e924732f683cfee Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 27 Aug 2017 07:52:29 +0800
Subject: [PATCH 143/167] Update OpenX.com related rulesets (#12110)
* Update OpenX.com related rulesets
* Update OpenX.xml
---
src/chrome/content/rules/OpenX.xml | 221 ++++++------------
.../content/rules/openx.com-resources.xml | 66 ------
2 files changed, 65 insertions(+), 222 deletions(-)
delete mode 100644 src/chrome/content/rules/openx.com-resources.xml
diff --git a/src/chrome/content/rules/OpenX.xml b/src/chrome/content/rules/OpenX.xml
index 6b744aa26128..454bde8b4081 100644
--- a/src/chrome/content/rules/OpenX.xml
+++ b/src/chrome/content/rules/OpenX.xml
@@ -1,168 +1,77 @@
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/chrome/content/rules/openx.com-resources.xml b/src/chrome/content/rules/openx.com-resources.xml
deleted file mode 100644
index 9a3423ae53a7..000000000000
--- a/src/chrome/content/rules/openx.com-resources.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 18ebbc6f3c72942aa4e8e7dbeb71bda7be9f7df6 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 27 Aug 2017 14:21:56 +0800
Subject: [PATCH 144/167] Update Bigdinosaur.org.xml, Fix #12132 (#12133)
---
src/chrome/content/rules/Bigdinosaur.org.xml | 33 +++++++++++++-------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/chrome/content/rules/Bigdinosaur.org.xml b/src/chrome/content/rules/Bigdinosaur.org.xml
index b3c16205e20d..c0a6668d1c36 100644
--- a/src/chrome/content/rules/Bigdinosaur.org.xml
+++ b/src/chrome/content/rules/Bigdinosaur.org.xml
@@ -1,15 +1,26 @@
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
From 214642000a0e10c5cbe4f5441cae564076083a35 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 27 Aug 2017 18:15:11 +0800
Subject: [PATCH 145/167] Update and rename Locaweb.xml to Locaweb.com.br.xml
(#12021)
---
src/chrome/content/rules/Locaweb.com.br.xml | 20 +++++++++++++++++
src/chrome/content/rules/Locaweb.xml | 24 ---------------------
2 files changed, 20 insertions(+), 24 deletions(-)
create mode 100644 src/chrome/content/rules/Locaweb.com.br.xml
delete mode 100644 src/chrome/content/rules/Locaweb.xml
diff --git a/src/chrome/content/rules/Locaweb.com.br.xml b/src/chrome/content/rules/Locaweb.com.br.xml
new file mode 100644
index 000000000000..2bc492f52fc9
--- /dev/null
+++ b/src/chrome/content/rules/Locaweb.com.br.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Locaweb.xml b/src/chrome/content/rules/Locaweb.xml
deleted file mode 100644
index 03c154dc822d..000000000000
--- a/src/chrome/content/rules/Locaweb.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
From 7ed24d0f742b90dbd760bf602bea827df943d59f Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 27 Aug 2017 10:51:12 +0000
Subject: [PATCH 146/167] Create arslan.io.xml (#12112)
---
src/chrome/content/rules/arslan.io.xml | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 src/chrome/content/rules/arslan.io.xml
diff --git a/src/chrome/content/rules/arslan.io.xml b/src/chrome/content/rules/arslan.io.xml
new file mode 100644
index 000000000000..5d89fb9ff716
--- /dev/null
+++ b/src/chrome/content/rules/arslan.io.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
From 6a2bd8ea1274235cc6a683d9f1afb63c9dea8aeb Mon Sep 17 00:00:00 2001
From: Christian Heinrichs
Date: Sun, 27 Aug 2017 12:53:22 +0200
Subject: [PATCH 147/167] Create vdvc.de.xml (#12134)
---
src/chrome/content/rules/vdvc.de.xml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 src/chrome/content/rules/vdvc.de.xml
diff --git a/src/chrome/content/rules/vdvc.de.xml b/src/chrome/content/rules/vdvc.de.xml
new file mode 100644
index 000000000000..e08938555fea
--- /dev/null
+++ b/src/chrome/content/rules/vdvc.de.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
From 7eb858e0acb9a205b0b311491aa0ba4df46a04d4 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall
Date: Sun, 27 Aug 2017 12:12:42 +0100
Subject: [PATCH 148/167] Remove shopping.rsbp.org.uk (#7951)
Each of the pages will load and display, but if you try to interact with them, they are all broken
---
src/chrome/content/rules/RSPB.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/chrome/content/rules/RSPB.xml b/src/chrome/content/rules/RSPB.xml
index f0376f73beeb..c0ece1805e54 100644
--- a/src/chrome/content/rules/RSPB.xml
+++ b/src/chrome/content/rules/RSPB.xml
@@ -1,7 +1,10 @@
+
+
-
@@ -10,4 +13,4 @@
-
\ No newline at end of file
+
From 0464d5502bcef63a9b3be5d90394257eabe18916 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 27 Aug 2017 11:17:25 +0000
Subject: [PATCH 149/167] Update Qibla.com.xml (#12147)
---
src/chrome/content/rules/Qibla.com.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/chrome/content/rules/Qibla.com.xml b/src/chrome/content/rules/Qibla.com.xml
index c4f295885fb3..a085c02004d7 100644
--- a/src/chrome/content/rules/Qibla.com.xml
+++ b/src/chrome/content/rules/Qibla.com.xml
@@ -1,11 +1,9 @@
-
+
+
+
From 39aa8155c46634e81923fc619dc31a7a0a86d5fc Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall
Date: Sun, 27 Aug 2017 14:31:40 +0100
Subject: [PATCH 150/167] Add zipcar.co.uk (#8189)
---
src/chrome/content/rules/Zipcar.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/chrome/content/rules/Zipcar.xml b/src/chrome/content/rules/Zipcar.xml
index 5e53e33638b4..0d7226abe28f 100644
--- a/src/chrome/content/rules/Zipcar.xml
+++ b/src/chrome/content/rules/Zipcar.xml
@@ -1,9 +1,8 @@
From c0b9a234f34ee2242a0266275971ecbcd7f12d3e Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 27 Aug 2017 13:52:34 +0000
Subject: [PATCH 151/167] Update Stallman.org.xml (#12148)
---
src/chrome/content/rules/Stallman.org.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/chrome/content/rules/Stallman.org.xml b/src/chrome/content/rules/Stallman.org.xml
index ce60e997d8fc..42357ecc2bb6 100644
--- a/src/chrome/content/rules/Stallman.org.xml
+++ b/src/chrome/content/rules/Stallman.org.xml
@@ -8,6 +8,8 @@
+
+
From 80e6bdb5ee71d584c4dec83cfc0563417b383550 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 27 Aug 2017 13:57:11 +0000
Subject: [PATCH 152/167] Create nytimes2tsqtnxek.onion.xml (#12125)
* Create nytimes2tsqtnxek.onion.xml
* [NYTimes.com] Add comment about onion ruleset
* Add comment about invalid certificate
---
src/chrome/content/rules/NYTimes.xml | 1 +
.../content/rules/nytimes2tsqtnxek.onion.xml | 14 ++++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 src/chrome/content/rules/nytimes2tsqtnxek.onion.xml
diff --git a/src/chrome/content/rules/NYTimes.xml b/src/chrome/content/rules/NYTimes.xml
index bc9813ea6ad9..f1357c611834 100644
--- a/src/chrome/content/rules/NYTimes.xml
+++ b/src/chrome/content/rules/NYTimes.xml
@@ -7,6 +7,7 @@
- NYT_Co.me.xml
- NYT_eXaminer.com.xml
- INYT.com.xml
+ - nytimes2tsqtnxek.onion.xml
CDN buckets:
- pimage.timespeople.nytimes.com.amazonaws.com
diff --git a/src/chrome/content/rules/nytimes2tsqtnxek.onion.xml b/src/chrome/content/rules/nytimes2tsqtnxek.onion.xml
new file mode 100644
index 000000000000..850e6228b6b7
--- /dev/null
+++ b/src/chrome/content/rules/nytimes2tsqtnxek.onion.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
From 70b4423ac69a02c6512a873444da4a4363821317 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sun, 27 Aug 2017 14:03:09 +0000
Subject: [PATCH 153/167] Create tomritterbassljd.onion.xml (#12143)
* Create tomritterbassljd.onion.xml
* [Ritter.vg] Add comment about hidden service
---
src/chrome/content/rules/Ritter.vg.xml | 7 ++++---
.../content/rules/tomritterbassljd.onion.xml | 14 ++++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 src/chrome/content/rules/tomritterbassljd.onion.xml
diff --git a/src/chrome/content/rules/Ritter.vg.xml b/src/chrome/content/rules/Ritter.vg.xml
index cad69844caff..949a6793c556 100644
--- a/src/chrome/content/rules/Ritter.vg.xml
+++ b/src/chrome/content/rules/Ritter.vg.xml
@@ -1,11 +1,12 @@
+
-
-
diff --git a/src/chrome/content/rules/tomritterbassljd.onion.xml b/src/chrome/content/rules/tomritterbassljd.onion.xml
new file mode 100644
index 000000000000..4352ca0ce50d
--- /dev/null
+++ b/src/chrome/content/rules/tomritterbassljd.onion.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
From e410667c0d2b746b9a6f36df46efa5fe0430f908 Mon Sep 17 00:00:00 2001
From: Christian Heinrichs
Date: Sun, 27 Aug 2017 16:06:53 +0200
Subject: [PATCH 154/167] Create cebix.net.xml (#12144)
---
src/chrome/content/rules/cebix.net.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 src/chrome/content/rules/cebix.net.xml
diff --git a/src/chrome/content/rules/cebix.net.xml b/src/chrome/content/rules/cebix.net.xml
new file mode 100644
index 000000000000..31e4d8eaea0b
--- /dev/null
+++ b/src/chrome/content/rules/cebix.net.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
From 718f785a056c710de50048428dd64941a2c10954 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 27 Aug 2017 14:08:46 +0000
Subject: [PATCH 155/167] Create cloudonaut.io.xml (#12114)
---
src/chrome/content/rules/cloudonaut.io.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 src/chrome/content/rules/cloudonaut.io.xml
diff --git a/src/chrome/content/rules/cloudonaut.io.xml b/src/chrome/content/rules/cloudonaut.io.xml
new file mode 100644
index 000000000000..dd65fa9459e0
--- /dev/null
+++ b/src/chrome/content/rules/cloudonaut.io.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
From aedf85437ec2cac6583652fdd702d80c9bd95da1 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing
Date: Sun, 27 Aug 2017 22:10:51 +0800
Subject: [PATCH 156/167] Update HealthCheckUSA.xml (disabled twice) (#12099)
---
.../content/rules/HealthCheckUSA.com.xml | 15 ++++++++++++++
src/chrome/content/rules/HealthCheckUSA.xml | 20 -------------------
2 files changed, 15 insertions(+), 20 deletions(-)
create mode 100644 src/chrome/content/rules/HealthCheckUSA.com.xml
delete mode 100644 src/chrome/content/rules/HealthCheckUSA.xml
diff --git a/src/chrome/content/rules/HealthCheckUSA.com.xml b/src/chrome/content/rules/HealthCheckUSA.com.xml
new file mode 100644
index 000000000000..03075b03c223
--- /dev/null
+++ b/src/chrome/content/rules/HealthCheckUSA.com.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/HealthCheckUSA.xml b/src/chrome/content/rules/HealthCheckUSA.xml
deleted file mode 100644
index 6219aaaf181a..000000000000
--- a/src/chrome/content/rules/HealthCheckUSA.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
From 9346a4bb13da6f557bbe296652f8ffef06e951a2 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 27 Aug 2017 21:59:03 +0000
Subject: [PATCH 157/167] Create shitcoin.com.xml (#12127)
* Create shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
* Update shitcoin.com.xml
---
src/chrome/content/rules/shitcoin.com.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 src/chrome/content/rules/shitcoin.com.xml
diff --git a/src/chrome/content/rules/shitcoin.com.xml b/src/chrome/content/rules/shitcoin.com.xml
new file mode 100644
index 000000000000..34be2251f452
--- /dev/null
+++ b/src/chrome/content/rules/shitcoin.com.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
From c03c0a34c2912b9a457d4dfb3619f2de3fbeaf22 Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Sun, 27 Aug 2017 22:01:07 +0000
Subject: [PATCH 158/167] Create SiaHub.info.xml (#12130)
* Create SiaHub.info.xml
* Update SiaHub.info.xml
* Update SiaHub.info.xml
* Update SiaHub.info.xml
* Update SiaHub.info.xml
* Update SiaHub.info.xml
---
src/chrome/content/rules/SiaHub.info.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 src/chrome/content/rules/SiaHub.info.xml
diff --git a/src/chrome/content/rules/SiaHub.info.xml b/src/chrome/content/rules/SiaHub.info.xml
new file mode 100644
index 000000000000..4ed6c1ade1cf
--- /dev/null
+++ b/src/chrome/content/rules/SiaHub.info.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
From 9176c8b8ed469c9f3eec3f3c568c944da5ef910b Mon Sep 17 00:00:00 2001
From: koops76
Date: Mon, 28 Aug 2017 01:02:40 +0300
Subject: [PATCH 159/167] DuckDuckGo Onion Service (#8748) (#12150)
* DuckDuckGo Onion Service
* Fixes
* Update 3g2upl4pq6kufc4m.onion.xml
* Update DuckDuckGo.xml
---
.../content/rules/3g2upl4pq6kufc4m.onion.xml | 15 +++++++++++++++
src/chrome/content/rules/DuckDuckGo.xml | 1 +
2 files changed, 16 insertions(+)
create mode 100644 src/chrome/content/rules/3g2upl4pq6kufc4m.onion.xml
diff --git a/src/chrome/content/rules/3g2upl4pq6kufc4m.onion.xml b/src/chrome/content/rules/3g2upl4pq6kufc4m.onion.xml
new file mode 100644
index 000000000000..ad046cc1c13a
--- /dev/null
+++ b/src/chrome/content/rules/3g2upl4pq6kufc4m.onion.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/DuckDuckGo.xml b/src/chrome/content/rules/DuckDuckGo.xml
index 962b6bcdbdc1..fd19d25c77b5 100644
--- a/src/chrome/content/rules/DuckDuckGo.xml
+++ b/src/chrome/content/rules/DuckDuckGo.xml
@@ -1,5 +1,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Sony.xml b/src/chrome/content/rules/Sony.xml
index 643ff6f15555..19a6ee1b51ae 100644
--- a/src/chrome/content/rules/Sony.xml
+++ b/src/chrome/content/rules/Sony.xml
@@ -8,6 +8,7 @@
- PlayStation_Network.com.xml
- SCEA.com.xml
- Sony.co.uk.xml
+ - Sony.com.au.xml
- Sony.com.hk.xml
- Sony.com.mx.xml
- Sony.eu.xml
From 8c0ba1e3a67196ce586f3d33a6a41066a73ece1d Mon Sep 17 00:00:00 2001
From: koops76
Date: Mon, 28 Aug 2017 05:49:58 +0300
Subject: [PATCH 161/167] Update Lloydsbank.com.xml (#12121)
* Update Lloydsbank.com.xml
* Update Lloydsbank.com.xml
* Update Lloydsbank.com.xml
* Update Lloydsbank.com.xml
* Update Lloydsbank.com.xml
* Update Lloydsbank.com.xml
* Update Lloydsbank.com.xml
---
src/chrome/content/rules/Lloydsbank.com.xml | 94 +++------------------
1 file changed, 12 insertions(+), 82 deletions(-)
diff --git a/src/chrome/content/rules/Lloydsbank.com.xml b/src/chrome/content/rules/Lloydsbank.com.xml
index 8251c87b4890..8bd2be141a7f 100644
--- a/src/chrome/content/rules/Lloydsbank.com.xml
+++ b/src/chrome/content/rules/Lloydsbank.com.xml
@@ -1,59 +1,14 @@
-
-
-
+
+
@@ -62,42 +17,17 @@ Fetch error: http://secure.lloydsbank.com/ => https://secure.lloydsbank.com/: To
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
From f08a0de56fd044c37d8832440c454678b06e9efe Mon Sep 17 00:00:00 2001
From: I-have-50-open-PRs-to-HTTPS-EVERYWHERE
<30478887+I-have-50-open-PRs-to-HTTPS-EVERYWHERE@users.noreply.github.com>
Date: Mon, 28 Aug 2017 22:45:13 +0000
Subject: [PATCH 162/167] Gone from DNS (Buy-Premium-Tech.xml) (#12168)
---
src/chrome/content/rules/Buy-Premium-Tech.xml | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 src/chrome/content/rules/Buy-Premium-Tech.xml
diff --git a/src/chrome/content/rules/Buy-Premium-Tech.xml b/src/chrome/content/rules/Buy-Premium-Tech.xml
deleted file mode 100644
index 41901bd6e0bc..000000000000
--- a/src/chrome/content/rules/Buy-Premium-Tech.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
From 2e10e9f2f5b87f9779cf2a7166d915520d0f271e Mon Sep 17 00:00:00 2001
From: Bardi Harborow
Date: Tue, 29 Aug 2017 19:12:12 +1000
Subject: [PATCH 163/167] [Theory.org] Update ruleset. (#12171)
---
src/chrome/content/rules/Theory.org.xml | 24 +++++++++++++-----------
utils/ruleset-whitelist.csv | 1 -
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/chrome/content/rules/Theory.org.xml b/src/chrome/content/rules/Theory.org.xml
index 367e5766c2e4..074c1044bace 100644
--- a/src/chrome/content/rules/Theory.org.xml
+++ b/src/chrome/content/rules/Theory.org.xml
@@ -1,18 +1,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index 12b8058dbb85..02de4bde7a63 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -3237,7 +3237,6 @@ d3cad14d26c563280c4e79db4b0cf3861e3f31b33ca0eeaa23247d90c54d1599,1,1,The_Informa
ba5cddc5052720f05477eb3d7c182a687f18021b30a937d34458c7d10d5faf8b,1,1,The_Next_Web-problematic.xml
0eaa13eb00dfa89e920c20033aac3643c377713df15945b2afaef3b4fb13d8e4,1,1,The-Next-Web.xml
4a241330c6d4a018f80c27a20703e70c45ecf17cf9fbeda893e47da1e6169937,1,1,The-Open-Group.xml
-4e0af838c4fceca85d9c15610ad185cf241c6229425eb8a45ded944641cc2220,1,1,Theory.org.xml
6ce3ac8cd6caa5c805e60c651cb1b5c5b00eca8e306e9731b6929a39f26e06d5,1,1,The_Patriot_Post.xml
47a59b2dd91d2cfdf21e5a9dc3e4d41cf42a9b52c99dba572e95b1f39c1d3a34,1,1,The-Public-Index.xml
74543ac90a7b3e191da32cd7f530d15156c29648ac63f8d327ea72726dacb6cd,1,1,The-Republic.xml
From 7727b193146cffbe2f2e17ce2b0886119368202c Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Tue, 29 Aug 2017 13:28:57 +0000
Subject: [PATCH 164/167] [SearchMarketingNow.com] Update and reactivate
ruleset (#10755)
* [SearchMarketingNow.com] Update and reactivate ruleset
* [SearchMarketing] Add subdomains in top comment
---
src/chrome/content/rules/Third-Door-Media.xml | 35 +++++++------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/chrome/content/rules/Third-Door-Media.xml b/src/chrome/content/rules/Third-Door-Media.xml
index 2f78fad17f50..ce7ee111e5db 100644
--- a/src/chrome/content/rules/Third-Door-Media.xml
+++ b/src/chrome/content/rules/Third-Door-Media.xml
@@ -1,33 +1,24 @@
-
-
+
-
-
-
-
-
-
-
+
From 4f9b98dc1ab7b4f25bb2f0d642f7fe1d90d34ae1 Mon Sep 17 00:00:00 2001
From: William Budington
Date: Tue, 29 Aug 2017 15:43:18 -0700
Subject: [PATCH 165/167] Update CONTRIBUTING.md to include the handles of
maintainers as well as updating description of the core codebase layout.
---
CONTRIBUTING.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a5333975602..30c5473fe032 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ There are several main areas of development on HTTPS Everywhere: the rulesets, t
The rulesets can be found in the [`rules`](rules) top-level path and include all the rules for redirecting individual sites to HTTPS. These are written in XML. If you want to get started contributing to HTTPS Everywhere, we recommend starting here.
-The core codebase consists of the code that performs the redirects, the UI, logging code, the decentralized SSL observatory code, and ruleset loading, and is written in JavaScript. It is divided into two separate extensions. One is based on the `XPCOM` API used by Mozilla Firefox (soon to be deprecated, located in the [`src`](src) top-level path), and the other is based on the `WebExtensions` API (located in [`chromium`](chromium)), first developed in Google's Chromium browser.
+The core codebase consists of the code that performs the redirects, the UI, logging code, and ruleset loading. This encompasses all code delivered with the extension itself that is *not* a ruleset. It is written in JavaScript, using the `WebExtensions` API (located in [`chromium`](chromium)) on all supported browsers. In Firefox, this extension is wrapped in a thin `XPCOM` layer for the purposes of migrating settings, located in [`src`](src), which will soon be deprecated.
The utilities ([`utils`](utils) top-level path) include scripts that build the extension, sanitize and perform normalization on rulesets, simplify rules, and help label GitHub issues. Historically, these utilities have been written in Python. Many of the newer utilities are written in JavaScript, and are meant to be run in node. Some of the wrappers for these utilities are in shell scripts.
@@ -76,7 +76,7 @@ This would create `Example.com.xml`, which you could then take a look at and edi
## Minimum Requirements for a Ruleset PR
-There are several volunteers to HTTPS Everywhere who have graciously dedicated their time to look at the `ruleset` contributions and work with contributors to ensure quality of the pull requests before merging. It is typical for there to be several back-and-fourth communications with these `ruleset` maintainers before a PR is in a good shape to merge. Please be patient and respectful, the maintainers are donating their time for no benefit other than the satisfaction of making the web more secure. They are under no obligation to merge your request, and may reject it if it is impossible to ensure quality.
+There are several volunteers to HTTPS Everywhere who have graciously dedicated their time to look at the `ruleset` contributions and work with contributors to ensure quality of the pull requests before merging. It is typical for there to be several back-and-forth communications with these `ruleset` maintainers before a PR is in a good shape to merge. Please be patient and respectful, the maintainers are donating their time for no benefit other than the satisfaction of making the web more secure. They are under no obligation to merge your request, and may reject it if it is impossible to ensure quality. You can identify these volunteers by looking for the "Collaborator" identifier in their comments on HTTPS Everywhere issues and pull requests.
In the back-and-fourth process of getting the `ruleset` in good shape, there may be many commits made. It is this project's convention to squash-and-merge these commits into a single commit before merging into the project. If your commits are cryptographically signed, we may ask you to squash the commits yourself in order to preserve this signature. Otherwise, we may squash them ourselves before merging.
@@ -314,6 +314,8 @@ Officially supported browsers:
We also informally support Opera browser, but do not have tooling around testing Opera. Firefox ESR is supported because this is what the Tor Browser, which includes HTTPS Everywhere, is built upon. For the test commands, refer to [README.md](README.md).
+The current extension maintainer is @Hainish. You can tag him for PRs which involve the core codebase.
+
Several of our utilities and our full test suite is written in Python. Eventually we would like the whole codebase to be standardized as JavaScript. If you are so inclined, it would be helpful to rewrite the tooling and tests into JavaScript while maintaining the functionality.
* * *
From 04b4e1df08543be683655c67652b8d337d61daf7 Mon Sep 17 00:00:00 2001
From: William Budington
Date: Tue, 29 Aug 2017 16:49:08 -0700
Subject: [PATCH 166/167] Elaborating on instructions to become a ruleset
maintainer (closes #9111)
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 30c5473fe032..49ad1f5556df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Welcome, and thank you for your interest in contributing to HTTPS Everywhere! HT
One of the things that makes it easy to contribute to HTTPS Everywhere is that you don't have to be a coder to contribute. That's because HTTPS Everywhere's most important component is the list of rules that tell it when it can request a website over HTTPS. These rules are just XML files that contain regular expressions, so if you can write XML and simple regexes, you can help us add rules and increase HTTPS Everywhere's coverage. No coding skills necessary!
-If you want to have the greatest impact, however, you can help be a ruleset maintainer. Ruleset maintainers are volunteers who examine rulesets contributed by others and work with them to ensure that these rulesets work properly and are styled correctly before they're merged in. While we currently have a couple of extremely dedicated and extremely proficient ruleset maintainers, the backlog of sites to add to HTTPS Everywhere just keeps growing, and they need help! If this sounds interesting to you, please contact us at https-everywhere-rules-owner [at] eff <dot> org.
+If you want to have the greatest impact, however, you can help be a ruleset maintainer. Ruleset maintainers are trusted volunteers who examine rulesets contributed by others and work with them to ensure that these rulesets work properly and are styled correctly before they're merged in. While we currently have a couple of extremely dedicated and extremely proficient ruleset maintainers, the backlog of sites to add to HTTPS Everywhere just keeps growing, and they need help! If you would like to volunteer to become one, the best thing to do is to build trust in your work by monitoring the repository, contributing pull requests, and commenting on issues that interest you. Then you can contact us at https-everywhere-rules-owner [at] eff <dot> org expressing your interest in helping out.
If you get stuck we have two publicly-archived mailing lists: the https-everywhere list (https://lists.eff.org/mailman/listinfo/https-everywhere) is for discussing the project as a whole, and the https-everywhere-rulesets list (https://lists.eff.org/mailman/listinfo/https-everywhere-rules) is for discussing the `rulesets` and their contents, including patches and git pull requests.
From 3e000d6582ba4d52de3604a21ef2c60ab0cfebc8 Mon Sep 17 00:00:00 2001
From: Bisaloo
Date: Sat, 29 Jul 2017 17:55:09 +0200
Subject: [PATCH 167/167] [OPM.gov] Update and reactivate ruleset
---
src/chrome/content/rules/OPM.gov.xml | 47 ++++++----------------------
1 file changed, 10 insertions(+), 37 deletions(-)
diff --git a/src/chrome/content/rules/OPM.gov.xml b/src/chrome/content/rules/OPM.gov.xml
index fd986d0c3ee1..7b91622fc99b 100644
--- a/src/chrome/content/rules/OPM.gov.xml
+++ b/src/chrome/content/rules/OPM.gov.xml
@@ -1,44 +1,17 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+