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 sending prefs for whole, growing VT families #1603

Merged
merged 5 commits into from
Jul 6, 2021
Merged

Fix sending prefs for whole, growing VT families #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d74dc2e
Fix sending prefs for whole, growing VT families
timopollmeier Jun 30, 2021
d0a25d3
Merge branch 'master' of github.com:greenbone/gvmd into revert-vt_gro…
timopollmeier Jun 30, 2021
4299980
Add CHANGELOG entry for VT preferences fix
timopollmeier Jun 30, 2021
417b84b
Merge branch 'master' into revert-vt_groups-use
timopollmeier Jul 6, 2021
34abda8
Merge branch 'master' into revert-vt_groups-use
bjoernricks Jul 6, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Deprecated
### Removed
### Fixed
- Fix sending prefs for whole, growing VT families [#1603](https://github.com/greenbone/gvmd/pull/1603)

[Unreleased]: https://github.com/greenbone/gvmd/compare/v21.4.2...gvmd-21.04

Expand Down
20 changes: 3 additions & 17 deletions src/manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2483,7 +2483,7 @@ launch_osp_openvas_task (task_t task, target_t target, const char *scan_id,
gchar *clean_hosts, *clean_exclude_hosts, *clean_finished_hosts_str;
int alive_test, reverse_lookup_only, reverse_lookup_unify;
osp_target_t *osp_target;
GSList *osp_targets, *vts, *vt_groups;
GSList *osp_targets, *vts;
GHashTable *vts_hash_table;
osp_credential_t *ssh_credential, *smb_credential, *esxi_credential;
osp_credential_t *snmp_credential;
Expand Down Expand Up @@ -2624,7 +2624,6 @@ launch_osp_openvas_task (task_t task, target_t target, const char *scan_id,

/* Setup vulnerability tests (without preferences) */
vts = NULL;
vt_groups = NULL;
vts_hash_table
= g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
/* Value is freed in vts list. */
Expand All @@ -2634,18 +2633,7 @@ launch_osp_openvas_task (task_t task, target_t target, const char *scan_id,
while (next (&families))
{
const char *family = family_iterator_name (&families);
if (family && config_family_entire_and_growing (config, family))
{
gchar *filter;
osp_vt_group_t *vt_group;

filter = g_strdup_printf ("family=%s", family);
vt_group = osp_vt_group_new (filter);
g_free (filter);

vt_groups = g_slist_prepend (vt_groups, vt_group);
}
else if (family)
if (family)
{
iterator_t nvts;
init_nvt_iterator (&nvts, 0, config, family, NULL, 1, NULL);
Expand Down Expand Up @@ -2723,13 +2711,12 @@ launch_osp_openvas_task (task_t task, target_t target, const char *scan_id,
g_slist_free_full (osp_targets, (GDestroyNotify) osp_target_free);
// Credentials are freed with target
g_slist_free_full (vts, (GDestroyNotify) osp_vt_single_free);
g_slist_free_full (vt_groups, (GDestroyNotify) osp_vt_group_free);
g_hash_table_destroy (scanner_options);
return -1;
}

start_scan_opts.targets = osp_targets;
start_scan_opts.vt_groups = vt_groups;
start_scan_opts.vt_groups = NULL;
start_scan_opts.vts = vts;
start_scan_opts.scanner_params = scanner_options;
start_scan_opts.scan_id = scan_id;
Expand All @@ -2742,7 +2729,6 @@ launch_osp_openvas_task (task_t task, target_t target, const char *scan_id,
g_slist_free_full (osp_targets, (GDestroyNotify) osp_target_free);
// Credentials are freed with target
g_slist_free_full (vts, (GDestroyNotify) osp_vt_single_free);
g_slist_free_full (vt_groups, (GDestroyNotify) osp_vt_group_free);
g_hash_table_destroy (scanner_options);
return ret;
}
Expand Down