Remove delete_agent_installer GMP command

The agent installers can no longer be deleted by users via GMP
and the corresponding trash tables are no longer used.
Instead the feed sync will also remove any installers not in the
metadata file from the database.

This simplifies the file handling for agent installers and resolves
the issue that removing files from the feed would make installer
entries in the database unusable.
Now this has to be managed only by keeping the installer and metadata
files consistent with each other.

Author: timopollmeier

src/gmp.c

@@ -4375,7 +4375,6 @@ typedef enum
   CLIENT_CREATE_USER_SOURCES_SOURCE,
 #if ENABLE_AGENTS
   CLIENT_DELETE_AGENT_GROUP,
-  CLIENT_DELETE_AGENT_INSTALLER,
   CLIENT_DELETE_AGENTS,
 #endif /* ENABLE_AGENTS */
   CLIENT_DELETE_ALERT,
@@ -4963,12 +4962,6 @@ gmp_xml_handle_start_element (/* unused */ GMarkupParseContext* context,
                           attribute_names, attribute_values);
             set_client_state (CLIENT_DELETE_AGENT_GROUP);
           }
-        else if (strcasecmp ("DELETE_AGENT_INSTALLER", element_name) == 0)
-          {
-            delete_start ("agent_installer", "Agent Installer",
-                          attribute_names, attribute_values);
-            set_client_state (CLIENT_DELETE_AGENT_INSTALLER);
-          }
         else if (strcasecmp ("DELETE_AGENTS", element_name) == 0)
           {
             delete_agents_start (gmp_parser, attribute_names, attribute_values);
@@ -20559,11 +20552,6 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
         break;
 
 #if ENABLE_AGENTS
-      case CLIENT_DELETE_AGENT_INSTALLER:
-        delete_run (gmp_parser, error);
-        set_client_state (CLIENT_AUTHENTIC);
-        break;
-
       case CLIENT_DELETE_AGENT_GROUP:
         delete_run (gmp_parser, error);
         set_client_state (CLIENT_AUTHENTIC);

src/manage.c

@@ -7040,10 +7040,6 @@ manage_run_wizard (const gchar *wizard_name,
 int
 delete_resource (const char *type, const char *resource_id, int ultimate)
 {
-#if ENABLE_AGENTS
-  if (strcasecmp (type, "agent_installer") == 0)
-    return delete_agent_installer (resource_id, ultimate);
-#endif /* ENABLE_AGENTS */
 #if ENABLE_CONTAINER_SCANNING
   if (strcasecmp (type, "oci_image_target") == 0)
     return delete_oci_image_target (resource_id, ultimate);

src/manage_agent_installers.c

@@ -10,6 +10,7 @@
  * General management of agent installers.
  */
 
+#include "gmp_base.h"
 #include "manage_agent_installers.h"
 #include "manage_sql_agent_installers.h"
 #include <gvm/util/jsonpull.h>
@@ -487,17 +488,21 @@ get_agent_installer_data_from_json (cJSON *json,
  *
  * @param[in]  entry    The JSON object to process.
  * @param[in]  rebuild  Whether to also update installers with old timestamps.
+ * @param[in,out] installers_list_sql  String buffer for a list of UUIDs
+ *                                     of installers in the feed in SQL-quoted
+ *                                     form.
  *
  * @return 0 success, -1 error.
  */
 static int
-agent_installers_json_handle_entry (cJSON *entry, gboolean rebuild)
+agent_installers_json_handle_entry (cJSON *entry, gboolean rebuild,
+                                    GString *installers_list_sql)
 {
   agent_installer_data_t data;
   agent_installer_t agent_installer;
-  int trash = 0;
   time_t db_modification_time = 0;
   int ret = 0;
+  gchar *quoted_uuid;
 
   memset (&data, 0, sizeof (data));
   if (get_agent_installer_data_from_json (entry, &data))
@@ -508,30 +513,27 @@ agent_installers_json_handle_entry (cJSON *entry, gboolean rebuild)
       return -1;
     }
 
-  agent_installer = agent_installer_by_uuid (data.uuid, FALSE);
+  agent_installer = agent_installer_by_uuid (data.uuid);
   if (agent_installer)
     {
       db_modification_time
-        = agent_installer_modification_time (agent_installer, FALSE);
-    }
-  else
-    {
-      agent_installer = agent_installer_by_uuid (data.uuid, TRUE);
-      if (agent_installer)
-        {
-          trash = 1;
-          db_modification_time
-            = agent_installer_modification_time (agent_installer, TRUE);
-        }
+        = agent_installer_modification_time (agent_installer);
     }
 
   if (agent_installer == 0)
     ret = create_agent_installer_from_data (&data);
   else if (rebuild || db_modification_time < data.modification_time)
-    ret = update_agent_installer_from_data (agent_installer, trash, &data);
+    ret = update_agent_installer_from_data (agent_installer, &data);
   else
     g_debug ("%s: skipping agent installer %s", __func__, data.uuid);
 
+  quoted_uuid = sql_quote (data.uuid);
+  g_string_append_printf (installers_list_sql,
+                          "%s'%s'",
+                          installers_list_sql->len ? ", " : "",
+                          quoted_uuid);
+  g_free (quoted_uuid);
+
   g_ptr_array_free (data.cpes, TRUE);
   return ret ? -1 : 0;
 }
@@ -544,13 +546,17 @@ agent_installers_json_handle_entry (cJSON *entry, gboolean rebuild)
  * @param[in]  parser   The JSON parser.
  * @param[in]  parser   The JSON parser event data structure.
  * @param[in]  rebuild  Whether to also update installers with old timestamps.
+ * @param[in,out] installers_list_sql  String buffer for a list of UUIDs
+ *                                     of installers in the feed in SQL-quoted
+ *                                     form.
  *
  * @return 0 success, -1 error.
  */
 static int
 agent_installers_json_handle_list_items (gvm_json_pull_parser_t *parser,
                                          gvm_json_pull_event_t *event,
-                                         gboolean rebuild)
+                                         gboolean rebuild,
+                                         GString *installers_list_sql)
 {
   gvm_json_pull_parser_next (parser, event);
   while (event->type != GVM_JSON_PULL_EVENT_ARRAY_END)
@@ -569,7 +575,9 @@ agent_installers_json_handle_list_items (gvm_json_pull_parser_t *parser,
               cJSON_Delete (entry);
               return -1;
             }
-          else if (agent_installers_json_handle_entry (entry, rebuild)) {
+          else if (agent_installers_json_handle_entry (entry,
+                                                       rebuild,
+                                                       installers_list_sql)) {
             cJSON_Delete (entry);
             return -1;
           }
@@ -606,6 +614,7 @@ sync_agent_installers_with_feed (gboolean rebuild)
   gchar *feed_owner_uuid, *feed_owner_name;
   gvm_json_pull_parser_t parser;
   gvm_json_pull_event_t event;
+  GString *installers_list_sql;
 
   g_info ("Updating agent installers%s", rebuild ? " (rebuild)" : "");
   update_meta_agent_installers_last_update ();
@@ -656,7 +665,10 @@ sync_agent_installers_with_feed (gboolean rebuild)
       return -1;
     }
 
-  if (agent_installers_json_handle_list_items (&parser, &event, rebuild))
+  installers_list_sql = g_string_new ("");
+
+  if (agent_installers_json_handle_list_items (&parser, &event, rebuild,
+                                               installers_list_sql))
     {
       gvm_json_pull_parser_cleanup (&parser);
       gvm_json_pull_event_cleanup (&event);
@@ -667,6 +679,34 @@ sync_agent_installers_with_feed (gboolean rebuild)
   gvm_json_pull_parser_cleanup (&parser);
   gvm_json_pull_event_cleanup (&event);
   fclose (stream);
+
+  if (installers_list_sql->len)
+    {
+      iterator_t deleted_installers;
+
+      sql_begin_immediate ();
+
+      sql ("DELETE FROM agent_installer_cpes WHERE agent_installer NOT IN"
+          " (SELECT id FROM agent_installers WHERE uuid IN (%s));",
+          installers_list_sql->str);
+
+      init_iterator (&deleted_installers,
+                     "DELETE FROM agent_installers WHERE uuid NOT IN (%s)"
+                     " RETURNING uuid;",
+                     installers_list_sql->str);
+      while (next (&deleted_installers))
+        {
+          log_event ("agent_installer", "Agent Installer",
+                     iterator_string (&deleted_installers, 0),
+                     "deleted");
+        }
+      cleanup_iterator (&deleted_installers);
+  
+      sql_commit ();
+    }
+  else
+    g_warning ("%s: No agent installers found in metadata file", __func__);
+  
   g_info ("Finished updating agent installers");
   return 0;
 }

src/manage_agent_installers.h

@@ -60,9 +60,6 @@ typedef struct {
 void
 agent_installer_cpe_data_free (agent_installer_cpe_data_t *);
 
-int
-delete_agent_installer (const char*, int);
-
 FILE *
 open_agent_installer_file (const char *, gchar **);
 
@@ -92,21 +89,20 @@ void
 manage_sync_agent_installers ();
 
 int
-create_agent_installer_from_data (agent_installer_data_t *agent_installer_data);
+create_agent_installer_from_data (agent_installer_data_t *);
 
 int
 update_agent_installer_from_data (agent_installer_t,
-                                  gboolean,
-                                  agent_installer_data_t *agent_installer_data);
+                                  agent_installer_data_t *);
 
 int
 agent_installer_count (const get_data_t *get);
 
 agent_installer_t
-agent_installer_by_uuid (const char *, int);
+agent_installer_by_uuid (const char *);
 
 time_t
-agent_installer_modification_time (agent_installer_t, int);
+agent_installer_modification_time (agent_installer_t);
 
 int
 init_agent_installer_iterator (iterator_t*, get_data_t*);

src/manage_commands.c

@@ -53,7 +53,6 @@ command_t gmp_commands[]
 #if ENABLE_AGENTS
     {"DELETE_AGENT_GROUP", "Delete an agent group."},
     {"DELETE_AGENTS", "Delete one or more agents."},
-    {"DELETE_AGENT_INSTALLER", "Delete an agent installer."},
 #endif /* ENABLE_AGENTS */
     {"DELETE_ALERT", "Delete an alert."},
     {"DELETE_ASSET", "Delete an asset."},

src/manage_pg.c

@@ -2275,33 +2275,6 @@ create_tables ()
        "  version_end_incl text,"
        "  version_end_excl text);");
 
-  sql ("CREATE TABLE IF NOT EXISTS agent_installers_trash"
-       " (id SERIAL PRIMARY KEY,"
-       "  uuid text UNIQUE NOT NULL,"
-       "  owner integer REFERENCES users (id) ON DELETE RESTRICT,"
-       "  name text NOT NULL,"
-       "  comment text,"
-       "  creation_time integer,"
-       "  modification_time integer,"
-       "  description text,"
-       "  content_type text,"
-       "  file_extension text,"
-       "  installer_path text,"
-       "  version text,"
-       "  checksum text,"
-       "  file_size integer,"
-       "  last_update integer);");
-
-  sql ("CREATE TABLE IF NOT EXISTS agent_installer_cpes_trash"
-       " (id SERIAL PRIMARY KEY,"
-       "  agent_installer integer"
-       "    REFERENCES agent_installers_trash (id) ON DELETE RESTRICT,"
-       "  criteria text,"
-       "  version_start_incl text,"
-       "  version_start_excl text,"
-       "  version_end_incl text,"
-       "  version_end_excl text);");
-
   sql ("CREATE TABLE IF NOT EXISTS agent_groups"
      " (id SERIAL PRIMARY KEY,"
      "  uuid TEXT NOT NULL UNIQUE,"

src/manage_resources.c

@@ -282,7 +282,9 @@ type_has_comment (const char *type)
 int
 type_has_trash (const char *type)
 {
-  return strcasecmp (type, "report")
+  return strcasecmp (type, "agent")
+         && strcasecmp (type, "agent_installer")
+         && strcasecmp (type, "report")
          && strcasecmp (type, "result")
          && strcasecmp (type, "info")
          && type_is_info_subtype (type) == 0

src/manage_sql.c

@@ -39613,65 +39613,6 @@ manage_restore (const char *id)
       return 0;
     }
 
-#if ENABLE_AGENTS
-  /* Agent Installer. */
-
-  if (find_trash ("agent_installer", id, &resource))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (resource)
-    {
-      agent_installer_t agent_installer;
-
-      agent_installer
-        = sql_int64_0 ("INSERT INTO agent_installers"
-                       " (uuid, owner, name, comment,"
-                       "  creation_time, modification_time,"
-                       "  description, content_type, file_extension,"
-                       "  installer_path, version, checksum,"
-                       "  file_size, last_update)"
-                       " SELECT uuid, owner, name, comment,"
-                       "  creation_time, modification_time,"
-                       "  description, content_type, file_extension,"
-                       "  installer_path, version, checksum,"
-                       "  file_size, last_update"
-                       " FROM agent_installers_trash WHERE id = %llu"
-                       " RETURNING id;",
-                       resource);
-
-      sql ("INSERT INTO agent_installer_cpes"
-           " (agent_installer, criteria,"
-           "  version_start_incl, version_start_excl,"
-           "  version_end_incl, version_end_excl)"
-           " SELECT %llu, criteria,"
-           "  version_start_incl, version_start_excl,"
-           "  version_end_incl, version_end_excl"
-           " FROM agent_installer_cpes_trash WHERE agent_installer = %llu;",
-           agent_installer,
-           resource);
-
-      permissions_set_locations ("agent_installer",
-                                 resource,
-                                 agent_installer,
-                                 LOCATION_TABLE);
-      tags_set_locations ("agent_installer",
-                          resource,
-                          agent_installer,
-                          LOCATION_TABLE);
-
-      sql ("DELETE FROM agent_installer_cpes_trash"
-           " WHERE agent_installer = %llu;",
-          resource);
-      sql ("DELETE FROM agent_installers_trash WHERE id = %llu;", resource);
-
-      sql_commit ();
-      return 0;
-    }
-#endif /* ENABLE_AGENTS */
-
   /* Alert. */
 
   if (find_trash ("alert", id, &resource))
@@ -40579,14 +40520,6 @@ manage_empty_trashcan ()
        "                                    WHERE uuid = '%s'));",
        current_credentials.uuid);
   sql ("DELETE FROM groups_trash" WHERE_OWNER);
-#if ENABLE_AGENTS
-  sql ("DELETE FROM agent_installer_cpes_trash"
-       " WHERE agent_installer IN (SELECT id from agent_installers_trash"
-       "                           WHERE owner = (SELECT id FROM users"
-       "                                          WHERE uuid = '%s'));",
-       current_credentials.uuid);
-  sql ("DELETE FROM agent_installers_trash" WHERE_OWNER);
-#endif /* ENABLE_AGENTS */
   sql ("DELETE FROM alert_condition_data_trash"
        " WHERE alert IN (SELECT id from alerts_trash"
        "                 WHERE owner = (SELECT id FROM users"