<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54888] trunk: Comments: Make moderated or disallowed key check case-insensitive for non-Latin words.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54888">54888</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54888","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-28 19:42:56 +0000 (Mon, 28 Nov 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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: [https://www.php.net/manual/en/reference.pcre.pattern.modifiers.php PHP Manual: Pattern Modifiers].
Follow-up to <a href="https://core.trac.wordpress.org/changeset/984">[984]</a>, <a href="https://core.trac.wordpress.org/changeset/2075">[2075]</a>, <a href="https://core.trac.wordpress.org/changeset/48121">[48121]</a>, <a href="https://core.trac.wordpress.org/changeset/48575">[48575]</a>.
Props bonjour52, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/57207">#57207</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunktestsphpunittestscommentcheckCommentphp">trunk/tests/phpunit/tests/comment/checkComment.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpCheckCommentDisallowedListphp">trunk/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2022-11-28 15:11:03 UTC (rev 54887)
+++ trunk/src/wp-includes/comment.php 2022-11-28 19:42:56 UTC (rev 54888)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Check the comment fields for moderation keywords. If any are found,
</span><span class="cx" style="display: block; padding: 0 10px"> * fail the check for the given field by returning false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern = "#$word#i";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern = "#$word#iu";
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( $pattern, $author ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,7 +1357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // in the spam words don't break things:
</span><span class="cx" style="display: block; padding: 0 10px"> $word = preg_quote( $word, '#' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern = "#$word#i";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern = "#$word#iu";
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( $pattern, $author )
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match( $pattern, $email )
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match( $pattern, $url )
</span></span></pre></div>
<a id="trunktestsphpunittestscommentcheckCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/checkComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/checkComment.php 2022-11-28 15:11:03 UTC (rev 54887)
+++ trunk/tests/phpunit/tests/comment/checkComment.php 2022-11-28 19:42:56 UTC (rev 54888)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $results );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_false_when_content_matches_moderation_key() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_false_when_content_matches_moderation_keys() {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comment_previously_approved', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'WendytheBuilder';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +86,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $results );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_when_content_does_not_match_moderation_keys() {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comment_previously_approved', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpCheckCommentDisallowedListphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php 2022-11-28 15:11:03 UTC (rev 54887)
+++ trunk/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php 2022-11-28 19:42:56 UTC (rev 54888)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,6 +40,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @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 );
+
+ $this->assertTrue( $result );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_true_when_author_matches_disallowed_keys() {
</span><span class="cx" style="display: block; padding: 0 10px"> $author = 'Sideshow Mel';
</span><span class="cx" style="display: block; padding: 0 10px"> $author_email = 'mel@example.com';
</span></span></pre>
</div>
</div>
</body>
</html>