From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Thu, 16 May 2013 06:19:13 +0000 (+0200)
Subject: Make 'subnet' feature of $wgRateLimits work with IPv6
X-Git-Tag: 1.31.0-rc.0~19551^2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=6352be71c603bb9e3059278fbdb731c9ba62b251

Make 'subnet' feature of $wgRateLimits work with IPv6

- 'subnet' will aggregate limits for a /64 subnet on IPv6
- Updated DefaultSettings.php to mention this
- Only call WebRequest::getIP() when it will really be used

Change-Id: Ia96800df5fb498a79e2c0527baee2392cd4623c7
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 296b71d1a2..2c03f132c4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4328,7 +4328,7 @@ $wgRateLimits = array(
 		'user' => null, // for each logged-in user
 		'newbie' => null, // for each recent (autoconfirmed) account; overrides 'user'
 		'ip' => null, // for each anon and recent account
-		'subnet' => null, // ... with final octet removed
+		'subnet' => null, // ... within a /24 subnet in IPv4 or /64 in IPv6
 	),
 	'move' => array(
 		'user' => null,
diff --git a/includes/User.php b/includes/User.php
index d114b994ef..617336dff6 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1500,7 +1500,6 @@ class User {
 		$limits = $wgRateLimits[$action];
 		$keys = array();
 		$id = $this->getId();
-		$ip = $this->getRequest()->getIP();
 		$userLimit = false;
 
 		if ( isset( $limits['anon'] ) && $id == 0 ) {
@@ -1515,12 +1514,23 @@ class User {
 				$keys[wfMemcKey( 'limiter', $action, 'user', $id )] = $limits['newbie'];
 			}
 			if ( isset( $limits['ip'] ) ) {
+				$ip = $this->getRequest()->getIP();
 				$keys["mediawiki:limiter:$action:ip:$ip"] = $limits['ip'];
 			}
-			$matches = array();
-			if ( isset( $limits['subnet'] ) && preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $ip, $matches ) ) {
-				$subnet = $matches[1];
-				$keys["mediawiki:limiter:$action:subnet:$subnet"] = $limits['subnet'];
+			if ( isset( $limits['subnet'] ) ) {
+				$ip = $this->getRequest()->getIP();
+				$matches = array();
+				$subnet = false;
+				if ( IP::isIPv6( $ip ) ) {
+					$parts = IP::parseRange( "$ip/64" );
+					$subnet = $parts[0];
+				} elseif ( preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $ip, $matches ) ) {
+					// IPv4
+					$subnet = $matches[1];
+				}
+				if ( $subnet !== false ) {
+					$keys["mediawiki:limiter:$action:subnet:$subnet"] = $limits['subnet'];
+				}
 			}
 		}
 		// Check for group-specific permissions