[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r21712 - in trunk/openvas-manager: . doc src/schema_formats/XML
From: scm-commit () wald ! intevation ! org
Date: 2015-02-25 11:11:56
Message-ID: 20150225111157.1242A9A213AD () wald ! intevation ! org
[Download RAW message or body]
Author: timopollmeier
Date: 2015-02-25 12:11:56 +0100 (Wed, 25 Feb 2015)
New Revision: 21712
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_NVTS.
* src/schema_formats/XML/OMP.xml.in (get_nvts): Change "id" attribute
in response to "oid". Move "creation_time" and "modification_time"
response elements to optional group. Remove missing elements
"permissions", "description and "risk_factor". Add "alt" subelement to
"preference" elements. Add summary text to describe response elements.
Update example.
* doc/omp.html, doc/omp.rnc: Update from source.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2015-02-25 09:10:55 UTC (rev 21711)
+++ trunk/openvas-manager/ChangeLog 2015-02-25 11:11:56 UTC (rev 21712)
@@ -1,3 +1,16 @@
+2015-02-25 Timo Pollmeier <timo.pollmeier@greenbone.net>
+
+ Update OMP documentation of GET_NVTS.
+
+ * src/schema_formats/XML/OMP.xml.in (get_nvts): Change "id" attribute
+ in response to "oid". Move "creation_time" and "modification_time"
+ response elements to optional group. Remove missing elements
+ "permissions", "description and "risk_factor". Add "alt" subelement to
+ "preference" elements. Add summary text to describe response elements.
+ Update example.
+
+ * doc/omp.html, doc/omp.rnc: Update from source.
+
2015-02-24 Matthew Mundell <matthew.mundell@greenbone.net>
* src/omp.c (omp_xml_handle_end_element): Setup the filter before
Modified: trunk/openvas-manager/doc/omp.html
===================================================================
--- trunk/openvas-manager/doc/omp.html 2015-02-25 09:10:55 UTC (rev 21711)
+++ trunk/openvas-manager/doc/omp.html 2015-02-25 11:11:56 UTC (rev 21712)
@@ -18878,26 +18878,6 @@
<ul style="list-style: none"></ul>
</li>
<li>
- <<b>creation_time</b>>
- <ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>modification_time</b>>
- <ul style="list-style: none"></ul>
-</li>
-<li>
- <<b>permissions</b>>
- <div style="margin-left: 15px; display: inline;">Permissions that the \
current user has on the nvt.</div>
-<ul style="list-style: none"><li>
- <<b>permission</b>>
- *<ul style="list-style: none"><li>
- <<b>name</b>>
- <div style="margin-left: 15px; display: inline;">The name of the \
permission.</div>
-<ul style="list-style: none"></ul>
-</li></ul>
-</li></ul>
-</li>
-<li>
<<b>user_tags</b>>
<div style="margin-left: 15px; display: inline;">Info on tags attached \
to the NVT.</div> <ul style="list-style: none">
@@ -18937,38 +18917,46 @@
<li>
<i>The group</i><b>?</b><ul style="list-style: none">
<li>
- <<b>category</b>>
- <ul style="list-style: none"></ul>
+ <<b>creation_time</b>>
+ <div style="margin-left: 15px; display: inline;">The creation time of \
the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
- <<b>copyright</b>>
- <ul style="list-style: none"></ul>
+ <<b>modification_time</b>>
+ <div style="margin-left: 15px; display: inline;">The modification time \
of the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
- <<b>description</b>>
- <ul style="list-style: none"></ul>
+ <<b>category</b>>
+ <div style="margin-left: 15px; display: inline;">The category of the \
NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
+ <<b>copyright</b>>
+ <div style="margin-left: 15px; display: inline;">Copyright info of the \
NVT.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
<<b>summary</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">Short description of \
the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>family</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">Name of the family \
the NVT belongs to.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>version</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">Version of the \
NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>cvss_base</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">CVSS base score of \
the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
- <<b>risk_factor</b>>
- <ul style="list-style: none"></ul>
-</li>
-<li>
<<b>qod</b>>
<div style="margin-left: 15px; display: inline;">The quality of \
detection (QoD) of the NVT.</div> <ul style="list-style: none">
@@ -18986,7 +18974,8 @@
</li>
<li>
<<b>cve_id</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">IDs of the CVEs the \
NVT adresses.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>cert_refs</b>>
@@ -19017,53 +19006,80 @@
</li>
<li>
<<b>bugtraq_id</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">List of Bugtraq IDs \
of the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>xrefs</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">List of other \
references of the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>tags</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">The tags of the NVT, \
separated by vertical bars.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>preference_count</b>>
- ?<ul style="list-style: none"></ul>
+ ?<div style="margin-left: 15px; display: inline;">The number of \
preferences for the NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>timeout</b>>
- ?<ul style="list-style: none"></ul>
+ ?<div style="margin-left: 15px; display: inline;">The timeout of the \
NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>preferences</b>>
- ?<ul style="list-style: none">
+ ?<div style="margin-left: 15px; display: inline;">List of preferences \
of the NVT.</div> +<ul style="list-style: none">
<li>
<<b>timeout</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">The timeout of the \
NVT.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>preference</b>>
*<ul style="list-style: none">
<li>
<<b>nvt</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">NVT to which \
preference applies.</div> +<ul style="list-style: none">
+<li>
+ @<b>oid</b>
+ (<a href="#type_oid">oid</a>)
+ </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>
+</ul>
+</li>
<li>
<<b>name</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">The name of the \
preference.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>type</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">The type of the \
preference.</div> +<ul style="list-style: none"></ul>
</li>
<li>
<<b>value</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">The value of the \
preference.</div> +<ul style="list-style: none"></ul>
</li>
<li>
+ <<b>alt</b>>
+ *<div style="margin-left: 15px; display: inline;">An alternate value \
of the preference.</div> +<ul style="list-style: none"></ul>
+</li>
+<li>
<<b>default</b>>
- <ul style="list-style: none"></ul>
+ <div style="margin-left: 15px; display: inline;">The default value of \
the preference.</div> +<ul style="list-style: none"></ul>
</li>
</ul>
</li>
@@ -19105,18 +19121,15 @@
{
attribute id { uuid }
& get_nvts_response_nvt_name
- & get_nvts_response_nvt_creation_time
- & get_nvts_response_nvt_modification_time
- & get_nvts_response_nvt_permissions
& get_nvts_response_nvt_user_tags
- & ( get_nvts_response_nvt_category
+ & ( get_nvts_response_nvt_creation_time
+ & get_nvts_response_nvt_modification_time
+ & get_nvts_response_nvt_category
& get_nvts_response_nvt_copyright
- & get_nvts_response_nvt_description
& get_nvts_response_nvt_summary
& get_nvts_response_nvt_family
& get_nvts_response_nvt_version
& get_nvts_response_nvt_cvss_base
- & get_nvts_response_nvt_risk_factor
& get_nvts_response_nvt_qod
& get_nvts_response_nvt_cve_id
& get_nvts_response_nvt_cert_refs
@@ -19152,24 +19165,6 @@
iso_time
}
-get_nvts_response_nvt_permissions
- = element permissions
- {
- get_nvts_response_nvt_permissions_permission*
- }
-
-get_nvts_response_nvt_permissions_permission
- = element permission
- {
- get_nvts_response_nvt_permissions_permission_name
- }
-
-get_nvts_response_nvt_permissions_permission_name
- = element name
- {
- name
- }
-
get_nvts_response_nvt_user_tags
= element user_tags
{
@@ -19216,12 +19211,6 @@
text
}
-get_nvts_response_nvt_description
- = element description
- {
- text
- }
-
get_nvts_response_nvt_summary
= element summary
{
@@ -19246,12 +19235,6 @@
text
}
-get_nvts_response_nvt_risk_factor
- = element risk_factor
- {
- text
- }
-
get_nvts_response_nvt_qod
= element qod
{
@@ -19348,15 +19331,23 @@
& get_nvts_response_nvt_preferences_preference_name
& get_nvts_response_nvt_preferences_preference_type
& get_nvts_response_nvt_preferences_preference_value
+ & get_nvts_response_nvt_preferences_preference_alt*
& get_nvts_response_nvt_preferences_preference_default
}
get_nvts_response_nvt_preferences_preference_nvt
= element nvt
{
- oid
+ attribute oid { oid }
+ & get_nvts_response_nvt_preferences_preference_nvt_name
}
+get_nvts_response_nvt_preferences_preference_nvt_name
+ = element name
+ {
+ name
+ }
+
get_nvts_response_nvt_preferences_preference_name
= element name
{
@@ -19375,6 +19366,12 @@
text
}
+get_nvts_response_nvt_preferences_preference_alt
+ = element alt
+ {
+ text
+ }
+
get_nvts_response_nvt_preferences_preference_default
= element default
{
@@ -19397,14 +19394,10 @@
</user_tags>
<category>Services</category>
<copyright>GNU GPL v2</copyright>
- <description>
- This script attempts to detect which service is running on which port.
- </description>
<summary>Find what is listening on which port</summary>
<family>Service detection</family>
<version>$Revision: 1852 $</version>
<cvss_base/>
- <risk_factor>None</risk_factor>
<cve_id>NOCVE</cve_id>
<bugtraq_id>NOBID</bugtraq_id>
<cert_refs/>
Modified: trunk/openvas-manager/doc/omp.rnc
===================================================================
--- trunk/openvas-manager/doc/omp.rnc 2015-02-25 09:10:55 UTC (rev 21711)
+++ trunk/openvas-manager/doc/omp.rnc 2015-02-25 11:11:56 UTC (rev 21712)
@@ -11090,18 +11090,15 @@
{
attribute id { uuid }
& get_nvts_response_nvt_name
- & get_nvts_response_nvt_creation_time
- & get_nvts_response_nvt_modification_time
- & get_nvts_response_nvt_permissions
& get_nvts_response_nvt_user_tags
- & ( get_nvts_response_nvt_category
+ & ( get_nvts_response_nvt_creation_time
+ & get_nvts_response_nvt_modification_time
+ & get_nvts_response_nvt_category
& get_nvts_response_nvt_copyright
- & get_nvts_response_nvt_description
& get_nvts_response_nvt_summary
& get_nvts_response_nvt_family
& get_nvts_response_nvt_version
& get_nvts_response_nvt_cvss_base
- & get_nvts_response_nvt_risk_factor
& get_nvts_response_nvt_qod
& get_nvts_response_nvt_cve_id
& get_nvts_response_nvt_cert_refs
@@ -11120,44 +11117,27 @@
name
}
+# The category of the NVT.
get_nvts_response_nvt_category
= element category
{
text
}
+# The creation time of the NVT.
get_nvts_response_nvt_creation_time
= element creation_time
{
iso_time
}
+# The modification time of the NVT.
get_nvts_response_nvt_modification_time
= element modification_time
{
iso_time
}
-# Permissions that the current user has on the nvt.
-get_nvts_response_nvt_permissions
- = element permissions
- {
- get_nvts_response_nvt_permissions_permission*
- }
-
-get_nvts_response_nvt_permissions_permission
- = element permission
- {
- get_nvts_response_nvt_permissions_permission_name
- }
-
-# The name of the permission.
-get_nvts_response_nvt_permissions_permission_name
- = element name
- {
- name
- }
-
# Info on tags attached to the NVT.
get_nvts_response_nvt_user_tags
= element user_tags
@@ -11205,48 +11185,41 @@
text
}
+# Copyright info of the NVT.
get_nvts_response_nvt_copyright
= element copyright
{
text
}
-get_nvts_response_nvt_description
- = element description
- {
- text
- }
-
+# Short description of the NVT.
get_nvts_response_nvt_summary
= element summary
{
text
}
+# Name of the family the NVT belongs to.
get_nvts_response_nvt_family
= element family
{
text
}
+# Version of the NVT.
get_nvts_response_nvt_version
= element version
{
text
}
+# CVSS base score of the NVT.
get_nvts_response_nvt_cvss_base
= element cvss_base
{
text
}
-get_nvts_response_nvt_risk_factor
- = element risk_factor
- {
- text
- }
-
# The quality of detection (QoD) of the NVT.
get_nvts_response_nvt_qod
= element qod
@@ -11269,12 +11242,14 @@
text
}
+# IDs of the CVEs the NVT adresses.
get_nvts_response_nvt_cve_id
= element cve_id
{
text
}
+# List of Bugtraq IDs of the NVT.
get_nvts_response_nvt_bugtraq_id
= element bugtraq_id
{
@@ -11306,30 +11281,35 @@
text
}
+# List of other references of the NVT.
get_nvts_response_nvt_xrefs
= element xrefs
{
text
}
+# The tags of the NVT, separated by vertical bars.
get_nvts_response_nvt_tags
= element tags
{
text
}
+# The number of preferences for the NVT.
get_nvts_response_nvt_preference_count
= element preference_count
{
text
}
+# The timeout of the NVT.
get_nvts_response_nvt_timeout
= element timeout
{
text
}
+# List of preferences of the NVT.
get_nvts_response_nvt_preferences
= element preferences
{
@@ -11338,6 +11318,7 @@
& get_nvts_response_nvt_preferences_preference*
}
+# The timeout of the NVT.
get_nvts_response_nvt_preferences_timeout
= element timeout
{
@@ -11351,33 +11332,54 @@
& get_nvts_response_nvt_preferences_preference_name
& get_nvts_response_nvt_preferences_preference_type
& get_nvts_response_nvt_preferences_preference_value
+ & get_nvts_response_nvt_preferences_preference_alt*
& get_nvts_response_nvt_preferences_preference_default
}
+# NVT to which preference applies.
get_nvts_response_nvt_preferences_preference_nvt
= element nvt
{
- oid
+ attribute oid { oid }
+ & get_nvts_response_nvt_preferences_preference_nvt_name
}
+# The name of the NVT.
+get_nvts_response_nvt_preferences_preference_nvt_name
+ = element name
+ {
+ name
+ }
+
+# The name of the preference.
get_nvts_response_nvt_preferences_preference_name
= element name
{
text
}
+# The type of the preference.
get_nvts_response_nvt_preferences_preference_type
= element type
{
text
}
+# The value of the preference.
get_nvts_response_nvt_preferences_preference_value
= element value
{
text
}
+# An alternate value of the preference.
+get_nvts_response_nvt_preferences_preference_alt
+ = element alt
+ {
+ text
+ }
+
+# The default value of the preference.
get_nvts_response_nvt_preferences_preference_default
= element default
{
Modified: trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in
===================================================================
--- trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in 2015-02-25 09:10:55 UTC \
(rev 21711)
+++ trunk/openvas-manager/src/schema_formats/XML/OMP.xml.in 2015-02-25 11:11:56 UTC \
(rev 21712) @@ -11209,25 +11209,22 @@
<name>nvt</name>
<pattern>
<attrib>
- <name>id</name>
- <type>uuid</type>
+ <name>oid</name>
+ <type>oid</type>
<required>1</required>
</attrib>
<e>name</e>
- <e>creation_time</e>
- <e>modification_time</e>
- <e>permissions</e>
<e>user_tags</e>
<o>
<g>
+ <e>creation_time</e>
+ <e>modification_time</e>
<e>category</e>
<e>copyright</e>
- <e>description</e>
<e>summary</e>
<e>family</e>
<e>version</e>
<e>cvss_base</e>
- <e>risk_factor</e>
<e>qod</e>
<e>cve_id</e>
<e>cert_refs</e>
@@ -11247,35 +11244,20 @@
</ele>
<ele>
<name>category</name>
+ <summary>The category of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>creation_time</name>
+ <summary>The creation time of the NVT</summary>
<pattern><t>iso_time</t></pattern>
</ele>
<ele>
<name>modification_time</name>
+ <summary>The modification time of the NVT</summary>
<pattern><t>iso_time</t></pattern>
</ele>
<ele>
- <name>permissions</name>
- <summary>Permissions that the current user has on the nvt</summary>
- <pattern>
- <any><e>permission</e></any>
- </pattern>
- <ele>
- <name>permission</name>
- <pattern>
- <e>name</e>
- </pattern>
- <ele>
- <name>name</name>
- <summary>The name of the permission</summary>
- <pattern><t>name</t></pattern>
- </ele>
- </ele>
- </ele>
- <ele>
<name>user_tags</name>
<summary>Info on tags attached to the NVT</summary>
<pattern>
@@ -11323,33 +11305,30 @@
</ele>
<ele>
<name>copyright</name>
+ <summary>Copyright info of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
- <name>description</name>
- <pattern>text</pattern>
- </ele>
- <ele>
<name>summary</name>
+ <summary>Short description of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>family</name>
+ <summary>Name of the family the NVT belongs to</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>version</name>
+ <summary>Version of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>cvss_base</name>
+ <summary>CVSS base score of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
- <name>risk_factor</name>
- <pattern>text</pattern>
- </ele>
- <ele>
<name>qod</name>
<summary>The quality of detection (QoD) of the NVT</summary>
<pattern>
@@ -11369,10 +11348,12 @@
</ele>
<ele>
<name>cve_id</name>
+ <summary>IDs of the CVEs the NVT adresses</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>bugtraq_id</name>
+ <summary>List of Bugtraq IDs of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
@@ -11408,22 +11389,27 @@
</ele>
<ele>
<name>xrefs</name>
+ <summary>List of other references of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>tags</name>
+ <summary>The tags of the NVT, separated by vertical bars</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>preference_count</name>
+ <summary>The number of preferences for the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>timeout</name>
+ <summary>The timeout of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>preferences</name>
+ <summary>List of preferences of the NVT</summary>
<pattern>
<e>timeout</e>
<any><e>preference</e></any>
@@ -11431,6 +11417,7 @@
</pattern>
<ele>
<name>timeout</name>
+ <summary>The timeout of the NVT</summary>
<pattern>text</pattern>
</ele>
<ele>
@@ -11440,26 +11427,49 @@
<e>name</e>
<e>type</e>
<e>value</e>
+ <any><e>alt</e></any>
<e>default</e>
</pattern>
<ele>
<name>nvt</name>
- <pattern><t>oid</t></pattern>
+ <summary>NVT to which preference applies</summary>
+ <pattern>
+ <attrib>
+ <name>oid</name>
+ <type>oid</type>
+ <required>1</required>
+ </attrib>
+ <e>name</e>
+ </pattern>
+ <ele>
+ <name>name</name>
+ <summary>The name of the NVT</summary>
+ <pattern><t>name</t></pattern>
+ </ele>
</ele>
<ele>
<name>name</name>
+ <summary>The name of the preference</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>type</name>
+ <summary>The type of the preference</summary>
<pattern>text</pattern>
</ele>
<ele>
<name>value</name>
+ <summary>The value of the preference</summary>
<pattern>text</pattern>
</ele>
<ele>
+ <name>alt</name>
+ <summary>An alternate value of the preference</summary>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
<name>default</name>
+ <summary>The default value of the preference</summary>
<pattern>text</pattern>
</ele>
</ele>
@@ -11483,12 +11493,10 @@
</user_tags>
<category>Services</category>
<copyright>GNU GPL v2</copyright>
- <description>This script attempts to detect which service is running on \
which port.</description> <summary>Find what is listening on which port</summary>
<family>Service detection</family>
<version>$Revision: 1852 $</version>
<cvss_base></cvss_base>
- <risk_factor>None</risk_factor>
<cve_id>NOCVE</cve_id>
<bugtraq_id>NOBID</bugtraq_id>
<cert_refs/>
_______________________________________________
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