<!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>[11247] sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-bad-request.php: Bad Requets: Flag 'customize_changeset_uuid' & 'forum' as non-array query vars to reduce PHP Notices & Warnings generated as a result of such requests.</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="http://meta.trac.wordpress.org/changeset/11247">11247</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11247","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-09-22 07:05:13 +0000 (Wed, 22 Sep 2021)</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'>Bad Requets: Flag 'customize_changeset_uuid' & 'forum' as non-array query vars to reduce PHP Notices & Warnings generated as a result of such requests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubwporgbadrequestphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-bad-request.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubwporgbadrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-bad-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-bad-request.php 2021-09-21 01:00:41 UTC (rev 11246)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-bad-request.php 2021-09-22 07:05:13 UTC (rev 11247)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Check a set of internal query variables against the WordPress WP_Query values to detect invalid input.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_for_invalid_query_vars( $vars, $ref = '$public_query_vars' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_vars = (new \WP)->public_query_vars;
+ $query_vars[] = 'customize_changeset_uuid';
+ $query_vars[] = 'forum';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Assumption: WP::$public_query_vars will only ever contain non-array query vars.
</span><span class="cx" style="display: block; padding: 0 10px"> // Assumption invalid. Some fields are valid.
</span><span class="cx" style="display: block; padding: 0 10px"> $array_fields = [ 'post_type' => true, 'cat' => true ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'second' => true,
</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">- foreach ( (new \WP)->public_query_vars as $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $query_vars as $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $vars[ $field ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_scalar( $vars[ $field ] ) && ! isset( $array_fields[ $field ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> die_bad_request( "non-scalar $field in $ref" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,12 +120,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Detect invalid requests from over hungry vulnerability scanners.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'send_headers', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'setup_theme', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['EGOTEC'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> die_bad_request( 'EGOTEC request parameter set' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}, 1 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sorry, this shouldn't be needed.
+ // rate limit bots requesting abnormally-high POST/GET vars
+ // these often include 'pagename' and cause responses to change,
+ // causing the scanner to target even more junk requests to the url.
+ $items = max( count( $_GET ), count( $_POST ) );
+ if (
+ $items >= 8 &&
+ ! is_user_logged_in() &&
+ empty( $_SERVER['HTTP_AUTHORIZATION'] ) &&
+ in_array( $items, [ 8, 16, 32, 64, 128, 255, 256, 512, 1024 ], true ) &&
+ wp_using_ext_object_cache()
+ ) {
+ $key = 'scanner:' . $_SERVER['REMOTE_ADDR'];
+ $group = 'ip-ratelimit-bp';
+
+ if ( function_exists( 'wp_cache_add_global_groups' ) ) {
+ wp_cache_add_global_groups( $group );
+ }
+
+ $hits = wp_cache_get( $key, $group );
+ if ( false === $hits ) {
+ wp_cache_add( $key, 1, $group, HOUR_IN_SECONDS );
+ return;
+ }
+
+ // Only increment it for high counts, but block on low counts if exceeded.
+ if ( $items > 16 || $hits > 20 ) {
+ $hits = wp_cache_incr( $key, 1, $group );
+ }
+
+ // Abnormally high numbers to be on the 'safe' side.
+ if ( $hits >= 20 ) {
+ // Since they hit the threshold and still kept going.. longer.
+ if ( $hits == 50 ) {
+ wp_cache_set( $key, $hit, $group, DAY_IN_SECONDS );
+ }
+
+ die_bad_request( "Bulk POST query scanner: $key" );
+ }
+ }
+}, 0 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Detect invalid requests from vulnerability scanners to Jetpack Share by Email forms.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> die_bad_request( "non-scalar action in admin-ajax." );
</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">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Die with a 400 Bad Request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,8 +219,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPORGPATH' ) && file_exists( WPORGPATH . '/403.php' ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! defined( 'XMLRPC_REQUEST' ) && ! defined( 'REST_REQUEST' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bare header, we don't need Block assets.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bare header & footer, we don't need all the extras.
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_all_actions( 'wp_head' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_all_actions( 'wp_footer' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> status_header( 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> $header_set_for_403 = true;
</span></span></pre>
</div>
</div>
</body>
</html>