[GEA-1178] Add target_type to tasks table

CMakeLists.txt

@@ -96,7 +96,7 @@ include(CPack)
 
 ## Variables
 
-set(GVMD_DATABASE_VERSION 281)
+set(GVMD_DATABASE_VERSION 282)
 
 set(GVMD_SCAP_DATABASE_VERSION 22)
 

src/gmp.c

@@ -167,15 +167,17 @@
  */
 #define G_LOG_DOMAIN "md    gmp"
 
-
+
+
 /* Static headers. */
 
 /** @todo Exported for manage_sql.c. */
 void
 buffer_results_xml (GString *, iterator_t *, task_t, int, int, int, int, int,
                     int, int, const char *, iterator_t *, int, int, int, int);
 
-
+
+
 /* Helper functions. */
 
 /**
@@ -394,7 +396,8 @@ check_public_key (const char *key_str)
   return ret;
 }
 
-
+
+
 /* GMP parser. */
 
 static int
@@ -457,7 +460,8 @@ command_disabled (gmp_parser_t *gmp_parser, const gchar *name)
   return 0;
 }
 
-
+
+
 /* Command data passed between parser callbacks. */
 
 /**
@@ -3635,7 +3639,8 @@ command_data_init (command_data_t *data)
   memset (data, 0, sizeof (command_data_t));
 }
 
-
+
+
 /* Global variables. */
 
 /**
@@ -4248,7 +4253,8 @@ xml_context = NULL;
  */
 static GMarkupParser xml_parser;
 
-
+
+
 /* Client state. */
 
 /**
@@ -4904,7 +4910,8 @@ set_client_state (client_state_t state)
   g_debug ("   client state set: %i", client_state);
 }
 
-
+
+
 /* XML parser handlers. */
 
 /**
@@ -20006,6 +20013,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
       task_t index;
       gchar *progress_xml;
       target_t target;
+      task_target_type_t target_type;
       scanner_t scanner;
       const char *first_report_id, *last_report_id;
       char *config_name, *config_uuid;
@@ -20021,6 +20029,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
       report_t running_report;
       char *owner, *observers;
       int target_in_trash, scanner_in_trash;
+      int target_location_trash;
       int holes = 0, infos = 0, logs = 0, warnings = 0;
       int holes_2 = 0, infos_2 = 0, warnings_2 = 0;
       int criticals = 0, criticals_2 = 0;
@@ -20051,6 +20060,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
 
       index = get_iterator_resource (&tasks);
       target = task_target (index);
+      target_type = task_target_type (index);
 
       task_schedule_xml = get_task_schedule_xml (index);
 
@@ -20069,10 +20079,17 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
       else
         {
           SEND_GET_COMMON (task, &get_tasks_data->get, &tasks);
-          target_in_trash = task_target_in_trash (index);
-          if (target && (target == 0)
-              && (task_iterator_run_status (&tasks)
-                  == TASK_STATUS_RUNNING))
+
+          target_location_trash
+            = (target_type == TASK_TARGET_TYPE_IMPORT_TASK)
+                ? 0
+                : task_target_in_trash (index);
+
+          target_in_trash = (target_type == TASK_TARGET_TYPE_REGULAR)
+                              ? target_location_trash
+                              : 0;
+          if (target_type == TASK_TARGET_TYPE_IMPORT_TASK
+              && (task_iterator_run_status (&tasks) == TASK_STATUS_RUNNING))
             {
               progress_xml = g_strdup_printf
                               ("%i",
@@ -20314,24 +20331,33 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
           config_name = task_config_name (index);
           config_uuid = task_config_uuid (index);
           target_available = 1;
-          if (target_in_trash)
-            {
-              task_target_uuid = trash_target_uuid (target);
-              task_target_name = trash_target_name (target);
-              target_available = trash_target_readable (target);
-            }
-          else if (target)
+
+          if (target_type == TASK_TARGET_TYPE_REGULAR)
             {
-              target_t found;
-              task_target_uuid = target_uuid (target);
-              task_target_name = target_name (target);
-              if (find_target_with_permission (task_target_uuid,
-                                                &found,
-                                                "get_targets"))
-                g_error ("%s: GET_TASKS: error finding task target,"
-                         " aborting",
-                         __func__);
-              target_available = (found > 0);
+              if (target_in_trash)
+                {
+                  task_target_uuid = trash_target_uuid (target);
+                  task_target_name = trash_target_name (target);
+                  target_available = trash_target_readable (target);
+                }
+              else if (target)
+                {
+                  target_t found;
+                  task_target_uuid = target_uuid (target);
+                  task_target_name = target_name (target);
+                  if (find_target_with_permission (task_target_uuid,
+                                                    &found,
+                                                    "get_targets"))
+                    g_error ("%s: GET_TASKS: error finding task target,"
+                             " aborting",
+                             __func__);
+                  target_available = (found > 0);
+                }
+              else
+                {
+                  task_target_uuid = NULL;
+                  task_target_name = NULL;
+                }
             }
           else
             {
@@ -20340,17 +20366,14 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
             }
 
 #if ENABLE_CONTAINER_SCANNING
-          oci_image_target_t oci_image_target;
-          int oci_image_target_in_trash, oci_image_target_available;
-          char *task_oci_image_target_uuid, *task_oci_image_target_name;
-          gchar *task_oci_image_target_name_escaped;
-
-          oci_image_target = task_oci_image_target (index);
-          oci_image_target_in_trash = task_oci_image_target_in_trash (index);
-
-          if (oci_image_target || oci_image_target_in_trash)
+          if (target_type == TASK_TARGET_TYPE_OCI_IMAGE)
             {
-              oci_image_target_available = 1;
+              oci_image_target_t oci_image_target = target;
+              int oci_image_target_in_trash = target_location_trash;
+              int oci_image_target_available = 1;
+              char *task_oci_image_target_uuid, *task_oci_image_target_name;
+              gchar *task_oci_image_target_name_escaped;
+
               if (oci_image_target_in_trash)
                 {
                   task_oci_image_target_uuid
@@ -20403,15 +20426,14 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
             }
 #endif
 #if ENABLE_AGENTS
-          agent_group_t agent_group = 0;
-          int group_readable = 0;
-          char *task_agent_group_uuid = NULL;
-          char *task_agent_group_name = NULL;
-          agent_group =task_agent_group (index); /* row id or 0 */
-          int agent_group_in_trash = task_agent_group_in_trash (index);
-
-          if (agent_group)
+          if (target_type == TASK_TARGET_TYPE_AGENT_GROUP)
             {
+              agent_group_t agent_group = target;
+              int agent_group_in_trash = target_location_trash;
+              int group_readable = 0;
+              char *task_agent_group_uuid = NULL;
+              char *task_agent_group_name = NULL;
+
               if (agent_group_in_trash)
                 {
                   task_agent_group_uuid = trash_agent_group_uuid (agent_group);
@@ -20442,17 +20464,15 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
             }
 #endif /* ENABLE_AGENT_GROUPS */
 #if ENABLE_WEB_APPLICATION_SCANNING
-          web_application_target_t web_application_target;
-          int web_application_target_in_trash, web_application_target_available;
-          char *task_web_application_target_uuid, *task_web_application_target_name;
-          gchar *task_web_application_target_name_escaped;
-
-          web_application_target = task_web_application_target (index);
-          web_application_target_in_trash = task_web_application_target_in_trash (index);
-
-          if (web_application_target || web_application_target_in_trash)
+          if (target_type == TASK_TARGET_TYPE_WEB_APPLICATION)
             {
-              web_application_target_available = 1;
+              web_application_target_t web_application_target = target;
+              int web_application_target_in_trash = target_location_trash;
+              int web_application_target_available = 1;
+              char *task_web_application_target_uuid;
+              char *task_web_application_target_name;
+              gchar *task_web_application_target_name_escaped;
+
               if (web_application_target_in_trash)
                 {
                   task_web_application_target_uuid
@@ -25589,6 +25609,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
           gboolean is_agent_task = FALSE;
           gboolean is_container_scanning_task = FALSE;
           gboolean is_web_application_scanning_task = FALSE;
+          int targets_given;
           guint index;
 
           /* @todo Buffer the entire task creation and pass everything to a
@@ -25758,11 +25779,23 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
               goto create_task_fail;
             }
 
-          if (create_task_data->target_id && create_task_data->agent_group_id)
+          targets_given = 0;
+          if (create_task_data->target_id)
+            targets_given++;
+          if (create_task_data->agent_group_id)
+            targets_given++;
+          if (create_task_data->oci_image_target_id)
+            targets_given++;
+          if (create_task_data->web_application_target_id)
+            targets_given++;
+
+          if (targets_given > 1)
             {
               SEND_TO_CLIENT_OR_FAIL
                (XML_ERROR_SYNTAX ("create_task",
-                                  "Only one of target_id or agent_group_id must be provided"));
+                                  "Only one of target_id, agent_group_id,"
+                                  " oci_image_target_id or"
+                                  " web_application_target_id may be given"));
               goto create_task_fail;
             }
           if (create_task_data->target_id && is_container_scanning_task)
@@ -25818,8 +25851,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                   goto create_task_fail;
                 }
 
-              set_task_agent_group_and_location (create_task_data->task,
-                                                 agent_group);
+              set_task_agent_group (create_task_data->task, agent_group);
             }
 #endif /* ENABLE_AGENTS */
 
@@ -25887,7 +25919,8 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
             {
               /* Import task. */
 
-              set_task_target (create_task_data->task, 0);
+              set_task_target (create_task_data->task, 0,
+                               TASK_TARGET_TYPE_IMPORT_TASK);
               set_task_usage_type (create_task_data->task,
                                    create_task_data->usage_type);
               SENDF_TO_CLIENT_OR_FAIL (XML_OK_CREATED_ID ("create_task"),
@@ -26060,7 +26093,8 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                     error_send_to_client (error);
                   goto create_task_fail;
                 }
-              set_task_target (create_task_data->task, target);
+              set_task_target (create_task_data->task, target,
+                               TASK_TARGET_TYPE_REGULAR);
             }
 
           set_task_scanner (create_task_data->task, scanner);
@@ -29021,6 +29055,17 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                                   modify_task_data->task_id,
                                   "modified");
                   break;
+                case MODIFY_TASK_MULTIPLE_TARGETS:
+                  SEND_TO_CLIENT_OR_FAIL
+                   (XML_ERROR_SYNTAX ("modify_task",
+                                      "Only one of target, agent_group,"
+                                      " oci_image_target or"
+                                      " web_application_target"
+                                      " must be provided"));
+                  log_event_fail ("task", "Task",
+                                  modify_task_data->task_id,
+                                  "modified");
+                  break;
                 default:
                 case MODIFY_TASK_ERROR:
                   SEND_TO_CLIENT_OR_FAIL
@@ -31140,7 +31185,8 @@ gmp_xml_handle_error (/* unused */ GMarkupParseContext* context,
   g_debug ("   XML ERROR %s", error->message);
 }
 
-
+
+
 /* GMP input processor. */
 
 /** @todo Most likely the client should get these from init_gmp_process

src/manage.c

@@ -1707,7 +1707,9 @@ run_osp_task (task_t task, int from, char **report_id)
 {
   target_t target;
 
-  target = task_target (task);
+  if (task_regular_target (task, &target))
+    return -1;
+
   if (target)
     {
       char *uuid;
@@ -1917,7 +1919,9 @@ run_cve_task (task_t task)
 {
   target_t target;
 
-  target = task_target (task);
+  if (task_regular_target (task, &target))
+    return -1;
+
   if (target)
     {
       char *uuid;
@@ -7095,7 +7099,9 @@ run_openvasd_task (task_t task, int from, char **report_id)
     }
   target_t target;
 
-  target = task_target (task);
+  if (task_regular_target (task, &target))
+    return -1;
+
   if (target)
     {
       char *uuid;