wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 15:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ForeignWikiRequest: Guard against bad response

Browse source 
See also I4dde4e3bb4ff2ea8b7669bb18b2689410e5e7713

Bug: T274408
Change-Id: I3ab7d0a4b58a150fe940bc8441b5fb127142ad9f
This commit is contained in:
Kosta Harlan 2021-02-17 10:08:33 +01:00
parent e147f4fa5c
commit 294ed3c2cb
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/ForeignWikiRequest.php
View file

@ -118,7 +118,7 @@ class EchoForeignWikiRequest {
*
* @param string $wiki Name of the wiki to get a token for
* @suppress PhanTypeInvalidCallableArraySize getRequestParams can take an array, too (phan bug)
* @return string Token
* @return string Token, or empty string if an unable to retrieve the token.
*/
protected function getCsrfToken( $wiki ) {
if ( $this->csrfTokens === null ) {
@ -132,10 +132,20 @@ class EchoForeignWikiRequest {
] );
$responses = $this->doRequests( $reqs );
foreach ( $responses as $w => $response ) {
$this->csrfTokens[$w] = $response['query']['tokens']['csrftoken'];
if ( isset( $response['query']['tokens']['csrftoken'] ) ) {
$this->csrfTokens[$w] = $response['query']['tokens']['csrftoken'];
} else {
LoggerFactory::getInstance( 'Echo' )->warning(
__METHOD__ . ': Unexpected CSRF token API response from {wiki}',
[
'wiki' => $wiki,
'response' => $response,
]
);
}
}
}
return $this->csrfTokens[$wiki];
return $this->csrfTokens[$wiki] ?? '';
}
/**