Elasticsearch, ClickHouse: Do not print response if HTTP code is not 200

Thanks to Adam Crosser and Brian Sizemore

diff --git a/adminer/drivers/clickhouse.inc.php b/adminer/drivers/clickhouse.inc.php
index d72109d5becfe79354079d8c479b16f71d98ce8c..99c77ab8106754ebc0ac24e99863c2cf466e2b0a 100644 (file)
--- a/adminer/drivers/clickhouse.inc.php
+++ b/adminer/drivers/clickhouse.inc.php
@@ -22,7 +22,7 @@ if (isset($_GET["clickhouse"])) {
                                return $file;
                        }
                        if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-                               $this->error = $file;
+                               $this->error = lang('Invalid credentials.') . " $http_response_header[0]";
                                return false;
                        }
                        $return = json_decode($file, true);

diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php
index a29252fe079a9405102de78ab9ac226af841ec97..f2abfad7d3e83c121cddb793af5d48d50994821b 100644 (file)
--- a/adminer/drivers/elastic.inc.php
+++ b/adminer/drivers/elastic.inc.php
@@ -28,7 +28,7 @@ if (isset($_GET["elastic"])) {
                                        return $file;
                                }
                                if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-                                       $this->error = $file;
+                                       $this->error = lang('Invalid credentials.') . " $http_response_header[0]";
                                        return false;
                                }
                                $return = json_decode($file, true);

diff --git a/changes.txt b/changes.txt
index cb729decbf0a99ce00b6ba472f51fb76f8b01db1..11f501affe4c5a836f134ce7f267c2ee2f5f4bc8 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 4.7.9-dev:
+Elasticsearch, ClickHouse: Do not print response if HTTP code is not 200
 Re-enable PHP warnings (regression from 4.7.8)
 
 Adminer 4.7.8 (released 2020-12-06):