Update Lenovo.xml to the version from master / 3.0

pde · pde · commit 0dba9de9ec38 · 2012-09-05T16:51:43.000-07:00
(This should help with bugs like https://trac.torproject.org/projects/tor/ticket/6604)
diff --git a/src/chrome/content/rules/Lenovo.xml b/src/chrome/content/rules/Lenovo.xml
@@ -1,31 +1,77 @@
-<ruleset name="Lenovo">
-  <target host="lenovo.com" />
-  <target host="www.lenovo.com" />
-  <target host="shop.lenovo.com" />
-  <target host="lenovo.co.uk" />
-  <target host="www.lenovo.co.uk" />
-
-  <securecookie host="^(.+\.)?lenovo\.com$" name=".*"/>
-	<exclusion pattern="^http://lenovo\.com/friendsandfamily$"/>
-	<exclusion pattern="^http://(www\.)?lenovo\.com/depotstatus"/>
-	<!--	https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001098.html	-->
-	<exclusion pattern="^http://www\.lenovo\.com/(support|training)/"/>
-	<exclusion pattern="^http://shop\.lenovo\.com/us(/.*)?$"/>
-  <exclusion pattern="^http://lenovo\.com/friendsandfamily$"/>
-  <exclusion pattern="^http://shop\.lenovo\.com/us(/.*)?$"/>
-  <exclusion pattern="^http://(www\.)?lenovo\.com/depotstatus"/>
-
-  <rule from="^http://(?:www\.)?lenovo\.com/epp$" to="https://www.lenovo.com/epp/"/>
-
-  <rule from="^http://lenovo\.com/" to="https://www.lenovo.com/"/>
-  <rule from="^http://(www|shop)\.lenovo\.com/" to="https://$1.lenovo.com/"/>
-  
-  <rule from="^http://(?:www\.)?lenovo\.co\.uk/?$" to="https://www.lenovo.com/uk/en/"/>
+<!--	!functional:
+		- training.lenovo.partner-management.com
+-->
+<ruleset name="Lenovo (partial)">
+
+	<target host="lenovo.com"/>
+		<exclusion pattern="^http://lenovo\.com/friendsandfamily$"/>
+	<target host="blog.lenovo.com"/>
+	<target host="consumersupport.lenovo.com"/>
+	<target host="news.lenovo.com"/>
+	<target host="outlet.lenovo.com"/>
+	<target host="shop.lenovo.com"/>
+		<exclusion pattern="^http://shop\.lenovo\.com/us(/.*)?$"/>
+	<target host="social.lenovo.com"/>
+	<target host="support.lenovo.com"/>
+	<target host="www.lenovo.com"/>
+		<exclusion pattern="^http://(www\.)?lenovo\.com/depotstatus"/>
+		<!--	https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001098.html	-->
+		<exclusion pattern="^http://www\.lenovo\.com/(support|training)/"/>
+	<target host="lenovo.co.uk"/>
+	<target host="www.lenovo.co.uk"/>
+	<target host="lenovoorders.com"/>
+	<target host="www.lenovoorders.com"/>
+	<target host="www.lenovovision.com" />
+	<target host="thinkpad.com" />
+	<target host="www.thinkpad.com" />
+
+
+	<securecookie host="^(.+\.)?lenovo\.com$" name=".*"/>
+
+
+	<rule from="^http://lenovo\.com/"
+		to="https://www.lenovo.com/"/>
+
+	<rule from="^https?://www\.lenovo\.com/epp$"
+		to="https://www.lenovo.com/epp/"/>
+
+	<rule from="^http://(outlet|shop|www)\.lenovo\.com/"
+		to="https://$1.lenovo.com/"/>
+ 
+	<rule from="^http://(?:www\.)?lenovo\.co\.uk/?$"
+		to="https://www.lenovo.com/uk/en/"/>
+
+	<rule from="^http://(www\.)?lenovoorders\.com/"
+		to="https://$1lenovoorders.com/"/>
+
+	<!--	https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001098.html
+
+		support redirects to support.lenovo.com
+		training redirects to training.lenovo.partner-management.com
+										-->
+	<rule from="^https://www\.lenovo\.com/(support|training)/"
+		to="http://www.lenovo.com/$1/" downgrade="1" />
+
+	<!--	self-signed
+		social just redirects to blog
+		haven't seen blog nor support links, but just in case.
+										-->
+	<rule from="^https://(blog|(consumer)?support|news|social)\.lenovo\.com/"
+		to="http://$1.lenovo.com/" downgrade="1" />
+
 	<!--	shop.lenovo points here.
 
 		https://mail1.eff.org/pipermail/https-everywhere-rules/2012-June/001189.html
 					-->
 	<rule from="^https://www\.lenovovision\.com/"
 		to="http://www.lenovovision.com/" downgrade="1" />
 
+	<!--	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.
+
+		https://trac.torproject.org/projects/tor/ticket/6604
+									-->
+	<rule from="^https?://(?:(?:www\.)?lenovo\.com/link/redirect\.www\.lenovo\.com/)?(?:www\.)?thinkpad\.com/"
+		to="https://www.lenovo.com/us/en/?cid=SEO-thinkpadcom" />
+
 </ruleset>
