Update ruleset: Fox News (EFForg#15365)

injust · gloomy-ghost · commit 2a4dfa5b5bc4 · 2018-06-05T21:45:58.000+12:00
* Remove non-resolving target: foxnews.ramp.com * Remove default_off attribute * Remove non-resolving target: ureport.foxnews.com * Update nonfunctional domains * Rewrite *.foxnews.com target * Add default_off attribute back in, ruleset is too messy * Remove exclusion pattern, no longer needed * Cleaning in progress * Remove custom rule for www.fbnstatic.com Does not seem to require the custom rule anymore, but I can't find any instance of its usage * foxbusiness.com seems to be working * Clean up formatting * Refactor ruleset completely * Remove live.foxnews.com, timing out * Rename to fix naming conventions - Use hyphen instead of underscore * Rename ruleset reference * Comment out foxnews.com
diff --git a/src/chrome/content/rules/Fox-News.xml b/src/chrome/content/rules/Fox-News.xml
@@ -0,0 +1,54 @@
+<!--
+	For other News Corporation coverage, see News-Corporation.xml.
+
+	Active mixed content:
+		- foxnews.com
+		- www.foxnews.com
+
+	Connection closed:
+		- feeds.foxnews.com
+
+	Connection timed out:
+		- imag.foxnews.com
+		- live.foxnews.com
+		- affiliates.radio.foxnews.com
+		- foxnewsinsider.com
+		- www.foxnewsinsider.com
+
+	Invalid certificate:
+		- insider.foxnews.com
+		- beta.video.insider.foxnews.com
+		- latino.foxnews.com
+		- magazine.foxnews.com
+		- metrics.foxnews.com
+		- m.radio.foxnews.com
+-->
+
+<ruleset name="Fox News">
+	<!-- fbnstatic.com -->
+	<target host="www.fbnstatic.com" />
+	<target host="global.fncstatic.com" />
+
+	<!-- foxbusiness.com -->
+	<target host="foxbusiness.com" />
+	<target host="www.foxbusiness.com" />
+	<target host="video.foxbusiness.com" />
+	<target host="beta.video.foxbusiness.com" />
+
+	<!-- foxnews.com -->
+	<target host="a57.foxnews.com" />
+	<target host="ads.foxnews.com" />
+	<target host="help.foxnews.com" />
+	<target host="video.imag.foxnews.com" />
+	<target host="video.insider.foxnews.com" />
+	<target host="video.latino.foxnews.com" />
+	<target host="beta.video.latino.foxnews.com" />
+	<target host="nation.foxnews.com" />
+	<target host="radio.foxnews.com" />
+	<target host="video.foxnews.com" />
+
+	<!-- foxnewsinsider.com -->
+	<target host="facebook.foxnewsinsider.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Fox_News.xml b/src/chrome/content/rules/Fox_News.xml
diff --git a/src/chrome/content/rules/News-Corporation.xml b/src/chrome/content/rules/News-Corporation.xml
@@ -17,7 +17,7 @@ Fetch error: http://services.wsje.com/ => https://services.wsje.com/: (60, 'SSL
 		- alsop-n.uk.xml
 		- barrons.com.xml
 		- driving.co.uk.xml
-		- Fox_News.xml
+		- Fox-News.xml
 		- IGN.xml
 		- Marketwatch.com.xml
 		- sunmotors.co.uk.xml
