jenkins-bot has submitted this change and it was merged.
Change subject: Various fixes for RunJobs.php
......................................................................
Various fixes for RunJobs.php
* Use URL parameters for "wiki" parameter
* Work around bugs in the MediaWiki class accessors
* Enabled error logging so fatals show up
* Added a POST verb sanity check
Change-Id: I4b60c6d4f2f2b32a7afbbbd1e4c6e226fd2d92e1
---
M rpc/RunJobs.php
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/rpc/RunJobs.php b/rpc/RunJobs.php
index 9842311..e3b8210 100644
--- a/rpc/RunJobs.php
+++ b/rpc/RunJobs.php
@@ -20,21 +20,26 @@
*/
if ( !in_array( $_SERVER['REMOTE_ADDR'], array( '127.0.0.1', '0:0:0:0:0:0:0:1'
), true ) ) {
die( "Only loopback requests are allowed.\n" );
+} elseif ( $_SERVER['REQUEST_METHOD'] !== 'POST' ) {
+ die( "Request must use POST.\n" );
}
require_once( '../multiversion/MWVersion.php' );
-$wiki = isset( $_POST['wiki'] ) ? $_POST['wiki'] : '';
+$wiki = isset( $_GET['wiki'] ) ? $_GET['wiki'] : '';
require getMediaWiki( 'includes/WebStart.php', $wiki );
+error_reporting( E_ERROR ); // fatals but not random I/O warnings
+ini_set( 'display_errors', 1 );
$wgShowExceptionDetails = true;
-$mediawiki = new MediaWiki();
+$mediawiki = new MediaWiki();
$runner = new JobRunner();
$response = $runner->run( array(
- 'type' => $mediawiki->request()->get( 'type', false ),
- 'maxJobs' => $mediawiki->request()->get( 'maxjobs', 1 ),
- 'maxTime' => $mediawiki->request()->get( 'maxtime', 30 )
+ 'type' => isset( $_GET['type'] ) ? $_GET['type'] : false,
+ 'maxJobs' => isset( $_GET['maxjobs'] ) ? $_GET['maxjobs'] : 1,
+ 'maxTime' => isset( $_GET['maxtime'] ) ? $_GET['maxtime'] : 30
) );
+
print FormatJson::encode( $response, true );
$mediawiki->restInPeace();
--
To view, visit https://gerrit.wikimedia.org/r/150420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b60c6d4f2f2b32a7afbbbd1e4c6e226fd2d92e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
