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

api: Handle invalid/non-existent titles in ApiBlock

Browse source 
Defer to the TitleDef type definition for page titles to validate values
passed to the pagerestrictions parameter.

Bug: T279689
Change-Id: Ia2e116d1bc476b178d85a6331dec17d7a8df74ba
This commit is contained in:
Sam Smith 2021-07-26 12:39:51 +01:00
parent 62bdc0fb60
commit 9f1e946109
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/api/ApiBlock.php
View file

@ -29,6 +29,7 @@ use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\Restriction\ActionRestriction;
use MediaWiki\Block\Restriction\NamespaceRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\ParamValidator\TypeDef\TitleDef;
use MediaWiki\ParamValidator\TypeDef\UserDef;
use MediaWiki\User\UserIdentity;
use MediaWiki\User\UserIdentityLookup;
@ -147,10 +148,9 @@ class ApiBlock extends ApiBase {
$restrictions = [];
if ( $params['partial'] ) {
$pageRestrictions = [];
foreach ( (array)$params['pagerestrictions'] as $title ) {
$pageRestrictions[] = PageRestriction::newFromTitle( $title );
}
$pageRestrictions = array_map( static function ( $title ) {
return PageRestriction::newFromTitle( $title );
}, (array)$params['pagerestrictions'] );
$namespaceRestrictions = array_map( static function ( $id ) {
return new NamespaceRestriction( 0, $id );
@ -286,6 +286,15 @@ class ApiBlock extends ApiBase {
],
'partial' => false,
'pagerestrictions' => [
ApiBase::PARAM_TYPE => 'title',
TitleDef::PARAM_MUST_EXIST => true,
// TODO: TitleDef returns instances of TitleValue when PARAM_RETURN_OBJECT is
// truthy. At the time of writing,
// MediaWiki\Block\Restriction\PageRestriction::newFromTitle accepts either
// string or instance of Title.
//TitleDef::PARAM_RETURN_OBJECT => true,
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_ISMULTI_LIMIT1 => 10,
ApiBase::PARAM_ISMULTI_LIMIT2 => 10,