Allow es authentication with user credentials

Author: fabianaromagnoli

docker-compose.yml

@@ -12,9 +12,11 @@ services:
       - elasticsearch
 
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch-oss:7.4.0"
+    image: 'elastic/elasticsearch:8.4.2'
     environment:
       - "discovery.type=${ES_DISCOVERY_TYPE:-single-node}"
       - "ES_JAVA_OPTS=${ES_JAVA_OPTS:--Xms512m -Xmx512m}"
+      - xpack.security.enabled=true
+      - ELASTIC_PASSWORD=mySecretPassword
     ports:
       - "9200:9200"

src/Client.php

@@ -6,10 +6,11 @@
 
 use Amp\Http\Client\HttpClient;
 use Amp\Http\Client\HttpClientBuilder;
+use Amp\Http\Client\Interceptor\SetRequestHeaderIfUnset;
 use Amp\Http\Client\Request;
 use Amp\Http\Client\Response;
-use function Amp\call;
 use Amp\Promise;
+use function Amp\call;
 
 class Client
 {
@@ -22,9 +23,16 @@ class Client
      */
     private $httpClient;
 
-    public function __construct(string $baseUri)
+    public function __construct(string $baseUri, ?string $username, ?string $password)
     {
         $this->httpClient = HttpClientBuilder::buildDefault();
+
+        if ($username && $password) {
+            $authHeader = base64_encode("$username:$password");
+            $this->httpClient = (new HttpClientBuilder())
+                ->intercept(new SetRequestHeaderIfUnset('Authorization', 'Basic '. $authHeader))
+                ->build();
+        }
         $this->baseUri = rtrim($baseUri, '/');
     }
 

tests/Integration/ClientTest.php

@@ -13,6 +13,8 @@ class ClientTest extends TestCase
 {
     const TEST_INDEX = 'test_index';
     const DEFAULT_ES_URL = 'http://127.0.0.1:9200';
+    const DEFAULT_ES_USER = 'elastic';
+    const DEFAULT_ES_PASSWORD = 'mySecretPassword';
 
     /**
      * @var Client
@@ -22,7 +24,9 @@ class ClientTest extends TestCase
     protected function setUp(): void
     {
         $esUrl = getenv('ES_URL') ?: self::DEFAULT_ES_URL;
-        $this->client = new Client($esUrl);
+        $esUser = getenv('ES_USER') ?: self::DEFAULT_ES_USER;
+        $esPassword = getenv('ES_PASSWORD') ?: self::DEFAULT_ES_PASSWORD;
+        $this->client = new Client($esUrl, $esUser, $esPassword);
         $indices = Promise\wait($this->client->catIndices());
         foreach ($indices as $index) {
             Promise\wait($this->client->deleteIndex($index['index']));