Merge pull request EFForg#663 from StevenRoddis/4.0

2d1 · 2d1 · commit 7562e2b31b31 · 2014-11-10T23:11:54.000Z
Generic fix for signed Cloudfront urls
diff --git a/src/chrome/content/rules/Cloudfront.xml b/src/chrome/content/rules/Cloudfront.xml
@@ -1,35 +1,11 @@
 <ruleset name="Cloudfront">
-  <target host="www.cloudfront.net" />
+  <target host="cloudfront.net" />
   <target host="*.cloudfront.net" />
 
   <rule from="^http://([^/:@\.]+)\.cloudfront\.net/"  to="https://$1.cloudfront.net/"/>
-  <!-- Deal with https://trac.torproject.org/projects/tor/ticket/6848 -->
-  <exclusion pattern="^http://d1b14unh5d6w7g\.cloudfront\.net" />
-  <!-- https://trac.torproject.org/projects/tor/ticket/7020 -->
-  <exclusion pattern="^http://d1i6vahw24eb07\.cloudfront\.net" />
-  <!-- C-SPAN videos: https://trac.torproject.org/projects/tor/ticket/7567 -->
-  <exclusion pattern="^http://d1k4es7bw1lvxt\.cloudfront\.net" />
-  <!-- this unbreaks turntable.fm and probably many other things-->
-  <exclusion pattern="^http://d1bw0qpdrmjlhz\.cloudfront\.net" />
-	<!--
-		This breaks padlet.com wall:
 
-			https://trac.torproject.org/projects/tor/ticket/9146
-									-->
-	<exclusion pattern="^http://d2s8n7nv9yizdf\.cloudfront\.net/assets/extras-\w{32}\.js" />
-  <!-- and this is a generalised precaution from turntable.fm -->
-  <exclusion pattern="^http://([^/:@\.]+)\.cloudfront\.net/crossdomain\.xml" />
-  <!-- Spotify https://trac.torproject.org/projects/tor/ticket/7888 -->
-  <exclusion pattern="^http://dsu0uct5x2puz\.cloudfront\.net" />
-  <!-- Droplr: https://trac.torproject.org/projects/tor/ticket/8572 -->
-  <exclusion pattern="^http://d1zjcuqflbd5k\.cloudfront\.net" />
-  <!-- TuneIn: https://trac.torproject.org/projects/tor/ticket/8704 -->
-  <exclusion pattern="^http://d3bwsr3zpy54hy\.cloudfront\.net" />
-  <!-- Amazon mp3: https://trac.torproject.org/projects/tor/ticket/9367 
-                   https://trac.torproject.org/projects/tor/ticket/9851 -->
-  <exclusion pattern="^http://d2q1srilgjznst\.cloudfront\.net" />
-  <exclusion pattern="^http://d28julafmv4ekl\.cloudfront\.net" />
-
-  <!-- Panelsyndicate: https://github.com/EFForg/https-everywhere/issues/650 -->
-  <exclusion pattern="^http://d2h7a0a3c1074f\.cloudfront\.net" />
+  <!-- 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
+  -->
+  <exclusion pattern="&amp;Signature=" />
 </ruleset>
