saper has uploaded a new change for review. https://gerrit.wikimedia.org/r/203679
Change subject: Allow CheckUser for IPv6 ranges up to /32 ...................................................................... Allow CheckUser for IPv6 ranges up to /32 Bug: https://phabricator.wikimedia.org/T35734 Change-Id: I1dd55122c4542c5a2d4c739981854c31f285511d --- M CheckUser.php M extension.json M i18n/qqq.json M specials/SpecialCheckUser.php 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser refs/changes/79/203679/1 diff --git a/CheckUser.php b/CheckUser.php index 5fbc47b..81d35ca 100644 --- a/CheckUser.php +++ b/CheckUser.php @@ -61,7 +61,7 @@ //Shortest CIDR limits that can be checked in any individual range check $wgCheckUserCIDRLimit = array( 'IPv4'=>16, - 'IPv6'=>48, + 'IPv6'=>32, ); // Public key to encrypt private data that may need to be read later diff --git a/extension.json b/extension.json index 9e62d31..92a9629 100644 --- a/extension.json +++ b/extension.json @@ -15,7 +15,7 @@ "config": { "CheckUserCIDRLimit": { "IPv4": 16, - "IPv6": 48 + "IPv6": 32 }, "CheckUserMaxBlocks": 200, "CheckUserLog": "/home/wikipedia/logs/checkuser.log", diff --git a/i18n/qqq.json b/i18n/qqq.json index 33bf928..d0c5230 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -23,7 +23,7 @@ "Liuxinyu970226" ] }, - "checkuser-summary": "Explanation of CheckUser tool. See [[mw:Extension:CheckUser#Basic_interface|screenshot titled 'Basic CheckUser interface']].\n\nParameters:\n* $1 - an integer. default value: 16\n* $2 - an integer. default value: 48", + "checkuser-summary": "Explanation of CheckUser tool. See [[mw:Extension:CheckUser#Basic_interface|screenshot titled 'Basic CheckUser interface']].\n\nParameters:\n* $1 - an integer. default value: 16\n* $2 - an integer. default value: 32", "checkuser-desc": "{{desc|name=Check User|url=https://www.mediawiki.org/wiki/Extension:CheckUser}}";, "checkuser-logcase": "Unused at this time.", "checkuser": "Check user extension.\n{{doc-special|CheckUser}}\nIn the special page, checkusers can check the IP addresses of users.\n{{Identical|Check user}}", diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php index eaa3eb5..0c612c1 100644 --- a/specials/SpecialCheckUser.php +++ b/specials/SpecialCheckUser.php @@ -1377,7 +1377,7 @@ list( $start, $end ) = IP::parseRange( $ip ); return array( 'cuc_' . $type . '_hex BETWEEN ' . $db->addQuotes( $start ) . ' AND ' . $db->addQuotes( $end ) ); } elseif ( preg_match( '#^\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}:\w{1,4}/(\d+)$#', $ip, $matches ) ) { - // IPv6 CIDR, 48-128 bits + // IPv6 CIDR, 32-128 bits if ( $matches[1] < $wgCheckUserCIDRLimit['IPv6'] || $matches[1] > 128 ) { return false; // invalid } -- To view, visit https://gerrit.wikimedia.org/r/203679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1dd55122c4542c5a2d4c739981854c31f285511d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CheckUser Gerrit-Branch: master Gerrit-Owner: saper <sa...@saper.info> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
