Skip to content

Commit 11b3664

Browse files
fugledejeremyn
fuglede
authored and
jeremyn
committed
[Lenovo] Add exclusion (EFForg#6684)
* [Lenovo] Add exclusion This closes https://trac.torproject.org/projects/tor/ticket/18055 * [Lenovo] Remove non-capture indicators * [Lenovo] Update whitelist entry
1 parent fddae8f commit 11b3664

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

‎src/chrome/content/rules/Lenovo.xml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,19 @@
113113
<target host="support.lenovo.com" />
114114
<!--
115115
https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001098.html
116+
https://trac.torproject.org/projects/tor/ticket/18055
116117
117118
Redirects that 404. Destinations don't support https:
118119
-->
119-
<exclusion pattern="^http://www\.lenovo\.com/(?:support|training)/" />
120+
<exclusion pattern="^http://www\.lenovo\.com/(lenovorecovery|support|training)" />
120121

121-
<test url="http://www.lenovo.com/support/" />
122-
<test url="http://www.lenovo.com/training/" />
122+
<test url="http://www.lenovo.com/lenovorecovery" />
123+
<test url="http://www.lenovo.com/support" />
124+
<test url="http://www.lenovo.com/training" />
123125

124126
<!-- Redirects to http:
125127
-->
126-
<exclusion pattern="http://shop\.lenovo\.com/\w\w/\w\w/services-warranty(?:$|\?|/)" />
128+
<exclusion pattern="http://shop\.lenovo\.com/\w\w/\w\w/services-warranty($|\?|/)" />
127129

128130
<!-- -ve:
129131
-->
@@ -164,7 +166,7 @@
164166
(it's a pity we can't specify for a test whether
165167
CORS should cause said test to fail...)
166168
-->
167-
<exclusion pattern="http://support\.lenovo\.com/+(?!(?:App|~)/.+\.(?:(?:css|png)(?:$|[?/])|ashx\?w=\d)|~/media/images/system/icon/rss\.ashx)" />
169+
<exclusion pattern="http://support\.lenovo\.com/+(?!(App|~)/.+\.((css|png)($|[?/])|ashx\?w=\d)|~/media/images/system/icon/rss\.ashx)" />
168170

169171
<!-- +ve:
170172
-->
@@ -202,13 +204,13 @@
202204
<target host="www.partnerinfo.lenovo.com" />
203205
<target host="social.lenovo.com" />
204206

205-
<exclusion pattern="^http://(?:www\.)?lenovo\.co\.uk/(?!$)" />
207+
<exclusion pattern="^http://(www\.)?lenovo\.co\.uk/(?!$)" />
206208

207209
<test url="http://lenovo.co.uk//" />
208210
<test url="http://www.lenovo.co.uk/?" />
209211
<test url="http://www.lenovo.co.uk//" />
210212

211-
<exclusion pattern="^http://(?:blog|consumersupport|news|ovp|www\.partnerinfo|social)\.lenovo\.com/" />
213+
<exclusion pattern="^http://(blog|consumersupport|news|ovp|www\.partnerinfo|social)\.lenovo\.com/" />
212214

213215
<test url="http://blog.lenovo.com/" />
214216
<test url="http://consumersupport.lenovo.com" />
@@ -231,22 +233,22 @@
231233
<!--securecookie host="^\.support\.lenovo\.com$" name="^esupport#lang1$" /-->
232234

233235
<securecookie host="\.lenovo\.com$" name="VISITORID" />
234-
<securecookie host="(?:forums|\.?support)\.lenovo\.com$" name=".+" />
236+
<securecookie host="(forums|\.?support)\.lenovo\.com$" name=".+" />
235237

236238
<!-- Tracking cookies:
237239
These have been observed to break partner referral links and so are
238240
disabled...
239-
<securecookie host="^\.lenovo\.com$" name="^(?:exp_|oo_inv_|psp|s_|utag_)\w+$" />
240-
<securecookie host="^(?:.+\.)?lenovo\.com$" name=".+" />
241+
<securecookie host="^\.lenovo\.com$" name="^(exp_|oo_inv_|psp|s_|utag_)\w+$" />
242+
<securecookie host="^(.+\.)?lenovo\.com$" name=".+" />
241243
-->
242244

243245

244-
<rule from="^http://(?:www\.)?lenovo\.co\.uk/$"
246+
<rule from="^http://(www\.)?lenovo\.co\.uk/$"
245247
to="https://www.lenovo.com/uk/en/" />
246248

247249
<!-- 404s as-is:
248250
-->
249-
<rule from="^http://(?:www\.)?lenovo\.com/depotstatus/?$"
251+
<rule from="^http://(www\.)?lenovo\.com/depotstatus/?$"
250252
to="https://download.lenovo.com/lenovo/content/vru/depotstatus.html" />
251253

252254
<test url="http://lenovo.com/depotstatus" />
@@ -255,7 +257,7 @@
255257

256258
<!-- 404s as-is:
257259
-->
258-
<rule from="^http://(?:www\.)?lenovo\.com/friendsandfamily/?$"
260+
<rule from="^http://(www\.)?lenovo\.com/friendsandfamily/?$"
259261
to="https://shop.lenovo.com/SEUILibrary/controller/Lenovo:EnterStdAffinity?affinity=lenovofamily&amp;ConfigContext=StdAffinityPortal" />
260262

261263
<test url="http://lenovo.com/friendsandfamily" />
@@ -267,7 +269,7 @@
267269
thinkpad.com redirects to www.lenovo.com/link/redirect.www.lenovo.com/www.thinkpad.com/,
268270
which 404s over https but redirects like so over http:
269271
-->
270-
<rule from="^http://(?:(?:www\.)?lenovo\.com/link/redirect\.www\.lenovo\.com/)?(?:www\.)?thinkpad\.com/.*"
272+
<rule from="^http://((www\.)?lenovo\.com/link/redirect\.www\.lenovo\.com/)?(www\.)?thinkpad\.com/.*"
271273
to="https://www.lenovo.com/us/en/?cid=SEO-thinkpadcom" />
272274

273275
<rule from="^http://lenovo\.com/"
@@ -278,7 +280,7 @@
278280

279281
<!-- Loops as-is:
280282
-->
281-
<rule from="^http:///shop\.lenovo\.com/us/en/?(?:\?redir=y&amp;redirsrc=1)?$"
283+
<rule from="^http:///shop\.lenovo\.com/us/en/?(\?redir=y&amp;redirsrc=1)?$"
282284
to="https://www.lenovo.com/us/en/?redir=y&amp;redirsrc=1" />
283285

284286
<test url="http://shop.lenovo.com/us" />
@@ -289,7 +291,7 @@
289291
290292
shop.lenovo points here:
291293
-->
292-
<rule from="^http://(?:www\.)?lenovovision\.com/.*"
294+
<rule from="^http://(www\.)?lenovovision\.com/.*"
293295
to="https://www.lenovo.com/" />
294296

295297
<test url="http://lenovovision.com/foo" />

‎utils/ruleset-coverage-whitelist.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3527,8 +3527,7 @@ e68e273cc76ef330863f1e810aa136ec203f6cb6ff83573773f596f665da3a74 Lektorium.tv.x
35273527
92fb05b67aaed0d496c65da65ec7586211a77b7c5620e02e1a75e93565765547 Lelo.com.xml
35283528
c654e688d0010234dc5bb91f672333455c7ca1235884add140d3d4f9d17f3173 Lendo.se.xml
35293529
ee3473e024eda007335e6c7eeb73d6bc1eacd82f8664a24890d999fdd3b38e5a Lenos-Software.xml
3530-
22de8530b0d2e5e46019205f6d5d9a309985d9af80666ff376ea0e73aa0ea8e2 Lenovo.xml
3531-
8ba681f50ec6c6215348b77f19b4a9fb14367790cc9d0eabca3be939e52e9868 Lenovo.xml
3530+
b10faf0471fce5566245ab726b10f6b064d2c0d98dd3f057da8fb6d9bf3d5216 Lenovo.xml
35323531
d52e011483f8a5c89f93c1ab0e22ec93f6cffd51bdb9cd160e9eadbb257acd68 LensRentals.xml
35333532
07638a160417839ec68f1c62683aba3dc5e7c98935f4dc7600bfa8cf50cdbcd4 Leo.org.xml
35343533
0db5c093f93156a5764c5d52f71bf860cfee58c6bb7be818f235a9061ac8801b Leroy_Farmer_City_Press.xml

0 commit comments

Comments
 (0)