Changeset 43468 for branches/4.9

Timestamp:

07/17/2018 09:03:33 AM (6 years ago)

Author:

azaozz

Message:

Privacy: Don't replace comment author URL and email with anything.

Props TZ-Media, desrosj, birgire.
Merges [43467] to the 4.9 branch.
Fixes #44141.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/comment.php (modified) (2 diffs)
• tests/phpunit/tests/comment.php (modified) (7 diffs)
• tests/phpunit/tests/functions/anonymization.php (modified) (6 diffs)

branches/4.9/src/wp-includes/comment.php

@@ -3325 +3325 @@
     );
 
+    /* translators: Name of a comment's author after being anonymized. */
     $anon_author = __( 'Anonymous' );
     $messages    = array();
@@ -3332 +3333 @@
         $anonymized_comment['comment_agent']        = '';
         $anonymized_comment['comment_author']       = $anon_author;
-        $anonymized_comment['comment_author_email'] = wp_privacy_anonymize_data( 'email', $comment->comment_author_email );
+        $anonymized_comment['comment_author_email'] = '';
         $anonymized_comment['comment_author_IP']    = wp_privacy_anonymize_data( 'ip', $comment->comment_author_IP );
-        $anonymized_comment['comment_author_url']   = wp_privacy_anonymize_data( 'url', $comment->comment_author_url );
+        $anonymized_comment['comment_author_url']   = '';
         $anonymized_comment['user_id']              = 0;
 

branches/4.9/tests/phpunit/tests/comment.php

@@ -704 +704 @@
      * The `wp_comments_personal_data_eraser()` function should erase user's comments.
      *
+     * @group privacy
      * @ticket 43442
      */
@@ -745 +746 @@
             'user_id'              => '0', // Anonymized.
             'comment_author'       => 'Anonymous', // Anonymized.
-            'comment_author_email' => 'deleted@site.invalid', // Anonymized.
-            'comment_author_url'   => 'https://site.invalid', // Anonymized.
+            'comment_author_email' => '', // Anonymized.
+            'comment_author_url'   => '', // Anonymized.
             'comment_author_IP'    => '192.168.0.0', // Anonymized.
             'comment_date'         => '2018-04-14 17:20:00',
@@ -760 +761 @@
      * Testing the `wp_comments_personal_data_eraser()` function's output on an empty first page.
      *
+     * @group privacy
      * @ticket 43442
      */
@@ -778 +780 @@
      * Testing the `wp_comments_personal_data_eraser()` function's output, for the non-empty first page.
      *
+     * @group privacy
      * @ticket 43442
      */
@@ -809 +812 @@
      * Testing the `wp_comments_personal_data_eraser()` function's output, for an empty second page.
      *
+     * @group privacy
      * @ticket 43442
      */
@@ -840 +844 @@
      * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization.
      *
+     * @group privacy
      * @ticket 43442
      */
@@ -876 +881 @@
      * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization, with a custom message.
      *
+     * @group privacy
      * @ticket 43442
      */

branches/4.9/tests/phpunit/tests/functions/anonymization.php

@@ -3 +3 @@
  * Test anonymization functions.
  *
- * @package WordPress
- *
- * @since 5.0.0
+ * @package WordPress\UnitTests
+ *
+ * @since 4.9.6
  */
 
@@ -14 +14 @@
  * @group privacy
  *
- * @since 5.0.0
+ * @since 4.9.6
  */
 class Tests_Functions_Anonymization extends WP_UnitTestCase {
@@ -43 +43 @@
      * Provide test cases for `test_wp_privacy_anonymize_ip()`.
      *
-     * @since 5.0.0 Moved from `Test_WP_Community_Events::data_get_unsafe_client_ip_anonymization()`.
+     * @since 4.9.6 Moved from `Test_WP_Community_Events::data_get_unsafe_client_ip_anonymization()`.
      *
      * @return array {
@@ -213 +213 @@
      */
     public function test_anonymize_email() {
-        $this->assertEquals( 'deleted@site.invalid', wp_privacy_anonymize_data( 'email', 'bar@example.com' ) );
+        $this->assertSame( '', wp_privacy_anonymize_data( 'email', 'bar@example.com' ) );
     }
 
@@ -220 +220 @@
      */
     public function test_anonymize_url() {
-        $this->assertEquals( 'https://site.invalid', wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' ) );
+        $this->assertSame( '', wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' ) );
     }
 
@@ -245 +245 @@
         $this->assertEquals( 'This content was deleted by the author.', wp_privacy_anonymize_data( 'longtext', $text ) );
     }
+
+    /**
+     * Test text anonymization when a filter is added.
+     *
+     * @ticket 44141
+     */
+    public function test_anonymize_with_filter() {
+        add_filter( 'wp_privacy_anonymize_data', array( $this, 'filter_wp_privacy_anonymize_data' ), 10, 3 );
+        $actual_url   = wp_privacy_anonymize_data( 'url', 'https://example.com/author/username' );
+        remove_filter( 'wp_privacy_anonymize_data', array( $this, 'filter_wp_privacy_anonymize_data' ), 10 );
+
+        $this->assertSame( 'http://local.host/why-this-was-removed', $actual_url );
+    }
+
+    /**
+     * Change the anonymized value for URLs.
+     *
+     * @since 4.9.8
+     *
+     * @param string  $anonymous Anonymized data.
+     * @param string  $type      Type of the data.
+     * @param string  $data      Original data.
+     * @return string $anonymous Anonymized data.
+     */
+    public function filter_wp_privacy_anonymize_data( $anonymous, $type, $data ) {
+        if ( 'url' === $type && 'example.com' === parse_url( $data, PHP_URL_HOST ) ) {
+            return 'http://local.host/why-this-was-removed';
+        }
+        return $anonymous;
+    }
+
 }