<!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>[42968] trunk: Dashboard: Strip more extraneous IP parts to prevent PHP warnings.</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/42968">42968</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/42968","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-10 23:18:04 +0000 (Tue, 10 Apr 2018)</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'>Dashboard: Strip more extraneous IP parts to prevent PHP warnings.
This iterates on earlier versions of the code, in order to handle more edge cases. An arbitrary string like `or=\"` will now be stripped, as well as reachability scopes like `%eth0`.
Props eamax, soulseekah, iandunn.
Fixes <a href="https://core.trac.wordpress.org/ticket/41083">#41083</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommunityeventsphp">trunk/src/wp-admin/includes/class-wp-community-events.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesCommunityEventsphp">trunk/tests/phpunit/tests/admin/includesCommunityEvents.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpcommunityeventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-community-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-community-events.php 2018-04-10 18:01:20 UTC (rev 42967)
+++ trunk/src/wp-admin/includes/class-wp-community-events.php 2018-04-10 23:18:04 UTC (rev 42968)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * or false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_unsafe_client_ip() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $client_ip = $netmask = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $client_ip = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $ip_prefix = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // In order of preference, with the best ones for this purpose first.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,15 +279,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_ipv6 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // IPv6 addresses will always be enclosed in [] if there's a port.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ip_start = 1;
- $ip_end = (int) strpos( $client_ip, ']' ) - 1;
- $netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $left_bracket = strpos( $client_ip, '[' );
+ $right_bracket = strpos( $client_ip, ']' );
+ $percent = strpos( $client_ip, '%' );
+ $netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip the port (and [] from IPv6 addresses), if they exist.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ip_end > 0 ) {
- $client_ip = substr( $client_ip, $ip_start, $ip_end );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $left_bracket && false !== $right_bracket ) {
+ $client_ip = substr( $client_ip, $left_bracket + 1, $right_bracket - $left_bracket - 1 );
+ } elseif ( false !== $left_bracket || false !== $right_bracket ) {
+ // The IP has one bracket, but not both, so it's malformed.
+ return false;
</ins><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">+ // Strip the reachability scope.
+ if ( false !== $percent ) {
+ $client_ip = substr( $client_ip, 0, $percent );
+ }
+
+ // No invalid characters should be left.
+ if ( preg_match( '/[^0-9a-f:]/i', $client_ip ) ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Partially anonymize the IP by reducing it to the corresponding network ID.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'inet_pton' ) && function_exists( 'inet_ntop' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $client_ip = inet_ntop( inet_pton( $client_ip ) & inet_pton( $netmask ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesCommunityEventsphp"></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/admin/includesCommunityEvents.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesCommunityEvents.php 2018-04-10 18:01:20 UTC (rev 42967)
+++ trunk/tests/phpunit/tests/admin/includesCommunityEvents.php 2018-04-10 23:18:04 UTC (rev 42968)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,6 +502,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'unknown',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001',
+ false,
+ ),
+ // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"1000:0000:0000:0000:0000:0000:0000:0001',
+ false,
+ ),
+ // Invalid IP. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ '1000:0000:0000:0000:0000:0000:0000:0001or=\"',
+ false,
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]:400',
+ '1000::',
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]',
+ '1000::',
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ 'or=\"[1000:0000:0000:0000:0000:0000:0000:0001]400',
+ '1000::',
+ ),
+ // Malformed string with valid IP substring. Sometimes proxies add things like this, or other arbitrary strings.
+ array(
+ '[1000:0000:0000:0000:0000:0000:0000:0001]:235\"or=',
+ '1000::',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> // IPv4, no port
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '10.20.30.45',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,7 +604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> // IPv6, port, compatibility mode
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '[::ffff:10.15.20.25]:30000',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '[::FFFF:10.15.20.25]:30000',
</ins><span class="cx" style="display: block; padding: 0 10px"> '::ffff:10.15.20.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> // IPv6, no port, compatibility mode shorthand
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,6 +617,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '[::127.0.0.1]:30000',
</span><span class="cx" style="display: block; padding: 0 10px"> '::ffff:127.0.0.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // IPv6 with reachability scope
+ array(
+ 'fe80::b059:65f4:e877:c40%16',
+ 'fe80::',
+ ),
+ // IPv6 with reachability scope
+ array(
+ 'FE80::B059:65F4:E877:C40%eth0',
+ 'fe80::',
+ ),
</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"> }
</span></span></pre>
</div>
</div>
</body>
</html>