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

Avoid API error/header leakage from jobs API

Browse source 
* Also cleaned up some HTTP headers while at it

bug: 62092
Change-Id: Ia2c1643e47aae53916c107c901cca654dc438a16
This commit is contained in:
Aaron Schulz 2014-02-28 21:32:08 -08:00
parent f428d223c3
commit df2f5dc7a6
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/Wiki.php
View file

@ -643,14 +643,8 @@ class MediaWiki {
'tasks' => 'jobs', 'maxjobs' => $n, 'sigexpiry' => time() + 5 );
$query['signature'] = ApiRunJobs::getQuerySignature( $query );
// Slow job running method in case of API or socket functions being disabled
$fallback = function() use ( $query ) {
$api = new ApiMain( new FauxRequest( $query, true ) );
$api->execute();
};
if ( !$wgEnableAPI ) {
$fallback();
ApiRunJobs::executeJobs( $n ); // slow fallback
return;
}
@ -666,7 +660,7 @@ class MediaWiki {
wfRestoreWarnings();
if ( !$sock ) {
wfDebugLog( 'runJobs', "Failed to start cron API (socket error $errno): $errstr\n" );
$fallback();
ApiRunJobs::executeJobs( $n ); // slow fallback
return;
}
@ -684,7 +678,7 @@ class MediaWiki {
// Do not wait for the response (the script should handle client aborts).
// Make sure that we don't close before that script reaches ignore_user_abort().
$status = fgets( $sock );
if ( !preg_match( '#^HTTP/\d\.\d 204 #', $status ) ) {
if ( !preg_match( '#^HTTP/\d\.\d 202 #', $status ) ) {
wfDebugLog( 'runJobs', "Failed to start cron API: received '$status'\n" );
}
}

14
includes/api/ApiRunJobs.php
View file

@ -51,21 +51,21 @@ class ApiRunJobs extends ApiBase {
}
if ( !$verified || $params['sigexpiry'] < time() ) {
$this->dieUsage( 'Invalid or stale signature provided', 'bad_signature', 401 );
$this->dieUsage( 'Invalid or stale signature provided', 'bad_signature', 400 );
}
// Client will usually disconnect before checking the response,
// but it needs to know when it is safe to disconnect. Until this
// reaches ignore_user_abort(), it is not safe as the jobs won't run.
ignore_user_abort( true ); // jobs may take a bit of time
header( "HTTP/1.0 204 No Content" );
header( "HTTP/1.0 202 Accepted" );
ob_flush();
flush();
// Once the client receives this response, it can disconnect
// Do all of the specified tasks...
if ( in_array( 'jobs', $params['tasks'] ) ) {
$this->executeJobs( $params );
self::executeJobs( $params['maxjobs'] );
}
}
@ -83,11 +83,13 @@ class ApiRunJobs extends ApiBase {
/**
* Run jobs from the job queue
*
* @param array $params Request parameters
* @note: also called from Wiki.php
*
* @param integer $maxJobs Maximum number of jobs to run
* @return void
*/
protected function executeJobs( array $params ) {
$n = $params['maxjobs']; // number of jobs to run
public static function executeJobs( $maxJobs ) {
$n = $maxJobs; // number of jobs to run
if ( $n < 1 ) {
return;
}