Check that provided class implements IStorage in StorageManager::setBackend

- Add notice in admin if setting value change failed
- Add notice in console if setting value change failed

diff --git a/mod/admin.php b/mod/admin.php
index 39c2e9341b3483af8fc4aa5facc975320887d17e..f8a75b7a2d740ffbc5af5f7cf9391010790be327 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1200,7 +1200,9 @@ function admin_page_site_post(App $a)
         * @var $storagebackend \Friendica\Model\Storage\IStorage
         */
        $storagebackend    = Strings::escapeTags(trim(defaults($_POST, 'storagebackend', '')));
-       StorageManager::setBackend($storagebackend);
+       if (!StorageManager::setBackend($storagebackend)) {
+               info(L10n::t('Invalid storage backend setting value.'));
+       }
 
        // save storage backend form
        if (!is_null($storagebackend) && $storagebackend != "") {

diff --git a/src/Core/Console/Storage.php b/src/Core/Console/Storage.php
index a7a0ffd38b34a7183b47c3b2f53d3e4e893238b3..8b02d874c56f02bd3cddbbccc1c8bcb2b7821bd0 100644 (file)
--- a/src/Core/Console/Storage.php
+++ b/src/Core/Console/Storage.php
@@ -106,7 +106,11 @@ HELP;
                        return -1;
                }
 
-               StorageManager::setBackend($class);
+               if (!StorageManager::setBackend($class)) {
+                       $this->out($class . ' is not a valid backend storage class.');
+                       return -1;
+               }
+
                return 0;
        }
 

diff --git a/src/Core/StorageManager.php b/src/Core/StorageManager.php
index 335c28f05126baf5e7801b70befda94425542849..3bb1cc4511161960dcbc47aec33634eba7c8895f 100644 (file)
--- a/src/Core/StorageManager.php
+++ b/src/Core/StorageManager.php
@@ -54,12 +54,18 @@ class StorageManager
         * @brief Set current storage backend class
         *
         * @param string $class Backend class name
+        * @return bool
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function setBackend($class)
        {
-               /// @todo Check that $class implements IStorage
+               if (!in_array('Friendica\Model\Storage\IStorage', class_implements($class))) {
+                       return false;
+               }
+
                Config::set('storage', 'class', $class);
+
+               return true;
        }
 
        /**