From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 10 Apr 2007 16:07:42 +0000 (+0000)
Subject: Some xff function cleanup; add a function to get the leftmost ip
X-Git-Tag: 1.31.0-rc.0~53431
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=ab27a284a100d8ec4f68e7e9992811d9fc53d247;p=lhc%2Fweb%2Fwiklou.git

Some xff function cleanup; add a function to get the leftmost ip
---

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index fcd6a90186..646f6b5dda 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -27,18 +27,18 @@ function wfGetForwardedFor() {
 
 function wfGetLastIPfromXFF( $xff ) {
 	if ( $xff ) {
-	// Avoid annoyingly long xff hacks
-		$xff = substr( $xff, 0, 255 );
+		// Avoid annoyingly long xff hacks
+		$xff = substr( $xff, 0, 511 );
 		// Look for the last IP, assuming they are separated by commas or spaces
-		$n = ( strrpos($xff, ',') ) ? strrpos($xff, ',') : strrpos($xff, ' ');
-		if ( strrpos !== false ) {
-			$last = trim( substr( $xff, $n + 1 ) );
+		$s = ( strrpos($xff, ',') ) ? strrpos($xff, ',') : strrpos($xff, ' ');
+		if ( $s !== false ) {
+			$last = trim( substr( $xff, $s + 1 ) );
 			// Make sure it is an IP
 			$m = preg_match('#\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}#', $last, $last_ip4);
 			$n = preg_match('#:(:[0-9A-Fa-f]{1,4}){1,7}|[0-9A-Fa-f]{1,4}(:{1,2}[0-9A-Fa-f]{1,4}|::$){1,7}#', $last, $last_ip6);
-			if ( $m > 0 )
+			if ( $m )
 				$xff_ip = $last_ip4;
-			else if ( $n > 0 ) 
+			else if ( $n ) 
 				$xff_ip = $last_ip6;
 			else 
 				$xff_ip = null;
@@ -51,6 +51,25 @@ function wfGetLastIPfromXFF( $xff ) {
 	return $xff_ip;
 }
 
+function wfGetClientIPfromXFF( $xff ) {
+	if ( $xff ) {
+		// Avoid annoyingly long xff hacks
+		$xff = substr( $xff, 0, 511 );
+		// Look for the first IP
+		$m = preg_match('#\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}#', $xff, $first_ip);
+		$n = preg_match('#:(:[0-9A-Fa-f]{1,4}){1,7}|[0-9A-Fa-f]{1,4}(:{1,2}[0-9A-Fa-f]{1,4}|::$){1,7}#', $xff, $first_ip);
+		if ( $m )
+			$xff_ip = $first_ip4;
+		else if ( $n ) 
+			$xff_ip = $first_ip6;
+		else 
+			$xff_ip = null;
+	} else {
+		$xff_ip = null;
+	}
+	return $xff_ip;
+}
+
 function wfGetAgent() {
 	if( function_exists( 'apache_request_headers' ) ) {
 		// More reliable than $_SERVER due to case and -/_ folding