<!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>[49271] trunk: XML-RPC: Fix length validation of anonymous commenter's email address.</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/49271">49271</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/49271","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-22 02:40:06 +0000 (Thu, 22 Oct 2020)</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'>XML-RPC: Fix length validation of anonymous commenter's email address.
Fix the first step of validating an anonymous commenters in which the length is checked prior to running regular expressions.
Follow up to <a href="https://core.trac.wordpress.org/changeset/47808">[47808]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/51595">#51595</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></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/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-22 02:34:16 UTC (rev 49270)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-22 02:40:06 UTC (rev 49271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3913,7 +3913,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['user_ID'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'require_name_email' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strlen( $comment['comment_author_email'] < 6 ) || '' === $comment['comment_author'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $comment['comment_author_email'] ) < 6 || '' === $comment['comment_author'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'Comment author name and email are required.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $comment['comment_author_email'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'A valid email address is required.' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewCommentphp"></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/xmlrpc/wp/newComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2020-10-22 02:34:16 UTC (rev 49270)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php 2020-10-22 02:40:06 UTC (rev 49271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,4 +96,81 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIXRError( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 403, $result->code );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Ensure anonymous comments can be made via XML-RPC.
+ *
+ * @ticket 51595
+ */
+ function test_allowed_anon_comments() {
+ add_filter( 'xmlrpc_allow_anonymous_comments', '__return_true' );
+
+ $comment_args = array(
+ 1,
+ '',
+ '',
+ self::$post->ID,
+ array(
+ 'author' => 'WordPress',
+ 'author_email' => 'noreply@wordpress.org',
+ 'content' => 'Test Anon Comments',
+ ),
+ );
+
+ $result = $this->myxmlrpcserver->wp_newComment( $comment_args );
+ $this->assertNotIXRError( $result );
+ $this->assertInternalType( 'int', $result );
+ }
+
+ /**
+ * Ensure anonymous XML-RPC comments require a valid email.
+ *
+ * @ticket 51595
+ */
+ function test_anon_comments_require_email() {
+ add_filter( 'xmlrpc_allow_anonymous_comments', '__return_true' );
+
+ $comment_args = array(
+ 1,
+ '',
+ '',
+ self::$post->ID,
+ array(
+ 'author' => 'WordPress',
+ 'author_email' => 'noreply at wordpress.org',
+ 'content' => 'Test Anon Comments',
+ ),
+ );
+
+ $result = $this->myxmlrpcserver->wp_newComment( $comment_args );
+ $this->assertIXRError( $result );
+ $this->assertSame( 403, $result->code );
+ }
+
+ /**
+ * Ensure valid users don't use the anon flow.
+ *
+ * @ticket 51595
+ */
+ function test_username_avoids_anon_flow() {
+ add_filter( 'xmlrpc_allow_anonymous_comments', '__return_true' );
+
+ $comment_args = array(
+ 1,
+ 'administrator',
+ 'administrator',
+ self::$post->ID,
+ array(
+ 'author' => 'WordPress',
+ 'author_email' => 'noreply at wordpress.org',
+ 'content' => 'Test Anon Comments',
+ ),
+ );
+
+ $result = $this->myxmlrpcserver->wp_newComment( $comment_args );
+ $comment = get_comment( $result );
+ $user_id = get_user_by( 'login', 'administrator' )->ID;
+
+ $this->assertSame( $user_id, (int) $comment->user_id );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>