Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

block: Normalize ip in DatabaseBlock::doAutoblock

Browse source 
When using $wgPutIPinRC the ip from rc_ip is used, which is stored as
::1, but blocks working with 0:0:0:0:0:0:0:1, so parse the ip with the
BlockUtils::parseBlockTarget and use that value.
Also reject possible invalid types, as this is a public function and may
called with something not wanted.

The ip given via User::spreadAnyEditBlock is also ::1 and the autoblock
would be inserted, when also a regular ip block exists against ::1

Change-Id: I9c1f429a7b0ff9b2274b72c46bf850d9db9492cd
This commit is contained in:
Umherirrender 2023-06-14 20:42:45 +02:00
parent e930183636
commit 2d055eea30
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
includes/block/DatabaseBlock.php
View file

@ -564,7 +564,7 @@ class DatabaseBlock extends AbstractBlock {
* Autoblocks the given IP, referring to this block.
*
* @param string $autoblockIP The IP to autoblock.
* @return int|bool ID if an autoblock was inserted, false if not.
* @return int|false ID if an autoblock was inserted, false if not.
*/
public function doAutoblock( $autoblockIP ) {
# If autoblocks are disabled, go away.
@ -572,14 +572,22 @@ class DatabaseBlock extends AbstractBlock {
return false;
}
$services = MediaWikiServices::getInstance();
[ $target, $type ] = $services->getBlockUtils()
->parseBlockTarget( $autoblockIP );
if ( $type != self::TYPE_IP ) {
wfDebug( "Autoblock not supported for ip ranges." );
return false;
}
$target = (string)$target;
# Check if autoblock exempt.
if ( self::isExemptedFromAutoblocks( $autoblockIP ) ) {
if ( self::isExemptedFromAutoblocks( $target ) ) {
return false;
}
$services = MediaWikiServices::getInstance();
# Allow hooks to cancel the autoblock.
if ( !( new HookRunner( $services->getHookContainer() ) )->onAbortAutoblock( $autoblockIP, $this ) ) {
if ( !( new HookRunner( $services->getHookContainer() ) )->onAbortAutoblock( $target, $this ) ) {
wfDebug( "Autoblock aborted by hook." );
return false;
}
@ -594,7 +602,7 @@ class DatabaseBlock extends AbstractBlock {
$res = $dbr->select(
$blockQuery['tables'],
$blockQuery['fields'],
[ 'ipb_address' => $autoblockIP ],
[ 'ipb_address' => $target ],
__METHOD__,
[],
$blockQuery['joins']
@ -632,8 +640,8 @@ class DatabaseBlock extends AbstractBlock {
# Make a new block object with the desired properties.
$autoblock = new DatabaseBlock( [ 'wiki' => $this->getWikiId() ] );
wfDebug( "Autoblocking {$this->getTargetName()}@" . $autoblockIP );
$autoblock->setTarget( UserIdentityValue::newAnonymous( $autoblockIP, $this->getWikiId() ) );
wfDebug( "Autoblocking {$this->getTargetName()}@" . $target );
$autoblock->setTarget( UserIdentityValue::newAnonymous( $target, $this->getWikiId() ) );
$autoblock->setBlocker( $blocker );
$autoblock->setReason(
wfMessage(