diff options
Diffstat (limited to 'includes/HttpFunctions.php')
| -rw-r--r-- | includes/HttpFunctions.php | 519 |
1 files changed, 344 insertions, 175 deletions
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index d5983635..e6124426 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -12,28 +12,37 @@ class Http { /** * Perform an HTTP request - * @param $method string HTTP method. Usually GET/POST - * @param $url string Full URL to act on - * @param $options options to pass to HttpRequest object - * Possible keys for the array: - * timeout Timeout length in seconds - * postData An array of key-value pairs or a url-encoded form data - * proxy The proxy to use. Will use $wgHTTPProxy (if set) otherwise. - * noProxy Override $wgHTTPProxy (if set) and don't use any proxy at all. - * sslVerifyHost (curl only) Verify the SSL certificate - * caInfo (curl only) Provide CA information - * maxRedirects Maximum number of redirects to follow (defaults to 5) - * followRedirects Whether to follow redirects (defaults to true) - * @returns mixed (bool)false on failure or a string on success + * + * @param $method String: HTTP method. Usually GET/POST + * @param $url String: full URL to act on + * @param $options Array: options to pass to MWHttpRequest object. + * Possible keys for the array: + * - timeout Timeout length in seconds + * - postData An array of key-value pairs or a url-encoded form data + * - proxy The proxy to use. + * Will use $wgHTTPProxy (if set) otherwise. + * - noProxy Override $wgHTTPProxy (if set) and don't use any proxy at all. + * - sslVerifyHost (curl only) Verify hostname against certificate + * - sslVerifyCert (curl only) Verify SSL certificate + * - caInfo (curl only) Provide CA information + * - maxRedirects Maximum number of redirects to follow (defaults to 5) + * - followRedirects Whether to follow redirects (defaults to false). + * Note: this should only be used when the target URL is trusted, + * to avoid attacks on intranet services accessible by HTTP. + * @return Mixed: (bool)false on failure or a string on success */ public static function request( $method, $url, $options = array() ) { - wfDebug( "HTTP: $method: $url" ); + $url = wfExpandUrl( $url ); + wfDebug( "HTTP: $method: $url\n" ); $options['method'] = strtoupper( $method ); + if ( !isset( $options['timeout'] ) ) { $options['timeout'] = 'default'; } - $req = HttpRequest::factory( $url, $options ); + + $req = MWHttpRequest::factory( $url, $options ); $status = $req->execute(); + if ( $status->isOK() ) { return $req->getContent(); } else { @@ -60,11 +69,13 @@ class Http { /** * Check if the URL can be served by localhost - * @param $url string Full url to check - * @return bool + * + * @param $url String: full url to check + * @return Boolean */ public static function isLocalURL( $url ) { global $wgCommandLineMode, $wgConf; + if ( $wgCommandLineMode ) { return false; } @@ -77,6 +88,7 @@ class Http { $domainParts = explode( '.', $host ); // Check if this domain or any superdomain is listed in $wgConf as a local virtual host $domainParts = array_reverse( $domainParts ); + for ( $i = 0; $i < count( $domainParts ); $i++ ) { $domainPart = $domainParts[$i]; if ( $i == 0 ) { @@ -84,17 +96,19 @@ class Http { } else { $domain = $domainPart . '.' . $domain; } + if ( $wgConf->isLocalVHost( $domain ) ) { return true; } } } + return false; } /** * A standard user-agent we can use for external requests. - * @returns string + * @return String */ public static function userAgent() { global $wgVersion; @@ -102,15 +116,19 @@ class Http { } /** - * Checks that the given URI is a valid one + * Checks that the given URI is a valid one. Hardcoding the + * protocols, because we only want protocols that both cURL + * and php support. + * + * @fixme this is wildly inaccurate and fails to actually check most stuff + * * @param $uri Mixed: URI to check for validity - * @returns bool + * @returns Boolean */ public static function isValidURI( $uri ) { return preg_match( - '/(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/', - $uri, - $matches + '/^https?:\/\/[^\/\s]\S*$/D', + $uri ); } } @@ -118,8 +136,11 @@ class Http { /** * This wrapper class will call out to curl (if available) or fallback * to regular PHP if necessary for handling internal HTTP requests. + * + * Renamed from HttpRequest to MWHttpRequst to avoid conflict with + * php's HTTP extension. */ -class HttpRequest { +class MWHttpRequest { protected $content; protected $timeout = 'default'; protected $headersOnly = null; @@ -127,6 +148,7 @@ class HttpRequest { protected $proxy = null; protected $noProxy = false; protected $sslVerifyHost = true; + protected $sslVerifyCert = true; protected $caInfo = null; protected $method = "GET"; protected $reqHeaders = array(); @@ -134,7 +156,7 @@ class HttpRequest { protected $parsedUrl; protected $callback; protected $maxRedirects = 5; - protected $followRedirects = true; + protected $followRedirects = false; protected $cookieJar; @@ -146,8 +168,8 @@ class HttpRequest { public $status; /** - * @param $url string url to use - * @param $options array (optional) extra params to pass (see Http::request()) + * @param $url String: url to use + * @param $options Array: (optional) extra params to pass (see Http::request()) */ function __construct( $url, $options = array() ) { global $wgHTTPTimeout; @@ -156,21 +178,22 @@ class HttpRequest { $this->parsedUrl = parse_url( $url ); if ( !Http::isValidURI( $this->url ) ) { - $this->status = Status::newFatal('http-invalid-url'); + $this->status = Status::newFatal( 'http-invalid-url' ); } else { $this->status = Status::newGood( 100 ); // continue } - if ( isset($options['timeout']) && $options['timeout'] != 'default' ) { + if ( isset( $options['timeout'] ) && $options['timeout'] != 'default' ) { $this->timeout = $options['timeout']; } else { $this->timeout = $wgHTTPTimeout; } $members = array( "postData", "proxy", "noProxy", "sslVerifyHost", "caInfo", - "method", "followRedirects", "maxRedirects" ); + "method", "followRedirects", "maxRedirects", "sslVerifyCert" ); + foreach ( $members as $o ) { - if ( isset($options[$o]) ) { + if ( isset( $options[$o] ) ) { $this->$o = $options[$o]; } } @@ -178,42 +201,54 @@ class HttpRequest { /** * Generate a new request object - * @see HttpRequest::__construct + * @see MWHttpRequest::__construct */ public static function factory( $url, $options = null ) { if ( !Http::$httpEngine ) { Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php'; } elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) { - throw new MWException( __METHOD__.': curl (http://php.net/curl) is not installed, but'. + throw new MWException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' . ' Http::$httpEngine is set to "curl"' ); } switch( Http::$httpEngine ) { - case 'curl': - return new CurlHttpRequest( $url, $options ); - case 'php': - if ( !wfIniGetBool( 'allow_url_fopen' ) ) { - throw new MWException( __METHOD__.': allow_url_fopen needs to be enabled for pure PHP'. - ' http requests to work. If possible, curl should be used instead. See http://php.net/curl.' ); - } - return new PhpHttpRequest( $url, $options ); - default: - throw new MWException( __METHOD__.': The setting of Http::$httpEngine is not valid.' ); + case 'curl': + return new CurlHttpRequest( $url, $options ); + case 'php': + if ( !wfIniGetBool( 'allow_url_fopen' ) ) { + throw new MWException( __METHOD__ . ': allow_url_fopen needs to be enabled for pure PHP' . + ' http requests to work. If possible, curl should be used instead. See http://php.net/curl.' ); + } + return new PhpHttpRequest( $url, $options ); + default: + throw new MWException( __METHOD__ . ': The setting of Http::$httpEngine is not valid.' ); } } /** * Get the body, or content, of the response to the request - * @return string + * + * @return String */ public function getContent() { return $this->content; } /** + * Set the parameters of the request + + * @param $args Array + * @todo overload the args param + */ + public function setData( $args ) { + $this->postData = $args; + } + + /** * Take care of setting up the proxy * (override in subclass) - * @return string + * + * @return String */ public function proxySetup() { global $wgHTTPProxy; @@ -221,6 +256,7 @@ class HttpRequest { if ( $this->proxy ) { return; } + if ( Http::isLocalURL( $this->url ) ) { $this->proxy = 'http://localhost:80/'; } elseif ( $wgHTTPProxy ) { @@ -234,20 +270,20 @@ class HttpRequest { * Set the refererer header */ public function setReferer( $url ) { - $this->setHeader('Referer', $url); + $this->setHeader( 'Referer', $url ); } /** * Set the user agent */ public function setUserAgent( $UA ) { - $this->setHeader('User-Agent', $UA); + $this->setHeader( 'User-Agent', $UA ); } /** * Set an arbitrary header */ - public function setHeader($name, $value) { + public function setHeader( $name, $value ) { // I feel like I should normalize the case here... $this->reqHeaders[$name] = $value; } @@ -258,30 +294,51 @@ class HttpRequest { public function getHeaderList() { $list = array(); - if( $this->cookieJar ) { + if ( $this->cookieJar ) { $this->reqHeaders['Cookie'] = - $this->cookieJar->serializeToHttpRequest($this->parsedUrl['path'], - $this->parsedUrl['host']); + $this->cookieJar->serializeToHttpRequest( + $this->parsedUrl['path'], + $this->parsedUrl['host'] + ); } - foreach($this->reqHeaders as $name => $value) { + + foreach ( $this->reqHeaders as $name => $value ) { $list[] = "$name: $value"; } + return $list; } /** - * Set the callback - * @param $callback callback + * Set a read callback to accept data read from the HTTP request. + * By default, data is appended to an internal buffer which can be + * retrieved through $req->getContent(). + * + * To handle data as it comes in -- especially for large files that + * would not fit in memory -- you can instead set your own callback, + * in the form function($resource, $buffer) where the first parameter + * is the low-level resource being read (implementation specific), + * and the second parameter is the data buffer. + * + * You MUST return the number of bytes handled in the buffer; if fewer + * bytes are reported handled than were passed to you, the HTTP fetch + * will be aborted. + * + * @param $callback Callback */ public function setCallback( $callback ) { + if ( !is_callable( $callback ) ) { + throw new MWException( 'Invalid MwHttpRequest callback' ); + } $this->callback = $callback; } /** * A generic callback to read the body of the response from a remote * server. + * * @param $fh handle - * @param $content string + * @param $content String */ public function read( $fh, $content ) { $this->content .= $content; @@ -290,12 +347,15 @@ class HttpRequest { /** * Take care of whatever is necessary to perform the URI request. + * * @return Status */ public function execute() { global $wgTitle; - if( strtoupper($this->method) == "HEAD" ) { + $this->content = ""; + + if ( strtoupper( $this->method ) == "HEAD" ) { $this->headersOnly = true; } @@ -303,7 +363,7 @@ class HttpRequest { $this->postData = wfArrayToCGI( $this->postData ); } - if ( is_object( $wgTitle ) && !isset($this->reqHeaders['Referer']) ) { + if ( is_object( $wgTitle ) && !isset( $this->reqHeaders['Referer'] ) ) { $this->setReferer( $wgTitle->getFullURL() ); } @@ -315,8 +375,8 @@ class HttpRequest { $this->setCallback( array( $this, 'read' ) ); } - if ( !isset($this->reqHeaders['User-Agent']) ) { - $this->setUserAgent(Http::userAgent()); + if ( !isset( $this->reqHeaders['User-Agent'] ) ) { + $this->setUserAgent( Http::userAgent() ); } } @@ -324,18 +384,20 @@ class HttpRequest { * Parses the headers, including the HTTP status code and any * Set-Cookie headers. This function expectes the headers to be * found in an array in the member variable headerList. - * @returns nothing + * + * @return nothing */ protected function parseHeader() { $lastname = ""; - foreach( $this->headerList as $header ) { - if( preg_match( "#^HTTP/([0-9.]+) (.*)#", $header, $match ) ) { + + foreach ( $this->headerList as $header ) { + if ( preg_match( "#^HTTP/([0-9.]+) (.*)#", $header, $match ) ) { $this->respVersion = $match[1]; $this->respStatus = $match[2]; - } elseif( preg_match( "#^[ \t]#", $header ) ) { - $last = count($this->respHeaders[$lastname]) - 1; + } elseif ( preg_match( "#^[ \t]#", $header ) ) { + $last = count( $this->respHeaders[$lastname] ) - 1; $this->respHeaders[$lastname][$last] .= "\r\n$header"; - } elseif( preg_match( "#^([^:]*):[\t ]*(.*)#", $header, $match ) ) { + } elseif ( preg_match( "#^([^:]*):[\t ]*(.*)#", $header, $match ) ) { $this->respHeaders[strtolower( $match[1] )][] = $match[2]; $lastname = strtolower( $match[1] ); } @@ -345,35 +407,58 @@ class HttpRequest { } /** - * Sets the member variable status to a fatal status if the HTTP - * status code was not 200. - * @returns nothing + * Sets HTTPRequest status member to a fatal value with the error + * message if the returned integer value of the status code was + * not successful (< 300) or a redirect (>=300 and < 400). (see + * RFC2616, section 10, + * http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for a + * list of status codes.) + * + * @return nothing */ protected function setStatus() { - if( !$this->respHeaders ) { + if ( !$this->respHeaders ) { $this->parseHeader(); } - if((int)$this->respStatus !== 200) { - list( $code, $message ) = explode(" ", $this->respStatus, 2); - $this->status->fatal("http-bad-status", $code, $message ); + if ( (int)$this->respStatus > 399 ) { + list( $code, $message ) = explode( " ", $this->respStatus, 2 ); + $this->status->fatal( "http-bad-status", $code, $message ); } } + /** + * Get the integer value of the HTTP status code (e.g. 200 for "200 Ok") + * (see RFC2616, section 10, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html + * for a list of status codes.) + * + * @return Integer + */ + public function getStatus() { + if ( !$this->respHeaders ) { + $this->parseHeader(); + } + + return (int)$this->respStatus; + } + /** * Returns true if the last status code was a redirect. - * @return bool + * + * @return Boolean */ public function isRedirect() { - if( !$this->respHeaders ) { + if ( !$this->respHeaders ) { $this->parseHeader(); } $status = (int)$this->respStatus; - if ( $status >= 300 && $status < 400 ) { + + if ( $status >= 300 && $status <= 303 ) { return true; } + return false; } @@ -382,33 +467,39 @@ class HttpRequest { * request has been executed. Because some headers * (e.g. Set-Cookie) can appear more than once the, each value of * the associative array is an array of the values given. - * @return array + * + * @return Array */ public function getResponseHeaders() { - if( !$this->respHeaders ) { + if ( !$this->respHeaders ) { $this->parseHeader(); } + return $this->respHeaders; } /** * Returns the value of the given response header. - * @param $header string - * @return string + * + * @param $header String + * @return String */ - public function getResponseHeader($header) { - if( !$this->respHeaders ) { + public function getResponseHeader( $header ) { + if ( !$this->respHeaders ) { $this->parseHeader(); } + if ( isset( $this->respHeaders[strtolower ( $header ) ] ) ) { $v = $this->respHeaders[strtolower ( $header ) ]; return $v[count( $v ) - 1]; } + return null; } /** - * Tells the HttpRequest object to use this pre-loaded CookieJar. + * Tells the MWHttpRequest object to use this pre-loaded CookieJar. + * * @param $jar CookieJar */ public function setCookieJar( $jar ) { @@ -417,12 +508,14 @@ class HttpRequest { /** * Returns the cookie jar in use. + * * @returns CookieJar */ public function getCookieJar() { - if( !$this->respHeaders ) { + if ( !$this->respHeaders ) { $this->parseHeader(); } + return $this->cookieJar; } @@ -432,23 +525,25 @@ class HttpRequest { * Set-Cookie headers. * @see Cookie::set */ - public function setCookie( $name, $value = null, $attr = null) { - if( !$this->cookieJar ) { + public function setCookie( $name, $value = null, $attr = null ) { + if ( !$this->cookieJar ) { $this->cookieJar = new CookieJar; } - $this->cookieJar->setCookie($name, $value, $attr); + + $this->cookieJar->setCookie( $name, $value, $attr ); } /** * Parse the cookies in the response headers and store them in the cookie jar. */ protected function parseCookies() { - if( !$this->cookieJar ) { + if ( !$this->cookieJar ) { $this->cookieJar = new CookieJar; } - if( isset( $this->respHeaders['set-cookie'] ) ) { + + if ( isset( $this->respHeaders['set-cookie'] ) ) { $url = parse_url( $this->getFinalUrl() ); - foreach( $this->respHeaders['set-cookie'] as $cookie ) { + foreach ( $this->respHeaders['set-cookie'] as $cookie ) { $this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] ); } } @@ -456,16 +551,26 @@ class HttpRequest { /** * Returns the final URL after all redirections. - * @returns string + * + * @return String */ public function getFinalUrl() { - $location = $this->getResponseHeader("Location"); + $location = $this->getResponseHeader( "Location" ); + if ( $location ) { return $location; } return $this->url; } + + /** + * Returns true if the backend can follow redirects. Overridden by the + * child classes. + */ + public function canFollowRedirects() { + return true; + } } @@ -490,30 +595,33 @@ class Cookie { * Sets a cookie. Used before a request to set up any individual * cookies. Used internally after a request to parse the * Set-Cookie headers. - * @param $name string the name of the cookie - * @param $value string the value of the cookie - * @param $attr array possible key/values: + * + * @param $value String: the value of the cookie + * @param $attr Array: possible key/values: * expires A date string * path The path this cookie is used on * domain Domain this cookie is used on */ public function set( $value, $attr ) { $this->value = $value; - if( isset( $attr['expires'] ) ) { + + if ( isset( $attr['expires'] ) ) { $this->isSessionKey = false; $this->expires = strtotime( $attr['expires'] ); } - if( isset( $attr['path'] ) ) { + + if ( isset( $attr['path'] ) ) { $this->path = $attr['path']; } else { $this->path = "/"; } - if( isset( $attr['domain'] ) ) { - if( self::validateCookieDomain( $attr['domain'] ) ) { + + if ( isset( $attr['domain'] ) ) { + if ( self::validateCookieDomain( $attr['domain'] ) ) { $this->domain = $attr['domain']; } } else { - throw new MWException("You must specify a domain."); + throw new MWException( "You must specify a domain." ); } } @@ -525,46 +633,52 @@ class Cookie { * A better method might be to use a blacklist like * http://publicsuffix.org/ * - * @param $domain string the domain to validate - * @param $originDomain string (optional) the domain the cookie originates from - * @return bool + * @param $domain String: the domain to validate + * @param $originDomain String: (optional) the domain the cookie originates from + * @return Boolean */ - public static function validateCookieDomain( $domain, $originDomain = null) { + public static function validateCookieDomain( $domain, $originDomain = null ) { // Don't allow a trailing dot - if( substr( $domain, -1 ) == "." ) return false; - - $dc = explode(".", $domain); + if ( substr( $domain, -1 ) == "." ) { + return false; + } - // Don't allow cookies for "localhost", "ls" or other dot-less hosts - if( count($dc) < 2 ) return false; + $dc = explode( ".", $domain ); // Only allow full, valid IP addresses - if( preg_match( '/^[0-9.]+$/', $domain ) ) { - if( count( $dc ) != 4 ) return false; + if ( preg_match( '/^[0-9.]+$/', $domain ) ) { + if ( count( $dc ) != 4 ) { + return false; + } - if( ip2long( $domain ) === false ) return false; + if ( ip2long( $domain ) === false ) { + return false; + } - if( $originDomain == null || $originDomain == $domain ) return true; + if ( $originDomain == null || $originDomain == $domain ) { + return true; + } } // Don't allow cookies for "co.uk" or "gov.uk", etc, but allow "supermarket.uk" - if( strrpos( $domain, "." ) - strlen( $domain ) == -3 ) { - if( (count($dc) == 2 && strlen( $dc[0] ) <= 2 ) - || (count($dc) == 3 && strlen( $dc[0] ) == "" && strlen( $dc[1] ) <= 2 ) ) { + if ( strrpos( $domain, "." ) - strlen( $domain ) == -3 ) { + if ( ( count( $dc ) == 2 && strlen( $dc[0] ) <= 2 ) + || ( count( $dc ) == 3 && strlen( $dc[0] ) == "" && strlen( $dc[1] ) <= 2 ) ) { return false; } - if( (count($dc) == 2 || (count($dc) == 3 && $dc[0] == "") ) - && preg_match( '/(com|net|org|gov|edu)\...$/', $domain) ) { + if ( ( count( $dc ) == 2 || ( count( $dc ) == 3 && $dc[0] == "" ) ) + && preg_match( '/(com|net|org|gov|edu)\...$/', $domain ) ) { return false; } } - if( $originDomain != null ) { - if( substr( $domain, 0, 1 ) != "." && $domain != $originDomain ) { + if ( $originDomain != null ) { + if ( substr( $domain, 0, 1 ) != "." && $domain != $originDomain ) { return false; } - if( substr( $domain, 0, 1 ) == "." + + if ( substr( $domain, 0, 1 ) == "." && substr_compare( $originDomain, $domain, -strlen( $domain ), strlen( $domain ), TRUE ) != 0 ) { return false; @@ -576,47 +690,50 @@ class Cookie { /** * Serialize the cookie jar into a format useful for HTTP Request headers. - * @param $path string the path that will be used. Required. - * @param $domain string the domain that will be used. Required. - * @return string + * + * @param $path String: the path that will be used. Required. + * @param $domain String: the domain that will be used. Required. + * @return String */ public function serializeToHttpRequest( $path, $domain ) { $ret = ""; - if( $this->canServeDomain( $domain ) + if ( $this->canServeDomain( $domain ) && $this->canServePath( $path ) && $this->isUnExpired() ) { - $ret = $this->name ."=". $this->value; + $ret = $this->name . "=" . $this->value; } return $ret; } protected function canServeDomain( $domain ) { - if( $domain == $this->domain - || ( strlen( $domain) > strlen( $this->domain ) - && substr( $this->domain, 0, 1) == "." + if ( $domain == $this->domain + || ( strlen( $domain ) > strlen( $this->domain ) + && substr( $this->domain, 0, 1 ) == "." && substr_compare( $domain, $this->domain, -strlen( $this->domain ), strlen( $this->domain ), TRUE ) == 0 ) ) { return true; } + return false; } protected function canServePath( $path ) { - if( $this->path && substr_compare( $this->path, $path, 0, strlen( $this->path ) ) == 0 ) { + if ( $this->path && substr_compare( $this->path, $path, 0, strlen( $this->path ) ) == 0 ) { return true; } + return false; } protected function isUnExpired() { - if( $this->isSessionKey || $this->expires > time() ) { + if ( $this->isSessionKey || $this->expires > time() ) { return true; } + return false; } - } class CookieJar { @@ -626,12 +743,13 @@ class CookieJar { * Set a cookie in the cookie jar. Make sure only one cookie per-name exists. * @see Cookie::set() */ - public function setCookie ($name, $value, $attr) { + public function setCookie ( $name, $value, $attr ) { /* cookies: case insensitive, so this should work. * We'll still send the cookies back in the same case we got them, though. */ - $index = strtoupper($name); - if( isset( $this->cookie[$index] ) ) { + $index = strtoupper( $name ); + + if ( isset( $this->cookie[$index] ) ) { $this->cookie[$index]->set( $value, $attr ); } else { $this->cookie[$index] = new Cookie( $name, $value, $attr ); @@ -644,38 +762,46 @@ class CookieJar { public function serializeToHttpRequest( $path, $domain ) { $cookies = array(); - foreach( $this->cookie as $c ) { + foreach ( $this->cookie as $c ) { $serialized = $c->serializeToHttpRequest( $path, $domain ); - if ( $serialized ) $cookies[] = $serialized; + + if ( $serialized ) { + $cookies[] = $serialized; + } } - return implode("; ", $cookies); + return implode( "; ", $cookies ); } /** * Parse the content of an Set-Cookie HTTP Response header. - * @param $cookie string + * + * @param $cookie String + * @param $domain String: cookie's domain */ public function parseCookieResponseHeader ( $cookie, $domain ) { $len = strlen( "Set-Cookie:" ); + if ( substr_compare( "Set-Cookie:", $cookie, 0, $len, TRUE ) === 0 ) { $cookie = substr( $cookie, $len ); } $bit = array_map( 'trim', explode( ";", $cookie ) ); - if ( count($bit) >= 1 ) { - list($name, $value) = explode( "=", array_shift( $bit ), 2 ); + + if ( count( $bit ) >= 1 ) { + list( $name, $value ) = explode( "=", array_shift( $bit ), 2 ); $attr = array(); - foreach( $bit as $piece ) { + + foreach ( $bit as $piece ) { $parts = explode( "=", $piece ); - if( count( $parts ) > 1 ) { + if ( count( $parts ) > 1 ) { $attr[strtolower( $parts[0] )] = $parts[1]; } else { $attr[strtolower( $parts[0] )] = true; } } - if( !isset( $attr['domain'] ) ) { + if ( !isset( $attr['domain'] ) ) { $attr['domain'] = $domain; } elseif ( !Cookie::validateCookieDomain( $attr['domain'], $domain ) ) { return null; @@ -686,11 +812,10 @@ class CookieJar { } } - /** - * HttpRequest implemented using internal curl compiled into PHP + * MWHttpRequest implemented using internal curl compiled into PHP */ -class CurlHttpRequest extends HttpRequest { +class CurlHttpRequest extends MWHttpRequest { static $curlMessageMap = array( 6 => 'http-host-unreachable', 28 => 'http-timed-out' @@ -706,26 +831,33 @@ class CurlHttpRequest extends HttpRequest { public function execute() { parent::execute(); + if ( !$this->status->isOK() ) { return $this->status; } + $this->curlOptions[CURLOPT_PROXY] = $this->proxy; $this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout; $this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0; $this->curlOptions[CURLOPT_WRITEFUNCTION] = $this->callback; - $this->curlOptions[CURLOPT_HEADERFUNCTION] = array($this, "readHeader"); + $this->curlOptions[CURLOPT_HEADERFUNCTION] = array( $this, "readHeader" ); $this->curlOptions[CURLOPT_MAXREDIRS] = $this->maxRedirects; + $this->curlOptions[CURLOPT_ENCODING] = ""; # Enable compression /* not sure these two are actually necessary */ - if(isset($this->reqHeaders['Referer'])) { + if ( isset( $this->reqHeaders['Referer'] ) ) { $this->curlOptions[CURLOPT_REFERER] = $this->reqHeaders['Referer']; } $this->curlOptions[CURLOPT_USERAGENT] = $this->reqHeaders['User-Agent']; - if ( $this->sslVerifyHost ) { + if ( isset( $this->sslVerifyHost ) ) { $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost; } + if ( isset( $this->sslVerifyCert ) ) { + $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert; + } + if ( $this->caInfo ) { $this->curlOptions[CURLOPT_CAINFO] = $this->caInfo; } @@ -747,12 +879,18 @@ class CurlHttpRequest extends HttpRequest { $this->curlOptions[CURLOPT_HTTPHEADER] = $this->getHeaderList(); $curlHandle = curl_init( $this->url ); + if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) { - throw new MWException("Error setting curl options."); + throw new MWException( "Error setting curl options." ); } - if ( ! @curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, $this->followRedirects ) ) { - wfDebug("Couldn't set CURLOPT_FOLLOWLOCATION. Probably safe_mode or open_basedir is set."); - /* Continue the processing. If it were in curl_setopt_array, processing would have halted on its entry */ + + if ( $this->followRedirects && $this->canFollowRedirects() ) { + if ( ! @curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) { + wfDebug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " . + "Probably safe_mode or open_basedir is set.\n" ); + // Continue the processing. If it were in curl_setopt_array, + // processing would have halted on its entry + } } if ( false === curl_exec( $curlHandle ) ) { @@ -764,20 +902,33 @@ class CurlHttpRequest extends HttpRequest { $this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) ); } } else { - $this->headerList = explode("\r\n", $this->headerText); + $this->headerList = explode( "\r\n", $this->headerText ); } curl_close( $curlHandle ); $this->parseHeader(); $this->setStatus(); + return $this->status; } -} -class PhpHttpRequest extends HttpRequest { - protected $manuallyRedirect = false; + public function canFollowRedirects() { + if ( strval( ini_get( 'open_basedir' ) ) !== '' || wfIniGetBool( 'safe_mode' ) ) { + wfDebug( "Cannot follow redirects in safe mode\n" ); + return false; + } + + if ( !defined( 'CURLOPT_REDIR_PROTOCOLS' ) ) { + wfDebug( "Cannot follow redirects with libcurl < 7.19.4 due to CVE-2009-0037\n" ); + return false; + } + + return true; + } +} +class PhpHttpRequest extends MWHttpRequest { protected function urlToTcp( $url ) { $parsedUrl = parse_url( $url ); @@ -789,11 +940,10 @@ class PhpHttpRequest extends HttpRequest { // At least on Centos 4.8 with PHP 5.1.6, using max_redirects to follow redirects // causes a segfault - if ( version_compare( '5.1.7', phpversion(), '>' ) ) { - $this->manuallyRedirect = true; - } + $manuallyRedirect = version_compare( phpversion(), '5.1.7', '<' ); - if ( $this->parsedUrl['scheme'] != 'http' ) { + if ( $this->parsedUrl['scheme'] != 'http' && + $this->parsedUrl['scheme'] != 'https' ) { $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] ); } @@ -810,14 +960,14 @@ class PhpHttpRequest extends HttpRequest { $options['request_fulluri'] = true; } - if ( !$this->followRedirects || $this->manuallyRedirect ) { + if ( !$this->followRedirects || $manuallyRedirect ) { $options['max_redirects'] = 0; } else { $options['max_redirects'] = $this->maxRedirects; } $options['method'] = $this->method; - $options['header'] = implode("\r\n", $this->getHeaderList()); + $options['header'] = implode( "\r\n", $this->getHeaderList() ); // Note that at some future point we may want to support // HTTP/1.1, but we'd have to write support for chunking // in version of PHP < 5.3.1 @@ -833,7 +983,7 @@ class PhpHttpRequest extends HttpRequest { $oldTimeout = false; if ( version_compare( '5.2.1', phpversion(), '>' ) ) { - $oldTimeout = ini_set('default_socket_timeout', $this->timeout); + $oldTimeout = ini_set( 'default_socket_timeout', $this->timeout ); } else { $options['timeout'] = $this->timeout; } @@ -843,25 +993,42 @@ class PhpHttpRequest extends HttpRequest { $this->headerList = array(); $reqCount = 0; $url = $this->url; + do { - $again = false; $reqCount++; wfSuppressWarnings(); $fh = fopen( $url, "r", false, $context ); wfRestoreWarnings(); - if ( $fh ) { - $result = stream_get_meta_data( $fh ); - $this->headerList = $result['wrapper_data']; - $this->parseHeader(); - $url = $this->getResponseHeader("Location"); - $again = $this->manuallyRedirect && $this->followRedirects && $url - && $this->isRedirect() && $this->maxRedirects > $reqCount; + + if ( !$fh ) { + break; + } + + $result = stream_get_meta_data( $fh ); + $this->headerList = $result['wrapper_data']; + $this->parseHeader(); + + if ( !$manuallyRedirect || !$this->followRedirects ) { + break; } - } while ( $again ); + + # Handle manual redirection + if ( !$this->isRedirect() || $reqCount > $this->maxRedirects ) { + break; + } + # Check security of URL + $url = $this->getResponseHeader( "Location" ); + + if ( substr( $url, 0, 7 ) !== 'http://' ) { + wfDebug( __METHOD__ . ": insecure redirection\n" ); + break; + } + } while ( true ); if ( $oldTimeout !== false ) { - ini_set('default_socket_timeout', $oldTimeout); + ini_set( 'default_socket_timeout', $oldTimeout ); } + $this->setStatus(); if ( $fh === false ) { @@ -874,13 +1041,15 @@ class PhpHttpRequest extends HttpRequest { return $this->status; } - if($this->status->isOK()) { + if ( $this->status->isOK() ) { while ( !feof( $fh ) ) { $buf = fread( $fh, 8192 ); + if ( $buf === false ) { $this->status->fatal( 'http-read-error' ); break; } + if ( strlen( $buf ) ) { call_user_func( $this->callback, $fh, $buf ); } |