Merge pull request #40 from robertlemke/http-basic-auth-bugfix

[BUGFIX] Request drops username / password in some cases

This change makes the RequestService more resilient for some cases when
the HTTP Request sent to Elasticsearch did not contain the username
and password anymore, even though it has been configured in the
settings.

While the root cause is the Http\Request::create() method in Flow,
this change at least provides a workaround which allows for connecting
with Elasticsearch instances protected with HTTP Basic Auth.

Also circumvents a rare case where the content of a PUT request contains
"null" as a string.

Author: robertlemke

Classes/Flowpack/ElasticSearch/Transfer/RequestService.php

@@ -11,8 +11,10 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\Domain\Model\Client\ClientConfiguration;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Http\Client\CurlEngine;
+use TYPO3\Flow\Http\Request;
 
 /**
  * Handles the requests
@@ -63,21 +65,27 @@ public function request($method, \Flowpack\ElasticSearch\Domain\Model\Client $cl
     {
         $clientConfigurations = $client->getClientConfigurations();
         $clientConfiguration = $clientConfigurations[0];
+        /** @var ClientConfiguration $clientConfiguration */
 
         $uri = clone $clientConfiguration->getUri();
         if ($path !== null) {
             $uri->setPath($uri->getPath() . $path);
         }
 
+        $request = Request::create($uri, $method, $arguments, array(), array());
+        // In some cases, $content will contain "null" as a string. Better be safe and handle this weird case:
+        if ($content === 'null') {
+            $request->setContent(null);
+        } else {
+            $request->setContent((is_array($content) ? json_encode($content) : $content));
+        }
         if ($uri->getUsername()) {
-            $requestEngine = $this->browser->getRequestEngine();
-            $requestEngine->setOption(CURLOPT_USERPWD, $uri->getUsername() . ':' . $uri->getPassword() );
-            $requestEngine->setOption(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+            $requestUri = $request->getUri();
+            $requestUri->setUsername($uri->getUsername());
+            $requestUri->setPassword($uri->getPassword());
         }
 
-        $response = $this->browser->request($uri, $method, $arguments, array(), array(),
-            is_array($content) ? json_encode($content) : $content);
-
+        $response = $this->browser->sendRequest($request);
         return new Response($response, $this->browser->getLastRequest());
     }
 }

Documentation/Index.rst

@@ -41,8 +41,9 @@ and password in your client settings::
 	    clients:
 	        # default bundle that will be used if no more specific bundle name was supplied.
 	      default:
-	        - host: localhost
-	          port: 9200
+	        - host: my.elasticsearch-service.com
+	          port: 443
+	          scheme: https
 	          username: john
 	          password: mysecretpassword