/**
* Determine if a given integer IPv4 address is in a given CIDR network
- * @deprecated Use IP::isAddressInRange
+ * @deprecated Use wfIsAddressInRange
*/
function isAddressInRange( $addr, $range ) {
- return IP::isAddressInRange( $addr, $range );
+ return wfIsAddressInRange( $addr, $range );
}
function initFromRow( $row )
$this->mRangeEnd = '';
if ( $this->mUser == 0 ) {
- list($this->mRangeStart, $this->mRangeEnd) = IP::parseRange($this->mAddress);
+ $startend = wfRangeStartEnd($this->mAddress);
+ $this->mRangeStart = $startend[0];
+ $this->mRangeEnd = $startend[1];
}
}
/**
* Autoblocks the given IP, referring to this Block.
- * @param string $autoblockip The IP to autoblock, dotted-quad.
- * @return bool True if an autoblock was inserted OR redundant to preexisting block.
+ * @param $autoblockip The IP to autoblock.
+ * @return bool Whether or not an autoblock was inserted.
*/
- public function doAutoblock( $autoblockip ) {
+ function doAutoblock( $autoblockip ) {
# Check if this IP address is already blocked
$dbw =& wfGetDb( DB_MASTER );
$dbw->begin();
- # If autoblocks are disabled, or if this IP is whitelisted, go away.
- if ( !$this->mEnableAutoblock || self::isWhitelistedIp( $autoblockip ) ) {
- return false;
+ # If autoblocks are disabled, go away.
+ if ( !$this->mEnableAutoblock ) {
+ return;
+ }
+
+ # Check for presence on the autoblock whitelist
+ # TODO cache this?
+ $lines = explode( "\n", wfMsgForContentNoTrans( 'autoblock_whitelist' ) );
+
+ $ip = wfGetIp();
+
+ wfDebug("Checking the autoblock whitelist..\n");
+
+ foreach( $lines as $line ) {
+ # List items only
+ if ( substr( $line, 0, 1 ) !== '*' ) {
+ continue;
+ }
+
+ $wlEntry = substr($line, 1);
+ $wlEntry = trim($wlEntry);
+
+ wfDebug("Checking $wlEntry\n");
+
+ # Is the IP in this range?
+ if (wfIsAddressInRange( $ip, $wlEntry )) {
+ wfDebug("IP $ip matches $wlEntry, not autoblocking\n");
+ #$autoblockip = null; # Don't autoblock a whitelisted IP.
+ return; #This /SHOULD/ introduce a dummy block - but
+ # I don't know a safe way to do so. -werdna
+ }
}
# It's okay to autoblock. Go ahead and create/insert the block.
# prolong block time
if ($this->mExpiry &&
($this->mExpiry < Block::getAutoblockExpiry($ipblock->mTimestamp))) {
- return true;
+ return;
}
# Just update the timestamp
$ipblock->updateTimestamp();
- return true;
+ return;
} else {
$ipblock = new Block;
}
return $ipblock->insert();
}
- /**
- * Checks whether an IP is whitelisted in the autoblock_whitelist message.
- * @todo Cache this?
- *
- * @param string $ip Dotted quad
- * @return bool
- */
- private static function isWhitelistedIp( $ip ) {
- $lines = explode( "\n", wfMsgForContentNoTrans( 'autoblock_whitelist' ) );
-
- wfDebug("Checking the autoblock whitelist..\n");
-
- foreach( $lines as $line ) {
- # Parse list items only
- if ( substr( $line, 0, 1 ) !== '*' ) {
- continue;
- }
-
- $wlEntry = substr($line, 1);
- $wlEntry = trim($wlEntry);
-
- wfDebug("Checking $wlEntry\n");
-
- # Is the IP in this range?
- if (IP::isAddressInRange( $ip, $wlEntry )) {
- wfDebug("IP $ip matches $wlEntry, not autoblocking\n");
- return true; #This /SHOULD/ introduce a dummy block - but
- # I don't know a safe way to do so. -werdna
- }
- }
- return false;
- }
function deleteIfExpired()
{
$fname = 'Block::deleteIfExpired';
}
}
+/**
+ * Get the start and end of a range.
+ * @param $range The range to get the start and end for.
+ * @return array An array with the first element as the start of the range, as a long, and the second element as the end of the range, also as a long.
+ *
+ */
+function wfRangeStartEnd( $range ) {
+ list( $network, $bits ) = wfParseCIDR( $range );
+ if ( $network !== false ) {
+ $start = sprintf( '%08X', $network );
+ $end = sprintf( '%08X', $network + (1 << (32 - $bits)) - 1 );
+ return array($start, $end);
+ }
+ return false;
+}
+
+/**
+ * Determine if a given integer IPv4 address is in a given CIDR network
+ * @param $addr The address to check against the given range.
+ * @param $range The range to check the given address against.
+ * @return bool Whether or not the given address is in the given range.
+ */
+function wfIsAddressInRange( $addr, $range ) {
+ $unsignedIP = IP::toUnsigned($addr);
+ $startend = wfRangeStartEnd($range);
+ $start = $startend[0];
+ $end = $startend[1];
+
+ return (($unsignedIP >= $start) && ($unsignedip <= $end));
+}
+
/*
* Get a Database object
* @param integer $db Index of the connection to get. May be DB_MASTER for the
/**
* Validate an IP address.
- * @param string $ipblock Dotted quad
* @return boolean True if it is valid.
*/
public static function isValid( $ip ) {
/**
* Validate an IP Block.
- * @param string $ipblock Dotted quad
* @return boolean True if it is valid.
*/
public static function isValidBlock( $ipblock ) {
* Determine if an IP address really is an IP address, and if it is public,
* i.e. not RFC 1918 or similar
* Comes from ProxyTools.php
- *
- * @param string $ip Dotted quad
- * @return bool
*/
public static function isPublic( $ip ) {
$n = IP::toUnsigned( $ip );
/**
* Split out an IP block as an array of 4 bytes and a mask,
- * return false if it can't be determined
+ * return false if it cant be determined
*
- * @param string $ipblock A quad dotted IP address
- * @return mixed Array or false
+ * @parameter $ip string A quad dotted IP address
+ * @return array
*/
public static function toArray( $ipblock ) {
if(! preg_match( '/^' . RE_IP_ADD . '(?:\/(?:'.RE_IP_PREFIX.'))?' . '$/', $ipblock, $matches ) ) {
* function for an IPv6 address will be prefixed with "v6-", a non-
* hexadecimal string which sorts after the IPv4 addresses.
*
- * @param string $ip Quad dotted IP address.
- * @return mixed String or false
+ * @param $ip Quad dotted IP address.
*/
public static function toHex( $ip ) {
$n = self::toUnsigned( $ip );
* Like ip2long() except that it actually works and has a consistent error return value.
* Comes from ProxyTools.php
* @param $ip Quad dotted IP address.
- * @return mixed Int or false
*/
public static function toUnsigned( $ip ) {
if ( $ip == '255.255.255.255' ) {
* 1.2.3.4/24 CIDR
* 1.2.3.4 - 1.2.3.5 Explicit range
* 1.2.3.4 Single IP
- * @param string $range
- * @return array (hex string start, hex string end), or (false, false) if an error occurred
*/
public static function parseRange( $range ) {
if ( strpos( $range, '/' ) !== false ) {
return array( $start, $end );
}
}
-
- /**
- * Determine if a given IPv4 address is in a given range
- * @param string $addr Dotted quad
- * @param string $range (CIDR, hyphenated dotted-quad, or single dotted-quad)
- * @return bool Whether or not the given address is in the given range. Returns false on error.
- */
- public static function isAddressInRange( $addr, $range ) {
- $unsignedIP = IP::toUnsigned($addr);
- list($start, $end) = IP::parseRange($range);
-
- if ($start == false || $end == false)
- return false;
- else
- return (($unsignedIP >= $start) && ($unsignedip <= $end)); // string comparison
- }
}
?>
'autosumm-shortnew' => 'New page: $1',
# Autoblock whitelist
-'autoblock_whitelist' => "AOL http://webmaster.info.aol.com/proxyinfo.html
-*64.12.96.0/19
-*149.174.160.0/20
-*152.163.240.0/21
-*152.163.248.0/22
-*152.163.252.0/23
-*152.163.96.0/22
-*152.163.100.0/23
-*195.93.32.0/22
-*195.93.48.0/22
-*195.93.64.0/19
-*195.93.96.0/19
-*195.93.16.0/20
-*198.81.0.0/22
-*198.81.16.0/20
-*198.81.8.0/23
-*202.67.64.128/25
-*205.188.192.0/20
-*205.188.208.0/23
-*205.188.112.0/20
-*205.188.146.144/30
-*207.200.112.0/21
-StarHub
-*202.156.6.54/32",
+'autoblock_whitelist' => '',
);
dépôts / lhc / web / wiklou.git / commitdiff