Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove port from IP address if it's there #6755

Merged
merged 1 commit into from
Mar 27, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions modules/protect/shared-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,15 @@ function jetpack_protect_get_ip() {
} else {
$ip = $_SERVER['REMOTE_ADDR'];
}

if ( ! $ip ) {
return false;
}


// Trim off ports
$ips = explode( ':', $ip );
$ip = $ips[0];

$ips = explode( ',', $ip );
if ( ! isset( $segments ) || ! $segments ) {
$segments = 1;
Expand All @@ -198,11 +202,11 @@ function jetpack_protect_get_ip() {
* @return $ip IP.
*/
function jetpack_clean_ip( $ip ) {

// Some misconfigured servers give back extra info, which comes after "unless"
$ips = explode( ' unless ', $ip );
$ip = $ips[0];

$ip = trim( $ip );
// Check for IPv4 IP cast as IPv6.
if ( preg_match( '/^::ffff:(\d+\.\d+\.\d+\.\d+)$/', $ip, $matches ) ) {
Expand Down