Photon: do not serve Amazon images from our CDN. (#38682)

Internal reference: p1722583835923719-slack-CBG1CP4EN
Automattic · Aug 2, 2024 · a2a9a9a · a2a9a9a
1 parent 94fb8a4
commit a2a9a9a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/projects/packages/image-cdn/changelog/fix-photon-amazon-cdn b/projects/packages/image-cdn/changelog/fix-photon-amazon-cdn
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Do not serve media from Amazon CDN from Jetpack's CDN.
diff --git a/projects/packages/image-cdn/src/class-image-cdn-core.php b/projects/packages/image-cdn/src/class-image-cdn-core.php
@@ -342,6 +342,7 @@ public static function banned_domains( $skip, $image_url ) {
 			'/\.cdninstagram\.com$/',
 			'/^(commons|upload)\.wikimedia\.org$/',
 			'/\.wikipedia\.org$/',
+			'/^m\.media-amazon\.com$/',
 		);
 
 		$host = wp_parse_url( $image_url, PHP_URL_HOST );

diff --git a/projects/packages/image-cdn/src/class-image-cdn.php b/projects/packages/image-cdn/src/class-image-cdn.php
@@ -12,7 +12,7 @@
  */
 final class Image_CDN {
 
-	const PACKAGE_VERSION = '0.4.3';
+	const PACKAGE_VERSION = '0.4.4-alpha';
 
 	/**
 	 * Singleton.

diff --git a/projects/packages/image-cdn/tests/php/test_class.image_cdn_core.php b/projects/packages/image-cdn/tests/php/test_class.image_cdn_core.php
@@ -428,6 +428,10 @@ public function get_photon_domains() {
 				true,
 				'https://en.wikipedia.org/wiki/File:MM10249.jpg',
 			),
+			'Banned Amazon domain'       => array(
+				true,
+				'http://m.media-amazon.com/images/I/41YeeCMUwTL._SL300_.jpg',
+			),
 		);
 	}
 }