vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Media: Revert [57310].

Browse Source 
This commit reintroduced a minor data exposure issue.

Props swissspidy.
See #59866, #57913.



git-svn-id: https://develop.svn.wordpress.org/trunk@57318 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Peter Wilson 2024-01-19 23:58:08 +00:00
parent 85de4aa70d
commit 3d154d7a0f
2 changed files with 9 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wp-includes/canonical.php
View File

@ -550,20 +550,13 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
$is_attachment_redirect = false;
if ( is_attachment() && ! get_option( 'wp_attachment_pages_enabled' ) ) {
$attachment_id = get_query_var( 'attachment_id' );
$attachment_post = get_post( $attachment_id );
$attachment_parent_id = $attachment_post ? $attachment_post->post_parent : 0;
$attachment_id = get_query_var( 'attachment_id' );
/*
* If an attachment is attached to a post, it inherits the parent post's status. Fetch the
* parent post to check its status later.
*/
if ( $attachment_parent_id ) {
$redirect_obj = get_post( $attachment_parent_id );
if ( current_user_can( 'read_post', $attachment_id ) ) {
$redirect_url = wp_get_attachment_url( $attachment_id );
$is_attachment_redirect = true;
}
$redirect_url = wp_get_attachment_url( $attachment_id );
$is_attachment_redirect = true;
}
$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );

68
tests/phpunit/tests/canonical.php
View File

@ -407,83 +407,23 @@ class Tests_Canonical extends WP_Canonical_UnitTestCase {
}
/**
* Test canonical redirects for attachment pages when the option is disabled.
*
* @ticket 57913
* @ticket 59866
*
* @dataProvider data_canonical_attachment_page_redirect_with_option_disabled
*/
public function test_canonical_attachment_page_redirect_with_option_disabled( $expected, $user = null, $parent_post_status = '' ) {
public function test_canonical_attachment_page_redirect_with_option_disabled() {
add_filter( 'pre_option_wp_attachment_pages_enabled', '__return_false' );
if ( '' !== $parent_post_status ) {
$parent_post_id = self::factory()->post->create(
array(
'post_status' => $parent_post_status,
)
);
} else {
$parent_post_id = 0;
}
$filename = DIR_TESTDATA . '/images/test-image.jpg';
$contents = file_get_contents( $filename );
$upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
$attachment_id = $this->_make_attachment( $upload, $parent_post_id );
$attachment_url = wp_get_attachment_url( $attachment_id );
$attachment_id = $this->_make_attachment( $upload );
$attachment_page = get_permalink( $attachment_id );
// Set as anonymous/logged out user.
if ( null !== $user ) {
wp_set_current_user( $user );
}
$this->go_to( $attachment_page );
$url = redirect_canonical( $attachment_page, false );
if ( is_string( $expected ) ) {
$expected = str_replace( '%%attachment_url%%', $attachment_url, $expected );
}
$url = redirect_canonical( $attachment_page, false );
$expected = wp_get_attachment_url( $attachment_id );
$this->assertSame( $expected, $url );
}
/**
* Data provider for test_canonical_attachment_page_redirect_with_option_disabled().
*
* @return array[]
*/
public function data_canonical_attachment_page_redirect_with_option_disabled() {
return array(
'logged out user, no parent' => array(
'%%attachment_url%%',
0,
),
'logged in user, no parent' => array(
'%%attachment_url%%',
),
'logged out user, private parent' => array(
null,
0,
'private',
),
'logged in user, private parent' => array(
'%%attachment_url%%',
null,
'private',
),
'logged out user, public parent' => array(
'%%attachment_url%%',
0,
'publish',
),
'logged in user, public parent' => array(
'%%attachment_url%%',
null,
'publish',
),
);
}
}