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

Send duplicated hosts as dead hosts to ospd, to adjust scan progress calculation #586

Merged
merged 2 commits into from
Aug 25, 2020
Merged

Send duplicated hosts as dead hosts to ospd, to adjust scan progress calculation #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10abb55
Send duplicated hosts as dead hosts to ospd, to adjust scan progress …
jjnicola Aug 21, 2020
a48931c
Update circleci to use gvm-libs 20.08
jjnicola Aug 24, 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
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git -b gvm-libs-20.08
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs (Release)
Expand All @@ -31,7 +31,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git -b gvm-libs-20.08
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs
Expand All @@ -47,7 +47,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git -b gvm-libs-20.08
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs
Expand Down
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 @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Fork vhosts before creating the socket.[#576](https://github.com/greenbone/openvas/pull/576)
- Check if another forked child has already added the same vhost. [#581](https://github.com/greenbone/openvas/pull/581)
- Send duplicated hosts as dead hosts to ospd, to adjust scan progress calculation. [#586](https://github.com/greenbone/openvas/pull/586)

[20.08]: https://github.com/greenbone/openvas/compare/v20.8.0...openvas-20.08

Expand Down
10 changes: 10 additions & 0 deletions src/attack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,7 @@ attack_network (struct scan_globals *globals)
const gchar *port_range;
kb_t host_kb;
GSList *unresolved;
int duplicated_hosts;

gboolean test_alive_hosts_only = prefs_get_bool ("test_alive_hosts_only");
gvm_hosts_t *alive_hosts_list = NULL;
Expand Down Expand Up @@ -1064,6 +1065,15 @@ attack_network (struct scan_globals *globals)

hosts = gvm_hosts_new (hostlist);
unresolved = gvm_hosts_resolve (hosts);

/* Duplicated hosts are removed from the list and ospd-openvas
needs to know that less hosts will be scanned, for the scan progress
calculation. Sent the amount of duplicated hosts as dead hosts to not
be taken in account. */
duplicated_hosts = gvm_hosts_duplicated (hosts);
if (duplicated_hosts > 0)
send_dead_hosts_to_ospd_openvas (duplicated_hosts);

while (unresolved)
{
g_warning ("Couldn't resolve hostname '%s'", (char *) unresolved->data);
Expand Down