X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fhttpclient.php;h=c7abe121166b7aaa72578c382048876f3ea29d5f;hb=c44146d6f83c06d1d10dac6a1e35754c7c783974;hp=384626ae06348de59dffc70af3a1a82338ed91e4;hpb=53650c7a5e8f2a27f8d0d02367bda8934f59c0e6;p=quix0rs-gnu-social.git

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 384626ae06..c7abe12116 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('GNUSOCIAL')) {
     exit(1);
 }
 
@@ -54,7 +54,7 @@ require_once 'HTTP/Request2/Response.php';
  * @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)
     {
@@ -132,9 +132,33 @@ class HTTPClient extends HTTP_Request2
         // ought to be investigated to see if we can handle
         // it gracefully in that case as well.
         $this->config['protocol_version'] = '1.0';
-        
+
+        // Default state of OpenSSL seems to have no trusted
+        // SSL certificate authorities, which breaks hostname
+        // verification and means we have a hard time communicating
+        // with other sites' HTTPS interfaces.
+        //
+        // Turn off verification unless we've configured a CA bundle.
+        if (common_config('http', 'ssl_cafile')) {
+            $this->config['ssl_cafile'] = common_config('http', 'ssl_cafile');
+        } else {
+            $this->config['ssl_verify_peer'] = false;
+        }
+
+        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());
     }
 
     /**
@@ -149,7 +173,7 @@ class HTTPClient extends HTTP_Request2
     /**
      * Convenience function to run a GET request.
      *
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
     public function get($url, $headers=array())
@@ -160,7 +184,7 @@ class HTTPClient extends HTTP_Request2
     /**
      * Convenience function to run a HEAD request.
      *
-     * @return StatusNet_HTTPResponse
+     * @return GNUsocial_HTTPResponse
      * @throws HTTP_Request2_Exception
      */
     public function head($url, $headers=array())
@@ -174,7 +198,7 @@ class HTTPClient extends HTTP_Request2
      * @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())
@@ -186,12 +210,21 @@ class HTTPClient extends HTTP_Request2
     }
 
     /**
-     * @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) {
@@ -209,23 +242,24 @@ class HTTPClient extends HTTP_Request2
     }
 
     /**
-     * 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()
@@ -268,6 +302,6 @@ class HTTPClient extends HTTP_Request2
             }
             break;
         } while ($maxRedirs);
-        return new StatusNet_HTTPResponse($response, $this->getUrl(), $redirs);
+        return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
     }
 }