diff --git src/wp-includes/comment.php src/wp-includes/comment.php index 4c78eb9..9b09a1c 100644 --- src/wp-includes/comment.php +++ src/wp-includes/comment.php @@ -3440,6 +3440,7 @@ function wp_comments_personal_data_eraser( $email_address, $page = 1 ) { ) ); + /* translators: Name of a comment's author after being anonymized. */ $anon_author = __( 'Anonymous' ); $messages = array(); @@ -3486,6 +3487,7 @@ function wp_comments_personal_data_eraser( $email_address, $page = 1 ) { $updated = $wpdb->update( $wpdb->comments, $anonymized_comment, $args ); if ( $updated ) { + update_comment_meta( $comment_id, '_wp_anonymized', true ); $items_removed = true; clean_comment_cache( $comment_id ); } else { diff --git src/wp-includes/functions.php src/wp-includes/functions.php index 60229ee..d5682ed 100644 --- src/wp-includes/functions.php +++ src/wp-includes/functions.php @@ -6212,12 +6212,6 @@ function wp_privacy_anonymize_ip( $ip_addr, $ipv6_fallback = false ) { function wp_privacy_anonymize_data( $type, $data = '' ) { switch ( $type ) { - case 'email': - $anonymous = 'deleted@site.invalid'; - break; - case 'url': - $anonymous = 'https://site.invalid'; - break; case 'ip': $anonymous = wp_privacy_anonymize_ip( $data ); break; diff --git tests/phpunit/tests/comment.php tests/phpunit/tests/comment.php index 7f63c62..3eecf7e 100644 --- tests/phpunit/tests/comment.php +++ tests/phpunit/tests/comment.php @@ -815,6 +815,7 @@ class Tests_Comment extends WP_UnitTestCase { /** * The `wp_comments_personal_data_eraser()` function should erase user's comments. * + * @group privacy * @ticket 43442 */ public function test_wp_comments_personal_data_eraser() { @@ -856,8 +857,8 @@ class Tests_Comment extends WP_UnitTestCase { 'comment_ID' => (string) $comment_id, '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', 'comment_date_gmt' => '2018-04-14 17:20:00', @@ -866,11 +867,14 @@ class Tests_Comment extends WP_UnitTestCase { ); $this->assertSame( $expected, $actual ); + // Ensure the comment was marked as anonymized in meta. + $this->assertSame( '1', get_comment_meta( $comment_id, '_wp_anonymized', true ) ); } /** * Testing the `wp_comments_personal_data_eraser()` function's output on an empty first page. * + * @group privacy * @ticket 43442 */ public function test_wp_comments_personal_data_eraser_empty_first_page_output() { @@ -889,6 +893,7 @@ class Tests_Comment extends WP_UnitTestCase { /** * Testing the `wp_comments_personal_data_eraser()` function's output, for the non-empty first page. * + * @group privacy * @ticket 43442 */ public function test_wp_comments_personal_data_eraser_non_empty_first_page_output() { @@ -920,6 +925,7 @@ class Tests_Comment extends WP_UnitTestCase { /** * Testing the `wp_comments_personal_data_eraser()` function's output, for an empty second page. * + * @group privacy * @ticket 43442 */ public function test_wp_comments_personal_data_eraser_empty_second_page_output() { @@ -951,6 +957,7 @@ class Tests_Comment extends WP_UnitTestCase { /** * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization. * + * @group privacy * @ticket 43442 */ public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization() { @@ -987,6 +994,7 @@ class Tests_Comment extends WP_UnitTestCase { /** * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization, with a custom message. * + * @group privacy * @ticket 43442 */ public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization_with_custom_message() { diff --git tests/phpunit/tests/functions/anonymization.php tests/phpunit/tests/functions/anonymization.php index a5c9c8a..65052c0 100644 --- tests/phpunit/tests/functions/anonymization.php +++ tests/phpunit/tests/functions/anonymization.php @@ -2,9 +2,9 @@ /** * Test anonymization functions. * - * @package WordPress + * @package WordPress\UnitTests * - * @since 5.0.0 + * @since 4.9.6 */ /** @@ -13,7 +13,7 @@ * @group functions.php * @group privacy * - * @since 5.0.0 + * @since 4.9.6 */ class Tests_Functions_Anonymization extends WP_UnitTestCase { /** @@ -42,7 +42,7 @@ class Tests_Functions_Anonymization extends WP_UnitTestCase { /** * 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 { * @type array { @@ -212,14 +212,14 @@ class Tests_Functions_Anonymization extends WP_UnitTestCase { * Test email anonymization of `wp_privacy_anonymize_data()`. */ 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' ) ); } /** * Test url anonymization of `wp_privacy_anonymize_data()`. */ 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' ) ); } /** @@ -244,4 +244,37 @@ class Tests_Functions_Anonymization extends WP_UnitTestCase { $text = __( 'Four score and seven years ago' ); $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_email = wp_privacy_anonymize_data( 'email', 'bar@example.com' ); + $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( '', $actual_email ); + $this->assertSame( 'http://local.host/why-this-was-removed', $actual_url ); + } + + /** + * Change the anonymized value for URLs. + * + * @since 4.9.7 + * + * @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; + } + }