Skip to content

Commit 6a0d1f6

Browse files
mattmundellbjoernricks
mattmundell
authored and
bjoernricks
committed
Change: move check_alerts out of manage_sql.c
1 parent a8f6800 commit 6a0d1f6

File tree

2 files changed

+216
-228
lines changed

2 files changed

+216
-228
lines changed

‎src/manage_sql.c

Lines changed: 0 additions & 228 deletions
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,6 @@ new_secinfo_message (event_t, const void*, alert_t);
246246
static gchar *
247247
new_secinfo_list (event_t, const void*, alert_t, int*);
248248

249-
static void
250-
check_for_new_scap ();
251-
252-
static void
253-
check_for_new_cert ();
254-
255-
static void
256-
check_for_updated_scap ();
257-
258-
static void
259-
check_for_updated_cert ();
260-
261249
#if CVSS3_RATINGS == 1
262250
static int
263251
report_counts_id_full (report_t, int *, int *, int *, int *, int *, int *,
@@ -6650,78 +6638,6 @@ DEF_ACCESS (task_role_iterator_uuid, 4);
66506638

66516639
/* Events and Alerts. */
66526640

6653-
/**
6654-
* @brief Check if any SecInfo alerts are due.
6655-
*/
6656-
void
6657-
check_alerts ()
6658-
{
6659-
if (manage_scap_loaded ())
6660-
{
6661-
int max_time;
6662-
6663-
max_time
6664-
= sql_int ("SELECT %s"
6665-
" ((SELECT max (modification_time) FROM scap.cves),"
6666-
" (SELECT max (modification_time) FROM scap.cpes),"
6667-
" (SELECT max (creation_time) FROM scap.cves),"
6668-
" (SELECT max (creation_time) FROM scap.cpes));",
6669-
sql_greatest ());
6670-
6671-
if (sql_int ("SELECT NOT EXISTS (SELECT * FROM meta"
6672-
" WHERE name = 'scap_check_time')"))
6673-
sql ("INSERT INTO meta (name, value)"
6674-
" VALUES ('scap_check_time', %i);",
6675-
max_time);
6676-
else if (sql_int ("SELECT value = '0' FROM meta"
6677-
" WHERE name = 'scap_check_time';"))
6678-
sql ("UPDATE meta SET value = %i"
6679-
" WHERE name = 'scap_check_time';",
6680-
max_time);
6681-
else
6682-
{
6683-
check_for_new_scap ();
6684-
check_for_updated_scap ();
6685-
sql ("UPDATE meta SET value = %i"
6686-
" WHERE name = 'scap_check_time';",
6687-
max_time);
6688-
}
6689-
}
6690-
6691-
if (manage_cert_loaded ())
6692-
{
6693-
int max_time;
6694-
6695-
max_time
6696-
= sql_int ("SELECT"
6697-
" %s"
6698-
" ((SELECT max (modification_time) FROM cert.cert_bund_advs),"
6699-
" (SELECT max (modification_time) FROM cert.dfn_cert_advs),"
6700-
" (SELECT max (creation_time) FROM cert.cert_bund_advs),"
6701-
" (SELECT max (creation_time) FROM cert.dfn_cert_advs));",
6702-
sql_greatest ());
6703-
6704-
if (sql_int ("SELECT NOT EXISTS (SELECT * FROM meta"
6705-
" WHERE name = 'cert_check_time')"))
6706-
sql ("INSERT INTO meta (name, value)"
6707-
" VALUES ('cert_check_time', %i);",
6708-
max_time);
6709-
else if (sql_int ("SELECT value = '0' FROM meta"
6710-
" WHERE name = 'cert_check_time';"))
6711-
sql ("UPDATE meta SET value = %i"
6712-
" WHERE name = 'cert_check_time';",
6713-
max_time);
6714-
else
6715-
{
6716-
check_for_new_cert ();
6717-
check_for_updated_cert ();
6718-
sql ("UPDATE meta SET value = %i"
6719-
" WHERE name = 'cert_check_time';",
6720-
max_time);
6721-
}
6722-
}
6723-
}
6724-
67256641
/**
67266642
* @brief Check if any SecInfo alerts are due.
67276643
*
@@ -34099,66 +34015,6 @@ target_task_iterator_readable (iterator_t* iterator)
3409934015
"Name Title\n" \
3410034016
"------------------------------------------------------------------------------------------\n"
3410134017

34102-
/**
34103-
* @brief Check for new SCAP SecInfo after an update.
34104-
*/
34105-
static void
34106-
check_for_new_scap ()
34107-
{
34108-
if (manage_scap_loaded ())
34109-
{
34110-
if (sql_int ("SELECT EXISTS"
34111-
" (SELECT * FROM scap.cves"
34112-
" WHERE creation_time"
34113-
" > coalesce (CAST ((SELECT value FROM meta"
34114-
" WHERE name"
34115-
" = 'scap_check_time')"
34116-
" AS INTEGER),"
34117-
" 0));"))
34118-
event (EVENT_NEW_SECINFO, "cve", 0, 0);
34119-
34120-
if (sql_int ("SELECT EXISTS"
34121-
" (SELECT * FROM scap.cpes"
34122-
" WHERE creation_time"
34123-
" > coalesce (CAST ((SELECT value FROM meta"
34124-
" WHERE name"
34125-
" = 'scap_check_time')"
34126-
" AS INTEGER),"
34127-
" 0));"))
34128-
event (EVENT_NEW_SECINFO, "cpe", 0, 0);
34129-
}
34130-
}
34131-
34132-
/**
34133-
* @brief Check for new CERT SecInfo after an update.
34134-
*/
34135-
static void
34136-
check_for_new_cert ()
34137-
{
34138-
if (manage_cert_loaded ())
34139-
{
34140-
if (sql_int ("SELECT EXISTS"
34141-
" (SELECT * FROM cert.cert_bund_advs"
34142-
" WHERE creation_time"
34143-
" > coalesce (CAST ((SELECT value FROM meta"
34144-
" WHERE name"
34145-
" = 'cert_check_time')"
34146-
" AS INTEGER),"
34147-
" 0));"))
34148-
event (EVENT_NEW_SECINFO, "cert_bund_adv", 0, 0);
34149-
34150-
if (sql_int ("SELECT EXISTS"
34151-
" (SELECT * FROM cert.dfn_cert_advs"
34152-
" WHERE creation_time"
34153-
" > coalesce (CAST ((SELECT value FROM meta"
34154-
" WHERE name"
34155-
" = 'cert_check_time')"
34156-
" AS INTEGER),"
34157-
" 0));"))
34158-
event (EVENT_NEW_SECINFO, "dfn_cert_adv", 0, 0);
34159-
}
34160-
}
34161-
3416234018
/**
3416334019
* @brief Print an URL for a New NVTs alert.
3416434020
*
@@ -34757,90 +34613,6 @@ new_secinfo_message (event_t event, const void* event_data, alert_t alert)
3475734613
return message;
3475834614
}
3475934615

34760-
/**
34761-
* @brief Check for updated SCAP SecInfo after an update.
34762-
*/
34763-
static void
34764-
check_for_updated_scap ()
34765-
{
34766-
if (manage_scap_loaded ())
34767-
{
34768-
if (sql_int ("SELECT EXISTS"
34769-
" (SELECT * FROM scap.cves"
34770-
" WHERE modification_time"
34771-
" > coalesce (CAST ((SELECT value FROM meta"
34772-
" WHERE name"
34773-
" = 'scap_check_time')"
34774-
" AS INTEGER),"
34775-
" 0)"
34776-
" AND creation_time"
34777-
" <= coalesce (CAST ((SELECT value FROM meta"
34778-
" WHERE name"
34779-
" = 'scap_check_time')"
34780-
" AS INTEGER),"
34781-
" 0));"))
34782-
event (EVENT_UPDATED_SECINFO, "cve", 0, 0);
34783-
34784-
if (sql_int ("SELECT EXISTS"
34785-
" (SELECT * FROM scap.cpes"
34786-
" WHERE modification_time"
34787-
" > coalesce (CAST ((SELECT value FROM meta"
34788-
" WHERE name"
34789-
" = 'scap_check_time')"
34790-
" AS INTEGER),"
34791-
" 0)"
34792-
" AND creation_time"
34793-
" <= coalesce (CAST ((SELECT value FROM meta"
34794-
" WHERE name"
34795-
" = 'scap_check_time')"
34796-
" AS INTEGER),"
34797-
" 0));"))
34798-
event (EVENT_UPDATED_SECINFO, "cpe", 0, 0);
34799-
}
34800-
}
34801-
34802-
/**
34803-
* @brief Check for updated CERT SecInfo after an update.
34804-
*/
34805-
static void
34806-
check_for_updated_cert ()
34807-
{
34808-
if (manage_cert_loaded ())
34809-
{
34810-
if (sql_int ("SELECT EXISTS"
34811-
" (SELECT * FROM cert.cert_bund_advs"
34812-
" WHERE modification_time"
34813-
" > coalesce (CAST ((SELECT value FROM meta"
34814-
" WHERE name"
34815-
" = 'cert_check_time')"
34816-
" AS INTEGER),"
34817-
" 0)"
34818-
" AND creation_time"
34819-
" <= coalesce (CAST ((SELECT value FROM meta"
34820-
" WHERE name"
34821-
" = 'cert_check_time')"
34822-
" AS INTEGER),"
34823-
" 0));"))
34824-
event (EVENT_UPDATED_SECINFO, "cert_bund_adv", 0, 0);
34825-
34826-
if (sql_int ("SELECT EXISTS"
34827-
" (SELECT * FROM cert.dfn_cert_advs"
34828-
" WHERE modification_time"
34829-
" > coalesce (CAST ((SELECT value FROM meta"
34830-
" WHERE name"
34831-
" = 'cert_check_time')"
34832-
" AS INTEGER),"
34833-
" 0)"
34834-
" AND creation_time"
34835-
" <= coalesce (CAST ((SELECT value FROM meta"
34836-
" WHERE name"
34837-
" = 'cert_check_time')"
34838-
" AS INTEGER),"
34839-
" 0));"))
34840-
event (EVENT_UPDATED_SECINFO, "dfn_cert_adv", 0, 0);
34841-
}
34842-
}
34843-
3484434616

3484534617
/* Credentials. */
3484634618

0 commit comments

Comments
 (0)