Skip to content

Commit

Permalink
Merge branch 'GEA474_Add_report_config_option_to_alerts' of github.co…
Browse files Browse the repository at this point in the history
…m:greenbone/gsad into GEA474_Add_report_config_option_to_alerts
  • Loading branch information
jhelmold committed May 28, 2024
2 parents ce211d9 + 7a5a97e commit 73d1f70
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/gsad.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,12 @@
"base-uri 'none'; " \
"connect-src 'self'; " \
"script-src 'self'; " \
"script-src-elem 'self' 'unsafe-inline';" \
"frame-ancestors 'none'; " \
"form-action 'self'; " \
"style-src-elem 'self' 'unsafe-inline'; " \
"style-src 'self' 'unsafe-inline'; " \
"font-src 'self';" \
"img-src 'self' blob:;"

/**
Expand Down
6 changes: 4 additions & 2 deletions src/gsad_gmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -5420,7 +5420,8 @@ create_target_gmp (gvm_connection_t *connection, credentials_t *credentials,
CHECK_VARIABLE_INVALID (allow_simultaneous_ips, "Create Target");

if (comment != NULL)
comment_element = g_strdup_printf ("<comment>%s</comment>", comment);
comment_element =
g_markup_printf_escaped ("<comment>%s</comment>", comment);
else
comment_element = g_strdup ("");

Expand Down Expand Up @@ -6391,7 +6392,8 @@ save_target_gmp (gvm_connection_t *connection, credentials_t *credentials,
entity_t entity;

if (comment)
comment_element = g_strdup_printf ("<comment>%s</comment>", comment);
comment_element =
g_markup_printf_escaped ("<comment>%s</comment>", comment);
else
comment_element = g_strdup ("");

Expand Down
1 change: 1 addition & 0 deletions src/gsad_http_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ make_url_handlers ()
url_handler_add_func (url_handlers, "^/robots\\.txt$", handle_static_file);

url_handler_add_func (url_handlers, "^/config\\.*js$", handle_static_config);
url_handler_add_func (url_handlers, "^/assets/.+$", handle_static_file);
url_handler_add_func (url_handlers, "^/static/(img|js|css|media)/.+$",
handle_static_file);
url_handler_add_func (url_handlers, "^/manual/.+$", handle_static_file);
Expand Down

0 comments on commit 73d1f70

Please sign in to comment.