<!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>[38381] trunk: Don't improperly cast IDs when fetching post, user, or term objects.</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/38381">38381</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/38381","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-26 19:08:23 +0000 (Fri, 26 Aug 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'>Don't improperly cast IDs when fetching post, user, or term objects.
Blindly casting passed IDs to integers can generate false positives
when the ID is cast to `1`.
Props deeptiboddapati.
Fixes <a href="https://core.trac.wordpress.org/ticket/37738">#37738</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcommentphp">trunk/src/wp-includes/class-wp-comment.php</a></li>
<li><a href="#trunksrcwpincludesclasswppostphp">trunk/src/wp-includes/class-wp-post.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermphp">trunk/src/wp-includes/class-wp-term.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscommentwpCommentphp">trunk/tests/phpunit/tests/comment/wpComment.php</a></li>
<li><a href="#trunktestsphpunittestspostwpPostphp">trunk/tests/phpunit/tests/post/wpPost.php</a></li>
<li><a href="#trunktestsphpunitteststermwpTermphp">trunk/tests/phpunit/tests/term/wpTerm.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcommentphp"></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/class-wp-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment.php 2016-08-26 18:46:17 UTC (rev 38380)
+++ trunk/src/wp-includes/class-wp-comment.php 2016-08-26 19:08:23 UTC (rev 38381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,11 +191,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_instance( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = (int) $id;
- if ( ! $comment_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_numeric( $id ) || $id != floor( $id ) || ! $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 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">+ $comment_id = (int) $id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $_comment = wp_cache_get( $comment_id, 'comment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $_comment ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswppostphp"></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/class-wp-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-post.php 2016-08-26 18:46:17 UTC (rev 38380)
+++ trunk/src/wp-includes/class-wp-post.php 2016-08-26 19:08:23 UTC (rev 38381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,10 +210,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_instance( $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = (int) $post_id;
- if ( ! $post_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_numeric( $post_id ) || $post_id != floor( $post_id ) || ! $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $post_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post = wp_cache_get( $post_id, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $_post ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermphp"></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/class-wp-term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term.php 2016-08-26 18:46:17 UTC (rev 38380)
+++ trunk/src/wp-includes/class-wp-term.php 2016-08-26 19:08:23 UTC (rev 38381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,11 +125,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_instance( $term_id, $taxonomy = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = (int) $term_id;
- if ( ! $term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_numeric( $term_id ) || $term_id != floor( $term_id ) || ! $term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 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">+ $term_id = (int) $term_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $_term = wp_cache_get( $term_id, 'terms' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there isn't a cached version, hit the database.
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpCommentphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/comment/wpComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpComment.php (rev 0)
+++ trunk/tests/phpunit/tests/comment/wpComment.php 2016-08-26 19:08:23 UTC (rev 38381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,102 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group comment
+ */
+class Tests_Term_WpComment extends WP_UnitTestCase {
+ protected static $comment_id;
+
+ public static function wpSetUpBeforeClass( $factory ) {
+ global $wpdb;
+
+ // Ensure that there is a comment with ID 1.
+ $comment_1 = WP_Comment::get_instance( 1 );
+ if ( ! $comment_1 ) {
+ $wpdb->insert( $wpdb->comments, array(
+ 'comment_ID' => 1,
+ ) );
+
+ clean_comment_cache( 1 );
+ }
+
+ self::$comment_id = self::factory()->comment->create();
+ }
+
+ public static function wpTearDownAfterClass() {
+ wp_delete_comment( 1, true );
+ wp_delete_comment( self::$comment_id, true );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_work_for_numeric_string() {
+ $found = WP_Comment::get_instance( (string) self::$comment_id );
+
+ $this->assertEquals( self::$comment_id, $found->comment_ID );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_negative_number() {
+ $found = WP_Comment::get_instance( -self::$comment_id );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_non_numeric_string() {
+ $found = WP_Comment::get_instance( 'abc' );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_bool() {
+ $found = WP_Comment::get_instance( true );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_succeed_for_float_that_is_equal_to_post_id() {
+ $found = WP_Comment::get_instance( 1.0 );
+
+ $this->assertEquals( 1, $found->comment_ID );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_float() {
+ $found = WP_Comment::get_instance( 1.6 );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_array() {
+ $found = WP_Comment::get_instance( array( 1 ) );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_class() {
+ $class = new stdClass();
+ $found = WP_Comment::get_instance( $class );
+
+ $this->assertFalse( $found );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestspostwpPostphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/post/wpPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/wpPost.php (rev 0)
+++ trunk/tests/phpunit/tests/post/wpPost.php 2016-08-26 19:08:23 UTC (rev 38381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,100 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group post
+ */
+class Tests_Post_WpPost extends WP_UnitTestCase {
+ protected static $post_id;
+
+ public static function wpSetUpBeforeClass( $factory ) {
+ global $wpdb;
+
+ // Ensure that there is a post with ID 1.
+ if ( ! get_post( 1 ) ) {
+ $wpdb->insert( $wpdb->posts, array(
+ 'ID' => 1,
+ 'post_title' => 'Post 1',
+ ) );
+ }
+
+ self::$post_id = self::factory()->post->create();
+ }
+
+ public static function wpTearDownAfterClass() {
+ wp_delete_post( 1, true );
+ wp_delete_post( self::$post_id, true );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_work_for_numeric_string() {
+ $found = WP_Post::get_instance( (string) self::$post_id );
+
+ $this->assertSame( self::$post_id, $found->ID );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_negative_number() {
+ $found = WP_Post::get_instance( -self::$post_id );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_non_numeric_string() {
+ $found = WP_Post::get_instance( 'abc' );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_bool() {
+ $found = WP_Post::get_instance( true );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_succeed_for_float_that_is_equal_to_post_id() {
+ $found = WP_Post::get_instance( 1.0 );
+
+ $this->assertSame( 1, $found->ID );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_float() {
+ $found = WP_Post::get_instance( 1.6 );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_array() {
+ $found = WP_Post::get_instance( array( 1 ) );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_class() {
+ $class = new stdClass();
+ $found = WP_Post::get_instance( $class );
+
+ $this->assertFalse( $found );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunitteststermwpTermphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/term/wpTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpTerm.php (rev 0)
+++ trunk/tests/phpunit/tests/term/wpTerm.php 2016-08-26 19:08:23 UTC (rev 38381)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,113 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group taxonomy
+ */
+class Tests_Term_WpTerm extends WP_UnitTestCase {
+ protected static $term_id;
+
+ public function setUp() {
+ parent::setUp();
+ register_taxonomy( 'wptests_tax', 'post' );
+ }
+
+ public static function wpSetUpBeforeClass( $factory ) {
+ global $wpdb;
+
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ // Ensure that there is a term with ID 1.
+ if ( ! get_term( 1 ) ) {
+ $wpdb->insert( $wpdb->terms, array(
+ 'term_id' => 1,
+ ) );
+
+ $wpdb->insert( $wpdb->term_taxonomy, array(
+ 'term_id' => 1,
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ clean_term_cache( 1, 'wptests_tax' );
+ }
+
+ self::$term_id = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+ }
+
+ public static function wpTearDownAfterClass() {
+ wp_delete_term( 1, 'wptests_tax' );
+ wp_delete_term( self::$term_id, 'wptests_tax' );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_work_for_numeric_string() {
+ $found = WP_Term::get_instance( (string) self::$term_id );
+
+ $this->assertSame( self::$term_id, $found->term_id );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_negative_number() {
+ $found = WP_Term::get_instance( -self::$term_id );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_non_numeric_string() {
+ $found = WP_Term::get_instance( 'abc' );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_bool() {
+ $found = WP_Term::get_instance( true );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_succeed_for_float_that_is_equal_to_post_id() {
+ $found = WP_Term::get_instance( 1.0 );
+
+ $this->assertSame( 1, $found->term_id );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_float() {
+ $found = WP_Term::get_instance( 1.6 );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_array() {
+ $found = WP_Term::get_instance( array( 1 ) );
+
+ $this->assertFalse( $found );
+ }
+
+ /**
+ * @ticket 37738
+ */
+ public function test_get_instance_should_fail_for_class() {
+ $class = new stdClass();
+ $found = WP_Term::get_instance( $class );
+
+ $this->assertFalse( $found );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>