X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=api.php;h=7fff04803aad8d3fed26e4500dd7f6a9503a0812;hb=e94c57e423a43b5555900e53cac41064495c4462;hp=cf5685838382187d216646be5b9a22a25191f49f;hpb=1378ce62d31b91afab060ec5b8b0cc35916eb71d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/api.php b/api.php
index cf56858383..7fff04803a 100644
--- a/api.php
+++ b/api.php
@@ -17,14 +17,14 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
  */
 
-/** 
- * This file is the entry point for all API queries. It begins by checking 
+/**
+ * This file is the entry point for all API queries. It begins by checking
  * whether the API is enabled on this wiki; if not, it informs the user that
  * s/he should set $wgEnableAPI to true and exits. Otherwise, it constructs
  * a new ApiMain using the parameter passed to it as an argument in the URL
@@ -34,34 +34,42 @@
  * in the URL.
  */
 
-// Initialise common code
-require (dirname(__FILE__) . '/includes/WebStart.php');
+// So extensions (and other code) can check whether they're running in API mode
+define( 'MW_API', true );
+
+// We want a plain message on catastrophic errors that machines can identify
+function wfDie( $msg = '' ) {
+	header( $_SERVER['SERVER_PROTOCOL'] . ' 500 MediaWiki configuration Error', true, 500 );
+	echo $msg;
+	die( 1 );
+}
+
+// Die on unsupported PHP versions
+if( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.2.3' ) < 0 ){
+	$version = htmlspecialchars( $wgVersion );
+	wfDie( "MediaWiki $version requires at least PHP version 5.2.3." );
+}
 
-wfProfileIn('api.php');
+// Initialise common code.
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+	require ( 'phase3/includes/WebStart.php' );
+} else {
+	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+}
+
+wfProfileIn( 'api.php' );
 $starttime = microtime( true );
 
 // URL safety checks
-//
-// See RawPage.php for details; summary is that MSIE can override the
-// Content-Type if it sees a recognized extension on the URL, such as
-// might be appended via PATH_INFO after 'api.php'.
-//
-// Some data formats can end up containing unfiltered user-provided data
-// which will end up triggering HTML detection and execution, hence
-// XSS injection and all that entails.
-//
-if( $wgRequest->isPathInfoBad() ) {
-	wfHttpError( 403, 'Forbidden',
-		'Invalid file extension found in PATH_INFO. ' . 
-		'The API must be accessed through the primary script entry point.' );
+if ( !$wgRequest->checkUrlExtension() ) {
 	return;
 }
 
 // Verify that the API has not been disabled
-if (!$wgEnableAPI) {
-	echo 'MediaWiki API is not enabled for this site. Add the following line to your LocalSettings.php';
-	echo '<pre><b>$wgEnableAPI=true;</b></pre>';
-	die(1);
+if ( !$wgEnableAPI ) {
+	wfDie( 'MediaWiki API is not enabled for this site. Add the following line to your LocalSettings.php'
+		. '<pre><b>$wgEnableAPI=true;</b></pre>'
+	);
 }
 
 // Selectively allow cross-site AJAX
@@ -82,7 +90,7 @@ function convertWildcard( $search ) {
 	return "/$search/";
 }
 
-if ( $wgCrossSiteAJAXdomains && isset($_SERVER['HTTP_ORIGIN']) ) {	
+if ( $wgCrossSiteAJAXdomains && isset( $_SERVER['HTTP_ORIGIN'] ) ) {
 	$exceptions = array_map( 'convertWildcard', $wgCrossSiteAJAXdomainExceptions );
 	$regexes = array_map( 'convertWildcard', $wgCrossSiteAJAXdomains );
 	foreach ( $regexes as $regex ) {
@@ -99,18 +107,15 @@ if ( $wgCrossSiteAJAXdomains && isset($_SERVER['HTTP_ORIGIN']) ) {
 	}
 }
 
-// So extensions can check whether they're running in API mode
-define('MW_API', true);
-
 // Set a dummy $wgTitle, because $wgTitle == null breaks various things
 // In a perfect world this wouldn't be necessary
-$wgTitle = Title::newFromText('API');
+$wgTitle = Title::makeTitle( NS_MAIN, 'API' );
 
 /* Construct an ApiMain with the arguments passed via the URL. What we get back
  * is some form of an ApiMain, possibly even one that produces an error message,
  * but we don't care here, as that is handled by the ctor.
  */
-$processor = new ApiMain($wgRequest, $wgEnableWriteAPI);
+$processor = new ApiMain( $wgRequest, $wgEnableWriteAPI );
 
 // Process data & print results
 $processor->execute();
@@ -120,20 +125,30 @@ wfDoUpdates();
 
 // Log what the user did, for book-keeping purposes.
 $endtime = microtime( true );
-wfProfileOut('api.php');
+wfProfileOut( 'api.php' );
 wfLogProfilingData();
 
 // Log the request
 if ( $wgAPIRequestLog ) {
-	wfErrorLog( implode( ',', array(
+	$items = array(
 			wfTimestamp( TS_MW ),
 			$endtime - $starttime,
 			wfGetIP(),
-			wfArrayToCGI( $wgRequest->getValues() )
-	) ) . "\n", $wgAPIRequestLog );
+			$_SERVER['HTTP_USER_AGENT']
+	);
+	$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';
+	$module = $processor->getModule();
+	if ( $module->mustBePosted() ) {
+		$items[] = "action=" . $wgRequest->getVal( 'action' );
+	} else {
+		$items[] = wfArrayToCGI( $wgRequest->getValues() );
+	}
+	wfErrorLog( implode( ',', $items ) . "\n", $wgAPIRequestLog );
 	wfDebug( "Logged API request to $wgAPIRequestLog\n" );
 }
 
-// Shut down the database
-wfGetLBFactory()->shutdown();
+// Shut down the database.  foo()->bar() syntax is not supported in PHP4: we won't ever actually
+// get here to worry about whether this should be = or =&, but the file has to parse properly.
+$lb = wfGetLBFactory();
+$lb->shutdown();