Split GETMEIN.com from Live-Nation.xml (EFForg#14057)

Chan Chak Shing · J0WI · commit 910f2d0fb6a0 · 2018-01-09T02:09:05.000+01:00
* Split GETMEIN.com from Live-Nation.xml

* Create GETMEIN.com.xml

* Update Live-Nation.xml

* Whitelist Live-Nation.xml from rules-test
diff --git a/src/chrome/content/rules/GETMEIN.com.xml b/src/chrome/content/rules/GETMEIN.com.xml
@@ -0,0 +1,35 @@
+<!--
+	For other Live Nation coverage, see Live-Nation.xml
+
+	Non-functional hosts
+		Couldn't connect to server:
+		- autodiscover.getmein.com
+
+		Timeout was reached:
+		- mta.e.getmein.com
+		- mta2.e.getmein.com
+		- view.e.getmein.com
+
+		SSL peer certificate was not OK:
+		- click.e.getmein.com
+		- image.e.getmein.com
+		- reviews.getmein.com
+		- sociable.getmein.com
+-->
+<ruleset name="GETMEIN.com">
+	<target host="getmein.com" />
+	<target host="www.getmein.com" />
+	<target host="affiliates.getmein.com" />
+	<target host="api.getmein.com" />
+	<target host="ats.getmein.com" />
+	<target host="connect.getmein.com" />
+	<target host="downloads.getmein.com" />
+	<target host="express.getmein.com" />
+	<target host="iservices.getmein.com" />
+	<target host="media.getmein.com" />
+	<target host="origin-media.getmein.com" />
+	<target host="secure.getmein.com" />
+	<target host="survey.getmein.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Live-Nation.xml b/src/chrome/content/rules/Live-Nation.xml
@@ -1,6 +1,7 @@
 <!--
 	Other Live Nation rulesets:
 
+		- GETMEIN.com.xml
 		- Ticketmaster.xml
 		- TicketsNow.xml
 
@@ -61,8 +62,6 @@
 -->
 <ruleset name="Live Nation Entertainment (partial)" platform="mixedcontent">
 
-	<target host="getmein.com" />
-	<target host="*.getmein.com" />
 	<target host="livenation.*" />
 	<target host="www.livenation.*" />
 	<target host="www1.livenation.*" />
@@ -76,27 +75,9 @@
 	<!--target host="media.livenationinternational.com" /-->
 
 
-	<securecookie host="^(?:.*\.)?getmein\.com$" name=".+" />
-	<!--
-		Omniture cookies:
-					-->
-	<securecookie host="^\.ticketmaster\.com$" name="^s_v\w$" />
-	<!--
-		Other cookie domains:
-
-			- concerts.livenation.com
-			- .concerts.livenation.com
-							-->
 	<securecookie host="^www1?\.(?:fr\.|nl\.)?livenation\.(?:\w\w|co\.jp|co\.uk|com\.au)" name=".+" />
 
 
-	<rule from="^http://(?:www\.)?getmein\.com/"
-		to="https://www.getmein.com/" />
-
-	<rule from="^http://secure\.getmein\.com/"
-		to="https://secure.getmein.com/" />
-
-
 	<rule from="^http://(?:www(1)?\.)?livenation\.(ae|asia|co\.jp|co\.uk|com\.au|cz|dk|es|fi|fr|hu|it|kr|nl|no|pl|se)/"
 		to="https://www$1.livenation.$2/" />
 
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
@@ -1895,7 +1895,7 @@ fe52803da1f703cfe9990e08d740aaba64f6d59c459653376356b5ecce922a7e,0,1,Littlesvr.c
 fbeaf8dbd06fc62fb6217d020e5d4401df8539e62b29c3d1af073ff07d52ae00,1,0,LiveAgent.xml
 4df0e6a98068a7e8df85af4cb7248c048fbe6b5fd0bcbffadc7d155d8ce52610,1,0,Live_filestore.com.xml
 e3d7781eb8af6d39d6b9ce237e46688f6615aec94f65cb2a54a87e167b0c2236,1,0,LiveJasmin.xml
-594504bbdf2ed0d8ac1e795d826ddd6a37c2bb65aa9ba26d6b3bf09d1cb9dcc1,1,1,Live-Nation.xml
+55209764f2c017642baaf0bb12a26fb24f4fd5d3e23a4ca5e21f507d887e41f8,1,1,Live-Nation.xml
 657622e6f0195b2dfe3210112b7ab0e1e31a00717ffb3d40d8659fa04b74d5b0,0,1,Livermores-Centennial-Light-Live-Cam.xml
 70ffd66c918dddc6e24325ef9851aab98064bc9054887498b0b1ee96ee1c57c6,1,1,Livestatserver.com.xml
 42955f3e20090e82cebb057f5b3834f31c28d0a05cea87cb1ebd75cac55e7d32,1,0,Livestream.xml
