fix curl tests

Author: dplewis

src/Parse/HttpClients/ParseCurlHttpClient.php

@@ -306,6 +306,18 @@ public function setCAFile($caFile)
         $this->parseCurl->setOption(CURLOPT_CAINFO, $caFile);
     }
 
+    /**
+     * Sets multiple curl options
+     * https://www.php.net/manual/en/function.curl-setopt.php
+     *
+     * @param array $options    Array of options to set
+     * @throws ParseException
+     */
+    public function setHttpOptions($options)
+    {
+        $this->parseCurl->setOptionsArray($options);
+    }
+
     /**
      * Gets the error code
      *

src/Parse/HttpClients/ParseHttpable.php

@@ -63,6 +63,13 @@ public function setTimeout($timeout);
      */
     public function setCAFile($caFile);
 
+    /**
+     * Sets http options to pass to the http client
+     *
+     * @param string $httpOptions    Options to set
+     */
+    public function setHttpOptions($httpOptions);
+
     /**
      * Gets the error code
      *

src/Parse/HttpClients/ParseStreamHttpClient.php

@@ -78,6 +78,13 @@ class ParseStreamHttpClient implements ParseHttpable
      */
     private $caFile;
 
+    /**
+     * Options to pass to the stream context.
+     *
+     * @var array
+     */
+    private static $httpOptions;
+
     /**
      * Optional timeout for this request
      *
@@ -195,6 +202,12 @@ public function send($url, $method = 'GET', $data = array())
             $this->options['ssl']['cafile'] = $this->caFile;
         }
 
+        if (isset($this->httpOptions)) {
+            foreach ($data as $key => $value) {
+                $this->options[$key] = $value;
+            }
+        }
+
         // add additional options for this request
         $this->options['http'] = array(
             'method'        => $method,
@@ -348,6 +361,17 @@ public function setCAFile($caFile)
         $this->caFile = $caFile;
     }
 
+    /**
+     * Sets http options to pass to the stream context
+     * https://www.php.net/manual/en/context.php
+     *
+     * @param array $httpOptions    options to set
+     */
+    public function setHttpOptions($httpOptions)
+    {
+        $this->$httpOptions = $httpOptions;
+    }
+
     /**
      * Sets the request timeout
      *

src/Parse/ParseClient.php

@@ -103,6 +103,13 @@ final class ParseClient
      */
     private static $caFile;
 
+    /**
+     * Options to pass to the http client.
+     *
+     * @var array
+     */
+    private static $httpOptions;
+
     /**
      * Constant for version string to include with requests.
      *
@@ -230,6 +237,7 @@ public static function getServerHealth()
 
         // try to get a response from the server
         $url = self::createRequestUrl('health');
+
         $response = $httpClient->send($url);
 
         $errorCode = $httpClient->getErrorCode();
@@ -301,6 +309,21 @@ public static function setCAFile($caFile)
         self::$caFile = $caFile;
     }
 
+    /**
+     * Sets http options to pass to the http client
+     * For curl
+     * https://www.php.net/manual/en/function.curl-setopt.php
+     *
+     * For stream context
+     * https://www.php.net/manual/en/context.php
+     * 
+     * @param array $httpOptions    options to set
+     */
+    public static function setHttpOptions($httpOptions)
+    {
+        self::$httpOptions = $httpOptions;
+    }
+
     /**
      * ParseClient::_encode, internal method for encoding object values.
      *
@@ -452,6 +475,9 @@ private static function getPreparedHttpClient()
             // set CA file
             $httpClient->setCAFile(self::$caFile);
         }
+        if (isset(self::$httpOptions)) {
+            $httpClient->setHttpOptions(self::$httpOptions);
+        }
 
         return $httpClient;
     }

tests/Parse/Helper.php

@@ -63,8 +63,6 @@ public static function setHttpClient()
             // default client set
             if (function_exists('curl_init')) {
                 // cURL client
-                Helper::print("diamon lewis");
-
                 ParseClient::setHttpClient(new ParseCurlHttpClient());
             } else {
                 // stream client
@@ -110,7 +108,7 @@ public static function print($text)
 
     public static function printArray($array)
     {
-        var_dump($array);
+        print_r($array);
         ob_end_flush();
     }
 }

tests/Parse/ParseClientTest.php

@@ -16,6 +16,8 @@
 
 use PHPUnit\Framework\TestCase;
 
+defined('CURLOPT_PINNEDPUBLICKEY') || define('CURLOPT_PINNEDPUBLICKEY', 10230);
+
 class ParseClientTest extends TestCase
 {
     public static function setUpBeforeClass() : void
@@ -671,19 +673,45 @@ public function testCheckBadServer()
     /**
      * @group test-http-options
      */
-    public function testHttpOptions()
+    public function testCurlHttpOptions()
     {
         if (function_exists('curl_init')) {
-            // set a curl client
             ParseClient::setHttpClient(new ParseCurlHttpClient());
-            echo dirname(__DIR__).'/keys/client.crt';
-            ParseClient::setCAFile(dirname(__DIR__).'/keys/client.crt');
             ParseClient::setServerURL('https://localhost:1338', 'parse');
+            ParseClient::setHttpOptions([
+                CURLOPT_SSL_VERIFYPEER => false,
+                CURLOPT_PINNEDPUBLICKEY => 'sha256//Oz+R70/uIv0irdBWc7RNPyCGeZNbN+CBiPLjJxXWigg=',
+                CURLOPT_SSLCERT => dirname(__DIR__).'/keys/client.crt',
+                CURLOPT_SSLKEY => dirname(__DIR__).'/keys/client.key',
+            ]);
             $health = ParseClient::getServerHealth();
-            Helper::printArray($health);
+
             $this->assertNotNull($health);
             $this->assertEquals($health['status'], 200);
             $this->assertEquals($health['response']['status'], 'ok');
+            Helper::setServerURL();
         }
     }
+
+    /**
+     * @group test-http-options
+     */
+    public function testStreamHttpOptions()
+    {
+        ParseClient::setHttpClient(new ParseStreamHttpClient());
+        ParseClient::setServerURL('https://localhost:1338', 'parse');
+        // ParseClient::setHttpOptions([
+        //     CURLOPT_SSL_VERIFYPEER => false,
+        //     CURLOPT_PINNEDPUBLICKEY => 'sha256//Oz+R70/uIv0irdBWc7RNPyCGeZNbN+CBiPLjJxXWigg=',
+        //     CURLOPT_SSLCERT => dirname(__DIR__).'/keys/client.crt',
+        //     CURLOPT_SSLKEY => dirname(__DIR__).'/keys/client.key',
+        // ]);
+        $health = ParseClient::getServerHealth();
+
+        Helper::printArray($health);
+        $this->assertNotNull($health);
+        $this->assertEquals($health['status'], 200);
+        $this->assertEquals($health['response']['status'], 'ok');
+        Helper::setServerURL();
+    }
 }

tests/gencerts.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 # https://gist.github.com/ryankurte/bc0d8cff6e73a6bb1950
+# https://curl.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html
 # ./gencerts.sh parseca localhost parsephp keys/
 # ./gencerts.sh parseca client parsephp keys/
 

tests/keys/client-copy.pem

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2EH42IZ9cCArjIkp0kRT
+2AKQFRXBOYRVghseMr8e5bFsMh5UAcxIzUJYVmbvbN9waItDa/OpI1DaYIal59GU
+oYYTlyH8c8Op4Qpv9Cb5SdBPIyMo4xZyQ0TOqGKU6IwcZHSFvqHmCK/PxpDuSOnc
+QuZFZoFYnWsGLOigHd8QMB0a0QQgOKr+Lb+xJFwWY55VgnzKcgnb9KaoXcq21ABm
+e6+0VEYP7sL6WjLHP68JsAiSXVKbCPdmxMp8ZgahJADtntBUvN57tCAaYcJaJGa8
+rFdl9pbbtITvGiTDrwPHzgV4Vh5RNdm6AIsW1wdD8zt6dmx9Q2N8aoUTzymIpdMO
+BdqqoIYpOpSFZiOe8fwCaJJvNRZgIn5i0BjvA7sh2OtXM+HymcJFcp58zbEkQmEN
+tKDmVaSVruslB+8pe5GXKIqifIjmEhgXDODA8+jP5Mo8tGW3LOY92Y2yEE3xRJc5
+3dDm8b0lZIzak/+XlRS6xFEDZKsMSy53TTiadB4KHUgdsX6yu51IdAo/LFg51z9b
+NRXLL5E3nc3VUb0mQfrS3cODStiIL7CKWpLYbnoxuCtI3gdOV2ZwZ5vMkwh0Wk1I
+osm4jzzqSB5933Q52w+pIjyuM+sRUDIvTrDs/X39tpbLJGUNAvcOjm68xGTZgYcr
+YSOZqUHq6rgxq2o5ZeiuhisCAwEAAQ==
+-----END PUBLIC KEY-----

tests/keys/localhost.pubkey.der

@@ -91,7 +91,6 @@ function onRequest(req) {
 
 // Create TLS enabled server
 const server = https.createServer(serverOptions, app);
-// const server = http.createServer(app);
 server.on('request', onRequest);
 
 // Start Server