Adform: don't force www, squish, add coverage

MB · MB · commit c5edce4c9254 · 2016-09-30T13:53:07.000Z
diff --git a/src/chrome/content/rules/Adform.xml b/src/chrome/content/rules/Adform.xml
@@ -30,18 +30,23 @@
 
 		- Images on showroom from showroom.adform.com ˢ
 
-	ˢ See https://www.paulirish.com/2010/the-protocol-relative-url/
+	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
 <ruleset name="Adform (partial)">
 
+	<!--	Direct rewrites:
+				-->
 	<target host="adform.com" />
+	<target host="showroom.adform.com" />
+	<target host="site.adform.com" />
 	<target host="www.adform.com" />
 
 	<target host="a1.adform.net" />
 	<target host="adx.adform.net" />
 	<target host="asia.adform.net" />
 	<target host="cp.adform.net" />
+	<target host="dmp.adform.net" />
 	<target host="files.adform.net" />
 	<target host="s1.adform.net" />
 	<target host="s2.adform.net" />
@@ -58,27 +63,46 @@
 		<!--test url="http://dmp.adform.net/dmp/profile/?CC=1&amp;pid=1&amp;" /-->
 		<!--test url="http://track.adform.net/Serving/TrackPoint/?pm=1" /-->
 
+	<!--	Complications:
+				-->
+	<target host="academy.adform.com" />
+	<target host="blog.adform.com" />
+	<target host="creative.adform.com" />
+
+		<exclusion pattern="^http://(?:academy|blog|creative)\.adform\.com/" />
+
+			<!--	+ve:
+					-->
+			<test url="http://academy.adform.com/" />
+			<test url="http://blog.adform.com/" />
+			<test url="http://creative.adform.com/" />
+
 
 	<!--	Not secured by server:
 					-->
 	<!--securecookie host="^\.adform\.net$" name="^uid$" /-->
 	<!--securecookie host="^track\.adform\.net$" name="^C$" /-->
 
-	<securecookie host="^www\.adform\.com$" name=".+" />
+	<securecookie host="^\w.*\.adform\.com$" name="." />
 	<!--
 		name="^(GCM|TPC)$"
 					-->
-	<securecookie host="^\.adform\.net$" name=".+" />
-	<securecookie host="^track\.adform\.net$" name=".+" />
+	<securecookie host="\.adform\.net$" name="." />
 	<!--
 		name="^uid$"
 				-->
-	<securecookie host="^\.adformdsp\.net$" name=".+" />
-	<securecookie host="^server\.adformdsp\.net$" name=".+" />
+	<securecookie host="\.adformdsp\.net$" name="." />
 
 
-	<rule from="^http://adform\.com/"
-		to="https://www.adform.com/" />
+	<!--	Protocol-relative links on ^site.../$:
+							-->
+	<rule from="^https://(academy|blog|creative)\.adform\.com/"
+		  to="http://$1.adform.com/"
+	downgrade="1" />
+
+		<test url="https://academy.adform.com/" />
+		<test url="https://blog.adform.com/" />
+		<test url="https://creative.adform.com/" />
 
 	<rule from="^http:"
 		to="https:" />
diff --git a/utils/downgrade-whitelist.txt b/utils/downgrade-whitelist.txt
@@ -1,3 +1,4 @@
+Adform (partial)
 Altmetric.com
 Apple.com (partial)
 CERN.ch (partial)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Adform (partial)`
`1`	`2`	`Altmetric.com`
`2`	`3`	`Apple.com (partial)`
`3`	`4`	`CERN.ch (partial)`