From e8621389248160c5fbaf475c4f03896b77110b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Tue, 30 Aug 2016 22:41:04 +0200 Subject: [PATCH 1/3] [Lenovo] Add exclusion This closes https://trac.torproject.org/projects/tor/ticket/18055 --- src/chrome/content/rules/Lenovo.xml | 8 +++++--- utils/ruleset-coverage-whitelist.txt | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Lenovo.xml b/src/chrome/content/rules/Lenovo.xml index f6ea28e7552e..50fa71c660df 100644 --- a/src/chrome/content/rules/Lenovo.xml +++ b/src/chrome/content/rules/Lenovo.xml @@ -113,13 +113,15 @@ - + - - + + + diff --git a/utils/ruleset-coverage-whitelist.txt b/utils/ruleset-coverage-whitelist.txt index 9931846ef125..d4b270ca4714 100644 --- a/utils/ruleset-coverage-whitelist.txt +++ b/utils/ruleset-coverage-whitelist.txt @@ -3527,8 +3527,7 @@ e68e273cc76ef330863f1e810aa136ec203f6cb6ff83573773f596f665da3a74 Lektorium.tv.x 92fb05b67aaed0d496c65da65ec7586211a77b7c5620e02e1a75e93565765547 Lelo.com.xml c654e688d0010234dc5bb91f672333455c7ca1235884add140d3d4f9d17f3173 Lendo.se.xml ee3473e024eda007335e6c7eeb73d6bc1eacd82f8664a24890d999fdd3b38e5a Lenos-Software.xml -22de8530b0d2e5e46019205f6d5d9a309985d9af80666ff376ea0e73aa0ea8e2 Lenovo.xml -8ba681f50ec6c6215348b77f19b4a9fb14367790cc9d0eabca3be939e52e9868 Lenovo.xml +ebb58338c1b0df002fdb6027508a73faea7234f6921a1be78c4f8ab91932da4f Lenovo.xml d52e011483f8a5c89f93c1ab0e22ec93f6cffd51bdb9cd160e9eadbb257acd68 LensRentals.xml 07638a160417839ec68f1c62683aba3dc5e7c98935f4dc7600bfa8cf50cdbcd4 Leo.org.xml 0db5c093f93156a5764c5d52f71bf860cfee58c6bb7be818f235a9061ac8801b Leroy_Farmer_City_Press.xml From e64ccf271c8829c3e25aea98f99cdb483c8106c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Wed, 31 Aug 2016 21:04:40 +0200 Subject: [PATCH 2/3] [Lenovo] Remove non-capture indicators --- src/chrome/content/rules/Lenovo.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/Lenovo.xml b/src/chrome/content/rules/Lenovo.xml index 50fa71c660df..4a7f0d3b9042 100644 --- a/src/chrome/content/rules/Lenovo.xml +++ b/src/chrome/content/rules/Lenovo.xml @@ -117,7 +117,7 @@ Redirects that 404. Destinations don't support https: --> - + @@ -125,7 +125,7 @@ - + @@ -166,7 +166,7 @@ (it's a pity we can't specify for a test whether CORS should cause said test to fail...) --> - + @@ -204,13 +204,13 @@ - + - + @@ -233,22 +233,22 @@ - + - - @@ -257,7 +257,7 @@ - @@ -269,7 +269,7 @@ thinkpad.com redirects to www.lenovo.com/link/redirect.www.lenovo.com/www.thinkpad.com/, which 404s over https but redirects like so over http: --> - - @@ -291,7 +291,7 @@ shop.lenovo points here: --> - From 914bd42139731f46e2640dba00013aeaf114bec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Wed, 31 Aug 2016 21:30:40 +0200 Subject: [PATCH 3/3] [Lenovo] Update whitelist entry --- utils/ruleset-coverage-whitelist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/ruleset-coverage-whitelist.txt b/utils/ruleset-coverage-whitelist.txt index d4b270ca4714..abadf3ef8901 100644 --- a/utils/ruleset-coverage-whitelist.txt +++ b/utils/ruleset-coverage-whitelist.txt @@ -3527,7 +3527,7 @@ e68e273cc76ef330863f1e810aa136ec203f6cb6ff83573773f596f665da3a74 Lektorium.tv.x 92fb05b67aaed0d496c65da65ec7586211a77b7c5620e02e1a75e93565765547 Lelo.com.xml c654e688d0010234dc5bb91f672333455c7ca1235884add140d3d4f9d17f3173 Lendo.se.xml ee3473e024eda007335e6c7eeb73d6bc1eacd82f8664a24890d999fdd3b38e5a Lenos-Software.xml -ebb58338c1b0df002fdb6027508a73faea7234f6921a1be78c4f8ab91932da4f Lenovo.xml +b10faf0471fce5566245ab726b10f6b064d2c0d98dd3f057da8fb6d9bf3d5216 Lenovo.xml d52e011483f8a5c89f93c1ab0e22ec93f6cffd51bdb9cd160e9eadbb257acd68 LensRentals.xml 07638a160417839ec68f1c62683aba3dc5e7c98935f4dc7600bfa8cf50cdbcd4 Leo.org.xml 0db5c093f93156a5764c5d52f71bf860cfee58c6bb7be818f235a9061ac8801b Leroy_Farmer_City_Press.xml