[BWC] Add getUserPass() method to ConnectionInterface

elastic · Sep 12, 2016 · 586fbdb · 586fbdb
1 parent 445fdea
commit 586fbdb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
@@ -493,6 +493,17 @@ public function getHost()
         return $this->host;
     }
 
+    /**
+     * @return null|string
+     */
+    public function getUserPass()
+    {
+        if (isset($this->connectionParams['client']['curl'][CURLOPT_USERPWD]) === true) {
+            return $this->connectionParams['client']['curl'][CURLOPT_USERPWD];
+        }
+        return null;
+    }
+
     /**
      * @param $request
      * @param $response

diff --git a/src/Elasticsearch/Connections/ConnectionInterface.php b/src/Elasticsearch/Connections/ConnectionInterface.php
@@ -44,6 +44,13 @@ public function getTransportSchema();
      */
     public function getHost();
 
+    /**
+     * Get the username:password string for this connection, null if not set
+     *
+     * @return null|string
+     */
+    public function getUserPass();
+
     /**
      * Check to see if this instance is marked as 'alive'
      *

diff --git a/tests/Elasticsearch/Tests/ClientTest.php b/tests/Elasticsearch/Tests/ClientTest.php
@@ -300,15 +300,13 @@ public function testInlineHosts()
         $this->assertEquals("https", $host->getTransportSchema());
 
 
-        // Note: we can't test user/pass themselves yet, need to introduce
-        // breaking change to interface in master to do that
-        // But we can confirm it doesn't break anything
         $client = Elasticsearch\ClientBuilder::create()->setHosts([
             'https://user:pass@foo.com:9200'
         ])->build();
         $host = $client->transport->getConnection();
         $this->assertEquals("foo.com:9200", $host->getHost());
         $this->assertEquals("https", $host->getTransportSchema());
+        $this->assertEquals("user:pass", $host->getUserPass());
     }
 
     public function testExtendedHosts()
@@ -410,12 +408,12 @@ public function testExtendedHosts()
             [
                 'host' => 'foo.com',
                 'user' => 'user',
-                'pass' => 'abc#$%!abc'
+                'pass' => 'abc#$@?%!abc'
             ]
         ])->build();
         $host = $client->transport->getConnection();
         $this->assertEquals("foo.com:9200", $host->getHost());
         $this->assertEquals("http", $host->getTransportSchema());
-
+        $this->assertEquals("user:abc#$@?%!abc", $host->getUserPass());
     }
 }