Fix and turn back on ruleset coverage testing.

jsha · jsha · commit dd7035c3d906 · 2015-02-14T21:45:39.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -19,4 +19,4 @@ script:
   - ./test.sh
   # Temporarily disable the ruleset coverage requirement while we are enabling
   # and disabling large chunks of URLs.
-  #- ./test-ruleset-coverage.sh
+  ./test-ruleset-coverage.sh
diff --git a/src/chrome/content/rules/Blender.org.xml b/src/chrome/content/rules/Blender.org.xml
@@ -32,9 +32,10 @@
 	<!-- Secured by server: -->
 	<!--securecookie host="^\.developer\.blender\.org$" name="^phsid$" /-->
 
-	<rule from="^http://((www\.)?developer|projects)\.blender\.org/"
-		  to="https://$1.blender.org/" />
+	<rule from="^http://(www\.)?(developer|projects)\.blender\.org/"
+		  to="https://$2.blender.org/" />
 
 	<rule from="^http://(www\.)?blender\.org/"
 	      to="https://www.blender.org/" />
+
 </ruleset>
diff --git a/src/chrome/content/rules/Cloudfront.xml b/src/chrome/content/rules/Cloudfront.xml
@@ -14,8 +14,9 @@
 		and this is a generalised precaution from turntable.fm
 		(rewriting this file seems to break cross origin in flash)
 									-->
-	<exclusion pattern="^http://(?:[^/:@\.]+)\.cloudfront\.net/crossdomain\.xml" />
+	<exclusion pattern="^http://(\w+)\.cloudfront\.net/crossdomain\.xml" />
 		<test url="http://d1h9a8s8eodvjz.cloudfront.net/crossdomain.xml" />
+		<test url="http://d1ej19d7kwigfi.cloudfront.net/crossdomain.xml" />
 
   <!-- See https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-creating-signed-url-custom-policy.html
     Policies contain the protocol, so a signature for http will not work for https
