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

Fix SecInfo alert filter conditions (master) #971

Merged
merged 15 commits into from
Feb 13, 2020
Merged

Fix SecInfo alert filter conditions (master) #971

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5aa1fd3
Fix count in "Filter count at least ..." text
timopollmeier Feb 3, 2020
6907868
Get filter info for SecInfo alert emails
timopollmeier Feb 3, 2020
385bfa2
Count only new/modified NVTs for alert conditions
timopollmeier Feb 4, 2020
758ef59
Consider SecInfo type in alert filter condition
timopollmeier Feb 4, 2020
f9a8310
Include new SecInfo in "updated" lists
timopollmeier Feb 4, 2020
381ca61
Add alert filter condition fixes to CHANGELOG
timopollmeier Feb 4, 2020
c4cc815
Add missing param in doc of secinfo_count_after
timopollmeier Feb 4, 2020
d8ab8b7
Merge branch 'master' into secinfo-alert-filter-master
mattmundell Feb 11, 2020
26f0c30
Merge branch 'master' into secinfo-alert-filter-master
timopollmeier Feb 11, 2020
ee5ab49
Add missing g_free and remove stray debug printf
timopollmeier Feb 11, 2020
041e4bb
Fix formatting in SecInfo alert changes
timopollmeier Feb 11, 2020
e673574
Merge branch 'secinfo-alert-filter-master' of github.com:timopollmeie…
timopollmeier Feb 11, 2020
725c25d
Revert "Include new SecInfo in "updated" lists"
timopollmeier Feb 11, 2020
dd8274c
Make SecInfo alert condition and lists consistent
timopollmeier Feb 13, 2020
36f34d9
Merge branch 'master' into secinfo-alert-filter-master
timopollmeier Feb 13, 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
22 changes: 19 additions & 3 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11769,8 +11769,9 @@ email_secinfo (alert_t alert, task_t task, event_t event,
const gchar *from_address)
{
gchar *alert_subject, *message, *subject, *example, *list, *type, *base64;
gchar *body;
char *notice, *recipient_credential_id;
gchar *term, *body;
char *notice, *recipient_credential_id, *condition_filter_id;
filter_t condition_filter;
credential_t recipient_credential;
int ret, count;

Expand Down Expand Up @@ -11824,10 +11825,24 @@ email_secinfo (alert_t alert, task_t task, event_t event,
strlen (list));
}

condition_filter = 0;
term = NULL;
condition_filter_id = alert_data (alert, "condition", "filter_id");
if (condition_filter_id)
{
gchar *quoted_filter_id;
quoted_filter_id = sql_quote (condition_filter_id);
timopollmeier marked this conversation as resolved.
Show resolved Hide resolved
sql_int64 (&condition_filter,
"SELECT id FROM filters WHERE uuid = '%s'",
quoted_filter_id);
term = filter_term (condition_filter_id);
}
free (condition_filter_id);

if (message && strlen (message))
body = alert_message_print (message, event, type,
task, alert, condition,
NULL, 0, NULL, NULL, NULL,
NULL, condition_filter, term, NULL, NULL,
list,
list ? strlen (list) : 0,
0, count, 0);
Expand All @@ -11845,6 +11860,7 @@ email_secinfo (alert_t alert, task_t task, event_t event,
free (condition_desc);
}

g_free (term);
g_free (message);
g_free (list);

Expand Down