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

Fix autoblock update

Browse source 
When updating an autoblock due to a reblock, use the correct reason
message instead of the parent block reason.

If the reblock causes the parent block to expire before the autoblock,
adjust the autoblock expiry time downwards.

Adapt testUpdateBlock() to be a regression test for these two bugs.

Bug: T351173
Change-Id: I19843e4971106250cf9644ef68d68d6e33c6e3ab
This commit is contained in:
Tim Starling 2024-02-15 15:57:43 +11:00
parent 27224bbe19
commit dcbabb1a1d
2 changed files with 63 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
includes/block/DatabaseBlockStore.php
View file

@ -1792,10 +1792,21 @@ class DatabaseBlockStore {
'ipb_sitewide' => $block->isSitewide(),
];
if ( $block->getExpiry() !== 'infinity' ) {
// Shorten the autoblock expiry if the parent block expiry is sooner.
// Don't lengthen -- that is only done when the IP address is actually
// used by the blocked user.
$blockArray[] = 'ipb_expiry=' . $dbw->conditional(
$dbw->expr( 'ipb_expiry', '>', $dbw->timestamp( $block->getExpiry() ) ),
$dbw->addQuotes( $dbw->timestamp( $block->getExpiry() ) ),
'ipb_expiry'
);
}
$commentArray = $this->commentStore->insert(
$dbw,
'ipb_reason',
$block->getReasonComment()
$this->getAutoblockReason( $block )
);
} else {
$blockArray = [
@ -1806,10 +1817,21 @@ class DatabaseBlockStore {
'bl_sitewide' => $block->isSitewide(),
];
// Shorten the autoblock expiry if the parent block expiry is sooner.
// Don't lengthen -- that is only done when the IP address is actually
// used by the blocked user.
if ( $block->getExpiry() !== 'infinity' ) {
$blockArray[] = 'bl_expiry=' . $dbw->conditional(
$dbw->expr( 'bl_expiry', '>', $dbw->timestamp( $block->getExpiry() ) ),
$dbw->addQuotes( $dbw->timestamp( $block->getExpiry() ) ),
'bl_expiry'
);
}
$commentArray = $this->commentStore->insert(
$dbw,
'bl_reason',
$block->getReasonComment()
$this->getAutoblockReason( $block )
);
}
@ -1955,28 +1977,12 @@ class DatabaseBlockStore {
}
$timestamp = wfTimestampNow();
if ( $parentBlock->getExpiry() == 'infinity' ) {
// Original block was indefinite, start an autoblock now
$expiry = $this->getAutoblockExpiry( $timestamp );
} else {
// If the user is already blocked with an expiry date, we don't
// want to pile on top of that.
$expiry = min(
$parentBlock->getExpiry(),
$this->getAutoblockExpiry( $timestamp )
);
}
$expiry = $this->getAutoblockExpiry( $timestamp, $parentBlock->getExpiry() );
$autoblock = new DatabaseBlock( [
'wiki' => $this->wikiId,
'address' => UserIdentityValue::newAnonymous( $target, $this->wikiId ),
'by' => $blocker,
'reason' =>
wfMessage(
'autoblocker',
$parentBlock->getTargetName(),
$parentBlock->getReasonComment()->text
)->inContentLanguage()->plain(),
'reason' => $this->getAutoblockReason( $parentBlock ),
'decodedTimestamp' => $timestamp,
'auto' => true,
'createAccount' => $parentBlock->isCreateAccountBlocked(),
@ -1997,6 +2003,14 @@ class DatabaseBlockStore {
: false;
}
private function getAutoblockReason( DatabaseBlock $parentBlock ) {
return wfMessage(
'autoblocker',
$parentBlock->getTargetName(),
$parentBlock->getReasonComment()->text
)->inContentLanguage()->plain();
}
/**
* Update the timestamp on autoblocks.
*
@ -2008,8 +2022,11 @@ class DatabaseBlockStore {
if ( $block->getType() !== Block::TYPE_AUTO ) {
return;
}
$block->setTimestamp( wfTimestamp() );
$block->setExpiry( $this->getAutoblockExpiry( $block->getTimestamp() ) );
$now = wfTimestamp();
$block->setTimestamp( $now );
// No need to reduce the autoblock expiry to the expiry of the parent
// block, since the caller already checked for that.
$block->setExpiry( $this->getAutoblockExpiry( $now ) );
$dbw = $this->getPrimaryDB();
if ( $this->writeStage & SCHEMA_COMPAT_WRITE_OLD ) {
@ -2041,14 +2058,21 @@ class DatabaseBlockStore {
/**
* Get the expiry timestamp for an autoblock created at the given time.
*
* If the parent block expiry is specified, the return value will be earlier
* than or equal to the parent block expiry.
*
* @internal Public to support deprecated DatabaseBlock method
* @param string|int $timestamp
* @param string|null $parentExpiry
* @return string
*/
public function getAutoblockExpiry( $timestamp ) {
$autoblockExpiry = $this->options->get( MainConfigNames::AutoblockExpiry );
return wfTimestamp( TS_MW, (int)wfTimestamp( TS_UNIX, $timestamp ) + $autoblockExpiry );
public function getAutoblockExpiry( $timestamp, string $parentExpiry = null ) {
$maxDuration = $this->options->get( MainConfigNames::AutoblockExpiry );
$expiry = wfTimestamp( TS_MW, (int)wfTimestamp( TS_UNIX, $timestamp ) + $maxDuration );
if ( $parentExpiry !== null && $parentExpiry !== 'infinity' ) {
$expiry = min( $parentExpiry, $expiry );
}
return $expiry;
}
// endregion -- end of database write methods

14
tests/phpunit/integration/includes/block/DatabaseBlockStoreTest.php
View file

@ -124,6 +124,10 @@ class DatabaseBlockStoreTest extends MediaWikiIntegrationTestCase {
$this->assertSame( $autoblock->isEmailBlocked(), $block->isEmailBlocked() );
$this->assertSame( $autoblock->isUsertalkEditAllowed(), $block->isUsertalkEditAllowed() );
$this->assertSame( $autoblock->isSitewide(), $block->isSitewide() );
$this->assertSame(
$autoblock->getReasonComment()->text,
wfMessage( 'autoblocker', $block->getTargetName(), $block->getReasonComment()->text )->text()
);
$restrictionStore = $this->getServiceContainer()->getBlockRestrictionStore();
$this->assertTrue(
@ -470,15 +474,23 @@ class DatabaseBlockStoreTest extends MediaWikiIntegrationTestCase {
public function testUpdateBlock() {
$store = $this->getStore();
$existingBlock = $store->newFromTarget( $this->sysop );
// Insert an autoblock for T351173 regression testing
$autoblockId = $store->doAutoblock( $existingBlock, '127.0.0.1' );
// Modify a block option
$existingBlock->isUsertalkEditAllowed( true );
$newExpiry = wfTimestamp( TS_MW, time() + 1000 );
$existingBlock->setExpiry( $newExpiry );
$result = $store->updateBlock( $existingBlock );
$updatedBlock = $store->newFromID( $result['id'] );
$autoblock = $store->newFromID( $result['autoIds'][0] );
$autoblock = $store->newFromID( $autoblockId );
$this->assertTrue( $updatedBlock->equals( $existingBlock ) );
$this->assertAutoblockEqualsBlock( $existingBlock, $autoblock );
$this->assertLessThanOrEqual( $newExpiry, $autoblock->getExpiry() );
}
public function testUpdateBlockAddOrRemoveAutoblock() {