[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r21706 - in trunk/openvas-manager: . doc src/schema_formats/XML
From: scm-commit () wald ! intevation ! org
Date: 2015-02-24 16:34:14
Message-ID: 20150224163415.583A59A1BF21 () wald ! intevation ! org
[Download RAW message or body]
Author: timopollmeier
Date: 2015-02-24 17:34:14 +0100 (Tue, 24 Feb 2015)
New Revision: 21706
Modified:
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/doc/omp.html
trunk/openvas-manager/doc/omp.rnc
trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in
Log:
Update OMP documentation of GET_REPORT and the report element.
* src/schema_formats/XML/OMP.xml.in (report): Add choice "prognostic"
to type attrib in both command and response. Change description of
"name" as it contains the creation time. Move "sort", "filters",
"severity_class" outside the optional group. Make "hosts" non-optional
and make it either attributes or a count element, adjust description.
Add elements "closed_cves", "vulns", "os", "apps", "ssl_certs" and
"errors". Remove unused "show_closed_cves". Add summary and
subelements of target in task subelement.
(get_reports): Add command attributes apply_overrides and
result_hosts_only. Change pattern in autofp to an alts type. Update
example response.
* doc/omp.html, doc/omp.rnc: Update from source.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2015-02-24 14:22:38 UTC (rev 21705)
+++ trunk/openvas-manager/ChangeLog 2015-02-24 16:34:14 UTC (rev 21706)
@@ -1,5 +1,23 @@
2015-02-24 Timo Pollmeier <timo.pollmeier@greenbone.net>
+ Update OMP documentation of GET_REPORT and the report element.
+
+ * src/schema_formats/XML/OMP.xml.in (report): Add choice "prognostic"
+ to type attrib in both command and response. Change description of
+ "name" as it contains the creation time. Move "sort", "filters",
+ "severity_class" outside the optional group. Make "hosts" non-optional
+ and make it either attributes or a count element, adjust description.
+ Add elements "closed_cves", "vulns", "os", "apps", "ssl_certs" and
+ "errors". Remove unused "show_closed_cves". Add summary and
+ subelements of target in task subelement.
+ (get_reports): Add command attributes apply_overrides and
+ result_hosts_only. Change pattern in autofp to an alts type. Update
+ example response.
+
+ * doc/omp.html, doc/omp.rnc: Update from source.
+
+2015-02-24 Timo Pollmeier <timo.pollmeier@greenbone.net>
+
* ChangeLog: Add missing line for doc/omp.html, doc/omp.rnc in entry
of previous change in OMP doc for notes / overrides (SVN r21701).
Modified: trunk/openvas-manager/doc/omp.html
===================================================================
--- trunk/openvas-manager/doc/omp.html 2015-02-24 14:22:38 UTC (rev 21705)
+++ trunk/openvas-manager/doc/omp.html 2015-02-24 16:34:14 UTC (rev 21706)
@@ -3508,7 +3508,7 @@
</li>
<li>
@<b>type</b>
- ("scan" or "assets")
+ ("scan", "assets" or "prognostic")
</li>
<li>
<<b>owner</b>>
@@ -3521,7 +3521,7 @@
</li>
<li>
<<b>name</b>>
- <div style="margin-left: 15px; display: inline;">Empty compatibility \
placeholder.</div> + <div style="margin-left: 15px; display: \
inline;">Creation time as compatibility placeholder.</div> <ul style="list-style: \
none"></ul> </li>
<li>
@@ -3588,7 +3588,7 @@
</li>
<li>
@<b>type</b>
- ("scan" or "assets")
+ ("scan", "assets" or "prognostic")
</li>
<li>
<<b>omp</b>>
@@ -3619,41 +3619,6 @@
</li></ul>
</li>
<li>
- <<b>delta</b>>
- ?<ul style="list-style: none"><li>
- <<b>report</b>>
- <div style="margin-left: 15px; display: inline;">Second report, for \
delta reports.</div>
-<ul style="list-style: none">
-<li>
- @<b>id</b>
- (<a href="#type_uuid">uuid</a>)
- </li>
-<li>
- <<b>scan_run_status</b>>
- <div style="margin-left: 15px; display: inline;">Run status of task \
scan at time of report.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>timestamp</b>>
- <div style="margin-left: 15px; display: inline;">The time the scan was \
requested.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>scan_start</b>>
- <div style="margin-left: 15px; display: inline;">Start time of \
scan.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>scan_end</b>>
- <div style="margin-left: 15px; display: inline;">End time of \
scan.</div>
-<ul style="list-style: none"></ul>
-</li>
-</ul>
-</li></ul>
-</li>
-<li>
-<i>The group</i><b>?</b><ul style="list-style: none">
-<li>
<<b>sort</b>>
<div style="margin-left: 15px; display: inline;">Result sorting \
information.</div> <ul style="list-style: none"><li>
@@ -3721,12 +3686,6 @@
<ul style="list-style: none"></ul>
</li>
<li>
- <<b>show_closed_cves</b>>
- <div style="margin-left: 15px; display: inline;">(<a \
href="#element_boolean">boolean</a>)</div>
-<div style="margin-left: 15px; display: inline;">Whether to include the Closed CVEs \
host detail in the report.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
<<b>filter</b>>
*<div style="margin-left: 15px; display: inline;">Level filter.</div>
<ul style="list-style: none"></ul>
@@ -3768,6 +3727,77 @@
</ul>
</li>
<li>
+ <<b>severity_class</b>>
+ <ul style="list-style: none">
+<li>
+ <<b>name</b>>
+ <div style="margin-left: 15px; display: inline;">Short severity class \
name.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>full_name</b>>
+ <div style="margin-left: 15px; display: inline;">Full severity class \
name.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>severity_range</b>>
+ *<div style="margin-left: 15px; display: inline;">Severity \
range.</div> +<ul style="list-style: none">
+<li>
+ <<b>name</b>>
+ <div style="margin-left: 15px; display: inline;">Name of severity \
range.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>min</b>>
+ <div style="margin-left: 15px; display: inline;">Minimum CVSS \
value.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>max</b>>
+ <div style="margin-left: 15px; display: inline;">Maximum CVSS \
value.</div> +<ul style="list-style: none"></ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
+ <<b>delta</b>>
+ ?<ul style="list-style: none"><li>
+ <<b>report</b>>
+ <div style="margin-left: 15px; display: inline;">Second report, for \
delta reports.</div> +<ul style="list-style: none">
+<li>
+ @<b>id</b>
+ (<a href="#type_uuid">uuid</a>)
+ </li>
+<li>
+ <<b>scan_run_status</b>>
+ <div style="margin-left: 15px; display: inline;">Run status of task \
scan at time of report.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>timestamp</b>>
+ <div style="margin-left: 15px; display: inline;">The time the scan was \
requested.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>scan_start</b>>
+ <div style="margin-left: 15px; display: inline;">Start time of \
scan.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>scan_end</b>>
+ <div style="margin-left: 15px; display: inline;">End time of \
scan.</div> +<ul style="list-style: none"></ul>
+</li>
+</ul>
+</li></ul>
+</li>
+<li>
+<i>The group</i><b>?</b><ul style="list-style: none">
+<li>
<<b>timezone</b>>
<div style="margin-left: 15px; display: inline;">Name of timezone used \
for dates.</div> <ul style="list-style: none"></ul>
@@ -3943,42 +3973,6 @@
</ul>
</li>
<li>
- <<b>severity_class</b>>
- <ul style="list-style: none">
-<li>
- <<b>name</b>>
- <div style="margin-left: 15px; display: inline;">Short severity class \
name.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>full_name</b>>
- <div style="margin-left: 15px; display: inline;">Full severity class \
name.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>severity_range</b>>
- *<div style="margin-left: 15px; display: inline;">Severity \
range.</div>
-<ul style="list-style: none">
-<li>
- <<b>name</b>>
- <div style="margin-left: 15px; display: inline;">Name of severity \
range.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>min</b>>
- <div style="margin-left: 15px; display: inline;">Minimum CVSS \
value.</div>
-<ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>max</b>>
- <div style="margin-left: 15px; display: inline;">Maximum CVSS \
value.</div>
-<ul style="list-style: none"></ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li>
<<b>host_count</b>>
?<div style="margin-left: 15px; display: inline;">Counts of hosts in \
the results.</div> <ul style="list-style: none">
@@ -4007,11 +4001,24 @@
<ul style="list-style: none"></ul>
</li>
<li>
- <<a href="#element_"><b>target</b></a>>
- <div style="margin-left: 15px; display: inline;">.</div>
+ <<b>target</b>>
+ <div style="margin-left: 15px; display: inline;">The target of the \
task.</div> +<ul style="list-style: none">
+<li>
+ @<b>id</b>
+ (<a href="#type_uuid">uuid</a>)
+ The UUID of the target.
+ </li>
+<li>
+ <<b>trash</b>>
+ <div style="margin-left: 15px; display: inline;">(<a \
href="#element_boolean">boolean</a>)</div> +<div style="margin-left: 15px; display: \
inline;">Whether the target is in the trashcan.</div> +<ul style="list-style: \
none"></ul> </li>
</ul>
</li>
+</ul>
+</li>
<li>
<<b>scan</b>>
<div style="margin-left: 15px; display: inline;">Info from scan \
time.</div> @@ -4117,8 +4124,11 @@
</li>
<li>
<<b>hosts</b>>
- ?<ul style="list-style: none">
+ <ul style="list-style: none"><li>
+<i>One of</i><b></b><ul style="list-style: none">
<li>
+<i>The group</i><b></b><ul style="list-style: none">
+<li>
@<b>start</b>
(<a href="#type_integer">integer</a>)
</li>
@@ -4129,6 +4139,59 @@
</ul>
</li>
<li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">Number of \
hosts.</div> +<ul style="list-style: none"></ul>
+</li>
+</ul>
+</li></ul>
+</li>
+<li>
+ <<b>closed_cves</b>>
+ <div style="margin-left: 15px; display: inline;">.</div>
+<ul style="list-style: none"><li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">The number of closed \
CVEs.</div> +<ul style="list-style: none"></ul>
+</li></ul>
+</li>
+<li>
+ <<b>vulns</b>>
+ <div style="margin-left: 15px; display: inline;">.</div>
+<ul style="list-style: none"><li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">The number of \
Vulnerabilities.</div> +<ul style="list-style: none"></ul>
+</li></ul>
+</li>
+<li>
+ <<b>os</b>>
+ <div style="margin-left: 15px; display: inline;">.</div>
+<ul style="list-style: none"><li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">The number of \
operating systems.</div> +<ul style="list-style: none"></ul>
+</li></ul>
+</li>
+<li>
+ <<b>apps</b>>
+ <div style="margin-left: 15px; display: inline;">.</div>
+<ul style="list-style: none"><li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">The number of \
Applications.</div> +<ul style="list-style: none"></ul>
+</li></ul>
+</li>
+<li>
+ <<b>ssl_certs</b>>
+ <div style="margin-left: 15px; display: inline;">.</div>
+<ul style="list-style: none"><li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">The number of SSL \
certificates.</div> +<ul style="list-style: none"></ul>
+</li></ul>
+</li>
+<li>
<<b>host</b>>
*<ul style="list-style: none">
<li>
@@ -4216,10 +4279,71 @@
<div style="margin-left: 15px; display: inline;">End time of \
scan.</div> <ul style="list-style: none"></ul>
</li>
+<li>
+ <<b>errors</b>>
+ <ul style="list-style: none">
+<li>
+ <<b>count</b>>
+ <div style="margin-left: 15px; display: inline;">The number of error \
messages.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>error</b>>
+ *<div style="margin-left: 15px; display: inline;">An error \
message.</div> +<ul style="list-style: none">
+<li>
+ <<b>host</b>>
+ <div style="margin-left: 15px; display: inline;">The host of the error \
message.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>port</b>>
+ <div style="margin-left: 15px; display: inline;">The port of the error \
message.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>description</b>>
+ <div style="margin-left: 15px; display: inline;">The description of \
the error message.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>nvt</b>>
+ <div style="margin-left: 15px; display: inline;">The NVT that \
generated the error message.</div> +<ul style="list-style: none">
+<li>
+ @<b>oid</b>
+ ()
+ </li>
+<li>
+ <<b>name</b>>
+ <div style="margin-left: 15px; display: inline;">The name of the \
NVT.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>cvss_base</b>>
+ <div style="margin-left: 15px; display: inline;">The base CVSS score \
of the NVT.</div> +<ul style="list-style: none"></ul>
+</li>
</ul>
</li>
+<li>
+ <<b>scan_nvt_version</b>>
+ <div style="margin-left: 15px; display: inline;">The NVT version that \
generated the error.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>severity</b>>
+ <div style="margin-left: 15px; display: inline;">The severity score of \
the error message.</div> +<ul style="list-style: none"></ul>
+</li>
</ul>
</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
</ul></li></ul>
<h4>6.12.2 RNC</h4>
<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: \
auto; margin-right: auto; background: #d5d5d5;"><div style="margin-left: \
5%"><pre>report @@ -4230,7 +4354,7 @@
& attribute format_id { uuid }
& attribute extension { text }
& attribute content_type { text }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_owner
& report_name
& report_comment
@@ -4321,32 +4445,38 @@
= element report
{
attribute id { uuid }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_report_omp
& report_report_report_format
+ & report_report_sort
+ & report_report_filters
+ & report_report_severity_class
& report_report_delta?
- & ( report_report_sort
- & report_report_filters
- & report_report_timezone
+ & ( report_report_timezone
& report_report_timezone_abbrev
& report_report_permissions
& report_report_user_tags
& report_report_scan_run_status
& report_report_result_count
& report_report_severity
- & report_report_severity_class
& report_report_host_count?
& report_report_task
& report_report_scan
& report_report_ports
& report_report_results
- & report_report_hosts?
+ & report_report_hosts
+ & report_report_closed_cves
+ & report_report_vulns
+ & report_report_os
+ & report_report_apps
+ & report_report_ssl_certs
& report_report_host*
& report_report_timestamp
& report_report_scan_start
& report_report_host_start*
& report_report_host_end*
- & report_report_scan_end )?
+ & report_report_scan_end
+ & report_report_errors )?
}
report_report_omp
@@ -4459,7 +4589,6 @@
& report_report_filters_min_cvss_base
& report_report_filters_min_qod
& report_report_filters_autofp
- & report_report_filters_show_closed_cves
& report_report_filters_filter*
& report_report_filters_host?
& report_report_filters_delta?
@@ -4519,11 +4648,6 @@
xsd:token { pattern = "0|1|2" }
}
-report_report_filters_show_closed_cves
- = element show_closed_cves # type boolean
- {
- }
-
report_report_filters_filter
= element filter
{
@@ -4863,7 +4987,7 @@
{
attribute id { uuid }
& report_report_task_name
- & target
+ & report_report_task_target
}
report_report_task_name
@@ -4872,6 +4996,18 @@
name
}
+report_report_task_target
+ = element target
+ {
+ attribute id { uuid }?
+ & report_report_task_target_trash
+ }
+
+report_report_task_target_trash
+ = element trash # type boolean
+ {
+ }
+
report_report_scan
= element scan
{
@@ -5019,10 +5155,71 @@
report_report_hosts
= element hosts
{
- attribute start { integer }
- & attribute max { integer }
+ ( ( attribute start { integer }
+ & attribute max { integer } )
+ | report_report_hosts_count )
}
+report_report_hosts_count
+ = element count
+ {
+ }
+
+report_report_closed_cves
+ = element closed_cves
+ {
+ report_report_closed_cves_count
+ }
+
+report_report_closed_cves_count
+ = element count
+ {
+ }
+
+report_report_vulns
+ = element vulns
+ {
+ report_report_vulns_count
+ }
+
+report_report_vulns_count
+ = element count
+ {
+ }
+
+report_report_os
+ = element os
+ {
+ report_report_os_count
+ }
+
+report_report_os_count
+ = element count
+ {
+ }
+
+report_report_apps
+ = element apps
+ {
+ report_report_apps_count
+ }
+
+report_report_apps_count
+ = element count
+ {
+ }
+
+report_report_ssl_certs
+ = element ssl_certs
+ {
+ report_report_ssl_certs_count
+ }
+
+report_report_ssl_certs_count
+ = element count
+ {
+ }
+
report_report_host
= element host
{
@@ -5139,6 +5336,79 @@
{
iso_time
}
+
+report_report_errors
+ = element errors
+ {
+ report_report_errors_count
+ & report_report_errors_error*
+ }
+
+report_report_errors_count
+ = element count
+ {
+ }
+
+report_report_errors_error
+ = element error
+ {
+ report_report_errors_error_host
+ & report_report_errors_error_port
+ & report_report_errors_error_description
+ & report_report_errors_error_nvt
+ & report_report_errors_error_scan_nvt_version
+ & report_report_errors_error_severity
+ }
+
+report_report_errors_error_host
+ = element host
+ {
+ text
+ }
+
+report_report_errors_error_port
+ = element port
+ {
+ port
+ }
+
+report_report_errors_error_description
+ = element description
+ {
+ text
+ }
+
+report_report_errors_error_nvt
+ = element nvt
+ {
+ attribute oid { }
+ & report_report_errors_error_nvt_name
+ & report_report_errors_error_nvt_cvss_base
+ }
+
+report_report_errors_error_nvt_name
+ = element name
+ {
+ text
+ }
+
+report_report_errors_error_nvt_cvss_base
+ = element cvss_base
+ {
+ severity
+ }
+
+report_report_errors_error_scan_nvt_version
+ = element scan_nvt_version
+ {
+ text
+ }
+
+report_report_errors_error_severity
+ = element severity
+ {
+ severity
+ }
</pre></div></div>
</div>
<h2 id="command_details">7 Command Details</h2>
@@ -8477,7 +8747,7 @@
& attribute format_id { uuid }
& attribute extension { text }
& attribute content_type { text }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_owner
& report_name
& report_comment
@@ -21363,6 +21633,11 @@
(text)
</li>
<li>
+ @<b>apply_overrides</b>
+ (<a href="#type_boolean">boolean</a>)
+ Whether to apply overrides to the results.
+ </li>
+<li>
@<b>levels</b>
(<a href="#type_levels">levels</a>)
Which threat levels to include in the report.
@@ -21449,13 +21724,13 @@
</li>
<li>
@<b>autofp</b>
- ()
+ ("0", "1" or "2")
Whether to trust vendor security updates. 1 full match, 2 partial.
</li>
<li>
- @<b>show_closed_cves</b>
+ @<b>result_hosts_only</b>
(<a href="#type_boolean">boolean</a>)
- Whether to include the Closed CVEs host detail in the report.
+ Whether to include only hosts with results.
</li>
<li>
@<b>ignore_pagination</b>
@@ -21591,6 +21866,7 @@
& attribute max_results { integer }?
& attribute sort_order { sort_order }?
& attribute sort_field { text }?
+ & attribute apply_overrides { boolean }?
& attribute levels { levels }?
& attribute search_phrase { text }?
& attribute min_cvss_base { integer }?
@@ -21608,8 +21884,8 @@
& attribute pos { integer }?
& attribute delta_report_id { uuid }?
& attribute delta_states { }?
- & attribute autofp { }?
- & attribute show_closed_cves { boolean }?
+ & attribute autofp { xsd:token { pattern = "0|1|2" } }?
+ & attribute result_hosts_only { boolean }?
& attribute ignore_pagination { boolean }?
& attribute timezone { text }?
}
@@ -21634,7 +21910,7 @@
& attribute format_id { uuid }
& attribute extension { text }
& attribute content_type { text }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_owner
& report_name
& report_comment
@@ -21792,7 +22068,7 @@
<result_hosts_only>1</result_hosts_only>
<min_cvss_base/>
<autofp>0</autofp>
- <show_closed_cves>0</show_closed_cves>
+ <result_hosts_only>1</result_hosts_only>
<filter>High</filter>
<filter>Medium</filter>
<filter>Low</filter>
@@ -21803,6 +22079,24 @@
<count>0</count>
</user_tags>
<scan_run_status>Done</scan_run_status>
+ <hosts>
+ <count>1</count>
+ </hosts>
+ <closed_cves>
+ <count>0</count>
+ </closed_cves>
+ <vulns>
+ <count>3</count>
+ </vulns>
+ <os>
+ <count>1</count>
+ </os>
+ <apps>
+ <count>2</count>
+ </apps>
+ <ssl_certs>
+ <count>0</count>
+ </ssl_certs>
<result_count>
<full>10</full>
<filtered>10</filtered>
@@ -21830,6 +22124,13 @@
<task id="13bb418a-4220-4575-b35b-ec398bff7417">
<name>dik mm</name>
</task>
+ <scan>
+ <task/>
+ </scan>
+ <timestamp>2010-02-02T19:11:21+00:00</timestamp>
+ <scan_start>2010-02-02T19:11:21+00:00</scan_start>
+ <timezone>UTC</timezone>
+ <timezone_abbrev>UTC</timezone_abbrev>
<ports start="1"
max="-1">
<port>
@@ -21863,16 +22164,18 @@
</result>
...
</results>
- <scan_start>Mon Feb 1 19:11:21 2010</scan_start>
<host_start>
- Mon Feb 1 19:11:21 2010
+ 2010-02-02T19:11:21+00:00
<host>127.0.1.1</host>
</host_start>
<host_end>
- Mon Feb 1 19:11:52 2010
+ 2010-02-02T19:11:52+00:00
<host>127.0.1.1</host>
</host_end>
- <scan_end>Mon Feb 1 19:11:52 2010</scan_end>
+ <scan_end>2010-02-02T19:11:52+00:00</scan_end>
+ <errors>
+ <count>0</count>
+ </errors>
</report>
</report>
</get_reports_response>
Modified: trunk/openvas-manager/doc/omp.rnc
===================================================================
--- trunk/openvas-manager/doc/omp.rnc 2015-02-24 14:22:38 UTC (rev 21705)
+++ trunk/openvas-manager/doc/omp.rnc 2015-02-24 16:34:14 UTC (rev 21706)
@@ -1776,7 +1776,7 @@
& attribute format_id { uuid }
& attribute extension { text }
& attribute content_type { text }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_owner
& report_name
& report_comment
@@ -1803,7 +1803,7 @@
name
}
-# Empty compatibility placeholder.
+# Creation time as compatibility placeholder.
report_name
= element name
{
@@ -1879,32 +1879,38 @@
= element report
{
attribute id { uuid }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_report_omp
& report_report_report_format
+ & report_report_sort
+ & report_report_filters
+ & report_report_severity_class
& report_report_delta?
- & ( report_report_sort
- & report_report_filters
- & report_report_timezone
+ & ( report_report_timezone
& report_report_timezone_abbrev
& report_report_permissions
& report_report_user_tags
& report_report_scan_run_status
& report_report_result_count
& report_report_severity
- & report_report_severity_class
& report_report_host_count?
& report_report_task
& report_report_scan
& report_report_ports
& report_report_results
- & report_report_hosts?
+ & report_report_hosts
+ & report_report_closed_cves
+ & report_report_vulns
+ & report_report_os
+ & report_report_apps
+ & report_report_ssl_certs
& report_report_host*
& report_report_timestamp
& report_report_scan_start
& report_report_host_start*
& report_report_host_end*
- & report_report_scan_end )?
+ & report_report_scan_end
+ & report_report_errors )?
}
# Information of the OMP server.
@@ -2032,7 +2038,6 @@
& report_report_filters_min_cvss_base
& report_report_filters_min_qod
& report_report_filters_autofp
- & report_report_filters_show_closed_cves
& report_report_filters_filter*
& report_report_filters_host?
& report_report_filters_delta?
@@ -2101,12 +2106,6 @@
xsd:token { pattern = "0|1|2" }
}
-# Whether to include the Closed CVEs host detail in the report.
-report_report_filters_show_closed_cves
- = element show_closed_cves # type boolean
- {
- }
-
# Level filter.
report_report_filters_filter
= element filter
@@ -2494,7 +2493,7 @@
{
attribute id { uuid }
& report_report_task_name
- & target
+ & report_report_task_target
}
# The name of the task.
@@ -2504,6 +2503,21 @@
name
}
+# The target of the task.
+report_report_task_target
+ = element target
+ {
+ # The UUID of the target.
+ attribute id { uuid }?
+ & report_report_task_target_trash
+ }
+
+# Whether the target is in the trashcan.
+report_report_task_target_trash
+ = element trash # type boolean
+ {
+ }
+
# Info from scan time.
report_report_scan
= element scan
@@ -2657,10 +2671,82 @@
report_report_hosts
= element hosts
{
- attribute start { integer }
- & attribute max { integer }
+ ( ( attribute start { integer }
+ & attribute max { integer } )
+ | report_report_hosts_count )
}
+# Number of hosts.
+report_report_hosts_count
+ = element count
+ {
+ }
+
+# .
+report_report_closed_cves
+ = element closed_cves
+ {
+ report_report_closed_cves_count
+ }
+
+# The number of closed CVEs.
+report_report_closed_cves_count
+ = element count
+ {
+ }
+
+# .
+report_report_vulns
+ = element vulns
+ {
+ report_report_vulns_count
+ }
+
+# The number of Vulnerabilities.
+report_report_vulns_count
+ = element count
+ {
+ }
+
+# .
+report_report_os
+ = element os
+ {
+ report_report_os_count
+ }
+
+# The number of operating systems.
+report_report_os_count
+ = element count
+ {
+ }
+
+# .
+report_report_apps
+ = element apps
+ {
+ report_report_apps_count
+ }
+
+# The number of Applications.
+report_report_apps_count
+ = element count
+ {
+ }
+
+# .
+report_report_ssl_certs
+ = element ssl_certs
+ {
+ report_report_ssl_certs_count
+ }
+
+# The number of SSL certificates.
+report_report_ssl_certs_count
+ = element count
+ {
+ }
+
report_report_host
= element host
{
@@ -2793,6 +2879,89 @@
iso_time
}
+report_report_errors
+ = element errors
+ {
+ report_report_errors_count
+ & report_report_errors_error*
+ }
+
+# The number of error messages.
+report_report_errors_count
+ = element count
+ {
+ }
+
+# An error message.
+report_report_errors_error
+ = element error
+ {
+ report_report_errors_error_host
+ & report_report_errors_error_port
+ & report_report_errors_error_description
+ & report_report_errors_error_nvt
+ & report_report_errors_error_scan_nvt_version
+ & report_report_errors_error_severity
+ }
+
+# The host of the error message.
+report_report_errors_error_host
+ = element host
+ {
+ text
+ }
+
+# The port of the error message.
+report_report_errors_error_port
+ = element port
+ {
+ port
+ }
+
+# The description of the error message.
+report_report_errors_error_description
+ = element description
+ {
+ text
+ }
+
+# The NVT that generated the error message.
+report_report_errors_error_nvt
+ = element nvt
+ {
+ attribute oid { }
+ & report_report_errors_error_nvt_name
+ & report_report_errors_error_nvt_cvss_base
+ }
+
+# The name of the NVT.
+report_report_errors_error_nvt_name
+ = element name
+ {
+ text
+ }
+
+# The base CVSS score of the NVT.
+report_report_errors_error_nvt_cvss_base
+ = element cvss_base
+ {
+ severity
+ }
+
+# The NVT version that generated the error.
+report_report_errors_error_scan_nvt_version
+ = element scan_nvt_version
+ {
+ text
+ }
+
+# The severity score of the error message.
+report_report_errors_error_severity
+ = element severity
+ {
+ severity
+ }
+
### Commands
## Command authenticate
@@ -3711,7 +3880,7 @@
& attribute format_id { uuid }
& attribute extension { text }
& attribute content_type { text }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_owner
& report_name
& report_comment
@@ -5085,6 +5254,8 @@
attribute max_results { integer }?
& attribute sort_order { sort_order }?
& attribute sort_field { text }?
+ & # Whether to apply overrides to the results.
+ attribute apply_overrides { boolean }?
& # Which threat levels to include in the report.
attribute levels { levels }?
& # A string that all results in the report must contain.
@@ -5120,9 +5291,9 @@
& # Letters for results to include: c)hanged, g)one, n)ew, s)ame.
attribute delta_states { }?
& # Whether to trust vendor security updates. 1 full match, 2 partial.
- attribute autofp { }?
- & # Whether to include the Closed CVEs host detail in the report.
- attribute show_closed_cves { boolean }?
+ attribute autofp { xsd:token { pattern = "0|1|2" } }?
+ & # Whether to include only hosts with results.
+ attribute result_hosts_only { boolean }?
& # Whether to ignore info used to split the report into pages like the \
filter terms "first" and "rows".. attribute ignore_pagination { boolean }?
& # The timezone to use for dates in the report.
@@ -12212,7 +12383,7 @@
& attribute format_id { uuid }
& attribute extension { text }
& attribute content_type { text }
- & attribute type { xsd:token { pattern = "scan|assets" } }?
+ & attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& report_owner
& report_name
& report_comment
Modified: trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in
===================================================================
--- trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in 2015-02-24 14:22:38 UTC \
(rev 21705)
+++ trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in 2015-02-24 16:34:14 UTC \
(rev 21706) @@ -1490,6 +1490,7 @@
<alts>
<alt>scan</alt>
<alt>assets</alt>
+ <alt>prognostic</alt>
</alts>
</type>
</attrib>
@@ -1519,7 +1520,7 @@
</ele>
<ele>
<name>name</name>
- <summary>Empty compatibility placeholder</summary>
+ <summary>Creation time as compatibility placeholder</summary>
<pattern></pattern>
</ele>
<ele>
@@ -1595,16 +1596,18 @@
<alts>
<alt>scan</alt>
<alt>assets</alt>
+ <alt>prognostic</alt>
</alts>
</type>
</attrib>
<e>omp</e>
<e>report_format</e>
+ <e>sort</e>
+ <e>filters</e>
+ <e>severity_class</e>
<o><e>delta</e></o>
<o>
<g>
- <e>sort</e>
- <e>filters</e>
<e>timezone</e>
<e>timezone_abbrev</e>
<e>permissions</e>
@@ -1612,19 +1615,24 @@
<e>scan_run_status</e>
<e>result_count</e>
<e>severity</e>
- <e>severity_class</e>
<o><e>host_count</e></o>
<e>task</e>
<e>scan</e>
<e>ports</e>
<e>results</e>
- <o><e>hosts</e></o>
+ <e>hosts</e>
+ <e>closed_cves</e>
+ <e>vulns</e>
+ <e>os</e>
+ <e>apps</e>
+ <e>ssl_certs</e>
<any><e>host</e></any>
<e>timestamp</e>
<e>scan_start</e>
<any><e>host_start</e></any>
<any><e>host_end</e></any>
<e>scan_end</e>
+ <e>errors</e>
</g>
</o>
</pattern>
@@ -1757,7 +1765,6 @@
<e>min_cvss_base</e>
<e>min_qod</e>
<e>autofp</e>
- <e>show_closed_cves</e>
<any><e>filter</e></any>
<o><e>host</e></o>
<o><e>delta</e></o>
@@ -1828,13 +1835,6 @@
<pattern>xsd:token { pattern = "0|1|2" }</pattern>
</ele>
<ele>
- <name>show_closed_cves</name>
- <summary>
- Whether to include the Closed CVEs host detail in the report
- </summary>
- <type>boolean</type>
- </ele>
- <ele>
<name>filter</name>
<summary>Level filter</summary>
<pattern>
@@ -2215,6 +2215,23 @@
<summary>The name of the task</summary>
<pattern><t>name</t></pattern>
</ele>
+ <ele>
+ <name>target</name>
+ <summary>The target of the task</summary>
+ <pattern>
+ <attrib>
+ <name>id</name>
+ <type>uuid</type>
+ <summary>The UUID of the target</summary>
+ </attrib>
+ <e>trash</e>
+ </pattern>
+ <ele>
+ <name>trash</name>
+ <summary>Whether the target is in the trashcan</summary>
+ <type>boolean</type>
+ </ele>
+ </ele>
</ele>
<ele>
<name>scan</name>
@@ -2347,28 +2364,92 @@
<name>hosts</name>
<description>
<p>
- Analogous to the results element, but for hosts. However to keep
- backward compatibility the host elements are siblings of this
- element, instead of children.
+ Analogous to the results element, but for hosts, in the "assets"
+ report. However to keep backward compatibility the host elements
+ are siblings of this element, instead of children.
</p>
<p>
- This is only present in the "assets" report.
+ Contains only the count outside the "assets" report.
</p>
</description>
<pattern>
- <attrib>
- <name>start</name>
- <type>integer</type>
- <required>1</required>
- </attrib>
- <attrib>
- <name>max</name>
- <type>integer</type>
- <required>1</required>
- </attrib>
+ <or>
+ <g>
+ <attrib>
+ <name>start</name>
+ <type>integer</type>
+ <required>1</required>
+ </attrib>
+ <attrib>
+ <name>max</name>
+ <type>integer</type>
+ <required>1</required>
+ </attrib>
+ </g>
+ <e>count</e>
+ </or>
</pattern>
+ <ele>
+ <name>count</name>
+ <summary>Number of hosts</summary>
+ </ele>
</ele>
<ele>
+ <name>closed_cves</name>
+ <summary></summary>
+ <pattern>
+ <e>count</e>
+ </pattern>
+ <ele>
+ <name>count</name>
+ <summary>The number of closed CVEs</summary>
+ </ele>
+ </ele>
+ <ele>
+ <name>vulns</name>
+ <summary></summary>
+ <pattern>
+ <e>count</e>
+ </pattern>
+ <ele>
+ <name>count</name>
+ <summary>The number of Vulnerabilities</summary>
+ </ele>
+ </ele>
+ <ele>
+ <name>os</name>
+ <summary></summary>
+ <pattern>
+ <e>count</e>
+ </pattern>
+ <ele>
+ <name>count</name>
+ <summary>The number of operating systems</summary>
+ </ele>
+ </ele>
+ <ele>
+ <name>apps</name>
+ <summary></summary>
+ <pattern>
+ <e>count</e>
+ </pattern>
+ <ele>
+ <name>count</name>
+ <summary>The number of Applications</summary>
+ </ele>
+ </ele>
+ <ele>
+ <name>ssl_certs</name>
+ <summary></summary>
+ <pattern>
+ <e>count</e>
+ </pattern>
+ <ele>
+ <name>count</name>
+ <summary>The number of SSL certificates</summary>
+ </ele>
+ </ele>
+ <ele>
<name>host</name>
<pattern>
<e>ip</e>
@@ -2474,6 +2555,76 @@
<summary>End time of scan</summary>
<pattern><t>iso_time</t></pattern>
</ele>
+ <ele>
+ <name>errors</name>
+ <pattern>
+ <e>count</e>
+ <any><e>error</e></any>
+ </pattern>
+ <ele>
+ <name>count</name>
+ <summary>The number of error messages</summary>
+ </ele>
+ <ele>
+ <name>error</name>
+ <summary>An error message</summary>
+ <pattern>
+ <e>host</e>
+ <e>port</e>
+ <e>description</e>
+ <e>nvt</e>
+ <e>scan_nvt_version</e>
+ <e>severity</e>
+ </pattern>
+ <ele>
+ <name>host</name>
+ <summary>The host of the error message</summary>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>port</name>
+ <summary>The port of the error message</summary>
+ <pattern><t>port</t></pattern>
+ </ele>
+ <ele>
+ <name>description</name>
+ <summary>The description of the error message</summary>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>nvt</name>
+ <summary>The NVT that generated the error message</summary>
+ <pattern>
+ <attrib>
+ <name>oid</name>
+ <required>1</required>
+ </attrib>
+ <e>name</e>
+ <e>cvss_base</e>
+ </pattern>
+ <ele>
+ <name>name</name>
+ <summary>The name of the NVT</summary>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>cvss_base</name>
+ <summary>The base CVSS score of the NVT</summary>
+ <pattern><t>severity</t></pattern>
+ </ele>
+ </ele>
+ <ele>
+ <name>scan_nvt_version</name>
+ <summary>The NVT version that generated the error</summary>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>severity</name>
+ <summary>The severity score of the error message</summary>
+ <pattern><t>severity</t></pattern>
+ </ele>
+ </ele>
+ </ele>
</ele>
</element>
<command>
@@ -12852,6 +13003,11 @@
<type>text</type>
</attrib>
<attrib>
+ <name>apply_overrides</name>
+ <summary>Whether to apply overrides to the results</summary>
+ <type>boolean</type>
+ </attrib>
+ <attrib>
<name>levels</name>
<summary>Which threat levels to include in the report</summary>
<type>levels</type>
@@ -12949,12 +13105,18 @@
<summary>
Whether to trust vendor security updates. 1 full match, 2 partial
</summary>
- <pattern>xsd:token { pattern = "0|1|2" }</pattern>
+ <type>
+ <alts>
+ <alt>0</alt>
+ <alt>1</alt>
+ <alt>2</alt>
+ </alts>
+ </type>
</attrib>
<attrib>
- <name>show_closed_cves</name>
+ <name>result_hosts_only</name>
<summary>
- Whether to include the Closed CVEs host detail in the report
+ Whether to include only hosts with results
</summary>
<type>boolean</type>
</attrib>
@@ -13168,7 +13330,7 @@
<result_hosts_only>1</result_hosts_only>
<min_cvss_base></min_cvss_base>
<autofp>0</autofp>
- <show_closed_cves>0</show_closed_cves>
+ <result_hosts_only>1</result_hosts_only>
<filter>High</filter>
<filter>Medium</filter>
<filter>Low</filter>
@@ -13179,6 +13341,24 @@
<count>0</count>
</user_tags>
<scan_run_status>Done</scan_run_status>
+ <hosts>
+ <count>1</count>
+ </hosts>
+ <closed_cves>
+ <count>0</count>
+ </closed_cves>
+ <vulns>
+ <count>3</count>
+ </vulns>
+ <os>
+ <count>1</count>
+ </os>
+ <apps>
+ <count>2</count>
+ </apps>
+ <ssl_certs>
+ <count>0</count>
+ </ssl_certs>
<result_count>
<full>10</full>
<filtered>10</filtered>
@@ -13206,6 +13386,14 @@
<task id="13bb418a-4220-4575-b35b-ec398bff7417">
<name>dik mm</name>
</task>
+ <scan>
+ <task>
+ </task>
+ </scan>
+ <timestamp>2010-02-02T19:11:21+00:00</timestamp>
+ <scan_start>2010-02-02T19:11:21+00:00</scan_start>
+ <timezone>UTC</timezone>
+ <timezone_abbrev>UTC</timezone_abbrev>
<ports start="1" max="-1">
<port>
general/tcp
@@ -13236,10 +13424,12 @@
</result>
<truncated>...</truncated>
</results>
- <scan_start>Mon Feb 1 19:11:21 2010</scan_start>
- <host_start>Mon Feb 1 19:11:21 \
2010<host>127.0.1.1</host></host_start>
- <host_end>Mon Feb 1 19:11:52 2010<host>127.0.1.1</host></host_end>
- <scan_end>Mon Feb 1 19:11:52 2010</scan_end>
+ <host_start>2010-02-02T19:11:21+00:00<host>127.0.1.1</host></host_start>
+ <host_end>2010-02-02T19:11:52+00:00<host>127.0.1.1</host></host_end>
+ <scan_end>2010-02-02T19:11:52+00:00</scan_end>
+ <errors>
+ <count>0</count>
+ </errors>
</report>
</report>
</get_reports_response>
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic