IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64021
Change subject: Make 'subnet' feature of $wgRateLimits work with IPv6
......................................................................
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
---
M includes/DefaultSettings.php
M includes/User.php
2 files changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/64021/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 296b71d..2c03f13 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4328,7 +4328,7 @@
'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 d114b99..617336d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1500,7 +1500,6 @@
$limits = $wgRateLimits[$action];
$keys = array();
$id = $this->getId();
- $ip = $this->getRequest()->getIP();
$userLimit = false;
if ( isset( $limits['anon'] ) && $id == 0 ) {
@@ -1515,12 +1514,23 @@
$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
--
To view, visit https://gerrit.wikimedia.org/r/64021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia96800df5fb498a79e2c0527baee2392cd4623c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
