Fix Remove CSS/JS URL matching (#911)

* Fix matching
* Fix regex
* Match both directions
* Add Util_Environment::array_intersect_partial() unit test

Author: cssjoe

UserExperience_Remove_CssJs_Mutator.php

@@ -104,7 +104,7 @@ public function run( $buffer ) {
 		}
 
 		$this->buffer = preg_replace_callback(
-			'~(<link.+?href.+?>)|(<script.+?src.+?</script>)~is',
+			'~(<link[^>]+href[^>]+>)|(<script[^>]+src[^>]+></script>)~is',
 			array( $this, 'remove_content' ),
 			$this->buffer
 		);
@@ -154,26 +154,22 @@ private function is_content_included( $content ) {
 			}
 		}
 
-		// Build array of possible current page relative/absolute URLs.
+		// Build array of possible current page URLs.
 		$current_pages = array(
-			$wp->request,
-			trailingslashit( $wp->request ),
-			home_url( $wp->request ),
-			trailingslashit( home_url( $wp->request ) ),
+			esc_url( trailingslashit( home_url( $wp->request ) ) ),
 		);
 
+		if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
+			$current_pages[] = esc_url( trailingslashit( home_url( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ) );
+		}
+
 		foreach ( $this->singles_includes as $id => $data ) {
 			// Check if the defined single CSS/JS file is present in HTML content.
 			if ( ! empty( $data ) && strpos( $content, $data['url_pattern'] ) !== false ) {
 				// Check if current page URL(s) match any defined conditions.
-				$page_match = array_intersect(
+				$page_match = Util_Environment::array_intersect_partial(
 					$current_pages,
-					array_map(
-						function ($value) {
-							return ltrim( $value, '/' );
-						},
-						$data['includes']
-					)
+					$data['includes']
 				);
 
 				// Check if current page content match any defined conditions.

UserExperience_Remove_CssJs_Page_View.php

@@ -200,7 +200,7 @@
 												'w3-total-cache'
 											),
 											'<strong>',
-											'</strong>',
+											'</strong>'
 										),
 										array(
 											'strong' => array(),

Util_Environment.php

@@ -1612,4 +1612,56 @@ public static function textarea_to_array( $value ) {
 
 		return $values_array;
 	}
+
+	/**
+	 * Is there a partial array intersections match?
+	 *
+	 * Returns true if any entries between the tewo arrays match string endings or in whole.
+	 *
+	 * @since  X.X.X
+	 * @static
+	 *
+	 * @param array $array1 Array 1.
+	 * @param array $array2 Array 2.
+	 * @return bool
+	 */
+	public static function array_intersect_partial( array $array1, array $array2 ): bool {
+		foreach ( $array1 as $url1 ) {
+			foreach ( $array2 as $url2 ) {
+				/**
+				 * Parse array1 URLs to handle both full URLs and relative paths.
+				 * If homepage then 'path' will be null, set to '/'.
+				 */
+				$parsed_url1         = \wp_parse_url( \trim( $url1, '/' ) );
+				$parsed_url1['path'] = $parsed_url1['path'] ?? '/';
+
+				/**
+				 * Parse array2 URLs to handle both full URLs and relative paths.
+				 * If value is '/' for homepage then don't trim, otherwise tirm.
+				 */
+				$parsed_url2 = \wp_parse_url( '/' === $url2 ? '/' : \trim( $url2, '/' ) );
+
+				$is_host_set = isset( $parsed_url1['host'], $parsed_url2['host'] );
+
+				if ( $url1 === $url2 ) {
+					// Direct comparison for full URLs that are identical.
+					return true;
+				} elseif (
+					isset( $parsed_url1['path'], $parsed_url2['path'] )
+					&& (
+						\substr( $parsed_url1['path'], -\strlen( $parsed_url2['path'] ) ) === $parsed_url2['path'] ||
+						\substr( $parsed_url2['path'], -\strlen( $parsed_url1['path'] ) ) === $parsed_url1['path']
+					) && ( ! $is_host_set || ( $is_host_set && $parsed_url1['host'] === $parsed_url2['host'] ) )
+				) {
+					/**
+					 * Check if both parsed URLs have 'path' and 'host' component and if they match.
+					 * If either 'host' is not set but 'path' matches, consider it a match.
+					 */
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
 }

tests/admin/class-w3tc-admin-util-environment.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * File: class-w3tc-admin-util-environment.php
+ *
+ * @package    W3TC
+ * @subpackage W3TC/tests/admin
+ * @author     BoldGrid <development@boldgrid.com>
+ * @since      X.X.X
+ * @link       https://www.boldgrid.com/w3-total-cache/
+ */
+
+declare( strict_types = 1 );
+
+use W3TC\Util_Environment;
+
+/**
+ * Class: W3tc_Admin_Util_File_Test
+ *
+ * @since X.X.X
+ */
+class W3tc_Admin_Util_Environment extends WP_UnitTestCase {
+	/**
+	 * Test array_intersect_partial().
+	 *
+	 * @since X.X.X
+	 */
+	public function test_array_intersect_partial() {
+		// Ensure matches.
+		$data = array(
+			array(
+				array( 'https://www.example.com/test.php' ),
+				array( '/test.php' ),
+			),
+			array(
+				array( '/test.php' ),
+				array( 'https://www.example.com/test.php' ),
+			),
+			array(
+				array( 'https://www.example.com/test.php' ),
+				array( 'test.php' ),
+			),
+			array(
+				array( 'test.php' ),
+				array( 'https://www.example.com/test.php' ),
+			),
+			array(
+				array( 'https://www.example.com/match' ),
+				array(
+					'/test.php',
+					'/extra.php',
+					'nomatch',
+					'match',
+				),
+			),
+		);
+
+		foreach ( $data as $set ) {
+			$this->assertTrue( Util_Environment::array_intersect_partial( $set[0], $set[1] ) );
+		}
+
+		// Ensure no matches.
+		$data = array(
+			array(
+				array( 'https://www.example.com/test.php' ),
+				array( '/' ),
+			),
+			array(
+				array( '/' ),
+				array( 'https://www.example.com/test.php' ),
+			),
+			array(
+				array( 'https://www.example.com/test.php' ),
+				array( 'nomatch.php' ),
+			),
+			array(
+				array( 'nomatch.php' ),
+				array( 'https://www.example.com/test.php' ),
+			),
+			array(
+				array( 'https://www.example.com/test.php' ),
+				array( '/test2.php' ),
+			),
+			array(
+				array( 'https://www.example.com/test.php' ),
+				array( 'https://www.example.com/test2.php' ),
+			),
+			array(
+				array( 'https://www.example.com/match' ),
+				array(
+					'/test.php',
+					'/extra.php',
+					'nomatch',
+				),
+			),
+		);
+
+		foreach ( $data as $set ) {
+			$this->assertFalse( Util_Environment::array_intersect_partial( $set[0], $set[1] ) );
+		}
+	}
+}