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

Run OpenVAS scans via OSP instead of OTP #422

Merged
merged 26 commits into from
Jun 7, 2019
Merged

Run OpenVAS scans via OSP instead of OTP #422

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ad4950c
Add scanner type "OSP-OpenVAS"
timopollmeier Mar 12, 2019
1372610
Convert OpenVAS config preferences to OSP
timopollmeier Mar 12, 2019
8694edf
Merge branch 'master' of github.com:greenbone/gvm into openvas-via-osp
timopollmeier Mar 15, 2019
6565f37
Merge branch 'master' of github.com:greenbone/gvm into openvas-via-osp
timopollmeier May 21, 2019
17d1f3c
Fetch OSP results while scan is running
timopollmeier May 22, 2019
6e93b87
Handle OpenVAS scanner host details in OSP
timopollmeier May 22, 2019
417211d
Adjust OSP credentials auth data
timopollmeier May 23, 2019
a1c241f
Allow usk credentials in target_osp_ssh_credential
timopollmeier May 23, 2019
4410854
Add ESXi and SNMP credentials for OSP scans
timopollmeier May 23, 2019
b19e248
Don't get unused connecting to OSP file socket
timopollmeier May 24, 2019
2adcf64
Handle HOST_START and HOST_END in OSP scans
timopollmeier May 24, 2019
fdf2988
Merge branch 'master' of github.com:greenbone/gvm into openvas-via-osp
timopollmeier May 27, 2019
664a34d
Merge branch 'master' into openvas-via-osp
timopollmeier May 28, 2019
e29df9e
Add exclude_hosts parameter for osp_target_new()
timopollmeier May 28, 2019
6117fb6
Get hostname for OSP scan results
timopollmeier May 28, 2019
1f5daca
Merge branch 'master' into openvas-via-osp
timopollmeier May 29, 2019
a4061cc
Merge branch 'master' into openvas-via-osp
mattmundell May 30, 2019
c9b5d98
Merge branch 'master' of github.com:greenbone/gvm into openvas-via-osp
timopollmeier May 31, 2019
1608f12
Merge branch 'master' into openvas-via-osp
timopollmeier Jun 3, 2019
1294b42
Use OSP for all OpenVAS scans
timopollmeier Jun 5, 2019
cdda304
Get report from task in stop_osp_task
timopollmeier Jun 5, 2019
d927c29
Merge branch 'master' of github.com:greenbone/gvm into openvas-via-osp
timopollmeier Jun 5, 2019
9d8cc77
Merge branch 'master' of github.com:greenbone/gvm into openvas-via-osp
timopollmeier Jun 5, 2019
3559900
Use new struct-based osp_start_scan_ext
timopollmeier Jun 5, 2019
70de168
Add warning if OSP connection fails
timopollmeier Jun 7, 2019
53836d1
Fix uninitialized variables
timopollmeier Jun 7, 2019
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: 9 additions & 3 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32603,14 +32603,20 @@ parse_osp_report (task_t task, report_t report, const char *report_xml)
/* TODO: This should probably be handled by the "Host Detail"
* result type with extra source info in OSP.
*/
if (manage_report_host_detail (global_current_report,
host,
desc))
if (manage_report_host_detail (report, host, desc))
g_warning ("%s: Failed to add report detail for host '%s': %s",
__FUNCTION__,
host,
desc);
}
else if (host && nvt_id && desc && (strcmp (nvt_id, "HOST_START") == 0))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a strange feature of OSP.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also think it would be a good idea to change this. How would you handle the host start and end times in OSP?
My suggestion would be to add a new host detail result type to OSP and use "host_start" and "host_end" as the names.
I'm not sure if we should do it in this PR already.

{
set_scan_host_start_time_otp (report, host, desc);
}
else if (host && nvt_id && desc && (strcmp (nvt_id, "HOST_END") == 0))
{
set_scan_host_end_time_otp (report, host, desc);
}
else
{
result = make_osp_result (task, host, nvt_id, type, desc, port ?: "",
Expand Down