[Openvas-commits] r11659 - in trunk/openvas-manager: . doc src/schema_formats/XML

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Sep 22 16:03:14 CEST 2011


Author: mattm
Date: 2011-09-22 16:03:12 +0200 (Thu, 22 Sep 2011)
New Revision: 11659

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
Log:
	* src/schema_formats/XML/OMP.xml (actions, user_list): New types.
	(create_task, modify_task, get_configs, get_lsc_credentials, get_nvts)
	(get_targets, get_tasks): Add actions param and OBSERVERS.

	* doc/omp.rnc, doc/omp.html: Update from source.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-09-22 11:43:24 UTC (rev 11658)
+++ trunk/openvas-manager/ChangeLog	2011-09-22 14:03:12 UTC (rev 11659)
@@ -1,5 +1,13 @@
 2011-09-19  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/schema_formats/XML/OMP.xml (actions, user_list): New types.
+	(create_task, modify_task, get_configs, get_lsc_credentials, get_nvts)
+	(get_targets, get_tasks): Add actions param and OBSERVERS.
+
+	* doc/omp.rnc, doc/omp.html: Update from source.
+
+2011-09-19  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/omp.c (create_task_data_t, create_task_data_reset): Add observers.
 	(client_state_t): Add CLIENT_CREATE_TASK_OBSERVERS.
 	(omp_xml_handle_start_element, omp_xml_handle_end_element)
@@ -19,7 +27,7 @@
 	(omp_xml_handle_start_element, omp_xml_handle_end_element)
 	(omp_xml_handle_text): Add OBSERVERS to MODIFY_TASK and GET_TASK.  Move
 	CLIENT_GET_CONFIGS cleanup_iterator into right position.  Add actions flag
-	to GET_TASKS, GET_TARGETS, GET_CONFIGS and GET_LSC_CREDENTIALS.
+	to GET_TASKS, GET_TARGETS, GET_CONFIGS, GET_LSC_CREDENTIALS and GET_NVTS.
 
 	* src/manage_sql.c (user_t): New type.
 	(parse_actions, user_has_access_uuid): New functions.

Modified: trunk/openvas-manager/doc/omp.html
===================================================================
--- trunk/openvas-manager/doc/omp.html	2011-09-22 11:43:24 UTC (rev 11658)
+++ trunk/openvas-manager/doc/omp.html	2011-09-22 14:03:12 UTC (rev 11659)
@@ -22,6 +22,10 @@
 <h2 id="type_summary">1 Summary of Data Types</h2>
 <table id="index">
 <tr id="index">
+<td id="index"><a href="#type_actions">actions</a></td>
+<td id="index"><div style="margin-left: 15px;">A specifier of actions: get, modify, use..</div></td>
+</tr>
+<tr id="index">
 <td id="index"><a href="#type_base64">base64</a></td>
 <td id="index"><div style="margin-left: 15px;">Base64 encoded data.</div></td>
 </tr>
@@ -54,6 +58,10 @@
 <td id="index"><div style="margin-left: 15px;">A name.</div></td>
 </tr>
 <tr id="index">
+<td id="index"><a href="#type_user_list">user_list</a></td>
+<td id="index"><div style="margin-left: 15px;">A space separated list of users.</div></td>
+</tr>
+<tr id="index">
 <td id="index"><a href="#type_oid">oid</a></td>
 <td id="index"><div style="margin-left: 15px;">An Object Identifier (OID).</div></td>
 </tr>
@@ -539,16 +547,25 @@
 </pre></div>
 <h2 id="type_details">5 Data Type Details</h2>
 <div>
-<div><h3 id="type_base64">5.1
+<div><h3 id="type_actions">5.1
+        Data Type <tt>actions</tt>
+</h3></div>
+<p>In short: A specifier of actions: get, modify, use..</p>
+<h4>5.1.1 RNC</h4>
+<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>actions = xsd:token { pattern = "[gmu]{1,3}" }
+</pre></div>
+</div>
+<div>
+<div><h3 id="type_base64">5.2
         Data Type <tt>base64</tt>
 </h3></div>
 <p>In short: Base64 encoded data.</p>
-<h4>5.1.1 RNC</h4>
+<h4>5.2.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>base64 = xsd:base64Binary
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_boolean">5.2
+<div><h3 id="type_boolean">5.3
         Data Type <tt>boolean</tt>
 </h3></div>
 <p>In short: A true or false value.</p>
@@ -556,12 +573,12 @@
       Zero is false, anything else is true.  As a result, the empty string is
       considered true.
     </p>
-<h4>5.2.1 RNC</h4>
+<h4>5.3.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>boolean = text
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_boolean_atoi">5.3
+<div><h3 id="type_boolean_atoi">5.4
         Data Type <tt>boolean_atoi</tt>
 </h3></div>
 <p>In short: A true or false value, after conversion to an integer.</p>
@@ -570,51 +587,51 @@
       an integer, as by the C `atoi' routine.  This means that an empty string
       is considered false.
     </p>
-<h4>5.3.1 RNC</h4>
+<h4>5.4.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>boolean_atoi = text
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_ctime">5.4
+<div><h3 id="type_ctime">5.5
         Data Type <tt>ctime</tt>
 </h3></div>
 <p>In short: A date and time, in the C `ctime' format.</p>
 <p>
       An example string in this format is "Wed Jun 30 21:49:08 1993\n".
     </p>
-<h4>5.4.1 RNC</h4>
+<h4>5.5.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>ctime = text
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_type_name">5.5
+<div><h3 id="type_type_name">5.6
         Data Type <tt>type_name</tt>
 </h3></div>
 <p>In short: A name of a data type.</p>
-<h4>5.5.1 RNC</h4>
+<h4>5.6.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>type_name = xsd:string - xsd:whitespace
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_integer">5.6
+<div><h3 id="type_integer">5.7
         Data Type <tt>integer</tt>
 </h3></div>
 <p>In short: An integer.</p>
-<h4>5.6.1 RNC</h4>
+<h4>5.7.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>integer = xsd:integer
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_levels">5.7
+<div><h3 id="type_levels">5.8
         Data Type <tt>levels</tt>
 </h3></div>
 <p>In short: A string that may include the characters h, m, l, g and d.</p>
-<h4>5.7.1 RNC</h4>
+<h4>5.8.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>levels = xsd:token { pattern = "h?m?l?g?d?" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_name">5.8
+<div><h3 id="type_name">5.9
         Data Type <tt>name</tt>
 </h3></div>
 <p>In short: A name.</p>
@@ -622,21 +639,30 @@
       Typically this is the name of one of the manager resources, like a
       task or target.
     </p>
-<h4>5.8.1 RNC</h4>
+<h4>5.9.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>name = xsd:string
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_oid">5.9
+<div><h3 id="type_user_list">5.10
+        Data Type <tt>user_list</tt>
+</h3></div>
+<p>In short: A space separated list of users.</p>
+<h4>5.10.1 RNC</h4>
+<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>user_list = text
+</pre></div>
+</div>
+<div>
+<div><h3 id="type_oid">5.11
         Data Type <tt>oid</tt>
 </h3></div>
 <p>In short: An Object Identifier (OID).</p>
-<h4>5.9.1 RNC</h4>
+<h4>5.11.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>oid = xsd:token { pattern = "[0-9\.]{1,80}" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_sort_order">5.10
+<div><h3 id="type_sort_order">5.12
         Data Type <tt>sort_order</tt>
 </h3></div>
 <p>In short: A string describing an order for sorting.</p>
@@ -644,71 +670,71 @@
       The string "descending" denotes descending order, anything else means
       ascending.
     </p>
-<h4>5.10.1 RNC</h4>
+<h4>5.12.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>sort_order = text
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_status">5.11
+<div><h3 id="type_status">5.13
         Data Type <tt>status</tt>
 </h3></div>
 <p>In short: The success or failure status of a command.</p>
-<h4>5.11.1 RNC</h4>
+<h4>5.13.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>status = xsd:token { pattern = "200|201|202|400|401|403|404|409|500|503" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_task_status">5.12
+<div><h3 id="type_task_status">5.14
         Data Type <tt>task_status</tt>
 </h3></div>
 <p>In short: A task run status.</p>
-<h4>5.12.1 RNC</h4>
+<h4>5.14.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>task_status = xsd:token { pattern = "Delete Requested|Done|New|Pause Requested|Paused|Requ↵
 ested|Resume Requested|Running|Stop Requested|Stopped|Internal Error" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_task_trend">5.13
+<div><h3 id="type_task_trend">5.15
         Data Type <tt>task_trend</tt>
 </h3></div>
 <p>In short: The trend of results for a task.</p>
-<h4>5.13.1 RNC</h4>
+<h4>5.15.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>task_trend = xsd:token { pattern = "up|down|more|less|same" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_threat">5.14
+<div><h3 id="type_threat">5.16
         Data Type <tt>threat</tt>
 </h3></div>
 <p>In short: A threat level.</p>
-<h4>5.14.1 RNC</h4>
+<h4>5.16.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>threat = xsd:token { pattern = "High|Medium|Low|Log|Debug" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_time_unit">5.15
+<div><h3 id="type_time_unit">5.17
         Data Type <tt>time_unit</tt>
 </h3></div>
 <p>In short: A unit of time.</p>
-<h4>5.15.1 RNC</h4>
+<h4>5.17.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>time_unit = xsd:token { pattern = "second|minute|hour|day|week|month|year|decade" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_uuid">5.16
+<div><h3 id="type_uuid">5.18
         Data Type <tt>uuid</tt>
 </h3></div>
 <p>In short: A Universally Unique Identifier (UUID).</p>
-<h4>5.16.1 RNC</h4>
+<h4>5.18.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>uuid = xsd:token { pattern = "[0-9abcdefABCDEF\-]{1,40}" }
 </pre></div>
 </div>
 <div>
-<div><h3 id="type_uuid_or_empty">5.17
+<div><h3 id="type_uuid_or_empty">5.19
         Data Type <tt>uuid_or_empty</tt>
 </h3></div>
 <p>In short: A Universally Unique Identifier (UUID), or the empty string.</p>
-<h4>5.17.1 RNC</h4>
+<h4>5.19.1 RNC</h4>
 <div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><pre>uuid_or_empty = xsd:token { pattern = "[0-9abcdefABCDEF\-]{0,40}" }
 </pre></div>
 </div>
@@ -4787,6 +4813,11 @@
           </li></ul>
 </li>
 <li>
+              &lt;<b>observers</b>&gt;
+              ?<div style="margin-left: 15px; display: inline;">Users allowed to observe this task.</div>
+<ul style="list-style: none"></ul>
+</li>
+<li>
               &lt;<b>preferences</b>&gt;
               ?<ul style="list-style: none"><li>
               &lt;<b>preference</b>&gt;
@@ -4839,6 +4870,7 @@
        &amp; create_task_escalator?
        &amp; create_task_schedule?
        &amp; create_task_slave?
+       &amp; create_task_observers?
        &amp; create_task_preferences?
        &amp; create_task_rcfile?
      }
@@ -4885,6 +4917,12 @@
        attribute id { uuid }
      }
 
+create_task_observers
+ = element observers
+     {
+       user_list
+     }
+
 create_task_preferences
  = element preferences
      {
@@ -6043,6 +6081,11 @@
           ID of single config to get.
           </li>
 <li>
+          @<b>actions</b>
+          (<a href="#type_actions">actions</a>)
+          Actions filter for configs of observed tasks.
+          </li>
+<li>
           @<b>trash</b>
           (<a href="#type_boolean">boolean</a>)
           Whether to get the trashcan configs instead.
@@ -6227,6 +6270,7 @@
  = element get_configs
      {
        attribute config_id { uuid }?
+       &amp; attribute actions { actions }?
        &amp; attribute trash { boolean }?
        &amp; attribute export { boolean }?
        &amp; attribute families { boolean }?
@@ -6939,6 +6983,11 @@
           ID of single LSC credential to get.
           </li>
 <li>
+          @<b>actions</b>
+          (<a href="#type_actions">actions</a>)
+          Actions filter for LSC credentials of observed tasks.
+          </li>
+<li>
           @<b>trash</b>
           (<a href="#type_boolean">boolean</a>)
           Whether to get the trashcan LSC credentials instead.
@@ -7039,6 +7088,7 @@
  = element get_lsc_credentials
      {
        attribute lsc_credential_id { uuid }?
+       &amp; attribute actions { actions }?
        &amp; attribute trash { boolean }?
        &amp; attribute format { xsd:token { pattern = "key|rpm|deb|exe" } }?
        &amp; attribute sort_order { sort_order }?
@@ -7678,6 +7728,11 @@
           Single NVT to get.
           </li>
 <li>
+          @<b>actions</b>
+          (<a href="#type_actions">actions</a>)
+          Actions filter for NVTs of configs observed tasks.
+          </li>
+<li>
           @<b>details</b>
           (<a href="#type_boolean">boolean</a>)
           Whether to include full details.
@@ -7851,6 +7906,7 @@
  = element get_nvts
      {
        attribute nvt_oid { oid }
+       &amp; attribute actions { actions }?
        &amp; attribute details { boolean }?
        &amp; attribute preferences { boolean }?
        &amp; attribute preference_count { boolean }?
@@ -10904,6 +10960,11 @@
           ID of single target to get.
           </li>
 <li>
+          @<b>actions</b>
+          (<a href="#type_actions">actions</a>)
+          Actions filter for targets of observed tasks.
+          </li>
+<li>
           @<b>trash</b>
           (<a href="#type_boolean">boolean</a>)
           Whether to get the trashcan targets instead.
@@ -11038,6 +11099,7 @@
  = element get_targets
      {
        attribute target_id { uuid }?
+       &amp; attribute actions { actions }?
        &amp; attribute trash { boolean }?
        &amp; attribute tasks { boolean }?
        &amp; attribute sort_order { sort_order }?
@@ -11245,6 +11307,11 @@
           ID of single task to get.
           </li>
 <li>
+          @<b>actions</b>
+          (<a href="#type_actions">actions</a>)
+          Actions filter for tasks of observed tasks.
+          </li>
+<li>
           @<b>trash</b>
           (<a href="#type_boolean">boolean</a>)
           Whether to get the trashcan tasks instead.
@@ -11393,6 +11460,11 @@
 </ul>
 </li>
 <li>
+              &lt;<b>observers</b>&gt;
+              <div style="margin-left: 15px; display: inline;">Users allowed to observe this task.</div>
+<ul style="list-style: none"></ul>
+</li>
+<li>
               &lt;<b>schedule</b>&gt;
               <div style="margin-left: 15px; display: inline;">When the task will run.</div>
 <ul style="list-style: none">
@@ -11655,6 +11727,7 @@
  = element get_tasks
      {
        attribute task_id { uuid }?
+       &amp; attribute actions { actions }?
        &amp; attribute trash { boolean }?
        &amp; attribute details { boolean }?
        &amp; attribute rcfile { boolean }?
@@ -11715,6 +11788,7 @@
        &amp; get_tasks_response_task_config
        &amp; get_tasks_response_task_target
        &amp; get_tasks_response_task_escalator
+       &amp; get_tasks_response_task_observers
        &amp; get_tasks_response_task_schedule
        &amp; get_tasks_response_task_slave
        &amp; get_tasks_response_task_report_count
@@ -11825,6 +11899,12 @@
        boolean
      }
 
+get_tasks_response_task_observers
+ = element observers
+     {
+       user_list
+     }
+
 get_tasks_response_task_schedule
  = element schedule
      {
@@ -13770,6 +13850,11 @@
 <ul style="list-style: none"></ul>
 </li>
 <li>
+              &lt;<b>observers</b>&gt;
+              <div style="margin-left: 15px; display: inline;">Users allowed to observe this task.</div>
+<ul style="list-style: none"></ul>
+</li>
+<li>
               &lt;<b>preferences</b>&gt;
               <ul style="list-style: none"><li>
               &lt;<b>preference</b>&gt;
@@ -13847,6 +13932,7 @@
        &amp; ( modify_task_comment
            | modify_task_escalator
            | modify_task_name
+           | modify_task_observers
            | modify_task_preferences
            | modify_task_rcfile
            | modify_task_schedule
@@ -13872,6 +13958,12 @@
        name
      }
 
+modify_task_observers
+ = element observers
+     {
+       user_list
+     }
+
 modify_task_preferences
  = element preferences
      {

Modified: trunk/openvas-manager/doc/omp.rnc
===================================================================
--- trunk/openvas-manager/doc/omp.rnc	2011-09-22 11:43:24 UTC (rev 11658)
+++ trunk/openvas-manager/doc/omp.rnc	2011-09-22 14:03:12 UTC (rev 11659)
@@ -146,6 +146,8 @@
 
 ### Data Types
 
+# A specifier of actions: get, modify, use..
+actions = xsd:token { pattern = "[gmu]{1,3}" }
 # Base64 encoded data.
 base64 = xsd:base64Binary
 # A true or false value.
@@ -162,6 +164,8 @@
 levels = xsd:token { pattern = "h?m?l?g?d?" }
 # A name.
 name = xsd:string
+# A space separated list of users.
+user_list = text
 # An Object Identifier (OID).
 oid = xsd:token { pattern = "[0-9\.]{1,80}" }
 # A string describing an order for sorting.
@@ -1806,6 +1810,7 @@
        & create_task_escalator?
        & create_task_schedule?
        & create_task_slave?
+       & create_task_observers?
        & create_task_preferences?
        & create_task_rcfile?
      }
@@ -1859,6 +1864,13 @@
        attribute id { uuid }
      }
 
+# Users allowed to observe this task.
+create_task_observers
+ = element observers
+     {
+       user_list
+     }
+
 create_task_preferences
  = element preferences
      {
@@ -2065,6 +2077,8 @@
      {
        # ID of single config to get.
        attribute config_id { uuid }?
+       & # Actions filter for configs of observed tasks.
+       attribute actions { actions }?
        & # Whether to get the trashcan configs instead.
        attribute trash { boolean }?
        & attribute export { boolean }?
@@ -2109,6 +2123,8 @@
      {
        # ID of single LSC credential to get.
        attribute lsc_credential_id { uuid }?
+       & # Actions filter for LSC credentials of observed tasks.
+       attribute actions { actions }?
        & # Whether to get the trashcan LSC credentials instead.
        attribute trash { boolean }?
        & attribute format { xsd:token { pattern = "key|rpm|deb|exe" } }?
@@ -2142,6 +2158,8 @@
      {
        # Single NVT to get.
        attribute nvt_oid { oid }
+       & # Actions filter for NVTs of configs observed tasks.
+       attribute actions { actions }?
        & # Whether to include full details.
        attribute details { boolean }?
        & # Whether to include preference.
@@ -2364,6 +2382,8 @@
      {
        # ID of single target to get.
        attribute target_id { uuid }?
+       & # Actions filter for targets of observed tasks.
+       attribute actions { actions }?
        & # Whether to get the trashcan targets instead.
        attribute trash { boolean }?
        & # Whether to include list of tasks that use the target.
@@ -2381,6 +2401,8 @@
      {
        # ID of single task to get.
        attribute task_id { uuid }?
+       & # Actions filter for tasks of observed tasks.
+       attribute actions { actions }?
        & # Whether to get the trashcan tasks instead.
        attribute trash { boolean }?
        & # Whether to include full task details.
@@ -2776,6 +2798,7 @@
        & ( modify_task_comment
            | modify_task_escalator
            | modify_task_name
+           | modify_task_observers
            | modify_task_preferences
            | modify_task_rcfile
            | modify_task_schedule
@@ -2804,6 +2827,13 @@
        name
      }
 
+# Users allowed to observe this task.
+modify_task_observers
+ = element observers
+     {
+       user_list
+     }
+
 modify_task_preferences
  = element preferences
      {
@@ -5344,6 +5374,7 @@
        & get_tasks_response_task_config
        & get_tasks_response_task_target
        & get_tasks_response_task_escalator
+       & get_tasks_response_task_observers
        & get_tasks_response_task_schedule
        & get_tasks_response_task_slave
        & get_tasks_response_task_report_count
@@ -5468,6 +5499,13 @@
        boolean
      }
 
+# Users allowed to observe this task.
+get_tasks_response_task_observers
+ = element observers
+     {
+       user_list
+     }
+
 # When the task will run.
 get_tasks_response_task_schedule
  = element schedule

Modified: trunk/openvas-manager/src/schema_formats/XML/OMP.xml
===================================================================
--- trunk/openvas-manager/src/schema_formats/XML/OMP.xml	2011-09-22 11:43:24 UTC (rev 11658)
+++ trunk/openvas-manager/src/schema_formats/XML/OMP.xml	2011-09-22 14:03:12 UTC (rev 11659)
@@ -63,6 +63,11 @@
   <summary>The "management" protocol of the Open Vulnerability Assessment System</summary>
   <version>2.0</version>
   <type>
+    <name>actions</name>
+    <summary>A specifier of actions: get, modify, use.</summary>
+    <pattern>xsd:token { pattern = "[gmu]{1,3}" }</pattern>
+  </type>
+  <type>
     <name>base64</name>
     <summary>Base64 encoded data</summary>
     <pattern>xsd:base64Binary</pattern>
@@ -119,6 +124,11 @@
     <pattern>xsd:string</pattern>
   </type>
   <type>
+    <name>user_list</name>
+    <summary>A space separated list of users</summary>
+    <pattern>text</pattern>
+  </type>
+  <type>
     <name>oid</name>
     <summary>An Object Identifier (OID)</summary>
     <pattern>xsd:token { pattern = "[0-9\.]{1,80}" }</pattern>
@@ -2458,6 +2468,7 @@
       <o><e>escalator</e></o>
       <o><e>schedule</e></o>
       <o><e>slave</e></o>
+      <o><e>observers</e></o>
       <o><e>preferences</e></o>
       <o><e>rcfile</e></o>
     </pattern>
@@ -2529,6 +2540,11 @@
       </pattern>
     </ele>
     <ele>
+      <name>observers</name>
+      <summary>Users allowed to observe this task</summary>
+      <pattern><t>user_list</t></pattern>
+    </ele>
+    <ele>
       <name>preferences</name>
       <pattern>
         <any><e>preference</e></any>
@@ -3438,6 +3454,11 @@
         <type>uuid</type>
       </attrib>
       <attrib>
+        <name>actions</name>
+        <summary>Actions filter for configs of observed tasks</summary>
+        <type>actions</type>
+      </attrib>
+      <attrib>
         <name>trash</name>
         <summary>Whether to get the trashcan configs instead</summary>
         <type>boolean</type>
@@ -4060,6 +4081,11 @@
         <type>uuid</type>
       </attrib>
       <attrib>
+        <name>actions</name>
+        <summary>Actions filter for LSC credentials of observed tasks</summary>
+        <type>actions</type>
+      </attrib>
+      <attrib>
         <name>trash</name>
         <summary>Whether to get the trashcan LSC credentials instead</summary>
         <type>boolean</type>
@@ -4602,6 +4628,11 @@
         <required>1</required>
       </attrib>
       <attrib>
+        <name>actions</name>
+        <summary>Actions filter for NVTs of configs observed tasks</summary>
+        <type>actions</type>
+      </attrib>
+      <attrib>
         <name>details</name>
         <summary>Whether to include full details</summary>
         <type>boolean</type>
@@ -6839,6 +6870,11 @@
         <type>uuid</type>
       </attrib>
       <attrib>
+        <name>actions</name>
+        <summary>Actions filter for targets of observed tasks</summary>
+        <type>actions</type>
+      </attrib>
+      <attrib>
         <name>trash</name>
         <summary>Whether to get the trashcan targets instead</summary>
         <type>boolean</type>
@@ -7074,6 +7110,11 @@
         <type>uuid</type>
       </attrib>
       <attrib>
+        <name>actions</name>
+        <summary>Actions filter for tasks of observed tasks</summary>
+        <type>actions</type>
+      </attrib>
+      <attrib>
         <name>trash</name>
         <summary>Whether to get the trashcan tasks instead</summary>
         <type>boolean</type>
@@ -7163,6 +7204,7 @@
           <e>config</e>
           <e>target</e>
           <e>escalator</e>
+          <e>observers</e>
           <e>schedule</e>
           <e>slave</e>
           <e>report_count</e>
@@ -7279,6 +7321,11 @@
           </ele>
         </ele>
         <ele>
+          <name>observers</name>
+          <summary>Users allowed to observe this task</summary>
+          <pattern><t>user_list</t></pattern>
+        </ele>
+        <ele>
           <name>schedule</name>
           <summary>When the task will run</summary>
           <pattern>
@@ -8813,6 +8860,7 @@
         <e>comment</e>
         <e>escalator</e>
         <e>name</e>
+        <e>observers</e>
         <e>preferences</e>
         <e>rcfile</e>
         <e>schedule</e>
@@ -8844,6 +8892,11 @@
       <pattern><t>name</t></pattern>
     </ele>
     <ele>
+      <name>observers</name>
+      <summary>Users allowed to observe this task</summary>
+      <pattern><t>user_list</t></pattern>
+    </ele>
+    <ele>
       <name>preferences</name>
       <pattern>
         <any><e>preference</e></any>



More information about the Openvas-commits mailing list