From c2ff4acd57c9f3af25d4ac7f9bbefb8eb457c291 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 4 Jun 2016 21:10:08 +0200 Subject: [PATCH 01/11] rebased Amazon main sites --- .../content/rules/Amazon-Associates.xml | 97 ------------------- .../content/rules/Amazon.com.astore.xml | 23 ----- src/chrome/content/rules/Amazon.xml | 53 ++++++---- src/chrome/content/rules/amazon.ca.xml | 5 + src/chrome/content/rules/amazon.cn.xml | 7 ++ .../rules/{Amazon_JP.xml => amazon.co.jp.xml} | 10 ++ src/chrome/content/rules/amazon.co.uk.xml | 10 +- src/chrome/content/rules/amazon.com.au.xml | 3 +- src/chrome/content/rules/amazon.com.br.xml | 2 + src/chrome/content/rules/amazon.com.mx.xml | 11 +-- .../rules/{Amazon_EU.xml => amazon.de.xml} | 21 +++- src/chrome/content/rules/amazon.es.xml | 9 +- src/chrome/content/rules/amazon.fr.xml | 16 ++- src/chrome/content/rules/amazon.in.xml | 1 + src/chrome/content/rules/amazon.it.xml | 5 +- 15 files changed, 119 insertions(+), 154 deletions(-) delete mode 100644 src/chrome/content/rules/Amazon-Associates.xml delete mode 100644 src/chrome/content/rules/Amazon.com.astore.xml rename src/chrome/content/rules/{Amazon_JP.xml => amazon.co.jp.xml} (75%) rename src/chrome/content/rules/{Amazon_EU.xml => amazon.de.xml} (79%) diff --git a/src/chrome/content/rules/Amazon-Associates.xml b/src/chrome/content/rules/Amazon-Associates.xml deleted file mode 100644 index 0d245e9fcf7f..000000000000 --- a/src/chrome/content/rules/Amazon-Associates.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Amazon.com.astore.xml b/src/chrome/content/rules/Amazon.com.astore.xml deleted file mode 100644 index a34b82a25ef3..000000000000 --- a/src/chrome/content/rules/Amazon.com.astore.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml index fefb7939a655..a762b9ffb035 100644 --- a/src/chrome/content/rules/Amazon.xml +++ b/src/chrome/content/rules/Amazon.xml @@ -2,43 +2,41 @@ Other Amazon rulesets: - 6PM.com.xml - - AbeBooks.xml + - AWS_Trust.com.xml - AbeBooks.co.uk.xml + - Amazon.jobs.xml + - AmazonAWS.xml + - AmazonSupply.com.xml + - Amazon_Trust.com.xml + - Amazon_blogs.com.xml + - Assoc-Amazon.com.xml + - BeautyBar.com.xml + - ComiXology.com.xml + - CreateSpace.xml + - Images-CreateSpace.com.xml + - Junglee.com.xml + - MTurk.com.xml + - Soap.com.xml + - TenMarks.com.xml - amazon.ca.xml + - amazon.cn.xml + - amazon.co.jp.xml - amazon.co.uk.xml - amazon.com.au.xml - amazon.com.br.xml - amazon.com.mx.xml - - amazon.cn.xml + - amazon.de.xml - amazon.es.xml - amazon.fr.xml - amazon.in.xml - amazon.it.xml - - Amazon.jobs.xml - amazon.nl.xml - - Amazon-Associates.xml - - AmazonAWS.xml - - Amazon_EU.xml - - Amazon_JP.xml - - Amazon_Trust.com.xml - - Amazon_blogs.com.xml - - AmazonSupply.com.xml - - Assoc-Amazon.com.xml - - AWS_Trust.com.xml - - BeautyBar.com.xml - casa.com.xml - - ComiXology.com.xml - - CreateSpace.xml - diapers.com.xml - eastdane.com.xml - - Images-CreateSpace.com.xml - - Junglee.com.xml - - MTurk.com.xml - q-assets.com.xml - quidsi.com.xml - shopbop.com.xml - - Soap.com.xml - - TenMarks.com.xml - wag.com.xml - yoyo.com.xml @@ -59,10 +57,25 @@ + + + + + + + + + + + + + + + @@ -23,7 +23,15 @@ --> + + + + + + + + diff --git a/src/chrome/content/rules/amazon.com.au.xml b/src/chrome/content/rules/amazon.com.au.xml index 212f6f394413..902ecb3579c0 100644 --- a/src/chrome/content/rules/amazon.com.au.xml +++ b/src/chrome/content/rules/amazon.com.au.xml @@ -7,11 +7,12 @@ - .amazon.com.au ᶜ See https://owasp.org/index.php/SecureFlag - + --> + - + + + + + - - diff --git a/src/chrome/content/rules/Amazon_EU.xml b/src/chrome/content/rules/amazon.de.xml similarity index 79% rename from src/chrome/content/rules/Amazon_EU.xml rename to src/chrome/content/rules/amazon.de.xml index 868467afc71f..f316fd4db5d5 100644 --- a/src/chrome/content/rules/Amazon_EU.xml +++ b/src/chrome/content/rules/amazon.de.xml @@ -3,9 +3,13 @@ Problematic hosts in *amazon.de: + - affiliate-blog.amazon.de * + - aws.amazon.de ' + - kdp.amazon.de ʳ + - static.amazon.de * - - kdp ʳ - + * Mismatch + ' Refused ʳ Refused, preemptable redirect @@ -14,14 +18,25 @@ - .amazon.de ᶜ See https://owasp.org/index.php/SecureFlag - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/amazon.co.uk.xml b/src/chrome/content/rules/amazon.co.uk.xml index 467985b37fb3..894416c899e7 100644 --- a/src/chrome/content/rules/amazon.co.uk.xml +++ b/src/chrome/content/rules/amazon.co.uk.xml @@ -27,12 +27,15 @@ + + + diff --git a/src/chrome/content/rules/amazon.de.xml b/src/chrome/content/rules/amazon.de.xml index f316fd4db5d5..14079efed255 100644 --- a/src/chrome/content/rules/amazon.de.xml +++ b/src/chrome/content/rules/amazon.de.xml @@ -37,6 +37,7 @@ + - + - From 44ec62c308c1a9fda6d737d11c6ed6c9648dd99d Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 3 Aug 2016 13:42:48 +0200 Subject: [PATCH 09/11] added missing references --- src/chrome/content/rules/Amazon.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml index 4125483b215c..84c6eabf91e1 100644 --- a/src/chrome/content/rules/Amazon.xml +++ b/src/chrome/content/rules/Amazon.xml @@ -5,12 +5,18 @@ - AWS_Trust.com.xml - AbeBooks.co.uk.xml - AbeBooks.xml + - Amazon-Adsystem.com.xml - Amazon.jobs.xml - AmazonAWS.xml - AmazonSupply.com.xml - Amazon_Trust.com.xml - Amazon_blogs.com.xml + - Assoc-Amazon.ca.xml + - Assoc-Amazon.co.jp.xml + - Assoc-Amazon.co.uk.xml - Assoc-Amazon.com.xml + - Assoc-Amazon.de.xml + - Assoc-Amazon.fr.xml - BeautyBar.com.xml - ComiXology.com.xml - CreateSpace.xml From a3df1f3d0dcd0fbeb3f6482dad11fc4a4428f3b8 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 3 Aug 2016 13:43:35 +0200 Subject: [PATCH 10/11] some http redirects seems to be fixed by Amazon --- src/chrome/content/rules/Amazon.xml | 10 +++++++--- src/chrome/content/rules/amazon.co.uk.xml | 9 ++++++--- src/chrome/content/rules/amazon.de.xml | 9 ++++++--- src/chrome/content/rules/amazon.fr.xml | 9 ++++++--- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml index 84c6eabf91e1..8ed865dca2b2 100644 --- a/src/chrome/content/rules/Amazon.xml +++ b/src/chrome/content/rules/Amazon.xml @@ -73,6 +73,7 @@ + @@ -89,11 +90,11 @@ + - + +ve: + @@ -102,11 +103,14 @@ + --> + + diff --git a/src/chrome/content/rules/amazon.co.uk.xml b/src/chrome/content/rules/amazon.co.uk.xml index 894416c899e7..fdd9343b617b 100644 --- a/src/chrome/content/rules/amazon.co.uk.xml +++ b/src/chrome/content/rules/amazon.co.uk.xml @@ -40,11 +40,11 @@ + - + +ve: + @@ -53,11 +53,14 @@ + --> + + diff --git a/src/chrome/content/rules/amazon.de.xml b/src/chrome/content/rules/amazon.de.xml index 14079efed255..3117695c3dbc 100644 --- a/src/chrome/content/rules/amazon.de.xml +++ b/src/chrome/content/rules/amazon.de.xml @@ -41,11 +41,11 @@ + - + +ve: + @@ -54,10 +54,13 @@ + --> + + diff --git a/src/chrome/content/rules/amazon.fr.xml b/src/chrome/content/rules/amazon.fr.xml index 8d91be9f7923..47500319aa96 100644 --- a/src/chrome/content/rules/amazon.fr.xml +++ b/src/chrome/content/rules/amazon.fr.xml @@ -30,11 +30,11 @@ + - + +ve: + @@ -42,10 +42,13 @@ + --> + + From 895fc9d4f1e7378652876022dd382aa2b3d574fb Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 13 Aug 2016 12:08:00 +0200 Subject: [PATCH 11/11] - removed duped payments. - removed obsolete sis. - code style --- src/chrome/content/rules/AmazonAWS.xml | 163 ++++++++++++------------- 1 file changed, 80 insertions(+), 83 deletions(-) diff --git a/src/chrome/content/rules/AmazonAWS.xml b/src/chrome/content/rules/AmazonAWS.xml index d35d157ca633..d2b3aa3a42b1 100644 --- a/src/chrome/content/rules/AmazonAWS.xml +++ b/src/chrome/content/rules/AmazonAWS.xml @@ -17,7 +17,7 @@ - d1ge0kk1l5kms0.cloudfront.net - ec[5x].images-amazon.com - - g-ecx.images-amazon.com + - g-ecx.images-amazon.com - d36cz9buwru1tt.cloudfront.net - s3.amazonaws.com/awsmedia/ @@ -42,7 +42,7 @@ - ec[13].images-amazon.com - - g-ecx.images-amazon.com.c.footprint.net + - g-ecx.images-amazon.com.c.footprint.net - g-images.amazon.com @@ -103,11 +103,9 @@ - - @@ -140,10 +138,10 @@ --> - - - - - - - - - + + + + + + + + + + @@ -178,7 +177,7 @@ - -