Lazy initialisation of wgProxyList, no flip required

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

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 3ef4a20..dfddd4c 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -10,7 +10,12 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 /** Work out the IP address based on various globals */
 function wfGetIP() {
-       global $wgSquidServers, $wgSquidServersNoPurge;
+       global $wgSquidServers, $wgSquidServersNoPurge, $wgIP;
+
+       # Return cached result
+       if ( !empty( $wgIP ) ) {
+               return $wgIP;
+       }
 
        /* collect the originating ips */
        # Client connecting to this webserver
@@ -45,13 +50,18 @@ function wfGetIP() {
                }
        }
 
+       wfDebug( "IP: $ip\n" );
+       $wgIP = $ip;
        return $ip;
 }
 
-/** */
+/** 
+ * Given an IP address in dotted-quad notation, returns an unsigned integer.
+ * Like ip2long() except that it actually works and has a consistent error return value.
+ */
 function wfIP2Unsigned( $ip ) {
        $n = ip2long( $ip );
-       if ( $n == -1 ) {
+       if ( $n == -1 || $n === false ) { # Return value on error depends on PHP version
                $n = false;
        } elseif ( $n < 0 ) {
                $n += pow( 2, 32 );
@@ -59,6 +69,17 @@ function wfIP2Unsigned( $ip ) {
        return $n;
 }
 
+/**
+ * Return a zero-padded hexadecimal representation of an IP address
+ */
+function wfIP2Hex( $ip ) {
+       $n = wfIP2Unsigned( $ip );
+       if ( $n !== false ) {
+               $n = sprintf( '%08X', $n );
+       }
+       return $n;
+}
+
 /**
  * Determine if an IP address really is an IP address, and if it is public, 
  * i.e. not RFC 1918 or similar
@@ -89,5 +110,103 @@ function wfIsIPPublic( $ip ) {
        }
        return true;
 }
+
+/**
+ * Forks processes to scan the originating IP for an open proxy server
+ * MemCached can be used to skip IPs that have already been scanned
+ */
+function wfProxyCheck() {
+       global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
+       global $wgUseMemCached, $wgMemc, $wgDBname, $wgProxyMemcExpiry;
+
+       if ( !$wgBlockOpenProxies ) {
+               return;
+       }
+
+       $ip = wfGetIP();
+       
+       # Get MemCached key
+       $skip = false;
+       if ( $wgUseMemCached ) {
+               $mcKey = "$wgDBname:proxy:ip:$ip";
+               $mcValue = $wgMemc->get( $mcKey );
+               if ( $mcValue ) {
+                       $skip = true;
+               }
+       }
+
+       # Fork the processes
+       if ( !$skip ) {
+               $title = Title::makeTitle( NS_SPECIAL, 'Blockme' );
+               $iphash = md5( $ip . $wgProxyKey );
+               $url = $title->getFullURL( 'ip='.$iphash );
+
+               foreach ( $wgProxyPorts as $port ) {
+                       $params = implode( ' ', array(
+                                               escapeshellarg( $wgProxyScriptPath ),
+                                               escapeshellarg( $ip ),
+                                               escapeshellarg( $port ),
+                                               escapeshellarg( $url )
+                                               ));
+                       exec( "php $params &>/dev/null &" );
+               }
+               # Set MemCached key
+               if ( $wgUseMemCached ) {
+                       $wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );
+               }
+       }
+}
+
+/**
+ * Convert a network specification in CIDR notation to an integer network and a number of bits
+ */
+function wfParseCIDR( $range ) {
+       $parts = explode( '/', $range, 2 );
+       if ( count( $parts ) != 2 ) {
+               return array( false, false );
+       }
+       $network = wfIP2Unsigned( $parts[0] );
+       if ( $network !== false && is_numeric( $parts[1] ) && $parts[1] >= 0 && $parts[1] <= 32 ) {
+               $bits = $parts[1];
+       } else {
+               $network = false;
+               $bits = false;
+       }
+       return array( $network, $bits );
+}
+
+/**
+ * Check if an IP address is in the local proxy list
+ */
+function wfIsLocallyBlockedProxy( $ip ) {
+       global $wgProxyList;
+       $fname = 'wfIsLocallyBlockedProxy';
        
+       if ( !$wgProxyList ) {
+               return false;
+       } 
+       wfProfileIn( $fname );
+       
+       if ( !is_array( $wgProxyList ) ) {
+               # Load from the specified file
+               $wgProxyList = array_map( 'trim', file( $wgProxyList ) );
+       }
+       
+       if ( !is_array( $wgProxyList ) ) {
+               $ret = false;
+       } elseif ( array_search( $ip, $wgProxyList ) !== false ) {
+               $ret = true;
+       } elseif ( array_key_exists( $ip, $wgProxyList ) ) {
+               # Old-style flipped proxy list
+               $ret = true;
+       } else {
+               $ret = false;
+       }
+       wfProfileOut( $fname );
+       return $ret;
+}
+
+
+
+
 ?>