Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove all uses of GMP COMMANDS #1896

Merged
merged 4 commits into from
Jan 3, 2020
Merged

Remove all uses of GMP COMMANDS #1896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b602305
Remove GMP COMMANDS from wizard handling
mattmundell Jan 2, 2020
e2e499d
Merge branch 'master' into remove-commands
mattmundell Jan 2, 2020
c06f70d
Remove TODO about page handlers
mattmundell Jan 2, 2020
dfa4b21
Loop bulk delete commands instead of using COMMANDS
mattmundell Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gsa/src/gmp/commands/wizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down
132 changes: 68 additions & 64 deletions gsad/src/gsad_gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -15931,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)
Expand All @@ -15964,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 ("<commands>");

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, &param_name, &param))
{
xml_string_append (commands_xml,
"<delete_%s %s_id=\"%s\" ultimate=\"0\"", type,
type, param_name);
if (extra_attribs)
g_string_append_printf (commands_xml, " %s/>", extra_attribs);
gchar *command, *response;
entity_t entity;

/* Delete the resource. */

command = g_strdup_printf ("<delete_%s %s_id=\"%s\""
" ultimate=\"0\" %s/>",
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, "</commands>");

/* 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. */
}

/**
Expand Down