Add config directive to show/hide connection errors

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

2 files changed, 43 insertions, 10 deletions

diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php
index afd596ccd7..d0905eb00c 100644
--- a/libraries/classes/Dbi/DbiMysqli.php
+++ b/libraries/classes/Dbi/DbiMysqli.php
@@ -149,16 +149,29 @@ class DbiMysqli implements DbiExtension
             $host = $server['host'];
         }
 
-        $return_value = mysqli_real_connect(
-            $link,
-            $host,
-            $user,
-            $password,
-            '',
-            $server['port'],
-            $server['socket'],
-            $client_flags
-        );
+        if ($server['hide_connection_errors']) {
+            $return_value = @mysqli_real_connect(
+                $link,
+                $host,
+                $user,
+                $password,
+                '',
+                $server['port'],
+                $server['socket'],
+                $client_flags
+            );
+        } else {
+            $return_value = mysqli_real_connect(
+                $link,
+                $host,
+                $user,
+                $password,
+                '',
+                $server['port'],
+                $server['socket'],
+                $client_flags
+            );
+        }
 
         if ($return_value === false || is_null($return_value)) {
             /*
@@ -180,7 +193,20 @@ class DbiMysqli implements DbiExtension
                     );
                     $server['ssl'] = true;
                     return self::connect($user, $password, $server);
+            } elseif ($error_number === 1045 && $server['hide_connection_errors']) {
+                trigger_error(
+                    sprintf(
+                        __(
+                            'Error 1045: Access denied for user. Additional error information'
+                            . ' may be available, but is being hidden by the %s configuration directive.'
+                        ),
+                        '[code][doc@cfg_Servers_hide_connection_errors]'
+                        . '$cfg[\'Servers\'][$i][\'hide_connection_errors\'][/doc][/code]'
+                    ),
+                    E_USER_ERROR
+                );
             }
+
             return false;
         }
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index e7cf828bff..fcd54c9a18 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -604,6 +604,13 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true;
 $cfg['Servers'][$i]['tracking_add_drop_database'] = true;
 
 /**
+ * Whether to show or hide detailed MySQL/MariaDB connection errors on the login page.
+ *
+ * @global bool $cfg['Servers'][$i]['hide_connection_errors']
+ */
+$cfg['Servers'][$i]['hide_connection_errors'] = false;
+
+/**
  * Default server (0 = no default server)
  *
  * If you have more than one server configured, you can set $cfg['ServerDefault']