Fix elastic client builder for connecting to elastic vm

slub · Nov 8, 2024 · 32dcb00 · 32dcb00
1 parent 7f76e86
commit 32dcb00
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Classes/Common/ElasticClientBuilder.php b/Classes/Common/ElasticClientBuilder.php
@@ -51,7 +51,7 @@ protected function autoconfig (): ElasticClientBuilder {
 			$this->setBasicAuthentication('elastic', $this->password);
 		}
 		if ($this->caFilePath) {
-			$this->setSSLVerification($this->caFilePath);
+			$this->setCABundle($this->caFilePath);
 		}
 
 		return $this;
@@ -65,7 +65,8 @@ private function setCaFilePath(): void
         }
 
         $this->caFilePath = $this->extConf->
-            only('elastcCredentialsFilePath', 'elasticCaFileName')->
+            sortKeysDesc()->
+            only('elasticCredentialsFilePath', 'elasticCaFileName')->
             implode('/');
     }
 
@@ -77,11 +78,13 @@ private function setPassword(): void
 		}
 
         $passwordFilePath = $this->extConf->
+            sortKeys()->
             only('elasticCredentialsFilePath', 'elasticPwdFileName')->
             implode('/');
         $passwordFile = fopen($passwordFilePath, 'r') or
             die($passwordFilePath . ' not found. Check your extension\'s configuration');
+        $size = filesize($passwordFilePath);
 
-        $this->password = $passwordFile->getContents();
+        $this->password = trim(fread($passwordFile, $size));
     }
 }