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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/chrome/content/rules/Lenovo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,19 @@
<target host="support.lenovo.com" />
<!--
https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001098.html
https://trac.torproject.org/projects/tor/ticket/18055

Redirects that 404. Destinations don't support https:
-->
<exclusion pattern="^http://www\.lenovo\.com/(?:support|training)/" />
<exclusion pattern="^http://www\.lenovo\.com/(lenovorecovery|support|training)" />

<test url="http://www.lenovo.com/support/" />
<test url="http://www.lenovo.com/training/" />
<test url="http://www.lenovo.com/lenovorecovery" />
<test url="http://www.lenovo.com/support" />
<test url="http://www.lenovo.com/training" />

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

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

<!-- +ve:
-->
Expand Down Expand Up @@ -202,13 +204,13 @@
<target host="www.partnerinfo.lenovo.com" />
<target host="social.lenovo.com" />

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

<test url="http://lenovo.co.uk//" />
<test url="http://www.lenovo.co.uk/?" />
<test url="http://www.lenovo.co.uk//" />

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

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

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

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


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

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

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

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

<test url="http://lenovo.com/friendsandfamily" />
Expand All @@ -267,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:
-->
<rule from="^http://(?:(?:www\.)?lenovo\.com/link/redirect\.www\.lenovo\.com/)?(?:www\.)?thinkpad\.com/.*"
<rule from="^http://((www\.)?lenovo\.com/link/redirect\.www\.lenovo\.com/)?(www\.)?thinkpad\.com/.*"
to="https://www.lenovo.com/us/en/?cid=SEO-thinkpadcom" />

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

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

<test url="http://shop.lenovo.com/us" />
Expand All @@ -289,7 +291,7 @@

shop.lenovo points here:
-->
<rule from="^http://(?:www\.)?lenovovision\.com/.*"
<rule from="^http://(www\.)?lenovovision\.com/.*"
to="https://www.lenovo.com/" />

<test url="http://lenovovision.com/foo" />
Expand Down
3 changes: 1 addition & 2 deletions utils/ruleset-coverage-whitelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
b10faf0471fce5566245ab726b10f6b064d2c0d98dd3f057da8fb6d9bf3d5216 Lenovo.xml
d52e011483f8a5c89f93c1ab0e22ec93f6cffd51bdb9cd160e9eadbb257acd68 LensRentals.xml
07638a160417839ec68f1c62683aba3dc5e7c98935f4dc7600bfa8cf50cdbcd4 Leo.org.xml
0db5c093f93156a5764c5d52f71bf860cfee58c6bb7be818f235a9061ac8801b Leroy_Farmer_City_Press.xml
Expand Down