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

Move nvt_tags into lean case where it's used #2097

Closed
wants to merge 4 commits into from
Closed

Move nvt_tags into lean case where it's used #2097

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
84eefa9
Cache prefs in nvti_cache for handle_get_nvts
mattmundell Oct 16, 2023
2a4054a
Exclude timeout in update_nvti_cache
mattmundell Oct 17, 2023
9b2d1f2
Move nvt_tags into lean case where it's used
mattmundell Oct 17, 2023
396079b
Merge branch 'main' into get-nvt-xml-lean-tags
mattmundell Oct 24, 2023
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
12 changes: 10 additions & 2 deletions src/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13636,8 +13636,16 @@ handle_get_nvts (gmp_parser_t *gmp_parser, GError **error)

if (get_nvts_data->preference_count)
{
const char *nvt_oid = nvt_iterator_oid (&nvts);
pref_count = nvt_preference_count (nvt_oid);
const char *nvt_oid;
nvti_t *nvti;

nvt_oid = nvt_iterator_oid (&nvts);

nvti = lookup_nvti (nvt_oid);
if (nvti)
pref_count = nvti_pref_len (nvti);
else
pref_count = nvt_preference_count (nvt_oid);
}
if (send_nvt (&nvts, 1, get_nvts_data->preferences,
pref_count, timeout, config,
Expand Down
119 changes: 61 additions & 58 deletions src/manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5661,67 +5661,11 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
if (details)
{
int tag_count;
GString *refs_str, *tags_str, *buffer, *nvt_tags;
GString *refs_str, *tags_str, *buffer;
iterator_t cert_refs_iterator, tags;
gchar *tag_name_esc, *tag_value_esc, *tag_comment_esc;

DEF (family);
DEF (tag);

#undef DEF

nvt_tags = g_string_new (tag_text);
g_free (tag_text);

/* Add the elements that are expected as part of the pipe-separated tag list
* via API although internally already explicitly stored. Once the API is
* extended to have these elements explicitly, they do not need to be
* added to this tag string anymore. */
if (nvt_iterator_summary (nvts) && nvt_iterator_summary (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|summary=%s",
nvt_iterator_summary (nvts));
else
xml_string_append (nvt_tags, "summary=%s",
nvt_iterator_summary (nvts));
}
if (nvt_iterator_insight (nvts) && nvt_iterator_insight (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|insight=%s",
nvt_iterator_insight (nvts));
else
xml_string_append (nvt_tags, "insight=%s",
nvt_iterator_insight (nvts));
}
if (nvt_iterator_affected (nvts) && nvt_iterator_affected (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|affected=%s",
nvt_iterator_affected (nvts));
else
xml_string_append (nvt_tags, "affected=%s",
nvt_iterator_affected (nvts));
}
if (nvt_iterator_impact (nvts) && nvt_iterator_impact (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|impact=%s",
nvt_iterator_impact (nvts));
else
xml_string_append (nvt_tags, "impact=%s",
nvt_iterator_impact (nvts));
}
if (nvt_iterator_detection (nvts) && nvt_iterator_detection (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|vuldetect=%s",
nvt_iterator_detection (nvts));
else
xml_string_append (nvt_tags, "vuldetect=%s",
nvt_iterator_detection (nvts));
}

refs_str = g_string_new ("");

Expand Down Expand Up @@ -5826,6 +5770,64 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
if (lean == 0)
{
char *default_timeout;
GString *nvt_tags;

DEF (tag);

#undef DEF

nvt_tags = g_string_new (tag_text);
g_free (tag_text);

/* Add the elements that are expected as part of the pipe-separated tag list
* via API although internally already explicitly stored. Once the API is
* extended to have these elements explicitly, they do not need to be
* added to this tag string anymore. */
if (nvt_iterator_summary (nvts) && nvt_iterator_summary (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|summary=%s",
nvt_iterator_summary (nvts));
else
xml_string_append (nvt_tags, "summary=%s",
nvt_iterator_summary (nvts));
}
if (nvt_iterator_insight (nvts) && nvt_iterator_insight (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|insight=%s",
nvt_iterator_insight (nvts));
else
xml_string_append (nvt_tags, "insight=%s",
nvt_iterator_insight (nvts));
}
if (nvt_iterator_affected (nvts) && nvt_iterator_affected (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|affected=%s",
nvt_iterator_affected (nvts));
else
xml_string_append (nvt_tags, "affected=%s",
nvt_iterator_affected (nvts));
}
if (nvt_iterator_impact (nvts) && nvt_iterator_impact (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|impact=%s",
nvt_iterator_impact (nvts));
else
xml_string_append (nvt_tags, "impact=%s",
nvt_iterator_impact (nvts));
}
if (nvt_iterator_detection (nvts) && nvt_iterator_detection (nvts)[0])
{
if (nvt_tags->str)
xml_string_append (nvt_tags, "|vuldetect=%s",
nvt_iterator_detection (nvts));
else
xml_string_append (nvt_tags, "vuldetect=%s",
nvt_iterator_detection (nvts));
}

default_timeout = nvt_default_timeout (oid);
g_string_append_printf (buffer,
Expand Down Expand Up @@ -5858,6 +5860,8 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
refs_str->str,
nvt_tags->str);
free (default_timeout);

g_string_free (nvt_tags, 1);
}

g_string_append_printf (buffer,
Expand Down Expand Up @@ -5894,7 +5898,6 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
"</severities>");

g_free (family_text);
g_string_free (nvt_tags, 1);
g_string_free (refs_str, 1);
if (tags_str)
g_string_free (tags_str, 1);
Expand Down
20 changes: 19 additions & 1 deletion src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15611,7 +15611,7 @@ lookup_nvti (const gchar *nvt)
static void
update_nvti_cache ()
{
iterator_t nvts;
iterator_t nvts, prefs;

nvtis_free (nvti_cache);

Expand All @@ -15631,6 +15631,11 @@ update_nvti_cache ()
" FROM nvts"
" LEFT OUTER JOIN vt_refs ON nvts.oid = vt_refs.vt_oid;");

init_iterator (&prefs,
"SELECT pref_id, pref_nvt, pref_name, value"
" FROM nvt_preferences"
" WHERE NOT (pref_type = 'entry' AND pref_name = 'Timeout')");

while (next (&nvts))
{
nvti_t *nvti;
Expand All @@ -15642,6 +15647,18 @@ update_nvti_cache ()
nvti_set_oid (nvti, iterator_string (&nvts, 0));

nvtis_add (nvti_cache, nvti);

while (next (&prefs))
if (iterator_string (&prefs, 1)
&& (strcmp (iterator_string (&prefs, 1),
iterator_string (&nvts, 0))
== 0))
nvti_add_pref (nvti,
nvtpref_new (iterator_int (&prefs, 0),
iterator_string (&prefs, 2),
iterator_string (&prefs, 3),
NULL));
iterator_rewind (&prefs);
}

if (iterator_null (&nvts, 2))
Expand All @@ -15654,6 +15671,7 @@ update_nvti_cache ()
}

cleanup_iterator (&nvts);
cleanup_iterator (&prefs);

malloc_trim (0);
}
Expand Down
Loading