From 4066af8bc10dbf793940dd222c07f41c63f0408d Mon Sep 17 00:00:00 2001
From: Robert O'Rourke <robert@o-rourke.org>
Date: Mon, 2 Nov 2020 14:44:29 +0000
Subject: [PATCH] Ensure images with dimensions in name are supported

Tachyon would previsouly assume that an image with a suffix like `-123x456.jpg` was from a thumbnail and attempt to infer the size from that. This update checks whether that suffix matches an image GUID, if it does then its an original file and should not have the dimensions inferred or have the suffix stripped off.

Fixes #43
---
 inc/class-tachyon.php           |  74 +++++++++++++++++++++-----------
 tests/bootstrap.php             |   2 +-
 tests/data/tachyon-1132x687.jpg | Bin 0 -> 14904 bytes
 tests/tests/class-resizing.php  |  73 +++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 25 deletions(-)
 create mode 100644 tests/data/tachyon-1132x687.jpg

diff --git a/inc/class-tachyon.php b/inc/class-tachyon.php
index 5fa8c0d..c0fce66 100644
--- a/inc/class-tachyon.php
+++ b/inc/class-tachyon.php
@@ -111,6 +111,24 @@ public static function parse_dimensions_from_filename( $src ) {
 		return array( false, false );
 	}
 
+	/**
+	 * Get an attachment post ID by GUID.
+	 *
+	 * @param string $src The attachment source.
+	 * @return int|false
+	 */
+	public static function get_attachment_by_guid( $src ) {
+		global $wpdb;
+
+		// Trim the host name portion of the source as this could potentially have changed.
+		$src_path = wp_parse_url( $src, PHP_URL_PATH );
+
+		// Try to fetch the post ID by GUID.
+		$id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'attachment' AND guid LIKE '%%%s' LIMIT 1;", $src_path ) );
+
+		return $id ?? false;
+	}
+
 	/**
 	 * Identify images in post content, and if images are local (uploaded to the current site), pass through Tachyon.
 	 *
@@ -192,29 +210,30 @@ public static function filter_the_content( $content ) {
 					if ( preg_match( '#height=["|\']?([\d%]+)["|\']?#i', $images['img_tag'][ $index ], $height_string ) )
 						$height = $height_string[1];
 
+					// Detect WP registered image size from HTML class
+					if ( preg_match( '#class=["|\']?[^"\']*size-([^"\'\s]+)[^"\']*["|\']?#i', $images['img_tag'][ $index ], $matches ) ) {
+						$size = array_pop( $matches );
+					}
+
 					// If image tag lacks width or height arguments, try to determine from strings WP appends to resized image filenames.
-					if ( ! $width || ! $height ) {
+					if ( ! isset( $size ) && ( ! $width || ! $height ) ) {
 						$size_from_file = static::parse_dimensions_from_filename( $src );
-						$width = $width ?: $size_from_file[0];
-						$height = $height ?: $size_from_file[1];
+						// Check if this isn't a full size URL before inferring dimensions.
+						if ( $size_from_file[0] !== false && $size_from_file[1] !== false ) {
+							$attachment_id = self::get_attachment_by_guid( $src );
+							if ( $attachment_id ) {
+								$fullsize_url = true;
+							} else {
+								$width = $size_from_file[0];
+								$height = $size_from_file[1];
+							}
+						}
 					}
 
 					// Can't pass both a relative width and height, so unset the height in favor of not breaking the horizontal layout.
 					if ( false !== strpos( $width, '%' ) && false !== strpos( $height, '%' ) )
 						$width = $height = false;
 
-					// Detect WP registered image size from HTML class
-					if ( preg_match( '#class=["|\']?[^"\']*size-([^"\'\s]+)[^"\']*["|\']?#i', $images['img_tag'][ $index ], $matches ) ) {
-						$size = array_pop( $matches );
-
-						if ( false === $width && false === $height && isset( $size ) && array_key_exists( $size, $image_sizes ) ) {
-							$size_from_wp = wp_get_attachment_image_src( $attachment_id, $size );
-							$width = $size_from_wp[1];
-							$height = $size_from_wp[2];
-							$transform = $image_sizes[ $size ]['crop'] ? 'resize' : 'fit';
-						}
-					}
-
 					// WP Attachment ID, if uploaded to this site
 					if (
 						preg_match( '#class=["|\']?[^"\']*wp-image-([\d]+)[^"\']*["|\']?#i', $images['img_tag'][ $index ], $class_attachment_id ) &&
@@ -334,15 +353,6 @@ public static function filter_the_content( $content ) {
 							$transform = 'fit';
 					}
 
-					// Detect if image source is for a custom-cropped thumbnail and prevent further URL manipulation.
-					if ( ! $fullsize_url && preg_match_all( '#-e[a-z0-9]+(-\d+x\d+)?\.(' . implode('|', self::$extensions ) . '){1}$#i', basename( $src ), $filename ) )
-						$fullsize_url = true;
-
-					// Build URL, first maybe removing WP's resized string so we pass the original image to Tachyon
-					if ( ! $fullsize_url ) {
-						$src = self::strip_image_dimensions_maybe( $src );
-					}
-
 					// Build array of Tachyon args and expose to filter before passing to Tachyon URL function
 					$args = array();
 
@@ -395,6 +405,15 @@ public static function filter_the_content( $content ) {
 						$size = [ $width, $height ];
 					}
 
+					// Detect if image source is for a custom-cropped thumbnail and prevent further URL manipulation.
+					if ( ! $fullsize_url && preg_match_all( '#-e[a-z0-9]+(-\d+x\d+)?\.(' . implode('|', self::$extensions ) . '){1}$#i', basename( $src ), $filename ) )
+						$fullsize_url = true;
+
+					// Build URL, first maybe removing WP's resized string so we pass the original image to Tachyon
+					if ( ! $fullsize_url ) {
+						$src = self::strip_image_dimensions_maybe( $src );
+					}
+
 					/**
 					 * Filter the array of Tachyon arguments added to an image when it goes through Tachyon.
 					 * By default, only includes width and height values.
@@ -826,6 +845,13 @@ public static function validate_image_url( $url ) {
 	 * @return string
 	 **/
 	protected static function strip_image_dimensions_maybe( $src ) {
+		// Check we can find the attachment by that name
+		$attachment_id = self::get_attachment_by_guid( $src );
+		if ( $attachment_id ) {
+			// Prevent stripping dimenions from src.
+			return $src;
+		}
+
 		// Build URL, first removing WP's resized string so we pass the original image to Tachyon
 		if ( preg_match( '#(-\d+x\d+)\.(' . implode( '|', self::$extensions ) . '){1}$#i', $src, $src_parts ) ) {
 			$src = str_replace( $src_parts[1], '', $src );
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 7ca76bd..d7e98f0 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,7 +10,7 @@
 // 2. Plugin installed inside of WordPress.org developer checkout
 // 3. Tests checked out to /tmp
 if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) {
-	$test_root = getenv( 'WP_DEVELOP_DIR' ) . '/tests/phpunit';
+	$test_root = getenv( 'WP_DEVELOP_DIR' );
 } elseif ( file_exists( '../../../../tests/phpunit/includes/bootstrap.php' ) ) {
 	$test_root = '../../../../tests/phpunit';
 } elseif ( file_exists( '/tmp/wordpress-tests-lib/includes/bootstrap.php' ) ) {
diff --git a/tests/data/tachyon-1132x687.jpg b/tests/data/tachyon-1132x687.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cddb87d381b8b97b8f8e48f4a1d22dc75ec6cc20
GIT binary patch
literal 14904
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
N^RI;d)snSW{|6xez5M_H

literal 0
HcmV?d00001

diff --git a/tests/tests/class-resizing.php b/tests/tests/class-resizing.php
index 2e996a3..b5871bb 100644
--- a/tests/tests/class-resizing.php
+++ b/tests/tests/class-resizing.php
@@ -27,6 +27,7 @@ class Tests_Resizing extends WP_UnitTestCase {
 	 *
 	 * tachyon.jpg: 1280x719
 	 * tachyon-large.jpg: 5312x2988
+	 * tachyon-1132x687.jpg: 1280x719
 	 * Photo by Digital Buggu from Pexels
 	 * @link https://www.pexels.com/photo/0-7-rpm-171195/
 	 */
@@ -34,6 +35,9 @@ static public function wpSetUpBeforeClass( $factory ) {
 		global $_wp_additional_image_sizes;
 		self::$wp_additional_image_sizes = $_wp_additional_image_sizes;
 
+		// Ensure pre WP 5.3.1 behaviour with image file having dimensions in file name.
+		add_filter( 'wp_unique_filename', __NAMESPACE__ . '\\Tests_Resizing::unique_filename_override' );
+
 		self::setup_custom_sizes();
 
 		self::$attachment_ids['tachyon'] = $factory->attachment->create_upload_object(
@@ -43,6 +47,10 @@ static public function wpSetUpBeforeClass( $factory ) {
 		self::$attachment_ids['tachyon-large'] = $factory->attachment->create_upload_object(
 			realpath( __DIR__ . '/../data/tachyon-large.jpg')
 		);
+
+		self::$attachment_ids['tachyon-1132x687'] = $factory->attachment->create_upload_object(
+			realpath( __DIR__ . '/../data/tachyon-1132x687.jpg')
+		);
 	}
 
 	/**
@@ -72,6 +80,25 @@ public static function wpTearDownAfterClass() {
 			}
 		} );
 		rmdir( $uploads_dir );
+
+		remove_filter( 'wp_unique_filename', __NAMESPACE__ . '\\Tests_Resizing::unique_filename_override' );
+	}
+
+	/**
+	 * Prevents WP from fixing the file name during upload.
+	 *
+	 * This occurs if the file name contains dimensions as a suffix.
+	 * This is to help test for backwards compat with WP 5.3.0 and earlier.
+	 *
+	 * @param string $filename
+	 * @return string
+	 */
+	public static function unique_filename_override( $filename ) {
+		if ( strpos( $filename, 'tachyon-1132x687' ) === false ) {
+			return $filename;
+		}
+
+		return str_replace( '-1.jpg', '.jpg', $filename );
 	}
 
 	function setUp() {
@@ -411,6 +438,30 @@ function data_filtered_url() {
 				],
 				[ 1000, 1000 ],
 			],
+			[
+				'tachyon-1132x687',
+				'large',
+				[
+					'http://tachy.on/u/tachyon-1132x687.jpg?fit=1024,719',
+					'http://tachy.on/u/tachyon-1132x687.jpg?resize=1024,575',
+					'http://tachy.on/u/tachyon-1132x687.jpg?fit=1024,1024',
+					'http://tachy.on/u/tachyon-1132x687.jpg?w=1024&h=575',
+					'http://tachy.on/u/tachyon-1132x687-1.jpg?fit=1024,719',
+					'http://tachy.on/u/tachyon-1132x687-1.jpg?resize=1024,575',
+					'http://tachy.on/u/tachyon-1132x687-1.jpg?fit=1024,1024',
+					'http://tachy.on/u/tachyon-1132x687-1.jpg?w=1024&h=575',
+				],
+				[ 1024, 575 ],
+			],
+			[
+				'tachyon-1132x687',
+				'full',
+				[
+					'http://tachy.on/u/tachyon-1132x687.jpg',
+					'http://tachy.on/u/tachyon-1132x687-1.jpg',
+				],
+				[ 1280, 719 ],
+			],
 		];
 	}
 
@@ -720,6 +771,28 @@ function data_content_filtering() {
 					'http://tachy.on/u/tachyon.jpg?resize=150,150',
 				],
 			],
+			// Unknown attachment ID, unknown size, original file name contains dimensions.
+			[
+				'tachyon-1132x687',
+				'<p><img class="alignnone" src="%%BASE_URL%%/tachyon-1132x687.jpg" alt="" /></p>',
+				[
+					'http://tachy.on/u/tachyon-1132x687.jpg',
+				],
+			],
+			[
+				'tachyon-1132x687',
+				'<p><img class="alignnone" src="%%BASE_URL%%/tachyon-1132x687-150x150.jpg" alt="" width="150" height="150" /></p>',
+				[
+					'http://tachy.on/u/tachyon-1132x687.jpg?resize=150,150',
+				],
+			],
+			[
+				'tachyon-1132x687',
+				'<p><img class="alignnone" src="%%BASE_URL%%/tachyon-1132x687-150x150.jpg" alt="" /></p>',
+				[
+					'http://tachy.on/u/tachyon-1132x687.jpg?resize=150,150',
+				],
+			],
 		];
 	}
 }