<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[57357] trunk: Media: Redirect inactive attachment pages for logged-out users.</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta" style="font-size: 105%">

<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57357">57357</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57357","name":"Review Commit"}}</script></dd>

<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>

<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-25 17:34:54 +0000 (Thu, 25 Jan 2024)</dd>

</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Redirect inactive attachment pages for logged-out users.

Ensure logged out users are redirected to the media file when attachment pages are inactive. This removes the read_post capability check from the canonical redirects as anonymous users lack the permission.

This was previously committed in <a href="https://core.trac.wordpress.org/changeset/57310">[57310]</a> before being reverted in <a href="https://core.trac.wordpress.org/changeset/57318">[57318]</a>. This update includes a fix to cover instances where revealing a URL could be considered a data leak and greatly expands the unit tests to ensure that this is covered along with many other instances.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/56657">[56657]</a>, <a href="https://core.trac.wordpress.org/changeset/56658">[56658]</a>, <a href="https://core.trac.wordpress.org/changeset/56711">[56711]</a>, <a href="https://core.trac.wordpress.org/changeset/57310">[57310]</a>, <a href="https://core.trac.wordpress.org/changeset/57318">[57318]</a>.

Props peterwilsoncc, jorbin, afercia, aristath, chesio, joppuyo, jorbin, lakshmananphp, poena, sergeybiryukov, swissspidy, johnbillion.

Fixes <a href="https://core.trac.wordpress.org/ticket/59866">#59866</a>.

See <a href="https://core.trac.wordpress.org/ticket/57913">#57913</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalpostStatusphp">trunk/tests/phpunit/tests/canonical/postStatus.php</a></li>

<li><a href="#trunktestsphpunittestscanonicalphp">trunk/tests/phpunit/tests/canonical.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunksrcwpincludescanonicalphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/canonical.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php       2024-01-25 17:06:45 UTC (rev 57356)

+++ trunk/src/wp-includes/canonical.php 2024-01-25 17:34:54 UTC (rev 57357)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,13 +550,23 @@

</span><span class="cx" style="display: block; padding: 0 10px">        $is_attachment_redirect = false;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_attachment() && ! get_option( 'wp_attachment_pages_enabled' ) ) {

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $attachment_id = get_query_var( 'attachment_id' );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $attachment_id        = get_query_var( 'attachment_id' );

+               $attachment_post      = get_post( $attachment_id );

+               $attachment_parent_id = $attachment_post ? $attachment_post->post_parent : 0;

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( current_user_can( 'read_post', $attachment_id ) ) {

-                       $redirect_url = wp_get_attachment_url( $attachment_id );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $attachment_url = wp_get_attachment_url( $attachment_id );

+               if ( $attachment_url !== $redirect_url ) {

+                       /*

+                       * 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 );

+                       }

+                       $redirect_url = $attachment_url;

+               }

</ins><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $is_attachment_redirect = true;

-               }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $is_attachment_redirect = true;

</ins><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );

</span></span></pre></div>

<a id="trunktestsphpunittestscanonicalpostStatusphp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/canonical/postStatus.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/postStatus.php        2024-01-25 17:06:45 UTC (rev 57356)

+++ trunk/tests/phpunit/tests/canonical/postStatus.php  2024-01-25 17:34:54 UTC (rev 57357)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,8 +169,6 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public function set_up() {

</span><span class="cx" style="display: block; padding: 0 10px">                parent::set_up();

</span><span class="cx" style="display: block; padding: 0 10px">                self::setup_custom_types();

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-

-               add_filter( 'pre_option_wp_attachment_pages_enabled', '__return_true' );

</del><span class="cx" style="display: block; padding: 0 10px">         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">        /**

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,8 +221,15 @@

<span class="cx" style="display: block; padding: 0 10px">         * @param string $user_role User role.

<span class="cx" style="display: block; padding: 0 10px">         * @param string $requested Requested URL.

<span class="cx" style="display: block; padding: 0 10px">         * @param string $expected  Expected URL.

<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @param string $enable_attachment_pages Whether to enable attachment pages. Default true.

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function test_canonical_redirects_to_plain_permalinks( $post_key, $user_role, $requested, $expected ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_canonical_redirects_to_plain_permalinks( $post_key, $user_role, $requested, $expected, $enable_attachment_pages = true ) {

+               if ( $enable_attachment_pages ) {

+                       update_option( 'wp_attachment_pages_enabled', 1 );

+               } else {

+                       update_option( 'wp_attachment_pages_enabled', 0 );

+               }

+

</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_set_current_user( self::$users[ $user_role ] );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->set_permalink_structure( '' );

</span><span class="cx" style="display: block; padding: 0 10px">                $post = self::$posts[ $post_key ];

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,12 +248,7 @@

</span><span class="cx" style="display: block; padding: 0 10px">        /**

<span class="cx" style="display: block; padding: 0 10px">         * Data provider for test_canonical_redirects_to_plain_permalinks.

</span><span class="cx" style="display: block; padding: 0 10px">         *

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @return array[] Array of arguments for tests {

-        *     @type string $post_key  Post key used for creating fixtures.

-        *     @type string $user_role User role.

-        *     @type string $requested Requested URL.

-        *     @type string $expected  Expected URL.

-        * }

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @return array[]

</ins><span class="cx" style="display: block; padding: 0 10px">          */

</span><span class="cx" style="display: block; padding: 0 10px">        public function data_canonical_redirects_to_plain_permalinks() {

</span><span class="cx" style="display: block; padding: 0 10px">                $data              = array();

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,15 +273,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?post_type=page&p=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?post_type=page&p=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        "$post_key-page",

+                                       $user,

+                                       '/?post_type=page&p=%ID%',

+                                       '/?post_type=page&p=%ID%',

+                                       false,

+                               );

+

+                               $data[] = array(

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $post_key,

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        "/?name=$post_key-post",

</span><span class="cx" style="display: block; padding: 0 10px">                                        "/?name=$post_key-post",

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $data[] = array(

+                                       $post_key,

+                                       $user,

+                                       "/?name=$post_key-post",

+                                       "/?name=$post_key-post",

+                                       false,

+                               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // Ensure rss redirects to rss2.

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        $post_key,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,8 +306,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss&p=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss2&p=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $data[] = array(

+                                       $post_key,

+                                       $user,

+                                       '/?feed=rss&p=%ID%',

+                                       '/?feed=rss2&p=%ID%',

+                                       false,

+                               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // Ensure rss redirects to rss2.

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        "$post_key-page",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +323,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss&page_id=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss2&page_id=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                               $data[] = array(

+                                       "$post_key-page",

+                                       $user,

+                                       '/?feed=rss&page_id=%ID%',

+                                       '/?feed=rss2&page_id=%ID%',

+                                       false,

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px">                }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,15 +347,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?post_type=page&p=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?post_type=page&p=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        "$post_key-page",

+                                       $user,

+                                       '/?post_type=page&p=%ID%',

+                                       '/?post_type=page&p=%ID%',

+                                       false,

+                               );

+

+                               $data[] = array(

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $post_key,

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        "/?name=$post_key-post",

</span><span class="cx" style="display: block; padding: 0 10px">                                        "/?name=$post_key-post",

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $data[] = array(

+                                       $post_key,

+                                       $user,

+                                       "/?name=$post_key-post",

+                                       "/?name=$post_key-post",

+                                       false,

+                               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // Ensure rss redirects to rss2.

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        $post_key,

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,8 +380,17 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss&p=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss2&p=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $data[] = array(

+                                       $post_key,

+                                       $user,

+                                       '/?feed=rss&p=%ID%',

+                                       '/?feed=rss2&p=%ID%',

+                                       false,

+                               );

+

</ins><span class="cx" style="display: block; padding: 0 10px">                                 // Ensure rss redirects to rss2.

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><span class="cx" style="display: block; padding: 0 10px">                                        "$post_key-page",

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +397,16 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss&page_id=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?feed=rss2&page_id=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+                               $data[] = array(

+                                       "$post_key-page",

+                                       $user,

+                                       '/?feed=rss&page_id=%ID%',

+                                       '/?feed=rss2&page_id=%ID%',

+                                       false,

+                               );

</ins><span class="cx" style="display: block; padding: 0 10px">                         }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $select_block_list as $user ) {

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,15 +419,33 @@

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?post_type=page&p=%ID%',

</span><span class="cx" style="display: block; padding: 0 10px">                                        '/?post_type=page&p=%ID%',

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                                $data[] = array(

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        "$post_key-page",

+                                       $user,

+                                       '/?post_type=page&p=%ID%',

+                                       '/?post_type=page&p=%ID%',

+                                       false,

+                               );

+

+                               $data[] = array(

</ins><span class="cx" style="display: block; padding: 0 10px">                                         $post_key,

</span><span class="cx" style="display: block; padding: 0 10px">                                        $user,

</span><span class="cx" style="display: block; padding: 0 10px">                                        "/?name=$post_key-post",

</span><span class="cx" style="display: block; padding: 0 10px">                                        "/?name=$post_key-post",

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        true,

</ins><span class="cx" style="display: block; padding: 0 10px">                                 );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                $data[] = array(

+                                       $post_key,

+                                       $user,

+                                       "/?name=$post_key-post",

+                                       "/?name=$post_key-post",

+                                       false,

+                               );

+