Merge pull request #4584 from bruntib/sqlite_in_workspace_dir

[fix] Emit error message when SQLite DB is not under workspace dir

Author: bruntib

web/server/codechecker_server/api/product_server.py

@@ -418,6 +418,11 @@ def addProduct(self, product):
         # SQLite-backed product in a different directory, we follow
         # symlinks, but not when storing the path.
         if dbc.engine == 'sqlite':
+            if os.path.isabs(dbc.database):
+                raise codechecker_api_shared.ttypes.RequestFailed(
+                    codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                    "SQLite database must be given by relative path!")
+
             dbc.database = path_for_fake_root(os.path.join("/", dbc.database),
                                               self.__server.config_directory)
 
@@ -493,6 +498,16 @@ def addProduct(self, product):
             # Connect and create the database schema.
             self.__server.add_product(orm_prod, init_db=True)
             connection_wrapper = self.__server.get_product(product.endpoint)
+
+            if connection_wrapper is None:
+                err_msg = "Failed to add product."
+                if dbc.engine == 'sqlite':
+                    err_msg += " The SQLite database file must be under the " \
+                               "server workspace directory."
+                raise codechecker_api_shared.ttypes.RequestFailed(
+                    codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                    err_msg)
+
             if connection_wrapper.last_connection_failure:
                 msg = \
                     f"The configured connection for '/{product.endpoint}' " \
@@ -584,6 +599,10 @@ def editProduct(self, product_id, new_config):
 
             old_args = SQLServer.connection_string_to_args(product.connection)
             if dbc.engine == 'sqlite' and dbc.database != old_args['sqlite']:
+                if os.path.isabs(dbc.database):
+                    raise codechecker_api_shared.ttypes.RequestFailed(
+                        codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                        "SQLite database must be given by relative path!")
                 dbc.database = path_for_fake_root(
                     os.path.join("/", dbc.database),
                     self.__server.config_directory)
@@ -667,6 +686,17 @@ def editProduct(self, product_id, new_config):
                 LOG.debug("Product database successfully connected to.")
 
                 connection_wrapper = self.__server.get_product(dummy_endpoint)
+
+                if connection_wrapper is None:
+                    err_msg = "Failed to edit product."
+                    if dbc.engine == 'sqlite':
+                        err_msg += " The SQLite database file must be under " \
+                                   "the server workspace directory."
+
+                    raise codechecker_api_shared.ttypes.RequestFailed(
+                        codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                        err_msg)
+
                 if connection_wrapper.last_connection_failure:
                     msg = \
                         f"The configured connection for " \

web/server/codechecker_server/server.py

@@ -934,6 +934,13 @@ def add_product(self, orm_product, init_db=False):
 
         # Update the product database status.
         prod.connect()
+
+        if prod.db_status == DBStatus.FAILED_TO_CONNECT:
+            LOG.debug(
+                "Failed to connect to database for product '%s'",
+                orm_product.endpoint)
+            return
+
         if prod.db_status == DBStatus.SCHEMA_MISSING and init_db:
             LOG.debug("Schema was missing in the database. Initializing new")
             prod.connect(init_db=True)

web/server/vue-cli/src/components/Product/EditProductBtn.vue

@@ -147,8 +147,6 @@ export default {
           this.success = true;
           this.$emit("on-complete",
             new ProductConfiguration(this.productConfig));
-        }, () => {
-          this.error = true;
         }));
 
       // Save permissions.