mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-24 22:10:02 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Media: Allow wp_check_filetype() to support query strings in URLs.

Browse Source 
This changeset adjusts the regex in `wp_check_filetype()` to support query strings in URLs.

Follow-up to [30640], [32172].

Props voldemortensen, johnbillion, layotte, dd32, atomicjack, supercleanse, spencercameron, ianmjones, audrasjb.
Fixes #30377.


git-svn-id: https://develop.svn.wordpress.org/trunk@52829 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2022-03-07 22:50:12 +00:00
parent 4cee32dd66
commit 176afff375
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/functions.php
View File

@ -2981,8 +2981,9 @@ function wp_get_default_extension_for_mime_type( $mime_type ) {
* You can optionally define the mime array, if needed.
*
* @since 2.0.4
* @since 6.0.0 URLs are now supported.
*
* @param string $filename File name or path.
* @param string $filename File name, path, or URL.
* @param string[] $mimes Optional. Array of allowed mime types keyed by their file extension regex.
* @return array {
* Values for the extension and mime type.
@ -2998,6 +2999,15 @@ function wp_check_filetype( $filename, $mimes = null ) {
$type = false;
$ext = false;
// Strip query args and fragment from filename to reveal extension.
$query_pos = strpos( $filename, '?' );
if ( false !== $query_pos ) {
$filename = substr_replace( $filename, '', $query_pos );
}
$filename = strip_fragment_from_url( $filename );
foreach ( $mimes as $ext_preg => $mime_match ) {
$ext_preg = '!\.(' . $ext_preg . ')$!i';
if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {

58
tests/phpunit/tests/functions/wpCheckFiletype.php Normal file
View File

@ -0,0 +1,58 @@
<?php
/**
* Tests for wp_check_filetype()
*
* @group functions.php
* @covers ::wp_check_filetype
*/
class Tests_Functions_wpCheckFiletype extends WP_UnitTestCase {
public function data_url_filetypes() {
return array(
// Invalid or empty data:
array( null, false ),
array( '', false ),
array( ' ', false ),
// Paths:
array( 'file.jpg', 'jpg' ),
array( 'C:\path\to\file.mp3', 'mp3' ),
array( 'C:\path\to\file.mp3?file.jpg', 'mp3' ),
array( 'C:\path\to\file.exe?file.jpg', false ),
array( '/file.jpg', 'jpg' ),
array( '/path/to/file.jpg', 'jpg' ),
array( '/path/to/file.jpg', 'jpg' ),
array( '/file.exe?file.jpg', false ),
// Absolute URLs:
array( 'http://example.com', false ),
array( 'http://example.com/', false ),
array( 'http://example.com/wibble', false ),
array( 'http://example.com/wibble/', false ),
array( 'http://example.com/wibble.wobble', false ),
array( 'http://example.com/wibble.mp3', 'mp3' ),
array( 'http://example.com/wibble.mp3#wobble', 'mp3' ),
array( 'http://example.com/wibble.mp3?wobble=true', 'mp3' ),
array( 'http://example.com/wibble.mp3?wobble=true#wobble', 'mp3' ),
array( 'http://example.mp3/', false ),
array( 'http://example.com/file.mp3#file.jpg', 'mp3' ),
array( 'http://example.com/file.mp3?file.jpg', 'mp3' ),
array( 'http://example.com/file.exe#file.jpg', false ),
array( 'http://example.com/file.exe?file.jpg', false ),
array( 'http://example.com/file.mp3?foo=bar#?file=file.jpg', 'mp3' ),
array( 'http://example.com?file.jpg', false ),
);
}
/**
* @dataProvider data_url_filetypes
*
* @param string $url
* @param string|false $expected
*/
public function test_url_ext( $url, $expected ) {
$filetype = wp_check_filetype( $url );
$this->assertSame( $expected, $filetype['ext'] );
}
}