r51684 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r51683‎ | r51684 | r51685 >
Date:05:53, 10 June 2009
Author:tstarling
Status:deferred
Tags:
Comment:
Backported r51680 (use require not include) and added release notes.
Modified paths:
  • /branches/REL1_15/phase3/RELEASE-NOTES (modified) (history)
  • /branches/REL1_15/phase3/maintenance (modified) (history)
  • /branches/REL1_15/phase3/maintenance/dumpInterwiki.php (modified) (history)
  • /branches/REL1_15/phase3/maintenance/findhooks.php (modified) (history)
  • /branches/REL1_15/phase3/maintenance/fuzz-tester.php (modified) (history)
  • /branches/REL1_15/phase3/maintenance/rebuildInterwiki.php (modified) (history)

Diff [purge]

Index: branches/REL1_15/phase3/maintenance/fuzz-tester.php
@@ -169,7 +169,7 @@
170170 /////////////////////////// COMMAND LINE HELP ////////////////////////////////////
171171
172172 // This is a command line script, load MediaWiki env (gives command line options);
173 -include('commandLine.inc');
 173+require('commandLine.inc');
174174
175175 // if the user asked for an explanation of command line options.
176176 if ( isset( $options["help"] ) ) {
Index: branches/REL1_15/phase3/maintenance/rebuildInterwiki.php
@@ -12,8 +12,8 @@
1313 $oldCwd = getcwd();
1414
1515 $optionsWithArgs = array( "d" );
16 -include_once( "commandLine.inc" );
17 -include_once( "rebuildInterwiki.inc" );
 16+require( "commandLine.inc" );
 17+require( "rebuildInterwiki.inc" );
1818 chdir( $oldCwd );
1919
2020 # Output
Index: branches/REL1_15/phase3/maintenance/findhooks.php
@@ -21,8 +21,7 @@
2222 */
2323
2424 /** This is a command line script*/
25 -include('commandLine.inc');
26 -
 25+require('commandLine.inc');
2726 # GLOBALS
2827
2928 $doc = $IP . '/docs/hooks.txt';
@@ -156,4 +155,4 @@
157156 printArray('unclear hook calls', $bad );
158157
159158 if ( count( $todo ) == 0 && count( $deprecated ) == 0 && count( $bad ) == 0 )
160 - echo "Looks good!\n";
\ No newline at end of file
 159+ echo "Looks good!\n";
Index: branches/REL1_15/phase3/maintenance/dumpInterwiki.php
@@ -12,8 +12,8 @@
1313 $oldCwd = getcwd();
1414
1515 $optionsWithArgs = array( "o" );
16 -include_once( "commandLine.inc" );
17 -include_once( "dumpInterwiki.inc" );
 16+require( "commandLine.inc" );
 17+require( "dumpInterwiki.inc" );
1818 chdir( $oldCwd );
1919
2020 # Output
Property changes on: branches/REL1_15/phase3/maintenance
___________________________________________________________________
Name: svn:mergeinfo
2121 + /trunk/phase3/maintenance:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470,50580,51587,51680
Index: branches/REL1_15/phase3/RELEASE-NOTES
@@ -28,6 +28,9 @@
2929 installer.
3030 * (bug 19127) Documentation warning for PostgreSQL users who run update.php:
3131 use the same user in AdminSettings.php as in LocalSettings.php.
 32+* Fixed possible web invocation of some maintenance scripts, due to the use of
 33+ include() instead of require(). A full exploit would require a very strange
 34+ web server configuration.
3235 * Localisation updates.
3336
3437 === Configuration changes in 1.15 ===

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r51680Use require not include when sourcing commandLine.inc, to avoid possible web ...tstarling05:29, 10 June 2009

Status & tagging log