* @link http://status.net/
*/
-if (!defined('STATUSNET')) {
+if (!defined('GNUSOCIAL')) {
exit(1);
}
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-class StatusNet_HTTPResponse extends HTTP_Request2_Response
+class GNUsocial_HTTPResponse extends HTTP_Request2_Response
{
function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
{
*/
function getUrl()
{
- return $this->url;
+ return $this->effectiveUrl;
}
/**
*
* This extends the PEAR HTTP_Request2 package:
* - sends StatusNet-specific User-Agent header
- * - 'follow_redirects' config option, defaulting off
+ * - 'follow_redirects' config option, defaulting on
* - 'max_redirs' config option, defaulting to 10
* - extended response class adds getRedirectCount() and getUrl() methods
* - get() and post() convenience functions return body content directly
$this->config['ssl_verify_peer'] = false;
}
+ // This means "verify the cert hostname against what we connect to", it does not
+ // imply CA trust or anything like that. Just the hostname.
+ $this->config['ssl_verify_host'] = common_config('http', 'ssl_verify_host');
+
+ if (common_config('http', 'curl') && extension_loaded('curl')) {
+ $this->config['adapter'] = 'HTTP_Request2_Adapter_Curl';
+ }
+
+ foreach (array('host', 'port', 'user', 'password', 'auth_scheme') as $cf) {
+ $k = 'proxy_'.$cf;
+ $v = common_config('http', $k);
+ if (!empty($v)) {
+ $this->config[$k] = $v;
+ }
+ }
+
parent::__construct($url, $method, $config);
- $this->setHeader('User-Agent', $this->userAgent());
+ $this->setHeader('User-Agent', self::userAgent());
}
/**
return new HTTPClient();
}
+ /**
+ * Quick static function to GET a URL
+ */
+ public static function quickGet($url, $accept=null, $params=array())
+ {
+ if (!empty($params)) {
+ $params = http_build_query($params, null, '&');
+ if (strpos($url, '?') === false) {
+ $url .= '?' . $params;
+ } else {
+ $url .= '&' . $params;
+ }
+ }
+
+ $client = new HTTPClient();
+ if (!is_null($accept)) {
+ $client->setHeader('Accept', $accept);
+ }
+ $response = $client->get($url);
+ if (!$response->isOk()) {
+ // TRANS: Exception. %s is a profile URL.
+ throw new Exception(sprintf(_m('Could not GET URL %s.'), $url), $response->getStatus());
+ }
+ return $response->getBody();
+ }
+
+ public static function quickGetJson($url, $params=array())
+ {
+ $data = json_decode(self::quickGet($url, null, $params));
+ if (is_null($data)) {
+ common_debug('Could not decode JSON data from URL: '.$url);
+ throw new ServerException('Could not decode JSON data from URL');
+ }
+ return $data;
+ }
+
/**
* Convenience function to run a GET request.
*
- * @return StatusNet_HTTPResponse
+ * @return GNUsocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function get($url, $headers=array())
/**
* Convenience function to run a HEAD request.
*
- * @return StatusNet_HTTPResponse
+ * NOTE: Will probably turn into a GET request if you let it follow redirects!
+ * That option is only there to be flexible and may be removed in the future!
+ *
+ * @return GNUsocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
- public function head($url, $headers=array())
+ public function head($url, $headers=array(), $follow_redirects=false)
{
- return $this->doRequest($url, self::METHOD_HEAD, $headers);
+ // Save the configured value for follow_redirects
+ $old_follow = $this->config['follow_redirects'];
+ try {
+ // Temporarily (possibly) override the follow_redirects setting
+ $this->config['follow_redirects'] = $follow_redirects;
+ return $this->doRequest($url, self::METHOD_HEAD, $headers);
+ } catch (Exception $e) {
+ // Let the exception go on its merry way.
+ throw $e;
+ } finally {
+ // reset to the old value
+ $this->config['follow_redirects'] = $old_follow;
+ }
+ //we've either returned or thrown exception here
}
/**
* @param string $url
* @param array $headers optional associative array of HTTP headers
* @param array $data optional associative array or blob of form data to submit
- * @return StatusNet_HTTPResponse
+ * @return GNUsocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
public function post($url, $headers=array(), $data=array())
}
/**
- * @return StatusNet_HTTPResponse
+ * @return GNUsocial_HTTPResponse
* @throws HTTP_Request2_Exception
*/
protected function doRequest($url, $method, $headers)
{
$this->setUrl($url);
+
+ // Workaround for HTTP_Request2 not setting up SNI in socket contexts;
+ // This fixes cert validation for SSL virtual hosts using SNI.
+ // Requires PHP 5.3.2 or later and OpenSSL with SNI support.
+ if ($this->url->getScheme() == 'https' && defined('OPENSSL_TLSEXT_SERVER_NAME')) {
+ $this->config['ssl_SNI_enabled'] = true;
+ $this->config['ssl_SNI_server_name'] = $this->url->getHost();
+ }
+
$this->setMethod($method);
if ($headers) {
foreach ($headers as $header) {
}
/**
- * Pulls up StatusNet's customized user-agent string, so services
+ * Pulls up GNU Social's customized user-agent string, so services
* we hit can track down the responsible software.
*
* @return string
*/
- function userAgent()
+ static public function userAgent()
{
- return "StatusNet/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
+ return GNUSOCIAL_ENGINE . '/' . GNUSOCIAL_VERSION
+ . ' (' . GNUSOCIAL_CODENAME . ')';
}
/**
* Actually performs the HTTP request and returns a
- * StatusNet_HTTPResponse object with response body and header info.
+ * GNUsocial_HTTPResponse object with response body and header info.
*
* Wraps around parent send() to add logging and redirection processing.
*
- * @return StatusNet_HTTPResponse
+ * @return GNUsocial_HTTPResponse
* @throw HTTP_Request2_Exception
*/
public function send()
}
break;
} while ($maxRedirs);
- return new StatusNet_HTTPResponse($response, $this->getUrl(), $redirs);
+ return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
}
-}
+}
\ No newline at end of file