Changeset 54888

Timestamp:

11/28/2022 07:42:56 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Comments: Make moderated or disallowed key check case-insensitive for non-Latin words.

The check_comment() and wp_check_comment_disallowed_list() functions are expected to be case-insensitive, but that only worked for words using Latin script and consisting of ASCII characters.

This commit adds the Unicode flag to the regular expression used for the check in these functions, so that both pattern and subject can be treated as UTF-8 strings.

Reference: ​PHP Manual: Pattern Modifiers.

Follow-up to [984], [2075], [48121], [48575].

Props bonjour52, SergeyBiryukov.
Fixes #57207.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (2 diffs)
• tests/phpunit/tests/comment/checkComment.php (modified) (2 diffs)
• tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -98 +98 @@
              * fail the check for the given field by returning false.
              */
-            $pattern = "#$word#i";
+            $pattern = "#$word#iu";
             if ( preg_match( $pattern, $author ) ) {
                 return false;
@@ -1358 +1358 @@
         $word = preg_quote( $word, '#' );
 
-        $pattern = "#$word#i";
+        $pattern = "#$word#iu";
         if ( preg_match( $pattern, $author )
             || preg_match( $pattern, $email )

trunk/tests/phpunit/tests/comment/checkComment.php

@@ -71 +71 @@
     }
 
-    public function test_should_return_false_when_content_matches_moderation_key() {
+    public function test_should_return_false_when_content_matches_moderation_keys() {
         update_option( 'comment_previously_approved', 0 );
 
@@ -83 +83 @@
 
         update_option( 'moderation_keys', "foo\nbar\nscoop" );
+        $results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
+        $this->assertFalse( $results );
+    }
+
+    /**
+     * @ticket 57207
+     */
+    public function test_should_return_false_when_content_with_non_latin_words_matches_moderation_keys() {
+        update_option( 'comment_previously_approved', 0 );
+
+        $author       = 'Setup';
+        $author_email = 'setup@example.com';
+        $author_url   = 'http://example.com';
+        $comment      = 'Установка';
+        $author_ip    = '192.168.0.1';
+        $user_agent   = '';
+        $comment_type = '';
+
+        update_option( 'moderation_keys', "установка\nfoo" );
         $results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
         $this->assertFalse( $results );

trunk/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php

@@ -35 +35 @@
 
         update_option( 'disallowed_keys', "halfway\nfoo" );
+
+        $result = wp_check_comment_disallowed_list( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+        $this->assertTrue( $result );
+    }
+
+    /**
+     * @ticket 57207
+     */
+    public function test_should_return_true_when_content_with_non_latin_words_matches_disallowed_keys() {
+        $author       = 'Setup';
+        $author_email = 'setup@example.com';
+        $author_url   = 'http://example.com';
+        $comment      = 'Установка';
+        $author_ip    = '192.168.0.1';
+        $user_agent   = '';
+
+        update_option( 'disallowed_keys', "установка\nfoo" );
 
         $result = wp_check_comment_disallowed_list( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );