<!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>[38929] trunk: Feeds: Don't attempt to generate RSS feeds for invalid feed URLs such as `wp-content/feed`.</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 { 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/38929">38929</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/38929","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-25 21:53:22 +0000 (Tue, 25 Oct 2016)</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'>Feeds: Don't attempt to generate RSS feeds for invalid feed URLs such as `wp-content/feed`.
Props stevenkword, JRGould, lyubomir_popov, johnbillion
Fixes <a href="https://core.trac.wordpress.org/ticket/30210">#30210</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsfeedrss2php">trunk/tests/phpunit/tests/feed/rss2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-10-25 21:25:25 UTC (rev 38928)
+++ trunk/src/wp-includes/functions.php 2016-10-25 21:53:22 UTC (rev 38929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1213,6 +1213,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function do_feed() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Determine if we are looking at the main comment feed
+ $is_main_comments_feed = ( $wp_query->is_comment_feed() && ! $wp_query->is_singular() );
+
+ /*
+ * Check the queried object for the existence of posts if it is not a feed for an archive,
+ * search result, or main comments. By checking for the absense of posts we can prevent rendering the feed
+ * templates at invalid endpoints. e.g.) /wp-content/plugins/feed/
+ */
+ if ( ! $wp_query->have_posts() && ! ( $wp_query->is_archive() || $wp_query->is_search() || $is_main_comments_feed ) ) {
+ wp_die( __( 'ERROR: This is not a valid feed.' ), '', array( 'response' => 404 ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed = get_query_var( 'feed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove the pad, if present.
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedrss2php"></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/feed/rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php 2016-10-25 21:25:25 UTC (rev 38928)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2016-10-25 21:53:22 UTC (rev 38929)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> static $posts;
</span><span class="cx" style="display: block; padding: 0 10px"> static $category;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $post_date;
</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"> * Setup a new user and attribute some posts.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,16 +26,20 @@
</span><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"> // Create a taxonomy
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$category = self::factory()->category->create_and_get( array(
- 'name' => 'Test Category',
- 'slug' => 'test-cat',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$category = $factory->category->create_and_get( array(
+ 'name' => 'Foo Category',
+ 'slug' => 'foo',
</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">+ // Set a predictable time for testing date archives.
+ self::$post_date = '2003-05-27 10:07:53';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = get_option( 'posts_per_rss' ) + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a few posts
</span><span class="cx" style="display: block; padding: 0 10px"> self::$posts = $factory->post->create_many( $count, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => self::$user_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_date' => self::$post_date,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec velit massa, ultrices eu est suscipit, mattis posuere est. Donec vitae purus lacus. Cras vitae odio odio.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,6 +60,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->excerpt_only = get_option( 'rss_use_excerpt' );
</span><span class="cx" style="display: block; padding: 0 10px"> // this seems to break something
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_smilies', false );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+ create_initial_taxonomies();
</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">@@ -250,4 +258,213 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'comments_open', '__return_false' );
</span><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">+ /*
+ * Check to make sure we are rendering feed templates for the home feed.
+ * e.g. https://example.com/feed/
+ *
+ * @ticket 30210
+ */
+ function test_valid_home_feed_endpoint() {
+ // An example of a valid home feed endpoint.
+ $this->go_to( 'feed/' );
+
+ // Verify the query object is a feed.
+ $this->assertQueryTrue( 'is_feed' );
+
+ // Queries performed on valid feed endpoints should contain posts.
+ $this->assertTrue( have_posts() );
+
+ // Check to see if we have the expected XML output from the feed template.
+ $feed = $this->do_rss2();
+
+ $xml = xml_to_array( $feed );
+
+ // Get the <rss> child element of <xml>.
+ $rss = xml_find( $xml, 'rss' );
+
+ // There should only be one <rss> child element.
+ $this->assertEquals( 1, count( $rss ) );
+ }
+
+ /*
+ * Check to make sure we are rendering feed templates for the taxonomy feeds.
+ * e.g. https://example.com/category/foo/feed/
+ *
+ * @ticket 30210
+ */
+ function test_valid_taxonomy_feed_endpoint() {
+ // An example of an valid taxonomy feed endpoint.
+ $this->go_to( 'category/foo/feed/' );
+
+ // Verify the query object is a feed.
+ $this->assertQueryTrue( 'is_feed', 'is_archive', 'is_category' );
+
+ // Queries performed on valid feed endpoints should contain posts.
+ $this->assertTrue( have_posts() );
+
+ // Check to see if we have the expected XML output from the feed template.
+ $feed = $this->do_rss2();
+
+ $xml = xml_to_array( $feed );
+
+ // Get the <rss> child element of <xml>.
+ $rss = xml_find( $xml, 'rss' );
+
+ // There should only be one <rss> child element.
+ $this->assertEquals( 1, count( $rss ) );
+ }
+
+ /*
+ * Check to make sure we are rendering feed templates for the main comment feed.
+ * e.g. https://example.com/comments/feed/
+ *
+ * @ticket 30210
+ */
+ function test_valid_main_comment_feed_endpoint() {
+ // Generate a bunch of comments
+ foreach ( self::$posts as $post ) {
+ self::factory()->comment->create_post_comments( $post, 3 );
+ }
+
+ // An example of an valid main comment feed endpoint.
+ $this->go_to( 'comments/feed/' );
+
+ // Verify the query object is a feed.
+ $this->assertQueryTrue( 'is_feed', 'is_comment_feed' );
+
+ // Queries performed on valid feed endpoints should contain comments.
+ $this->assertTrue( have_comments() );
+
+ // Check to see if we have the expected XML output from the feed template.
+ $feed = $this->do_rss2();
+
+ $xml = xml_to_array( $feed );
+
+ // Get the <rss> child element of <xml>.
+ $rss = xml_find( $xml, 'rss' );
+
+ // There should only be one <rss> child element.
+ $this->assertEquals( 1, count( $rss ) );
+ }
+
+ /*
+ * Check to make sure we are rendering feed templates for the date archive feeds.
+ * e.g. https://example.com/2003/05/27/feed/
+ *
+ * @ticket 30210
+ */
+ function test_valid_archive_feed_endpoint() {
+ // An example of an valid date archive feed endpoint.
+ $this->go_to( '2003/05/27/feed/' );
+
+ // Verify the query object is a feed.
+ $this->assertQueryTrue( 'is_feed', 'is_archive', 'is_day', 'is_date' );
+
+ // Queries performed on valid feed endpoints should contain posts.
+ $this->assertTrue( have_posts() );
+
+ // Check to see if we have the expected XML output from the feed template.
+ $feed = $this->do_rss2();
+
+ $xml = xml_to_array( $feed );
+
+ // Get the <rss> child element of <xml>.
+ $rss = xml_find( $xml, 'rss' );
+
+ // There should only be one <rss> child element.
+ $this->assertEquals( 1, count( $rss ) );
+ }
+
+ /*
+ * Check to make sure we are rendering feed templates for single post comment feeds.
+ * e.g. https://example.com/2003/05/27/post-name/feed/
+ *
+ * @ticket 30210
+ */
+ function test_valid_single_post_comment_feed_endpoint() {
+ // An example of an valid date archive feed endpoint.
+ $this->go_to( get_post_comments_feed_link( self::$posts[0] ) );
+
+ // Verify the query object is a feed.
+ $this->assertQueryTrue( 'is_feed', 'is_comment_feed', 'is_single', 'is_singular' );
+
+ // Queries performed on valid feed endpoints should contain posts.
+ $this->assertTrue( have_posts() );
+
+ // Check to see if we have the expected XML output from the feed template.
+ $feed = $this->do_rss2();
+
+ $xml = xml_to_array( $feed );
+
+ // Get the <rss> child element of <xml>.
+ $rss = xml_find( $xml, 'rss' );
+
+ // There should only be one <rss> child element.
+ $this->assertEquals( 1, count( $rss ) );
+ }
+
+ /*
+ * Check to make sure we are rendering feed templates for the search archive feeds.
+ * e.g. https://example.com/?s=Lorem&feed=rss
+ *
+ * @ticket 30210
+ */
+ function test_valid_search_feed_endpoint() {
+ // An example of an valid search feed endpoint
+ $this->go_to( '?s=Lorem&feed=rss' );
+
+ // Verify the query object is a feed.
+ $this->assertQueryTrue( 'is_feed', 'is_search' );
+
+ // Queries performed on valid feed endpoints should contain posts.
+ $this->assertTrue( have_posts() );
+
+ // Check to see if we have the expected XML output from the feed template.
+ $feed = $this->do_rss2();
+
+ $xml = xml_to_array( $feed );
+
+ // Get the <rss> child element of <xml>.
+ $rss = xml_find( $xml, 'rss' );
+
+ // There should only be one <rss> child element.
+ $this->assertEquals( 1, count( $rss ) );
+ }
+
+ /*
+ * Check to make sure we are not rendering feed templates for invalid feed endpoints.
+ * e.g. https://example.com/wp-content/feed/
+ *
+ * @ticket 30210
+ */
+ function test_invalid_feed_endpoint() {
+ // An example of an invalid feed endpoint
+ $this->go_to( 'wp-content/feed/' );
+
+ // Queries performed on invalid feed endpoints should never contain posts.
+ $this->assertFalse( have_posts() );
+
+ // This is the assertion. Once the exception is thrown in do_feed, execution stops, preventing futher assertions.
+ $this->setExpectedException( 'WPDieException', 'ERROR: This is not a valid feed.' );
+ do_feed();
+ }
+
+ /*
+ * Make sure the requested feed is registered before rendering the requested template.
+ *
+ * @ticket 30210
+ */
+ function test_nonexistent_feeds() {
+ global $wp_rewrite;
+ $badfeed = 'badfeed';
+
+ $this->assertNotContains( $badfeed, $wp_rewrite->feeds );
+
+ $this->go_to( '/?feed=' . $badfeed );
+
+ // This is the assertion. Once the exception is thrown in do_feed, execution stops, preventing futher assertions.
+ $this->setExpectedException( 'WPDieException', 'ERROR: This is not a valid feed template.' );
+ do_feed();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>