Changeset 34113

Timestamp:

09/14/2015 04:43:48 AM (9 years ago)

Author:

wonderboymusic

Message:

Add sanity checks in map_meta_cap(), return 'do_not_allow' when posts don't exist.

Adds unit test.

Props ocean90, nerrad, filosofo.
Fixes #23162.

Location:

trunk

Files:

• src/wp-includes/capabilities-functions.php (modified) (7 diffs)
• tests/phpunit/tests/user/mapMetaCap.php (modified) (1 diff)

trunk/src/wp-includes/capabilities-functions.php

@@ -48 +48 @@
     case 'delete_page':
         $post = get_post( $args[0] );
+        if ( ! $post ) {
+            $caps[] = 'do_not_allow';
+            break;
+        }
 
         if ( 'revision' == $post->post_type ) {
             $post = get_post( $post->post_parent );
+            if ( ! $post ) {
+                $caps[] = 'do_not_allow';
+                break;
+            }
         }
 
@@ -98 +106 @@
     case 'edit_page':
         $post = get_post( $args[0] );
-        if ( empty( $post ) ) {
+        if ( ! $post ) {
             $caps[] = 'do_not_allow';
             break;
@@ -105 +113 @@
         if ( 'revision' == $post->post_type ) {
             $post = get_post( $post->post_parent );
+            if ( ! $post ) {
+                $caps[] = 'do_not_allow';
+                break;
+            }
         }
 
@@ -150 +162 @@
     case 'read_page':
         $post = get_post( $args[0] );
+        if ( ! $post ) {
+            $caps[] = 'do_not_allow';
+            break;
+        }
 
         if ( 'revision' == $post->post_type ) {
             $post = get_post( $post->post_parent );
+            if ( ! $post ) {
+                $caps[] = 'do_not_allow';
+                break;
+            }
         }
 
@@ -187 +207 @@
     case 'publish_post':
         $post = get_post( $args[0] );
+        if ( ! $post ) {
+            $caps[] = 'do_not_allow';
+            break;
+        }
+
         $post_type = get_post_type_object( $post->post_type );
         if ( ! $post_type ) {
@@ -201 +226 @@
     case 'add_post_meta':
         $post = get_post( $args[0] );
+        if ( ! $post ) {
+            $caps[] = 'do_not_allow';
+            break;
+        }
+
         $caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
 
@@ -230 +260 @@
     case 'edit_comment':
         $comment = get_comment( $args[0] );
-        if ( empty( $comment ) )
-            break;
+        if ( ! $comment ) {
+            $caps[] = 'do_not_allow';
+            break;
+        }
+
         $post = get_post( $comment->comment_post_ID );
 

trunk/tests/phpunit/tests/user/mapMetaCap.php

@@ -36 +36 @@
         unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
         parent::tearDown();
+    }
+
+    /**
+     * @ticket 13905
+     */
+    function test_capability_type_post_with_invalid_id() {
+        $this->assertEquals(
+            array( 'do_not_allow' ),
+            map_meta_cap( 'edit_post', $this->user_id, $this->post_id + 1 )
+        );
     }