Changeset 39302 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

Timestamp:

11/18/2016 09:12:03 PM (9 years ago)

Author:

rachelbaker

Message:

REST API: On Comment create, limit the ability to set the author_ip value directly.

Users without the moderate_comments capability can no longer set the author_ip property directly, and instead receive a WP_Error if they attempt to do so. Otherwise, the author_ip property is populated from $_SERVER['REMOTE_ADDR'] if present and a valid IP value. Finally, fallback to 127.0.0.1 as a last resort.

Props dd32, rachelbaker, joehoyle.
Fixes #38819.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (modified) (3 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -372 +372 @@
         }
 
-        // Limit who can set comment `author` or `status` to anything other than the default.
+        // Limit who can set comment `author`, `author_ip` or `status` to anything other than the default.
         if ( isset( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( 'moderate_comments' ) ) {
             /* translators: %s: request parameter */
             return new WP_Error( 'rest_comment_invalid_author', sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author' ), array( 'status' => rest_authorization_required_code() ) );
+        }
+
+        if ( isset( $request['author_ip'] ) && ! current_user_can( 'moderate_comments' ) ) {
+            if ( empty( $_SERVER['REMOTE_ADDR'] ) || $request['author_ip'] !== $_SERVER['REMOTE_ADDR'] ) {
+                return new WP_Error( 'rest_comment_invalid_author_ip', __( 'Sorry, you are not allowed to set author_ip for comments.' ), array( 'status' => rest_authorization_required_code() ) );
+            }
         }
 
@@ -1042 +1048 @@
         }
 
-        if ( isset( $request['author_ip'] ) ) {
+        if ( isset( $request['author_ip'] ) && current_user_can( 'moderate_comments' ) ) {
             $prepared_comment['comment_author_IP'] = $request['author_ip'];
+        } elseif ( ! empty( $_SERVER['REMOTE_ADDR'] ) && rest_is_ip_address( $_SERVER['REMOTE_ADDR'] ) ) {
+            $prepared_comment['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
+        } else {
+            $prepared_comment['comment_author_IP'] = '127.0.0.1';
         }
 
@@ -1120 +1130 @@
                     'format'       => 'ip',
                     'context'      => array( 'edit' ),
-                    'default'      => '127.0.0.1',
                 ),
                 'author_name'     => array(