PK AY0L-ì ì mediawiki-1.39.10.patchdiff -Nru mediawiki-1.39.9/extensions/AbuseFilter/includes/Api/CheckMatch.php mediawiki-1.39.10/extensions/AbuseFilter/includes/Api/CheckMatch.php --- mediawiki-1.39.9/extensions/AbuseFilter/includes/Api/CheckMatch.php 2024-09-30 15:06:24.194400500 +0100 +++ mediawiki-1.39.10/extensions/AbuseFilter/includes/Api/CheckMatch.php 2024-10-01 01:46:59.081510800 +0100 @@ -116,9 +116,9 @@ // TODO: Replace with dependency injection once security patch is uploaded publicly. $afFilterLookup = AbuseFilterServices::getFilterLookup(); - $privacyLevel = $afFilterLookup->getFilter( $row->afl_filter_id, $row->afl_global ) - ->getPrivacyLevel(); - $canSeeDetails = $this->afPermManager->canSeeLogDetailsForFilter( $performer, $privacyLevel ); + $hidden = $afFilterLookup->getFilter( $row->afl_filter_id, $row->afl_global ) + ->isHidden(); + $canSeeDetails = $this->afPermManager->canSeeLogDetailsForFilter( $performer, $hidden ); if ( !$canSeeDetails ) { $this->dieWithError( 'apierror-permissiondenied-generic', 'cannotseedetails' ); } diff -Nru mediawiki-1.39.9/extensions/AbuseFilter/tests/phpunit/integration/Api/CheckMatchTest.php mediawiki-1.39.10/extensions/AbuseFilter/tests/phpunit/integration/Api/CheckMatchTest.php --- mediawiki-1.39.9/extensions/AbuseFilter/tests/phpunit/integration/Api/CheckMatchTest.php 2024-09-30 23:49:01.855049600 +0100 +++ mediawiki-1.39.10/extensions/AbuseFilter/tests/phpunit/integration/Api/CheckMatchTest.php 2024-10-01 01:59:00.294750500 +0100 @@ -6,7 +6,6 @@ use FormatJson; use MediaWiki\Extension\AbuseFilter\AbuseFilterServices; use MediaWiki\Extension\AbuseFilter\Filter\ExistingFilter; -use MediaWiki\Extension\AbuseFilter\Filter\Flags; use MediaWiki\Extension\AbuseFilter\FilterLookup; use MediaWiki\Extension\AbuseFilter\Parser\Exception\InternalException; use MediaWiki\Extension\AbuseFilter\Parser\FilterEvaluator; @@ -15,6 +14,7 @@ use MediaWiki\Extension\AbuseFilter\Parser\RuleCheckerStatus; use MediaWiki\Extension\AbuseFilter\Variables\VariableHolder; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; +use Title; /** * @coversDefaultClass \MediaWiki\Extension\AbuseFilter\Api\CheckMatch @@ -24,6 +24,7 @@ */ class CheckMatchTest extends ApiTestCase { use AbuseFilterApiTestTrait; + use MockAuthorityTrait; /** * @covers ::execute @@ -103,13 +104,14 @@ } public function testExecuteWhenPerformerCannotSeeLogId() { + $this->setExpectedApiException( 'apierror-permissiondenied-generic', 'cannotseedetails' ); // Mock the FilterLookup service to return that the filter with the ID 1 is hidden. $mockLookup = $this->createMock( FilterLookup::class ); $mockLookup->method( 'getFilter' ) ->with( 1, false ) ->willReturnCallback( function () { $filterObj = $this->createMock( ExistingFilter::class ); - $filterObj->method( 'getPrivacyLevel' )->willReturn( Flags::FILTER_HIDDEN ); + $filterObj->method( 'isHidden' )->willReturn( true ); return $filterObj; } ); $this->setService( FilterLookup::SERVICE_NAME, $mockLookup ); @@ -121,7 +123,6 @@ )->addLogEntries( [ 1 => [ 'warn' ] ] ); // Execute the API using a user with the 'abusefilter-modify' right but without the // 'abusefilter-log-detail' right, while specifying a filter abuse filter log ID of 1 - $this->expectApiErrorCode( 'cannotseedetails' ); $this->doApiRequest( [ 'action' => 'abusefiltercheckmatch', diff -Nru mediawiki-1.39.9/includes/Defines.php mediawiki-1.39.10/includes/Defines.php --- mediawiki-1.39.9/includes/Defines.php 2024-09-30 23:48:59.407019000 +0100 +++ mediawiki-1.39.10/includes/Defines.php 2024-10-01 01:58:59.298737500 +0100 @@ -33,7 +33,7 @@ * * @since 1.35 (also backported to 1.33.3 and 1.34.1) */ -define( 'MW_VERSION', '1.39.9' ); +define( 'MW_VERSION', '1.39.10' ); /** @{ * Obsolete IDatabase::makeList() constants diff -Nru mediawiki-1.39.9/RELEASE-NOTES-1.39 mediawiki-1.39.10/RELEASE-NOTES-1.39 --- mediawiki-1.39.9/RELEASE-NOTES-1.39 2024-09-30 23:48:59.391018900 +0100 +++ mediawiki-1.39.10/RELEASE-NOTES-1.39 2024-10-01 01:58:59.286737400 +0100 @@ -5,6 +5,13 @@ PHP 8.2 workboard: https://phabricator.wikimedia.org/tag/php_8.2_support/ PHP 8.3 workboard: https://phabricator.wikimedia.org/tag/php_8.3_support/ +== MediaWiki 1.39.10 == + +This is a maintenance release of the MediaWiki 1.39 branch. + +=== Changes since 1.39.9 === +* Fix issue related to backport of AbuseFilter patch for T372998. + == Mediawiki 1.39.9 == This is a security and maintenance release of the MediaWiki 1.39 branch. PK AY0L-ì ì € mediawiki-1.39.10.patchPK E !