sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 #41083.


git-svn-id: https://develop.svn.wordpress.org/trunk@42968 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ian Dunn 2018-04-10 23:18:04 +00:00
parent 33979450ac
commit ede824e3cd
2 changed files with 66 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wp-admin/includes/class-wp-community-events.php
View File

@ -233,7 +233,7 @@ class WP_Community_Events {
* or false on failure. * or false on failure.
*/ */
public static function get_unsafe_client_ip() { public static function get_unsafe_client_ip() {
$client_ip = $netmask = false; $client_ip = false;
$ip_prefix = ''; $ip_prefix = '';
// In order of preference, with the best ones for this purpose first. // In order of preference, with the best ones for this purpose first.
@ -279,13 +279,27 @@ class WP_Community_Events {
if ( $is_ipv6 ) { if ( $is_ipv6 ) {
// IPv6 addresses will always be enclosed in [] if there's a port. // IPv6 addresses will always be enclosed in [] if there's a port.
$ip_start = 1; $left_bracket = strpos( $client_ip, '[' );
$ip_end = (int) strpos( $client_ip, ']' ) - 1; $right_bracket = strpos( $client_ip, ']' );
$netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000'; $percent = strpos( $client_ip, '%' );
$netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000';
// Strip the port (and [] from IPv6 addresses), if they exist. // Strip the port (and [] from IPv6 addresses), if they exist.
if ( $ip_end > 0 ) { if ( false !== $left_bracket && false !== $right_bracket ) {
$client_ip = substr( $client_ip, $ip_start, $ip_end ); $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;
}
// 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;
} }
// Partially anonymize the IP by reducing it to the corresponding network ID. // Partially anonymize the IP by reducing it to the corresponding network ID.

47
tests/phpunit/tests/admin/includesCommunityEvents.php
View File

@ -502,6 +502,41 @@ class Test_WP_Community_Events extends WP_UnitTestCase {
'unknown', 'unknown',
false, 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(
'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::',
),
// IPv4, no port // IPv4, no port
array( array(
'10.20.30.45', '10.20.30.45',
@ -569,7 +604,7 @@ class Test_WP_Community_Events extends WP_UnitTestCase {
), ),
// IPv6, port, compatibility mode // IPv6, port, compatibility mode
array( array(
'[::ffff:10.15.20.25]:30000', '[::FFFF:10.15.20.25]:30000',
'::ffff:10.15.20.0', '::ffff:10.15.20.0',
), ),
// IPv6, no port, compatibility mode shorthand // IPv6, no port, compatibility mode shorthand
@ -582,6 +617,16 @@ class Test_WP_Community_Events extends WP_UnitTestCase {
'[::127.0.0.1]:30000', '[::127.0.0.1]:30000',
'::ffff:127.0.0.0', '::ffff:127.0.0.0',
), ),
// IPv6 with reachability scope
array(
'fe80::b059:65f4:e877:c40%16',
'fe80::',
),
// IPv6 with reachability scope
array(
'FE80::B059:65F4:E877:C40%eth0',
'fe80::',
),
); );
} }
} }