Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit bf8b40439761 · 2022-02-15T17:45:40.000-03:00
diff --git a/ChangeLog b/ChangeLog
@@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 
 5.1.4 (not yet released)
 - issue #17287 Fixed sorting the database list with "statistics" enabled on "Data" column creates a PHP type error
+- issue #17368 Fix for invalid cache when losing access to config storage after it being cached
 
 5.1.3 (2022-02-10)
 - issue #17308 Fix broken pagination links in the navigation sidebar
diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php
@@ -7,11 +7,13 @@
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Config\Forms\User\UserFormList;
 use PhpMyAdmin\ConfigStorage\Relation;
+use PhpMyAdmin\Dbal\DatabaseName;
 
 use function __;
 use function array_flip;
 use function array_merge;
 use function basename;
+use function htmlspecialchars;
 use function http_build_query;
 use function is_array;
 use function json_decode;
@@ -120,7 +122,11 @@ public function save(array $config_array)
         $relationParameters = $this->relation->getRelationParameters();
         $server = $GLOBALS['server'] ?? $GLOBALS['cfg']['ServerDefault'];
         $cache_key = 'server_' . $server;
-        if ($relationParameters->userPreferencesFeature === null || $relationParameters->user === null) {
+        if (
+            $relationParameters->userPreferencesFeature === null
+            || $relationParameters->user === null
+            || $relationParameters->db === null
+        ) {
             // no pmadb table, use session storage
             $_SESSION['userconfig'] = [
                 'db' => $config_array,
@@ -165,17 +171,37 @@ public function save(array $config_array)
 
         if (! $dbi->tryQuery($query, DatabaseInterface::CONNECT_CONTROL)) {
             $message = Message::error(__('Could not save configuration'));
-            $message->addMessage(
-                Message::rawError($dbi->getError(DatabaseInterface::CONNECT_CONTROL)),
-                '<br><br>'
-            );
+            $message->addMessage(Message::error($dbi->getError(DatabaseInterface::CONNECT_CONTROL)), '<br><br>');
+            if (! $this->hasAccessToDatabase($relationParameters->db)) {
+                /**
+                 * When phpMyAdmin cached the configuration storage parameters, it checked if the database can be
+                 * accessed, so if it could not be accessed anymore, then the cache must be cleared as it's out of date.
+                 *
+                 * @psalm-suppress MixedArrayAssignment
+                 */
+                $_SESSION['relation'][$GLOBALS['server']] = [];
+                $message->addMessage(Message::error(htmlspecialchars(
+                    __('The phpMyAdmin configuration storage database could not be accessed.')
+                )), '<br><br>');
+            }
 
             return $message;
         }
 
         return true;
     }
 
+    private function hasAccessToDatabase(DatabaseName $database): bool
+    {
+        $escapedDb = $GLOBALS['dbi']->escapeString($database->getName());
+        $query = 'SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = \'' . $escapedDb . '\';';
+        if ($GLOBALS['cfg']['Server']['DisableIS']) {
+            $query = 'SHOW DATABASES LIKE \'' . Util::escapeMysqlWildcards($escapedDb) . '\';';
+        }
+
+        return (bool) $GLOBALS['dbi']->fetchSingleRow($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL);
+    }
+
     /**
      * Returns a user preferences array filtered by $cfg['UserprefsDisallow']
      * (exclude list) and keys from user preferences form (allow list)
diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php
@@ -140,6 +140,7 @@ public function testLoad(): void
      */
     public function testSave(): void
     {
+        $GLOBALS['cfg']['Server']['DisableIS'] = true;
         $GLOBALS['server'] = 2;
         $_SESSION['relation'] = [];
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([])->toArray();
@@ -246,7 +247,8 @@ public function testSave(): void
 
         $this->assertInstanceOf(Message::class, $result);
         $this->assertEquals(
-            'Could not save configuration<br><br>err1',
+            'Could not save configuration<br><br>err1'
+            . '<br><br>The phpMyAdmin configuration storage database could not be accessed.',
             $result->getMessage()
         );
     }
