<!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>[38047] trunk: Comments: Strip html tags from comment content before blacklist_keys comparison.</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 { 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/38047">38047</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/38047","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>rachelbaker</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-13 13:47:49 +0000 (Wed, 13 Jul 2016)</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: Strip html tags from comment content before blacklist_keys comparison.
Use `wp_kses()` to clean comment_content for preg_match against the blacklist_keys. Also includes some initial unit tests for `wp_blacklist_check()`.
Previously, if a blacklisted key was used in comment_content split by an html tag the regex in `wp_blacklist_check()` would not find a match. Example: Where "springfield" was a blacklisted word, if the content of a comment included `spring<i>field</i>" `wp_blacklist_check()` would not return true.
Props cfinke.
Fixes <a href="https://core.trac.wordpress.org/ticket/37208">#37208</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscommentwpBlacklistCheckphp">trunk/tests/phpunit/tests/comment/wpBlacklistCheck.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 2016-07-13 12:53:06 UTC (rev 38046)
+++ trunk/src/wp-includes/comment.php 2016-07-13 13:47:49 UTC (rev 38047)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,6 +1055,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mod_keys = trim( get_option('blacklist_keys') );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == $mod_keys )
</span><span class="cx" style="display: block; padding: 0 10px"> return false; // If moderation keys are empty
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Ensure HTML tags are not being used to bypass the blacklist.
+ $comment_without_html = wp_kses( $comment, array() );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $words = explode("\n", $mod_keys );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $words as $word ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1072,7 +1076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || preg_match($pattern, $comment)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || preg_match($pattern, $comment_without_html)
</ins><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $user_ip)
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $user_agent)
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpBlacklistCheckphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php (rev 0)
+++ trunk/tests/phpunit/tests/comment/wpBlacklistCheck.php 2016-07-13 13:47:49 UTC (rev 38047)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,82 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group comment
+ */
+class Tests_WP_Blacklist_Check extends WP_UnitTestCase {
+
+ public function test_should_return_true_when_content_matches_blacklist_keys() {
+ $author = 'Sting';
+ $author_email = 'sting@example.com';
+ $author_url = 'http://example.com';
+ $comment = "There's a hole in my heart. As deep as a well. For that poor little boy. Who's stuck halfway to Hell.";
+ $author_ip = '192.168.0.1';
+ $user_agent = '';
+
+ update_option( 'blacklist_keys',"well\nfoo" );
+
+ $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+ $this->assertTrue( $result );
+ }
+
+ public function test_should_return_true_when_content_with_html_matches_blacklist_keys() {
+ $author = 'Sting';
+ $author_email = 'sting@example.com';
+ $author_url = 'http://example.com';
+ $comment = "There's a hole in my heart. As deep as a well. For that poor little boy. Who's stuck <b>half</b>way to Hell.";
+ $author_ip = '192.168.0.1';
+ $user_agent = '';
+
+ update_option( 'blacklist_keys',"halfway\nfoo" );
+
+ $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+ $this->assertTrue( $result );
+ }
+
+ public function test_should_return_true_when_author_matches_blacklist_keys() {
+ $author = 'Sideshow Mel';
+ $author_email = 'mel@example.com';
+ $author_url = 'http://example.com';
+ $comment = "Though we can't get him out. We'll do the next best thing.";
+ $author_ip = '192.168.0.1';
+ $user_agent = '';
+
+ update_option( 'blacklist_keys',"sideshow\nfoo" );
+
+ $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+ $this->assertTrue( $result );
+ }
+
+ public function test_should_return_true_when_url_matches_blacklist_keys() {
+ $author = 'Rainier Wolfcastle';
+ $author_email = 'rainier@wolfcastle.com';
+ $author_url = 'http://example.com';
+ $comment = 'We go on TV and sing, sing, sing.';
+ $author_ip = '192.168.0.1';
+ $user_agent = '';
+
+ update_option( 'blacklist_keys',"example\nfoo" );
+
+ $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+ $this->assertTrue( $result );
+ }
+
+ public function test_should_return_false_when_no_match() {
+ $author = 'Krusty the Clown';
+ $author_email = 'krusty@example.com';
+ $author_url = 'http://example.com';
+ $comment = "And we're sending our love down the well.";
+ $author_ip = '192.168.0.1';
+ $user_agent = '';
+
+ update_option( 'blacklist_keys',"sideshow\nfoobar" );
+
+ $result = wp_blacklist_check( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+ $this->assertFalse( $result );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>