From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- includes/WebRequest.php | 187 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 131 insertions(+), 56 deletions(-) (limited to 'includes/WebRequest.php') diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 98007ef8..b17cb9ec 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -91,11 +91,11 @@ class WebRequest { wfSuppressWarnings(); $a = parse_url( $url ); wfRestoreWarnings(); - if( $a ) { + if ( $a ) { $path = isset( $a['path'] ) ? $a['path'] : ''; global $wgScript; - if( $path == $wgScript && $want !== 'all' ) { + if ( $path == $wgScript && $want !== 'all' ) { // Script inside a rewrite path? // Abort to keep from breaking... return $matches; @@ -106,7 +106,7 @@ class WebRequest { // Raw PATH_INFO style $router->add( "$wgScript/$1" ); - if( isset( $_SERVER['SCRIPT_NAME'] ) + if ( isset( $_SERVER['SCRIPT_NAME'] ) && preg_match( '/\.php5?/', $_SERVER['SCRIPT_NAME'] ) ) { # Check for SCRIPT_NAME, we handle index.php explicitly @@ -116,17 +116,17 @@ class WebRequest { } global $wgArticlePath; - if( $wgArticlePath ) { + if ( $wgArticlePath ) { $router->add( $wgArticlePath ); } global $wgActionPaths; - if( $wgActionPaths ) { + if ( $wgActionPaths ) { $router->add( $wgActionPaths, array( 'action' => '$key' ) ); } global $wgVariantArticlePath, $wgContLang; - if( $wgVariantArticlePath ) { + if ( $wgVariantArticlePath ) { $router->add( $wgVariantArticlePath, array( 'variant' => '$2' ), array( '$2' => $wgContLang->getVariants() ) @@ -224,7 +224,7 @@ class WebRequest { } $matches = self::getPathInfo( 'title' ); - foreach( $matches as $key => $val) { + foreach ( $matches as $key => $val ) { $this->data[$key] = $_GET[$key] = $_REQUEST[$key] = $val; } } @@ -240,15 +240,15 @@ class WebRequest { * @return array of URL variables to interpolate; empty if no match */ static function extractTitle( $path, $bases, $key = false ) { - foreach( (array)$bases as $keyValue => $base ) { + foreach ( (array)$bases as $keyValue => $base ) { // Find the part after $wgArticlePath $base = str_replace( '$1', '', $base ); $baseLen = strlen( $base ); - if( substr( $path, 0, $baseLen ) == $base ) { + if ( substr( $path, 0, $baseLen ) == $base ) { $raw = substr( $path, $baseLen ); - if( $raw !== '' ) { + if ( $raw !== '' ) { $matches = array( 'title' => rawurldecode( $raw ) ); - if( $key ) { + if ( $key ) { $matches[$key] = $keyValue; } return $matches; @@ -271,8 +271,8 @@ class WebRequest { */ private function &fix_magic_quotes( &$arr, $topLevel = true ) { $clean = array(); - foreach( $arr as $key => $val ) { - if( is_array( $val ) ) { + foreach ( $arr as $key => $val ) { + if ( is_array( $val ) ) { $cleanKey = $topLevel ? stripslashes( $key ) : $key; $clean[$cleanKey] = $this->fix_magic_quotes( $arr[$key], false ); } else { @@ -293,7 +293,7 @@ class WebRequest { private function checkMagicQuotes() { $mustFixQuotes = function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc(); - if( $mustFixQuotes ) { + if ( $mustFixQuotes ) { $this->fix_magic_quotes( $_COOKIE ); $this->fix_magic_quotes( $_ENV ); $this->fix_magic_quotes( $_GET ); @@ -311,8 +311,8 @@ class WebRequest { * @private */ function normalizeUnicode( $data ) { - if( is_array( $data ) ) { - foreach( $data as $key => $val ) { + if ( is_array( $data ) ) { + foreach ( $data as $key => $val ) { $data[$key] = $this->normalizeUnicode( $val ); } } else { @@ -335,19 +335,18 @@ class WebRequest { # http://us2.php.net/variables.external#language.variables.external.dot-in-names # Work around PHP *feature* to avoid *bugs* elsewhere. $name = strtr( $name, '.', '_' ); - if( isset( $arr[$name] ) ) { + if ( isset( $arr[$name] ) ) { global $wgContLang; $data = $arr[$name]; - if( isset( $_GET[$name] ) && !is_array( $data ) ) { + if ( isset( $_GET[$name] ) && !is_array( $data ) ) { # Check for alternate/legacy character encoding. - if( isset( $wgContLang ) ) { + if ( isset( $wgContLang ) ) { $data = $wgContLang->checkTitleEncoding( $data ); } } $data = $this->normalizeUnicode( $data ); return $data; } else { - taint( $default ); return $default; } } @@ -364,10 +363,10 @@ class WebRequest { */ public function getVal( $name, $default = null ) { $val = $this->getGPCVal( $this->data, $name, $default ); - if( is_array( $val ) ) { + if ( is_array( $val ) ) { $val = $default; } - if( is_null( $val ) ) { + if ( is_null( $val ) ) { return $val; } else { return (string)$val; @@ -414,7 +413,7 @@ class WebRequest { */ public function getArray( $name, $default = null ) { $val = $this->getGPCVal( $this->data, $name, $default ); - if( is_null( $val ) ) { + if ( is_null( $val ) ) { return null; } else { return (array)$val; @@ -433,7 +432,7 @@ class WebRequest { */ public function getIntArray( $name, $default = null ) { $val = $this->getArray( $name, $default ); - if( is_array( $val ) ) { + if ( is_array( $val ) ) { $val = array_map( 'intval', $val ); } return $val; @@ -569,6 +568,44 @@ class WebRequest { return $_GET; } + /** + * Return the contents of the Query with no decoding. Use when you need to + * know exactly what was sent, e.g. for an OAuth signature over the elements. + * + * @return String + */ + public function getRawQueryString() { + return $_SERVER['QUERY_STRING']; + } + + /** + * Return the contents of the POST with no decoding. Use when you need to + * know exactly what was sent, e.g. for an OAuth signature over the elements. + * + * @return String + */ + public function getRawPostString() { + if ( !$this->wasPosted() ) { + return ''; + } + return $this->getRawInput(); + } + + /** + * Return the raw request body, with no processing. Cached since some methods + * disallow reading the stream more than once. As stated in the php docs, this + * does not work with enctype="multipart/form-data". + * + * @return String + */ + public function getRawInput() { + static $input = false; + if ( $input === false ) { + $input = file_get_contents( 'php://input' ); + } + return $input; + } + /** * Get the HTTP method used for this request. * @@ -603,7 +640,7 @@ class WebRequest { * @return Boolean */ public function checkSessionCookie() { - return isset( $_COOKIE[ session_name() ] ); + return isset( $_COOKIE[session_name()] ); } /** @@ -615,7 +652,7 @@ class WebRequest { * @return Mixed: cookie value or $default if the cookie not set */ public function getCookie( $key, $prefix = null, $default = null ) { - if( $prefix === null ) { + if ( $prefix === null ) { global $wgCookiePrefix; $prefix = $wgCookiePrefix; } @@ -630,14 +667,14 @@ class WebRequest { * @return String */ public function getRequestURL() { - if( isset( $_SERVER['REQUEST_URI'] ) && strlen( $_SERVER['REQUEST_URI'] ) ) { + if ( isset( $_SERVER['REQUEST_URI'] ) && strlen( $_SERVER['REQUEST_URI'] ) ) { $base = $_SERVER['REQUEST_URI']; } elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) && strlen( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) { // Probably IIS; doesn't set REQUEST_URI $base = $_SERVER['HTTP_X_ORIGINAL_URL']; - } elseif( isset( $_SERVER['SCRIPT_NAME'] ) ) { + } elseif ( isset( $_SERVER['SCRIPT_NAME'] ) ) { $base = $_SERVER['SCRIPT_NAME']; - if( isset( $_SERVER['QUERY_STRING'] ) && $_SERVER['QUERY_STRING'] != '' ) { + if ( isset( $_SERVER['QUERY_STRING'] ) && $_SERVER['QUERY_STRING'] != '' ) { $base .= '?' . $_SERVER['QUERY_STRING']; } } else { @@ -651,14 +688,16 @@ class WebRequest { // need to strip it or we get false-positive redirect loops // or weird output URLs $hash = strpos( $base, '#' ); - if( $hash !== false ) { + if ( $hash !== false ) { $base = substr( $base, 0, $hash ); } - if( $base[0] == '/' ) { - return $base; + + if ( $base[0] == '/' ) { + // More than one slash will look like it is protocol relative + return preg_replace( '!^/+!', '/', $base ); } else { // We may get paths with a host prepended; strip it. - return preg_replace( '!^[^:]+://[^/]+/!', '/', $base ); + return preg_replace( '!^[^:]+://[^/]+/+!', '/', $base ); } } @@ -737,21 +776,21 @@ class WebRequest { global $wgUser; $limit = $this->getInt( 'limit', 0 ); - if( $limit < 0 ) { + if ( $limit < 0 ) { $limit = 0; } - if( ( $limit == 0 ) && ( $optionname != '' ) ) { + if ( ( $limit == 0 ) && ( $optionname != '' ) ) { $limit = $wgUser->getIntOption( $optionname ); } - if( $limit <= 0 ) { + if ( $limit <= 0 ) { $limit = $deflimit; } - if( $limit > 5000 ) { + if ( $limit > 5000 ) { $limit = 5000; # We have *some* limits... } $offset = $this->getInt( 'offset', 0 ); - if( $offset < 0 ) { + if ( $offset < 0 ) { $offset = 0; } @@ -842,9 +881,10 @@ class WebRequest { return; } - if ( function_exists( 'apache_request_headers' ) ) { - foreach ( apache_request_headers() as $tempName => $tempValue ) { - $this->headers[ strtoupper( $tempName ) ] = $tempValue; + $apacheHeaders = function_exists( 'apache_request_headers' ) ? apache_request_headers() : false; + if ( $apacheHeaders ) { + foreach ( $apacheHeaders as $tempName => $tempValue ) { + $this->headers[strtoupper( $tempName )] = $tempValue; } } else { foreach ( $_SERVER as $name => $value ) { @@ -891,7 +931,7 @@ class WebRequest { * @return Mixed */ public function getSessionData( $key ) { - if( !isset( $_SESSION[$key] ) ) { + if ( !isset( $_SESSION[$key] ) ) { return null; } return $_SESSION[$key]; @@ -1097,19 +1137,28 @@ HTML; array_unshift( $ipchain, $ip ); } - # Step through XFF list and find the last address in the list which is a trusted server - # Set $ip to the IP address given by that trusted server, unless the address is not sensible (e.g. private) + # Step through XFF list and find the last address in the list which is a + # trusted server. Set $ip to the IP address given by that trusted server, + # unless the address is not sensible (e.g. private). However, prefer private + # IP addresses over proxy servers controlled by this site (more sensible). foreach ( $ipchain as $i => $curIP ) { - $curIP = IP::canonicalize( $curIP ); - if ( wfIsTrustedProxy( $curIP ) ) { - if ( isset( $ipchain[$i + 1] ) ) { - if ( $wgUsePrivateIPs || IP::isPublic( $ipchain[$i + 1 ] ) ) { - $ip = $ipchain[$i + 1]; + $curIP = IP::sanitizeIP( IP::canonicalize( $curIP ) ); + if ( wfIsTrustedProxy( $curIP ) && isset( $ipchain[$i + 1] ) ) { + if ( wfIsConfiguredProxy( $curIP ) || // bug 48919; treat IP as sane + IP::isPublic( $ipchain[$i + 1] ) || + $wgUsePrivateIPs + ) { + $nextIP = IP::canonicalize( $ipchain[$i + 1] ); + if ( !$nextIP && wfIsConfiguredProxy( $ip ) ) { + // We have not yet made it past CDN/proxy servers of this site, + // so either they are misconfigured or there is some IP spoofing. + throw new MWException( "Invalid IP given in XFF '$forwardedFor'." ); } + $ip = $nextIP; + continue; } - } else { - break; } + break; } } @@ -1117,7 +1166,7 @@ HTML; wfRunHooks( 'GetIP', array( &$ip ) ); if ( !$ip ) { - throw new MWException( "Unable to determine IP" ); + throw new MWException( "Unable to determine IP." ); } wfDebug( "IP: $ip\n" ); @@ -1266,13 +1315,13 @@ class FauxRequest extends WebRequest { * @throws MWException */ public function __construct( $data = array(), $wasPosted = false, $session = null ) { - if( is_array( $data ) ) { + if ( is_array( $data ) ) { $this->data = $data; } else { throw new MWException( "FauxRequest() got bogus data" ); } $this->wasPosted = $wasPosted; - if( $session ) { + if ( $session ) { $this->session = $session; } } @@ -1337,10 +1386,11 @@ class FauxRequest extends WebRequest { } /** - * @param $name + * @param string $name The name of the header to get (case insensitive). * @return bool|string */ public function getHeader( $name ) { + $name = strtoupper( $name ); return isset( $this->headers[$name] ) ? $this->headers[$name] : false; } @@ -1349,6 +1399,7 @@ class FauxRequest extends WebRequest { * @param $val string */ public function setHeader( $name, $val ) { + $name = strtoupper( $name ); $this->headers[$name] = $val; } @@ -1357,7 +1408,7 @@ class FauxRequest extends WebRequest { * @return mixed */ public function getSessionData( $key ) { - if( isset( $this->session[$key] ) ) { + if ( isset( $this->session[$key] ) ) { return $this->session[$key]; } return null; @@ -1386,6 +1437,30 @@ class FauxRequest extends WebRequest { return false; } + /** + * FauxRequests shouldn't depend on raw request data (but that could be implemented here) + * @return String + */ + public function getRawQueryString() { + return ''; + } + + /** + * FauxRequests shouldn't depend on raw request data (but that could be implemented here) + * @return String + */ + public function getRawPostString() { + return ''; + } + + /** + * FauxRequests shouldn't depend on raw request data (but that could be implemented here) + * @return String + */ + public function getRawInput() { + return ''; + } + /** * @param array $extWhitelist * @return bool -- cgit v1.2.3-54-g00ecf