Merge pull request #59 from ppavlovic/master

Added Curl options to ignore unsigned SSL, support for http basic auth on URL (g4/value-object >= 3.6.0)

Author: ppavlovic

composer.json

@@ -44,7 +44,7 @@
         "ext-json"        : "*",
         "g4/factory"      : "1.*",
         "g4/profiler"     : ">=1.11.0",
-        "g4/value-object" : "*",
+        "g4/value-object" : ">=3.6.0",
         "zf1/zend-db"     : "1.12.*"
     },
     "scripts": {

src/Engine/Elasticsearch/ElasticsearchClient.php

@@ -254,6 +254,8 @@ private function submitCurlRequest()
             CURLOPT_URL            => (string) $this->url,
             CURLOPT_HTTPHEADER     => ['Content-Type: application/json'],
             CURLOPT_CUSTOMREQUEST  => $this->method,
+            CURLOPT_SSL_VERIFYPEER => false,
+            CURLOPT_SSL_VERIFYHOST => false,
         ]);
 
         $response =  curl_exec($handle);
@@ -308,7 +310,7 @@ private function throwCurlException($code, $message, $url, $body, $response)
                 "Unexpected response code:%s from ES has been returned on submit. More info: %s. Url: %s. Body: %s. Response: %s",
                 $code,
                 json_encode($message),
-                json_encode($url),
+                (string) $url,
                 json_encode($body),
                 is_array($response) ? json_encode($response) : $response
             )

src/Engine/Elasticsearch/ElasticsearchClientFactory.php

@@ -36,16 +36,26 @@ public function __construct(array $params)
      */
     public function create()
     {
+        $host = parse_url($this->params['host'], PHP_URL_HOST) ?: $this->params['host'];
+        $protocol = parse_url($this->params['host'], PHP_URL_SCHEME) ?: self::PROTOCOL;
+        $port = parse_url($this->params['host'], PHP_URL_PORT) ?: $this->params['port'];
+        $username = parse_url($this->params['host'], PHP_URL_USER);
+        $password = parse_url($this->params['host'], PHP_URL_PASS);
+
         $url = new Url(
-            self::PROTOCOL .
+            $protocol .
             self::COLON .
             self::FORWARD_SLASH .
             self::FORWARD_SLASH .
-            $this->params['host']
+            $host
         );
 
+        if ($username && $password) {
+            $url = $url->credentials($username, $password);
+        }
+
         return new ElasticsearchClient(
-            $url->port(new PortNumber($this->params['port'])),
+            $url->port(new PortNumber($port)),
             $this->params['index_type'],
             $this->params['timeout'],
             $this->params['version']

tests/unit/src/Engine/Elasticsearch/ElasticsearchClientTest.php

@@ -46,9 +46,9 @@ public function testGetUrl()
     public function testCurlError()
     {
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage('Unexpected response code:Curl error number - 6 from ES has been returned on submit. More info: "Could not resolve host: nothing". Url: {}. Body: null. Response: ');
-        $elasticsearchClient = new ElasticsearchClient(new Url('http://nothing'), null, 5);
-        $elasticsearchClient->execute();
+        $this->expectExceptionMessage('Unexpected response code:Curl error number - 6 from ES has been returned on submit. More info: "Could not resolve host: nothing". Url: http://nothing//doc/. Body: null. Response: ');
+        $elasticsearchClient = new ElasticsearchClient(new Url('http://nothing/'), null, 5);
+        $elasticsearchClient->execute(); // todo - misleading because execute is only called internally
     }
 
     protected function setUp()