From b602305a6eab71ac10bddfa262918884c2b45ca2 Mon Sep 17 00:00:00 2001 From: Matt Mundell Date: Thu, 2 Jan 2020 13:47:07 +0200 Subject: [PATCH 1/3] Remove GMP COMMANDS from wizard handling --- gsa/src/gmp/commands/wizard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gsa/src/gmp/commands/wizard.js b/gsa/src/gmp/commands/wizard.js index 601b4732c8..baded3c27a 100644 --- a/gsa/src/gmp/commands/wizard.js +++ b/gsa/src/gmp/commands/wizard.js @@ -118,7 +118,7 @@ class WizardCommand extends HttpCommand { }).then(response => { const {data} = response; - const resp = data.wizard.run_wizard_response.response.commands_response; + const resp = data.wizard.run_wizard_response.response; const settings = new Settings(); @@ -154,7 +154,7 @@ class WizardCommand extends HttpCommand { }).then(response => { const {data} = response; - const resp = data.wizard.run_wizard_response.response.commands_response; + const resp = data.wizard.run_wizard_response.response; const settings = new Settings(); From c06f70d4ee8e5133854ac283f3328ded6f41fc18 Mon Sep 17 00:00:00 2001 From: Matt Mundell Date: Thu, 2 Jan 2020 13:58:42 +0200 Subject: [PATCH 2/3] Remove TODO about page handlers They are a lot more uniform these days. --- gsad/src/gsad_gmp.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/gsad/src/gsad_gmp.c b/gsad/src/gsad_gmp.c index 408a576d26..87f0f4c34b 100644 --- a/gsad/src/gsad_gmp.c +++ b/gsad/src/gsad_gmp.c @@ -1859,23 +1859,6 @@ resource_action (gvm_connection_t *connection, credentials_t *credentials, * XML special sequences in the string are escaped. */ -/** - * @todo Unify the style of page handlers. - * - * There are variations in the style of the page handlers that run - * multiple GMP commands. - * - * Some, like delete_credential_gmp, simply run the GMP commands inside - * one GMP COMMANDS. - * - * Others, like create_target_gmp, run each command separately and wrap the - * responses in a unique page tag. - * - * One handler, delete_target_gmp, runs all the commands in a single COMMANDS - * and also wraps the response in a unique page tag to convey the context to - * the enveloped XML. This is probably the way to go. - */ - /** * @brief Get a value from a param or fall back to a setting * From dfa4b2172429d545c299089077d05156b09e0251 Mon Sep 17 00:00:00 2001 From: Matt Mundell Date: Fri, 3 Jan 2020 11:22:30 +0200 Subject: [PATCH 3/3] Loop bulk delete commands instead of using COMMANDS --- gsad/src/gsad_gmp.c | 115 ++++++++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 47 deletions(-) diff --git a/gsad/src/gsad_gmp.c b/gsad/src/gsad_gmp.c index 87f0f4c34b..340e016c7e 100644 --- a/gsad/src/gsad_gmp.c +++ b/gsad/src/gsad_gmp.c @@ -15914,14 +15914,9 @@ bulk_delete_gmp (gvm_connection_t *connection, credentials_t *credentials, params_t *params, cmd_response_data_t *response_data) { const char *type; - GString *commands_xml; params_t *selected_ids; - params_iterator_t iter; - param_t *param; - gchar *param_name; - gchar *html, *response; - entity_t entity; gchar *extra_attribs; + int count, fail; type = params_value (params, "resource_type"); if (type == NULL) @@ -15947,62 +15942,88 @@ bulk_delete_gmp (gvm_connection_t *connection, credentials_t *credentials, extra_attribs = g_strdup_printf ("inheritor_id=\"%s\"", inheritor_id); } - commands_xml = g_string_new (""); - + count = fail = 0; selected_ids = params_values (params, "bulk_selected:"); if (selected_ids) { + params_iterator_t iter; + param_t *param; + gchar *param_name; + params_iterator_init (&iter, selected_ids); while (params_iterator_next (&iter, ¶m_name, ¶m)) { - xml_string_append (commands_xml, - "", extra_attribs); + gchar *command, *response; + entity_t entity; + + /* Delete the resource. */ + + command = g_strdup_printf ("", + type, type, param_name, + extra_attribs ? extra_attribs : ""); + if (gvm_connection_sendf_xml (connection, command) == -1) + { + g_free (command); + cmd_response_data_set_status_code (response_data, + MHD_HTTP_INTERNAL_SERVER_ERROR); + return gsad_message ( + credentials, "Internal error", __func__, __LINE__, + "An internal error occurred while deleting resources. " + "The resources were not deleted. " + "Diagnostics: Failure to send command to manager daemon.", + response_data); + } + g_free (command); + + entity = NULL; + if (read_entity_and_text_c (connection, &entity, &response)) + { + cmd_response_data_set_status_code (response_data, + MHD_HTTP_INTERNAL_SERVER_ERROR); + return gsad_message ( + credentials, "Internal error", __func__, __LINE__, + "An internal error occurred while deleting resources. " + "It is unclear whether the resources have been deleted or not. " + "Diagnostics: Failure to read response from manager daemon.", + response_data); + } + + if (*(entity_attribute (entity, "status")) != '2') + fail = 1; else - g_string_append (commands_xml, "/>"); + count++; + + free_entity (entity); + g_free (response); } } - g_string_append (commands_xml, ""); - - /* Delete the resources and get all resources. */ + /* Cleanup, and return transformed XML. */ - if (gvm_connection_sendf_xml (connection, commands_xml->str) == -1) + if (fail) { - g_string_free (commands_xml, TRUE); - cmd_response_data_set_status_code (response_data, - MHD_HTTP_INTERNAL_SERVER_ERROR); - return gsad_message ( - credentials, "Internal error", __func__, __LINE__, - "An internal error occurred while deleting resources. " - "The resources were not deleted. " - "Diagnostics: Failure to send command to manager daemon.", - response_data); - } - g_string_free (commands_xml, TRUE); + gchar *html, *msg; - entity = NULL; - if (read_entity_and_text_c (connection, &entity, &response)) - { - cmd_response_data_set_status_code (response_data, - MHD_HTTP_INTERNAL_SERVER_ERROR); - return gsad_message ( - credentials, "Internal error", __func__, __LINE__, - "An internal error occurred while deleting resources. " - "It is unclear whether the resources have been deleted or not. " - "Diagnostics: Failure to read response from manager daemon.", - response_data); - } + cmd_response_data_set_status_code (response_data, MHD_HTTP_BAD_REQUEST); - /* Cleanup, and return transformed XML. */ - html = response_from_entity (connection, credentials, params, entity, - "Bulk Delete", response_data); - g_free (response); - free_entity (entity); + msg = g_strdup_printf + ("An error occurred while deleting one or more resources. " + "However, %i of the resources %s successfully deleted. " + "Diagnostics: At least one DELETE command failed.", + count, + count > 1 ? "were" : "was"); - return html; + html = gsad_message (credentials, "Error", __func__, __LINE__, msg, + response_data); + g_free (msg); + return html; + } + + return action_result (connection, credentials, params, response_data, "Bulk Delete", + "OK", + "", /* Status details. */ + NULL); /* ID. */ } /**