(bug 33911) SiteStats::isSane() should not check admins anymore

[lhc/web/wiklou.git] / includes / ProxyTools.php

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 68b27c9..bdab3be 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -7,39 +7,15 @@
 
 /**
  * Extracts the XFF string from the request header
- * Checks first for "X-Forwarded-For", then "Client-ip", then "X-Real-IP"
  * Note: headers are spoofable
+ *
+ * @deprecated in 1.19; use $wgRequest->getHeader( 'X-Forwarded-For' ) instead.
  * @return string
  */
 function wfGetForwardedFor() {
-       $apacheHeaders = function_exists( 'apache_request_headers' ) ? apache_request_headers() : null;
-       if( is_array( $apacheHeaders ) ) {
-               // More reliable than $_SERVER due to case and -/_ folding
-               $set = array();
-               foreach ( $apacheHeaders as $tempName => $tempValue ) {
-                       $set[ strtoupper( $tempName ) ] = $tempValue;
-               }
-               $index = strtoupper ( 'X-Forwarded-For' );
-               $index2 = strtoupper ( 'Client-ip' );
-               $index3 = strtoupper ( 'X-Real-IP' );
-       } else {
-               // Subject to spoofing with headers like X_Forwarded_For
-               $set = $_SERVER;
-               $index = 'HTTP_X_FORWARDED_FOR';
-               $index2 = 'CLIENT-IP';
-               $index3 = 'HTTP_X_REAL_IP';
-       }
-
-       #Try a couple of headers
-       if( isset( $set[$index] ) ) {
-               return $set[$index];
-       } elseif( isset( $set[$index2] ) ) {
-               return $set[$index2];
-       } elseif( isset( $set[$index3] ) ) {
-               return $set[$index3];
-       } else {
-               return null;
-       }
+       wfDeprecated( __METHOD__, '1.19' );
+       global $wgRequest;
+       return $wgRequest->getHeader( 'X-Forwarded-For' );
 }
 
 /**
@@ -50,88 +26,29 @@ function wfGetForwardedFor() {
  * @return string
  */
 function wfGetAgent() {
-       wfDeprecated( __FUNCTION__ );
-       if( function_exists( 'apache_request_headers' ) ) {
-               // More reliable than $_SERVER due to case and -/_ folding
-               $set = array();
-               foreach ( apache_request_headers() as $tempName => $tempValue ) {
-                       $set[ strtoupper( $tempName ) ] = $tempValue;
-               }
-               $index = strtoupper ( 'User-Agent' );
-       } else {
-               // Subject to spoofing with headers like X_Forwarded_For
-               $set = $_SERVER;
-               $index = 'HTTP_USER_AGENT';
-       }
-       if( isset( $set[$index] ) ) {
-               return $set[$index];
-       } else {
-               return '';
-       }
+       wfDeprecated( __METHOD__, '1.18' );
+       global $wgRequest;
+       return $wgRequest->getHeader( 'User-Agent' );
 }
 
 /**
  * Work out the IP address based on various globals
  * For trusted proxies, use the XFF client IP (first of the chain)
+ *
+ * @deprecated in 1.19; call $wgRequest->getIP() directly.
  * @return string
  */
 function wfGetIP() {
-       global $wgUsePrivateIPs, $wgCommandLineMode;
-       static $ip = false;
-
-       # Return cached result
-       if ( !empty( $ip ) ) {
-               return $ip;
-       }
-
-       /* collect the originating ips */
-       # Client connecting to this webserver
-       if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-               $ip = IP::canonicalize( $_SERVER['REMOTE_ADDR'] );
-       } elseif( $wgCommandLineMode ) {
-               $ip = '127.0.0.1';
-       }
-
-       # Append XFF
-       $forwardedFor = wfGetForwardedFor();
-       if ( $forwardedFor !== null ) {
-               $ipchain = array_map( 'trim', explode( ',', $forwardedFor ) );
-               $ipchain = array_reverse( $ipchain );
-               if ( $ip ) {
-                       array_unshift( $ipchain, $ip );
-               }
-
-               # Step through XFF list and find the last address in the list which is a trusted server
-               # Set $ip to the IP address given by that trusted server, unless the address is not sensible (e.g. private)
-               foreach ( $ipchain as $i => $curIP ) {
-                       $curIP = IP::canonicalize( $curIP );
-                       if ( wfIsTrustedProxy( $curIP ) ) {
-                               if ( isset( $ipchain[$i + 1] ) ) {
-                                       if( $wgUsePrivateIPs || IP::isPublic( $ipchain[$i + 1 ] ) ) {
-                                               $ip = $ipchain[$i + 1];
-                                       }
-                               }
-                       } else {
-                               break;
-                       }
-               }
-       }
-
-       # Allow extensions to improve our guess
-       wfRunHooks( 'GetIP', array( &$ip ) );
-
-       if( !$ip ) {
-               throw new MWException( "Unable to determine IP" );
-       }
-
-       wfDebug( "IP: $ip\n" );
-       return $ip;
+       wfDeprecated( __METHOD__, '1.19' );
+       global $wgRequest;
+       return $wgRequest->getIP();
 }
 
 /**
- * Checks if an IP is a trusted proxy providor
- * Useful to tell if X-Fowarded-For data is possibly bogus
- * Squid cache servers for the site and AOL are whitelisted
+ * Checks if an IP is a trusted proxy providor.
+ * Useful to tell if X-Fowarded-For data is possibly bogus.
+ * Squid cache servers for the site are whitelisted.
+ *
  * @param $ip String
  * @return bool
  */
@@ -150,14 +67,14 @@ function wfIsTrustedProxy( $ip ) {
  */
 function wfProxyCheck() {
        global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
-       global $wgMemc, $wgProxyMemcExpiry;
+       global $wgMemc, $wgProxyMemcExpiry, $wgRequest;
        global $wgProxyKey;
 
        if ( !$wgBlockOpenProxies ) {
                return;
        }
 
-       $ip = wfGetIP();
+       $ip = $wgRequest->getIP();
 
        # Get MemCached key
        $mcKey = wfMemcKey( 'proxy', 'ip', $ip );
@@ -168,7 +85,7 @@ function wfProxyCheck() {
        if ( !$skip ) {
                $title = SpecialPage::getTitleFor( 'Blockme' );
                $iphash = md5( $ip . $wgProxyKey );
-               $url = $title->getFullURL( 'ip='.$iphash );
+               $url = wfExpandUrl( $title->getFullURL( 'ip='.$iphash ), PROTO_HTTP );
 
                foreach ( $wgProxyPorts as $port ) {
                        $params = implode( ' ', array(