[Openvas-commits] r13163 - in trunk/openvas-manager: . doc src src/schema_formats/XML
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 28 12:53:00 CEST 2012
Author: mattm
Date: 2012-03-28 12:52:59 +0200 (Wed, 28 Mar 2012)
New Revision: 13163
Modified:
trunk/openvas-manager/CMakeLists.txt
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/doc/db.png
trunk/openvas-manager/doc/db_postgres.sql
trunk/openvas-manager/doc/omp.html
trunk/openvas-manager/doc/omp.rnc
trunk/openvas-manager/src/manage.c
trunk/openvas-manager/src/manage.h
trunk/openvas-manager/src/manage_sql.c
trunk/openvas-manager/src/manage_sql.h
trunk/openvas-manager/src/omp.c
trunk/openvas-manager/src/schema_formats/XML/OMP.xml
trunk/openvas-manager/src/sql.c
trunk/openvas-manager/src/sql.h
Log:
Rename Escalators to Alerts. Hence increase database version to 57. Add
database migration from version 56 to 57.
* CMakeLists.txt (OPENVASMD_DATABASE_VERSION): Increase to 57.
* src/sql.c (sql_rename_column, iterator_column_count)
(iterator_column_name): New functions.
* src/sql.h: Add headers accordingly.
* src/manage_sql.c: Everywhere replace escalator with alert.
(migrate_56_to_57): New function.
(database_migrators): Add migrate_56_to_57.
* src/manage.c, src/manage.h, src/manage_sql.h, src/omp.c,
doc/db_postgres.sql: Everywhere replace escalator with alert.
* src/schema_formats/XML/OMP.xml: Everywhere replace escalator with alert.
(version): Increment to 4.
* doc/db.png, doc/omp.rnc, doc/omp.html: Update from source.
Modified: trunk/openvas-manager/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/CMakeLists.txt 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/CMakeLists.txt 2012-03-28 10:52:59 UTC (rev 13163)
@@ -109,7 +109,7 @@
## Variables
-set (OPENVASMD_DATABASE_VERSION 56)
+set (OPENVASMD_DATABASE_VERSION 57)
if (SYSCONF_INSTALL_DIR)
set (SYSCONFDIR "${SYSCONF_INSTALL_DIR}")
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/ChangeLog 2012-03-28 10:52:59 UTC (rev 13163)
@@ -1,3 +1,27 @@
+2012-03-28 Matthew Mundell <matthew.mundell at greenbone.net>
+
+ Rename Escalators to Alerts. Hence increase database version to 57. Add
+ database migration from version 56 to 57.
+
+ * CMakeLists.txt (OPENVASMD_DATABASE_VERSION): Increase to 57.
+
+ * src/sql.c (sql_rename_column, iterator_column_count)
+ (iterator_column_name): New functions.
+
+ * src/sql.h: Add headers accordingly.
+
+ * src/manage_sql.c: Everywhere replace escalator with alert.
+ (migrate_56_to_57): New function.
+ (database_migrators): Add migrate_56_to_57.
+
+ * src/manage.c, src/manage.h, src/manage_sql.h, src/omp.c,
+ doc/db_postgres.sql: Everywhere replace escalator with alert.
+
+ * src/schema_formats/XML/OMP.xml: Everywhere replace escalator with alert.
+ (version): Increment to 4.
+
+ * doc/db.png, doc/omp.rnc, doc/omp.html: Update from source.
+
2012-03-28 Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
Post branch version bump.
Modified: trunk/openvas-manager/doc/db.png
===================================================================
(Binary files differ)
Modified: trunk/openvas-manager/doc/db_postgres.sql
===================================================================
--- trunk/openvas-manager/doc/db_postgres.sql 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/doc/db_postgres.sql 2012-03-28 10:52:59 UTC (rev 13163)
@@ -33,43 +33,43 @@
howto_install text,
howto_use text);
-CREATE TABLE escalator_condition_data (
+CREATE TABLE alert_condition_data (
id integer PRIMARY KEY,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
name text,
data text);
-CREATE TABLE escalator_condition_data_trash (
+CREATE TABLE alert_condition_data_trash (
id integer PRIMARY KEY,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
name text,
data text);
-CREATE TABLE escalator_event_data (
+CREATE TABLE alert_event_data (
id integer PRIMARY KEY,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
name text,
data text);
-CREATE TABLE escalator_event_data_trash (
+CREATE TABLE alert_event_data_trash (
id integer PRIMARY KEY,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
name text,
data text);
-CREATE TABLE escalator_method_data (
+CREATE TABLE alert_method_data (
id integer PRIMARY KEY,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
name text,
data text);
-CREATE TABLE escalator_method_data_trash (
+CREATE TABLE alert_method_data_trash (
id integer PRIMARY KEY,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
name text,
data text);
-CREATE TABLE escalators (
+CREATE TABLE alerts (
id integer PRIMARY KEY,
uuid text UNIQUE NOT NULL,
owner integer REFERENCES users (id) ON DELETE RESTRICT,
@@ -79,7 +79,7 @@
condition integer,
method integer);
-CREATE TABLE escalators_trash (
+CREATE TABLE alerts_trash (
id integer PRIMARY KEY,
uuid text UNIQUE NOT NULL,
owner integer REFERENCES users (id) ON DELETE RESTRICT,
@@ -228,11 +228,11 @@
name text,
content text);
-CREATE TABLE task_escalators (
+CREATE TABLE task_alerts (
id integer PRIMARY KEY,
task integer REFERENCES tasks (id) ON DELETE RESTRICT,
- escalator integer REFERENCES escalators (id) ON DELETE RESTRICT,
- escalator_location integer);
+ alert integer REFERENCES alerts (id) ON DELETE RESTRICT,
+ alert_location integer);
CREATE TABLE task_preferences (
task integer PRIMARY KEY REFERENCES tasks (id) ON DELETE RESTRICT,
Modified: trunk/openvas-manager/doc/omp.html
===================================================================
--- trunk/openvas-manager/doc/omp.html 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/doc/omp.html 2012-03-28 10:52:59 UTC (rev 13163)
@@ -7,7 +7,7 @@
<body style="background-color: #FFFFFF; margin: 0px; font: small Verdana, sans-serif; font-size: 12px; color: #1A1A1A;"><div style="width: 98%; width:700px; align: center; margin-left: auto; margin-right: auto;"><table style="width: 100%;" cellpadding="3" cellspacing="0"><tr><td valign="top">
<h1>OMP:
OpenVAS Management Protocol</h1>
-<p>Version: 3.0</p>
+<p>Version: 4.0</p>
<p>The "management" protocol of the Open Vulnerability Assessment System.</p>
<h2 id="contents">Contents</h2>
<ol>
@@ -164,8 +164,8 @@
<td id="index"><div style="margin-left: 15px;">Create a config.</div></td>
</tr>
<tr id="index">
-<td id="index"><a href="#command_create_escalator">create_escalator</a></td>
-<td id="index"><div style="margin-left: 15px;">Create an escalator.</div></td>
+<td id="index"><a href="#command_create_alert">create_alert</a></td>
+<td id="index"><div style="margin-left: 15px;">Create an alert.</div></td>
</tr>
<tr id="index">
<td id="index"><a href="#command_create_lsc_credential">create_lsc_credential</a></td>
@@ -220,8 +220,8 @@
<td id="index"><div style="margin-left: 15px;">Delete a config.</div></td>
</tr>
<tr id="index">
-<td id="index"><a href="#command_delete_escalator">delete_escalator</a></td>
-<td id="index"><div style="margin-left: 15px;">Delete an escalator.</div></td>
+<td id="index"><a href="#command_delete_alert">delete_alert</a></td>
+<td id="index"><div style="margin-left: 15px;">Delete an alert.</div></td>
</tr>
<tr id="index">
<td id="index"><a href="#command_delete_lsc_credential">delete_lsc_credential</a></td>
@@ -284,8 +284,8 @@
<td id="index"><div style="margin-left: 15px;">Get dependencies for all available NVTs.</div></td>
</tr>
<tr id="index">
-<td id="index"><a href="#command_get_escalators">get_escalators</a></td>
-<td id="index"><div style="margin-left: 15px;">Get all escalators.</div></td>
+<td id="index"><a href="#command_get_alerts">get_alerts</a></td>
+<td id="index"><div style="margin-left: 15px;">Get all alerts.</div></td>
</tr>
<tr id="index">
<td id="index"><a href="#command_get_info">get_info</a></td>
@@ -428,8 +428,8 @@
<td id="index"><div style="margin-left: 15px;">Stop a running task.</div></td>
</tr>
<tr id="index">
-<td id="index"><a href="#command_test_escalator">test_escalator</a></td>
-<td id="index"><div style="margin-left: 15px;">Run an escalator.</div></td>
+<td id="index"><a href="#command_test_alert">test_alert</a></td>
+<td id="index"><div style="margin-left: 15px;">Run an alert.</div></td>
</tr>
<tr id="index">
<td id="index"><a href="#command_verify_agent">verify_agent</a></td>
@@ -450,7 +450,7 @@
| commands
| create_agent
| create_config
- | create_escalator
+ | create_alert
| create_lsc_credential
| create_note
| create_override
@@ -464,7 +464,7 @@
| create_task
| delete_agent
| delete_config
- | delete_escalator
+ | delete_alert
| delete_lsc_credential
| delete_note
| delete_override
@@ -480,7 +480,7 @@
| get_agents
| get_configs
| get_dependencies
- | get_escalators
+ | get_alerts
| get_info
| get_lsc_credentials
| get_notes
@@ -516,7 +516,7 @@
| resume_stopped_task
| start_task
| stop_task
- | test_escalator
+ | test_alert
| verify_agent
| verify_report_format
@@ -525,7 +525,7 @@
| commands_response
| create_agent_response
| create_config_response
- | create_escalator_response
+ | create_alert_response
| create_lsc_credential_response
| create_note_response
| create_override_response
@@ -539,7 +539,7 @@
| create_task_response
| delete_agent_response
| delete_config_response
- | delete_escalator_response
+ | delete_alert_response
| delete_lsc_credential_response
| delete_note_response
| delete_override_response
@@ -555,7 +555,7 @@
| get_agents_response
| get_configs_response
| get_dependencies_response
- | get_escalators_response
+ | get_alerts_response
| get_info_response
| get_lsc_credentials_response
| get_notes_response
@@ -591,7 +591,7 @@
| resume_stopped_task_response
| start_task_response
| stop_task_response
- | test_escalator_response
+ | test_alert_response
| verify_agent_response
| verify_report_format_response
</pre></div>
@@ -2618,13 +2618,13 @@
</div>
</li>
<li>
- <<b>create_config></b><div style="margin-left: 15px; display: inline;">
-<a href="#command_create_config">create_config</a> command.
+ <<b>create_alert></b><div style="margin-left: 15px; display: inline;">
+<a href="#command_create_alert">create_alert</a> command.
</div>
</li>
<li>
- <<b>create_escalator></b><div style="margin-left: 15px; display: inline;">
-<a href="#command_create_escalator">create_escalator</a> command.
+ <<b>create_config></b><div style="margin-left: 15px; display: inline;">
+<a href="#command_create_config">create_config</a> command.
</div>
</li>
<li>
@@ -2683,13 +2683,13 @@
</div>
</li>
<li>
- <<b>delete_config></b><div style="margin-left: 15px; display: inline;">
-<a href="#command_delete_config">delete_config</a> command.
+ <<b>delete_alert></b><div style="margin-left: 15px; display: inline;">
+<a href="#command_delete_alert">delete_alert</a> command.
</div>
</li>
<li>
- <<b>delete_escalator></b><div style="margin-left: 15px; display: inline;">
-<a href="#command_delete_escalator">delete_escalator</a> command.
+ <<b>delete_config></b><div style="margin-left: 15px; display: inline;">
+<a href="#command_delete_config">delete_config</a> command.
</div>
</li>
<li>
@@ -2758,6 +2758,11 @@
</div>
</li>
<li>
+ <<b>get_alerts></b><div style="margin-left: 15px; display: inline;">
+<a href="#command_get_alerts">get_alerts</a> command.
+ </div>
+</li>
+<li>
<<b>get_configs></b><div style="margin-left: 15px; display: inline;">
<a href="#command_get_configs">get_configs</a> command.
</div>
@@ -2768,11 +2773,6 @@
</div>
</li>
<li>
- <<b>get_escalators></b><div style="margin-left: 15px; display: inline;">
-<a href="#command_get_escalators">get_escalators</a> command.
- </div>
-</li>
-<li>
<<b>get_info></b><div style="margin-left: 15px; display: inline;">
<a href="#command_get_info">get_info</a> command.
</div>
@@ -2943,8 +2943,8 @@
</div>
</li>
<li>
- <<b>test_escalator></b><div style="margin-left: 15px; display: inline;">
-<a href="#command_test_escalator">test_escalator</a> command.
+ <<b>test_alert></b><div style="margin-left: 15px; display: inline;">
+<a href="#command_test_alert">test_alert</a> command.
</div>
</li>
</ul>
@@ -2978,13 +2978,13 @@
</div>
</li>
<li>
- <<b>create_config_response></b><div style="margin-left: 15px; display: inline;">
- Response to <a href="#command_create_config">create_config</a> command.
+ <<b>create_alert_response></b><div style="margin-left: 15px; display: inline;">
+ Response to <a href="#command_create_alert">create_alert</a> command.
</div>
</li>
<li>
- <<b>create_escalator_response></b><div style="margin-left: 15px; display: inline;">
- Response to <a href="#command_create_escalator">create_escalator</a> command.
+ <<b>create_config_response></b><div style="margin-left: 15px; display: inline;">
+ Response to <a href="#command_create_config">create_config</a> command.
</div>
</li>
<li>
@@ -3038,13 +3038,13 @@
</div>
</li>
<li>
- <<b>delete_config_response></b><div style="margin-left: 15px; display: inline;">
- Response to <a href="#command_delete_config">delete_config</a> command.
+ <<b>delete_alert_response></b><div style="margin-left: 15px; display: inline;">
+ Response to <a href="#command_delete_alert">delete_alert</a> command.
</div>
</li>
<li>
- <<b>delete_escalator_response></b><div style="margin-left: 15px; display: inline;">
- Response to <a href="#command_delete_escalator">delete_escalator</a> command.
+ <<b>delete_config_response></b><div style="margin-left: 15px; display: inline;">
+ Response to <a href="#command_delete_config">delete_config</a> command.
</div>
</li>
<li>
@@ -3113,6 +3113,11 @@
</div>
</li>
<li>
+ <<b>get_alerts_response></b><div style="margin-left: 15px; display: inline;">
+ Response to <a href="#command_get_alerts">get_alerts</a> command.
+ </div>
+</li>
+<li>
<<b>get_configs_response></b><div style="margin-left: 15px; display: inline;">
Response to <a href="#command_get_configs">get_configs</a> command.
</div>
@@ -3123,11 +3128,6 @@
</div>
</li>
<li>
- <<b>get_escalators_response></b><div style="margin-left: 15px; display: inline;">
- Response to <a href="#command_get_escalators">get_escalators</a> command.
- </div>
-</li>
-<li>
<<b>get_info_response></b><div style="margin-left: 15px; display: inline;">
Response to <a href="#command_get_info">get_info</a> command.
</div>
@@ -3298,8 +3298,8 @@
</div>
</li>
<li>
- <<b>test_escalator_response></b><div style="margin-left: 15px; display: inline;">
- Response to <a href="#command_test_escalator">test_escalator</a> command.
+ <<b>test_alert_response></b><div style="margin-left: 15px; display: inline;">
+ Response to <a href="#command_test_alert">test_alert</a> command.
</div>
</li>
</ul>
@@ -3315,8 +3315,8 @@
( authenticate
| commands
| create_agent
+ | create_alert
| create_config
- | create_escalator
| create_lsc_credential
| create_note
| create_override
@@ -3328,8 +3328,8 @@
| create_target
| create_task
| delete_agent
+ | delete_alert
| delete_config
- | delete_escalator
| delete_lsc_credential
| delete_note
| delete_override
@@ -3343,9 +3343,9 @@
| delete_task
| empty_trashcan
| get_agents
+ | get_alerts
| get_configs
| get_dependencies
- | get_escalators
| get_info
| get_lsc_credentials
| get_notes
@@ -3380,7 +3380,7 @@
| resume_stopped_task
| start_task
| stop_task
- | test_escalator )*
+ | test_alert )*
}
</pre></div>
<i>Response</i><div style="margin-left: 5%"><pre>commands_response
@@ -3391,8 +3391,8 @@
& ( authenticate_response
| commands_response
| create_agent_response
+ | create_alert_response
| create_config_response
- | create_escalator_response
| create_lsc_credential_response
| create_note_response
| create_override_response
@@ -3403,8 +3403,8 @@
| create_target_response
| create_task_response
| delete_agent_response
+ | delete_alert_response
| delete_config_response
- | delete_escalator_response
| delete_lsc_credential_response
| delete_note_response
| delete_override_response
@@ -3418,9 +3418,9 @@
| delete_task_response
| empty_trashcan_response
| get_agents_response
+ | get_alerts_response
| get_configs_response
| get_dependencies_response
- | get_escalators_response
| get_info_response
| get_lsc_credentials_response
| get_notes_response
@@ -3455,7 +3455,7 @@
| resume_stopped_task_response
| start_task_response
| stop_task_response
- | test_escalator_response )*
+ | test_alert_response )*
}
</pre></div>
</div>
@@ -3760,13 +3760,13 @@
</div>
</div>
<div>
-<div><h3 id="command_create_escalator">7.5
- Command <tt>create_escalator</tt>
+<div><h3 id="command_create_alert">7.5
+ Command <tt>create_alert</tt>
</h3></div>
-<p>In short: Create an escalator.</p>
+<p>In short: Create an alert.</p>
<p>
- The client uses the create_escalator command to create a new
- escalator.
+ The client uses the create_alert command to create a new
+ alert.
</p>
<h4>7.5.1 Structure</h4>
<ul style="list-style: none">
@@ -3774,17 +3774,17 @@
<i>Command</i><ul style="list-style: none">
<li>
<<b>name</b>>
- <div style="margin-left: 15px; display: inline;">A name for the escalator.</div>
+ <div style="margin-left: 15px; display: inline;">A name for the alert.</div>
<ul style="list-style: none"></ul>
</li>
<li>
<<b>comment</b>>
- ?<div style="margin-left: 15px; display: inline;">A comment on the escalator.</div>
+ ?<div style="margin-left: 15px; display: inline;">A comment on the alert.</div>
<ul style="list-style: none"></ul>
</li>
<li>
<<b>condition</b>>
- <div style="margin-left: 15px; display: inline;">The condition that must be satisfied for escalation.</div>
+ <div style="margin-left: 15px; display: inline;">The condition that must be satisfied for the alert to occur.</div>
<ul style="list-style: none"><li>
<<b>data</b>>
*<div style="margin-left: 15px; display: inline;">Some data that defines the condition.</div>
@@ -3797,7 +3797,7 @@
</li>
<li>
<<b>event</b>>
- <div style="margin-left: 15px; display: inline;">The event that must happen for escalation.</div>
+ <div style="margin-left: 15px; display: inline;">The event that must happen for the alert to occur.</div>
<ul style="list-style: none"><li>
<<b>data</b>>
*<div style="margin-left: 15px; display: inline;">Some data that defines the event.</div>
@@ -3810,7 +3810,7 @@
</li>
<li>
<<b>method</b>>
- <div style="margin-left: 15px; display: inline;">The method by which escalation must occur.</div>
+ <div style="margin-left: 15px; display: inline;">The method by which the user is alerted.</div>
<ul style="list-style: none"><li>
<<b>data</b>>
*<div style="margin-left: 15px; display: inline;">Some data that defines the method.</div>
@@ -3842,90 +3842,90 @@
</ul>
<h4>7.5.2 RNC</h4>
<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;">
-<i>Command</i><div style="margin-left: 5%"><pre>create_escalator
- = element create_escalator
+<i>Command</i><div style="margin-left: 5%"><pre>create_alert
+ = element create_alert
{
- create_escalator_name
- & create_escalator_comment?
- & create_escalator_condition
- & create_escalator_event
- & create_escalator_method
+ create_alert_name
+ & create_alert_comment?
+ & create_alert_condition
+ & create_alert_event
+ & create_alert_method
}
-create_escalator_name
+create_alert_name
= element name
{
name
}
-create_escalator_comment
+create_alert_comment
= element comment
{
text
}
-create_escalator_condition
+create_alert_condition
= element condition
{
text
- & create_escalator_condition_data*
+ & create_alert_condition_data*
}
-create_escalator_condition_data
+create_alert_condition_data
= element data
{
text
- & create_escalator_condition_data_name
+ & create_alert_condition_data_name
}
-create_escalator_condition_data_name
+create_alert_condition_data_name
= element name
{
text
}
-create_escalator_event
+create_alert_event
= element event
{
text
- & create_escalator_event_data*
+ & create_alert_event_data*
}
-create_escalator_event_data
+create_alert_event_data
= element data
{
text
- & create_escalator_event_data_name
+ & create_alert_event_data_name
}
-create_escalator_event_data_name
+create_alert_event_data_name
= element name
{
text
}
-create_escalator_method
+create_alert_method
= element method
{
text
- & create_escalator_method_data*
+ & create_alert_method_data*
}
-create_escalator_method_data
+create_alert_method_data
= element data
{
text
- & create_escalator_method_data_name
+ & create_alert_method_data_name
}
-create_escalator_method_data_name
+create_alert_method_data_name
= element name
{
text
}
</pre></div>
-<i>Response</i><div style="margin-left: 5%"><pre>create_escalator_response
- = element create_escalator_response
+<i>Response</i><div style="margin-left: 5%"><pre>create_alert_response
+ = element create_alert_response
{
attribute status { status }
& attribute status_text { text }
@@ -3933,9 +3933,9 @@
}
</pre></div>
</div>
-<h4>7.5.3 Example: Create an escalator</h4>
+<h4>7.5.3 Example: Create an alert</h4>
<div style="margin-left: 5%; margin-right: 5%;">
-<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <create_escalator>
+<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <create_alert>
<name>emergency</name>
<condition>
Threat level at least
@@ -3962,11 +3962,11 @@
<name>from_address</name>
</data>
</method>
- </create_escalator>
+ </create_alert>
</pre></div>
-<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <create_escalator_response status="201"
- status_text="OK, resource created"
- id="254cd3ef-bbe1-4d58-859d-21b8d0c046c6"/>
+<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <create_alert_response status="201"
+ status_text="OK, resource created"
+ id="254cd3ef-bbe1-4d58-859d-21b8d0c046c6"/>
</pre></div>
</div>
</div>
@@ -5554,8 +5554,8 @@
</li></ul>
</li>
<li>
- <<b>escalator</b>>
- ?<div style="margin-left: 15px; display: inline;">An escalator that applies to the task.</div>
+ <<b>alert</b>>
+ ?<div style="margin-left: 15px; display: inline;">An alert that applies to the task.</div>
<ul style="list-style: none"><li>
@<b>id</b>
(<a href="#type_uuid">uuid</a>)
@@ -5632,7 +5632,7 @@
& create_task_comment?
& create_task_config
& create_task_target
- & create_task_escalator?
+ & create_task_alert?
& create_task_schedule?
& create_task_slave?
& create_task_observers?
@@ -5664,8 +5664,8 @@
attribute id { uuid }
}
-create_task_escalator
- = element escalator
+create_task_alert
+ = element alert
{
attribute id { uuid }
}
@@ -5878,13 +5878,13 @@
</div>
</div>
<div>
-<div><h3 id="command_delete_escalator">7.19
- Command <tt>delete_escalator</tt>
+<div><h3 id="command_delete_alert">7.19
+ Command <tt>delete_alert</tt>
</h3></div>
-<p>In short: Delete an escalator.</p>
+<p>In short: Delete an alert.</p>
<p>
- The client uses the delete_escalator command to delete an existing
- escalator.
+ The client uses the delete_alert command to delete an existing
+ alert.
</p>
<p>
Since this is a destructive command, the client is advised to ask
@@ -5896,7 +5896,7 @@
<li>
<i>Command</i><ul style="list-style: none">
<li>
- @<b>escalator_id</b>
+ @<b>alert_id</b>
(<a href="#type_uuid">uuid</a>)
</li>
<li>
@@ -5921,27 +5921,27 @@
</ul>
<h4>7.19.2 RNC</h4>
<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;">
-<i>Command</i><div style="margin-left: 5%"><pre>delete_escalator
- = element delete_escalator
+<i>Command</i><div style="margin-left: 5%"><pre>delete_alert
+ = element delete_alert
{
- attribute escalator_id { uuid }
+ attribute alert_id { uuid }
& attribute ultimate { boolean }
}
</pre></div>
-<i>Response</i><div style="margin-left: 5%"><pre>delete_escalator_response
- = element delete_escalator_response
+<i>Response</i><div style="margin-left: 5%"><pre>delete_alert_response
+ = element delete_alert_response
{
attribute status { status }
& attribute status_text { text }
}
</pre></div>
</div>
-<h4>7.19.3 Example: Delete an escalator</h4>
+<h4>7.19.3 Example: Delete an alert</h4>
<div style="margin-left: 5%; margin-right: 5%;">
-<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <delete_escalator escalator_id="267a3405-e84a-47da-97b2-5fa0d2e8995e"/>
+<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <delete_alert alert_id="267a3405-e84a-47da-97b2-5fa0d2e8995e"/>
</pre></div>
-<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <delete_escalator_response status="200"
- status_text="OK"/>
+<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <delete_alert_response status="200"
+ status_text="OK"/>
</pre></div>
</div>
</div>
@@ -7605,28 +7605,28 @@
</div>
</div>
<div>
-<div><h3 id="command_get_escalators">7.35
- Command <tt>get_escalators</tt>
+<div><h3 id="command_get_alerts">7.35
+ Command <tt>get_alerts</tt>
</h3></div>
-<p>In short: Get all escalators.</p>
+<p>In short: Get all alerts.</p>
<p>
- The client uses the get_escalators command to get escalator information.
+ The client uses the get_alerts command to get alert information.
If the command sent by the client was valid, the manager will
- reply with a list of escalators to the client.
+ reply with a list of alerts to the client.
</p>
<h4>7.35.1 Structure</h4>
<ul style="list-style: none">
<li>
<i>Command</i><ul style="list-style: none">
<li>
- @<b>escalator_id</b>
+ @<b>alert_id</b>
(<a href="#type_uuid">uuid</a>)
- ID of single escalator to get.
+ ID of single alert to get.
</li>
<li>
@<b>trash</b>
(<a href="#type_boolean">boolean</a>)
- Whether to get the trashcan escalators instead.
+ Whether to get the trashcan alerts instead.
</li>
<li>
@<b>sort_order</b>
@@ -7649,26 +7649,26 @@
(text)
</li>
<li>
- <<b>escalator</b>>
+ <<b>alert</b>>
*<ul style="list-style: none">
<li>
<<b>name</b>>
- <div style="margin-left: 15px; display: inline;">The name of the escalator.</div>
+ <div style="margin-left: 15px; display: inline;">The name of the alert.</div>
<ul style="list-style: none"></ul>
</li>
<li>
<<b>comment</b>>
- <div style="margin-left: 15px; display: inline;">The comment on the escalator.</div>
+ <div style="margin-left: 15px; display: inline;">The comment on the alert.</div>
<ul style="list-style: none"></ul>
</li>
<li>
<<b>in_use</b>>
- <div style="margin-left: 15px; display: inline;">Whether any tasks are using the escalator.</div>
+ <div style="margin-left: 15px; display: inline;">Whether any tasks are using the alert.</div>
<ul style="list-style: none"></ul>
</li>
<li>
<<b>condition</b>>
- <div style="margin-left: 15px; display: inline;">The condition that must be satisfied for escalation.</div>
+ <div style="margin-left: 15px; display: inline;">The condition that must be satisfied for the alert to occur.</div>
<ul style="list-style: none"><li>
<<b>data</b>>
*<div style="margin-left: 15px; display: inline;">Some data that defines the condition.</div>
@@ -7681,7 +7681,7 @@
</li>
<li>
<<b>event</b>>
- <div style="margin-left: 15px; display: inline;">The event that must happen for escalation.</div>
+ <div style="margin-left: 15px; display: inline;">The event that must happen for the alert to occur.</div>
<ul style="list-style: none"><li>
<<b>data</b>>
*<div style="margin-left: 15px; display: inline;">Some data that defines the event.</div>
@@ -7694,7 +7694,7 @@
</li>
<li>
<<b>method</b>>
- <div style="margin-left: 15px; display: inline;">The method by which escalation must occur.</div>
+ <div style="margin-left: 15px; display: inline;">The method by which he alert must occur.</div>
<ul style="list-style: none"><li>
<<b>data</b>>
*<div style="margin-left: 15px; display: inline;">Some data that defines the method.</div>
@@ -7712,120 +7712,120 @@
</ul>
<h4>7.35.2 RNC</h4>
<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;">
-<i>Command</i><div style="margin-left: 5%"><pre>get_escalators
- = element get_escalators
+<i>Command</i><div style="margin-left: 5%"><pre>get_alerts
+ = element get_alerts
{
- attribute escalator_id { uuid }?
+ attribute alert_id { uuid }?
& attribute trash { boolean }?
& attribute sort_order { sort_order }?
& attribute sort_field { text }?
}
</pre></div>
-<i>Response</i><div style="margin-left: 5%"><pre>get_escalators_response
- = element get_escalators_response
+<i>Response</i><div style="margin-left: 5%"><pre>get_alerts_response
+ = element get_alerts_response
{
attribute status { status }
& attribute status_text { text }
- & get_escalators_response_escalator*
+ & get_alerts_response_alert*
}
-get_escalators_response_escalator
- = element escalator
+get_alerts_response_alert
+ = element alert
{
- get_escalators_response_escalator_name
- & get_escalators_response_escalator_comment
- & get_escalators_response_escalator_in_use
- & get_escalators_response_escalator_condition
- & get_escalators_response_escalator_event
- & get_escalators_response_escalator_method
+ get_alerts_response_alert_name
+ & get_alerts_response_alert_comment
+ & get_alerts_response_alert_in_use
+ & get_alerts_response_alert_condition
+ & get_alerts_response_alert_event
+ & get_alerts_response_alert_method
}
-get_escalators_response_escalator_name
+get_alerts_response_alert_name
= element name
{
name
}
-get_escalators_response_escalator_comment
+get_alerts_response_alert_comment
= element comment
{
text
}
-get_escalators_response_escalator_in_use
+get_alerts_response_alert_in_use
= element in_use
{
boolean
}
-get_escalators_response_escalator_condition
+get_alerts_response_alert_condition
= element condition
{
text
- & get_escalators_response_escalator_condition_data*
+ & get_alerts_response_alert_condition_data*
}
-get_escalators_response_escalator_condition_data
+get_alerts_response_alert_condition_data
= element data
{
text
- & get_escalators_response_escalator_condition_data_name
+ & get_alerts_response_alert_condition_data_name
}
-get_escalators_response_escalator_condition_data_name
+get_alerts_response_alert_condition_data_name
= element name
{
text
}
-get_escalators_response_escalator_event
+get_alerts_response_alert_event
= element event
{
text
- & get_escalators_response_escalator_event_data*
+ & get_alerts_response_alert_event_data*
}
-get_escalators_response_escalator_event_data
+get_alerts_response_alert_event_data
= element data
{
text
- & get_escalators_response_escalator_event_data_name
+ & get_alerts_response_alert_event_data_name
}
-get_escalators_response_escalator_event_data_name
+get_alerts_response_alert_event_data_name
= element name
{
text
}
-get_escalators_response_escalator_method
+get_alerts_response_alert_method
= element method
{
text
- & get_escalators_response_escalator_method_data*
+ & get_alerts_response_alert_method_data*
}
-get_escalators_response_escalator_method_data
+get_alerts_response_alert_method_data
= element data
{
text
- & get_escalators_response_escalator_method_data_name
+ & get_alerts_response_alert_method_data_name
}
-get_escalators_response_escalator_method_data_name
+get_alerts_response_alert_method_data_name
= element name
{
text
}
</pre></div>
</div>
-<h4>7.35.3 Example: Get the escalators</h4>
+<h4>7.35.3 Example: Get the alerts</h4>
<div style="margin-left: 5%; margin-right: 5%;">
-<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <get_escalators/>
+<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <get_alerts/>
</pre></div>
-<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <get_escalators_response status="200"
- status_text="OK">
- <escalator id="6181e65d-8ba0-4937-9c44-8f2b10b0def7">
+<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <get_alerts_response status="200"
+ status_text="OK">
+ <alert id="6181e65d-8ba0-4937-9c44-8f2b10b0def7">
<name>Team alert</name>
<comment/>
<in_use>1</in_use>
@@ -7858,9 +7858,9 @@
<name>notice</name>
</data>
</method>
- </escalator>
+ </alert>
...
- </get_escalators_response>
+ </get_alerts_response>
</pre></div>
</div>
</div>
@@ -10393,9 +10393,9 @@
ID of required report format.
</li>
<li>
- @<b>escalator_id</b>
+ @<b>alert_id</b>
(<a href="#type_uuid">uuid</a>)
- ID of escalator to pass generated report to.
+ ID of alert to pass generated report to.
</li>
<li>
@<b>first_result</b>
@@ -10519,7 +10519,7 @@
attribute report_id { uuid }?
& attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& attribute format_id { uuid }?
- & attribute escalator_id { uuid }?
+ & attribute alert_id { uuid }?
& attribute first_result { integer }?
& attribute max_results { integer }?
& attribute sort_order { sort_order }?
@@ -12854,8 +12854,8 @@
</ul>
</li>
<li>
- <<b>escalator</b>>
- <div style="margin-left: 15px; display: inline;">An escalator that applies to the task.</div>
+ <<b>alert</b>>
+ <div style="margin-left: 15px; display: inline;">An alert that applies to the task.</div>
<ul style="list-style: none">
<li>
@<b>id</b>
@@ -12863,12 +12863,12 @@
</li>
<li>
<<b>name</b>>
- <div style="margin-left: 15px; display: inline;">The name of the escalator.</div>
+ <div style="margin-left: 15px; display: inline;">The name of the alert.</div>
<ul style="list-style: none"></ul>
</li>
<li>
<<b>trash</b>>
- <div style="margin-left: 15px; display: inline;">Whether the escalator is in the trashcan.</div>
+ <div style="margin-left: 15px; display: inline;">Whether the alert is in the trashcan.</div>
<ul style="list-style: none"></ul>
</li>
</ul>
@@ -13201,7 +13201,7 @@
& get_tasks_response_task_progress
& get_tasks_response_task_config
& get_tasks_response_task_target
- & get_tasks_response_task_escalator
+ & get_tasks_response_task_alert
& get_tasks_response_task_observers
& get_tasks_response_task_schedule
& get_tasks_response_task_slave
@@ -13293,21 +13293,21 @@
boolean
}
-get_tasks_response_task_escalator
- = element escalator
+get_tasks_response_task_alert
+ = element alert
{
attribute id { uuid_or_empty }
- & get_tasks_response_task_escalator_name
- & get_tasks_response_task_escalator_trash
+ & get_tasks_response_task_alert_name
+ & get_tasks_response_task_alert_trash
}
-get_tasks_response_task_escalator_name
+get_tasks_response_task_alert_name
= element name
{
name
}
-get_tasks_response_task_escalator_trash
+get_tasks_response_task_alert_trash
= element trash
{
boolean
@@ -13686,9 +13686,9 @@
<config id="daba56c8-73ec-11df-a475-002264764cea">
<name>Full and fast</name>
</config>
- <escalator id="">
+ <alert id="">
<name/>
- </escalator>
+ </alert>
<target id="1f28d970-17ef-4c69-ba8a-13827059f2b9">
<name>dik</name>
</target>
@@ -13771,9 +13771,9 @@
<config id="daba56c8-73ec-11df-a475-002264764cea">
<name>Full and fast</name>
</config>
- <escalator id="">
+ <alert id="">
<name/>
- </escalator>
+ </alert>
<target id="1f28d970-17ef-4c69-ba8a-13827059f2b9">
<name>dik</name>
</target>
@@ -14128,7 +14128,7 @@
COMMANDS Run a list of commands.
CREATE_AGENT Create an agent.
CREATE_CONFIG Create a config.
- CREATE_ESCALATOR Create an escalator.
+ CREATE_ALERT Create an alert.
CREATE_LSC_CREDENTIAL Create a local security check credential.
CREATE_NOTE Create a note.
CREATE_OVERRIDE Create an override.
@@ -14142,7 +14142,7 @@
CREATE_TASK Create a task.
DELETE_AGENT Delete an agent.
DELETE_CONFIG Delete a config.
- DELETE_ESCALATOR Delete an escalator.
+ DELETE_ALERT Delete an alert.
DELETE_LSC_CREDENTIAL Delete a local security check credential.
DELETE_NOTE Delete a note.
DELETE_OVERRIDE Delete an override.
@@ -14158,7 +14158,7 @@
GET_AGENTS Get all agents.
GET_CONFIGS Get all configs.
GET_DEPENDENCIES Get dependencies for all available NVTs.
- GET_ESCALATORS Get all escalators.
+ GET_ALERTS Get all alerts.
GET_LSC_CREDENTIALS Get all local security check credentials.
GET_NOTES Get all notes.
GET_NVTS Get one or all available NVTs.
@@ -14194,7 +14194,7 @@
RESUME_STOPPED_TASK Resume a stopped task.
START_TASK Manually start an existing task.
STOP_TASK Stop a running task.
- TEST_ESCALATOR Run an escalator.
+ TEST_ALERT Run an alert.
VERIFY_AGENT Verify an agent.
VERIFY_REPORT_FORMAT Verify a report format.
</help_response>
@@ -15390,8 +15390,8 @@
<ul style="list-style: none"></ul>
</li>
<li>
- <<b>escalator</b>>
- <div style="margin-left: 15px; display: inline;">Task escalator.</div>
+ <<b>alert</b>>
+ <div style="margin-left: 15px; display: inline;">Task alert.</div>
<ul style="list-style: none"><li>
@<b>id</b>
(<a href="#type_uuid">uuid</a>)
@@ -15483,7 +15483,7 @@
{
attribute task_id { uuid }
& ( modify_task_comment
- | modify_task_escalator
+ | modify_task_alert
| modify_task_name
| modify_task_observers
| modify_task_preferences
@@ -15499,8 +15499,8 @@
text
}
-modify_task_escalator
- = element escalator
+modify_task_alert
+ = element alert
{
attribute id { uuid }
}
@@ -15972,19 +15972,19 @@
</div>
</div>
<div>
-<div><h3 id="command_test_escalator">7.71
- Command <tt>test_escalator</tt>
+<div><h3 id="command_test_alert">7.71
+ Command <tt>test_alert</tt>
</h3></div>
-<p>In short: Run an escalator.</p>
+<p>In short: Run an alert.</p>
<p>
- The client uses the test_escalator command to invoke a test run of
- an escalator.
+ The client uses the test_alert command to invoke a test run of
+ an alert.
</p>
<h4>7.71.1 Structure</h4>
<ul style="list-style: none">
<li>
<i>Command</i><ul style="list-style: none"><li>
- @<b>escalator_id</b>
+ @<b>alert_id</b>
(<a href="#type_uuid">uuid</a>)
</li></ul>
</li>
@@ -16003,26 +16003,26 @@
</ul>
<h4>7.71.2 RNC</h4>
<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;">
-<i>Command</i><div style="margin-left: 5%"><pre>test_escalator
- = element test_escalator
+<i>Command</i><div style="margin-left: 5%"><pre>test_alert
+ = element test_alert
{
- attribute escalator_id { uuid }
+ attribute alert_id { uuid }
}
</pre></div>
-<i>Response</i><div style="margin-left: 5%"><pre>test_escalator_response
- = element test_escalator_response
+<i>Response</i><div style="margin-left: 5%"><pre>test_alert_response
+ = element test_alert_response
{
attribute status { status }
& attribute status_text { text }
}
</pre></div>
</div>
-<h4>7.71.3 Example: Test an escalator</h4>
+<h4>7.71.3 Example: Test an alert</h4>
<div style="margin-left: 5%; margin-right: 5%;">
-<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <test_escalator escalator_id="97390ade-e075-11df-9973-002264764cea"/>
+<i>Client</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <test_alert alert_id="97390ade-e075-11df-9973-002264764cea"/>
</pre></div>
-<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <test_escalator_response status="200"
- status_text="OK"/>
+<i>Manager</i><div style="margin-left: 2%; margin-right: 2%;"><pre> <test_alert_response status="200"
+ status_text="OK"/>
</pre></div>
</div>
</div>
Modified: trunk/openvas-manager/doc/omp.rnc
===================================================================
--- trunk/openvas-manager/doc/omp.rnc 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/doc/omp.rnc 2012-03-28 10:52:59 UTC (rev 13163)
@@ -1,6 +1,6 @@
#### OpenVAS Management Protocol (OMP)
####
-#### Version: 3.0
+#### Version: 4.0
####
#### The "management" protocol of the Open Vulnerability Assessment System.
@@ -13,7 +13,7 @@
| commands
| create_agent
| create_config
- | create_escalator
+ | create_alert
| create_lsc_credential
| create_note
| create_override
@@ -27,7 +27,7 @@
| create_task
| delete_agent
| delete_config
- | delete_escalator
+ | delete_alert
| delete_lsc_credential
| delete_note
| delete_override
@@ -43,7 +43,7 @@
| get_agents
| get_configs
| get_dependencies
- | get_escalators
+ | get_alerts
| get_info
| get_lsc_credentials
| get_notes
@@ -79,7 +79,7 @@
| resume_stopped_task
| start_task
| stop_task
- | test_escalator
+ | test_alert
| verify_agent
| verify_report_format
@@ -88,7 +88,7 @@
| commands_response
| create_agent_response
| create_config_response
- | create_escalator_response
+ | create_alert_response
| create_lsc_credential_response
| create_note_response
| create_override_response
@@ -102,7 +102,7 @@
| create_task_response
| delete_agent_response
| delete_config_response
- | delete_escalator_response
+ | delete_alert_response
| delete_lsc_credential_response
| delete_note_response
| delete_override_response
@@ -118,7 +118,7 @@
| get_agents_response
| get_configs_response
| get_dependencies_response
- | get_escalators_response
+ | get_alerts_response
| get_info_response
| get_lsc_credentials_response
| get_notes_response
@@ -154,7 +154,7 @@
| resume_stopped_task_response
| start_task_response
| stop_task_response
- | test_escalator_response
+ | test_alert_response
| verify_agent_response
| verify_report_format_response
@@ -1222,8 +1222,8 @@
( authenticate
| commands
| create_agent
+ | create_alert
| create_config
- | create_escalator
| create_lsc_credential
| create_note
| create_override
@@ -1235,8 +1235,8 @@
| create_target
| create_task
| delete_agent
+ | delete_alert
| delete_config
- | delete_escalator
| delete_lsc_credential
| delete_note
| delete_override
@@ -1250,9 +1250,9 @@
| delete_task
| empty_trashcan
| get_agents
+ | get_alerts
| get_configs
| get_dependencies
- | get_escalators
| get_info
| get_lsc_credentials
| get_notes
@@ -1287,7 +1287,7 @@
| resume_stopped_task
| start_task
| stop_task
- | test_escalator )*
+ | test_alert )*
}
## Command create_agent
@@ -1389,98 +1389,98 @@
name
}
-## Command create_escalator
+## Command create_alert
##
-## Create an escalator.
+## Create an alert.
-create_escalator
- = element create_escalator
+create_alert
+ = element create_alert
{
- create_escalator_name
- & create_escalator_comment?
- & create_escalator_condition
- & create_escalator_event
- & create_escalator_method
+ create_alert_name
+ & create_alert_comment?
+ & create_alert_condition
+ & create_alert_event
+ & create_alert_method
}
-# A name for the escalator.
-create_escalator_name
+# A name for the alert.
+create_alert_name
= element name
{
name
}
-# A comment on the escalator.
-create_escalator_comment
+# A comment on the alert.
+create_alert_comment
= element comment
{
text
}
-# The condition that must be satisfied for escalation.
-create_escalator_condition
+# The condition that must be satisfied for the alert to occur.
+create_alert_condition
= element condition
{
text
- & create_escalator_condition_data*
+ & create_alert_condition_data*
}
# Some data that defines the condition.
-create_escalator_condition_data
+create_alert_condition_data
= element data
{
text
- & create_escalator_condition_data_name
+ & create_alert_condition_data_name
}
# The name of the condition data.
-create_escalator_condition_data_name
+create_alert_condition_data_name
= element name
{
text
}
-# The event that must happen for escalation.
-create_escalator_event
+# The event that must happen for the alert to occur.
+create_alert_event
= element event
{
text
- & create_escalator_event_data*
+ & create_alert_event_data*
}
# Some data that defines the event.
-create_escalator_event_data
+create_alert_event_data
= element data
{
text
- & create_escalator_event_data_name
+ & create_alert_event_data_name
}
# The name of the event data.
-create_escalator_event_data_name
+create_alert_event_data_name
= element name
{
text
}
-# The method by which escalation must occur.
-create_escalator_method
+# The method by which the user is alerted.
+create_alert_method
= element method
{
text
- & create_escalator_method_data*
+ & create_alert_method_data*
}
# Some data that defines the method.
-create_escalator_method_data
+create_alert_method_data
= element data
{
text
- & create_escalator_method_data_name
+ & create_alert_method_data_name
}
# The name of the method data.
-create_escalator_method_data_name
+create_alert_method_data_name
= element name
{
text
@@ -2128,7 +2128,7 @@
& create_task_comment?
& create_task_config
& create_task_target
- & create_task_escalator?
+ & create_task_alert?
& create_task_schedule?
& create_task_slave?
& create_task_observers?
@@ -2164,9 +2164,9 @@
attribute id { uuid }
}
-# An escalator that applies to the task.
-create_task_escalator
- = element escalator
+# An alert that applies to the task.
+create_task_alert
+ = element alert
{
attribute id { uuid }
}
@@ -2249,14 +2249,14 @@
attribute ultimate { boolean }
}
-## Command delete_escalator
+## Command delete_alert
##
-## Delete an escalator.
+## Delete an alert.
-delete_escalator
- = element delete_escalator
+delete_alert
+ = element delete_alert
{
- attribute escalator_id { uuid }
+ attribute alert_id { uuid }
& # Whether to remove entirely, or to the trashcan.
attribute ultimate { boolean }
}
@@ -2444,16 +2444,16 @@
attribute nvt_oid { oid }?
}
-## Command get_escalators
+## Command get_alerts
##
-## Get all escalators.
+## Get all alerts.
-get_escalators
- = element get_escalators
+get_alerts
+ = element get_alerts
{
- # ID of single escalator to get.
- attribute escalator_id { uuid }?
- & # Whether to get the trashcan escalators instead.
+ # ID of single alert to get.
+ attribute alert_id { uuid }?
+ & # Whether to get the trashcan alerts instead.
attribute trash { boolean }?
& attribute sort_order { sort_order }?
& attribute sort_field { text }?
@@ -2613,8 +2613,8 @@
attribute type { xsd:token { pattern = "scan|assets|prognostic" } }?
& # ID of required report format.
attribute format_id { uuid }?
- & # ID of escalator to pass generated report to.
- attribute escalator_id { uuid }?
+ & # ID of alert to pass generated report to.
+ attribute alert_id { uuid }?
& # First result to get.
attribute first_result { integer }?
& # Maximum number of results to get.
@@ -3236,7 +3236,7 @@
# ID of task to modify.
attribute task_id { uuid }
& ( modify_task_comment
- | modify_task_escalator
+ | modify_task_alert
| modify_task_name
| modify_task_observers
| modify_task_preferences
@@ -3253,9 +3253,9 @@
text
}
-# Task escalator.
-modify_task_escalator
- = element escalator
+# Task alert.
+modify_task_alert
+ = element alert
{
attribute id { uuid }
}
@@ -3400,14 +3400,14 @@
attribute task_id { uuid }
}
-## Command test_escalator
+## Command test_alert
##
-## Run an escalator.
+## Run an alert.
-test_escalator
- = element test_escalator
+test_alert
+ = element test_alert
{
- attribute escalator_id { uuid }
+ attribute alert_id { uuid }
}
## Command verify_agent
@@ -3466,8 +3466,8 @@
& ( authenticate_response
| commands_response
| create_agent_response
+ | create_alert_response
| create_config_response
- | create_escalator_response
| create_lsc_credential_response
| create_note_response
| create_override_response
@@ -3478,8 +3478,8 @@
| create_target_response
| create_task_response
| delete_agent_response
+ | delete_alert_response
| delete_config_response
- | delete_escalator_response
| delete_lsc_credential_response
| delete_note_response
| delete_override_response
@@ -3493,9 +3493,9 @@
| delete_task_response
| empty_trashcan_response
| get_agents_response
+ | get_alerts_response
| get_configs_response
| get_dependencies_response
- | get_escalators_response
| get_info_response
| get_lsc_credentials_response
| get_notes_response
@@ -3530,7 +3530,7 @@
| resume_stopped_task_response
| start_task_response
| stop_task_response
- | test_escalator_response )*
+ | test_alert_response )*
}
## Response to create_agent
@@ -3553,10 +3553,10 @@
& attribute id { uuid }
}
-## Response to create_escalator
+## Response to create_alert
-create_escalator_response
- = element create_escalator_response
+create_alert_response
+ = element create_alert_response
{
attribute status { status }
& attribute status_text { text }
@@ -3691,10 +3691,10 @@
& attribute status_text { text }
}
-## Response to delete_escalator
+## Response to delete_alert
-delete_escalator_response
- = element delete_escalator_response
+delete_alert_response
+ = element delete_alert_response
{
attribute status { status }
& attribute status_text { text }
@@ -4146,112 +4146,112 @@
name
}
-## Response to get_escalators
+## Response to get_alerts
-get_escalators_response
- = element get_escalators_response
+get_alerts_response
+ = element get_alerts_response
{
attribute status { status }
& attribute status_text { text }
- & get_escalators_response_escalator*
+ & get_alerts_response_alert*
}
-get_escalators_response_escalator
- = element escalator
+get_alerts_response_alert
+ = element alert
{
- get_escalators_response_escalator_name
- & get_escalators_response_escalator_comment
- & get_escalators_response_escalator_in_use
- & get_escalators_response_escalator_condition
- & get_escalators_response_escalator_event
- & get_escalators_response_escalator_method
+ get_alerts_response_alert_name
+ & get_alerts_response_alert_comment
+ & get_alerts_response_alert_in_use
+ & get_alerts_response_alert_condition
+ & get_alerts_response_alert_event
+ & get_alerts_response_alert_method
}
-# The name of the escalator.
-get_escalators_response_escalator_name
+# The name of the alert.
+get_alerts_response_alert_name
= element name
{
name
}
-# The comment on the escalator.
-get_escalators_response_escalator_comment
+# The comment on the alert.
+get_alerts_response_alert_comment
= element comment
{
text
}
-# Whether any tasks are using the escalator.
-get_escalators_response_escalator_in_use
+# Whether any tasks are using the alert.
+get_alerts_response_alert_in_use
= element in_use
{
boolean
}
-# The condition that must be satisfied for escalation.
-get_escalators_response_escalator_condition
+# The condition that must be satisfied for the alert to occur.
+get_alerts_response_alert_condition
= element condition
{
text
- & get_escalators_response_escalator_condition_data*
+ & get_alerts_response_alert_condition_data*
}
# Some data that defines the condition.
-get_escalators_response_escalator_condition_data
+get_alerts_response_alert_condition_data
= element data
{
text
- & get_escalators_response_escalator_condition_data_name
+ & get_alerts_response_alert_condition_data_name
}
# The name of the condition data.
-get_escalators_response_escalator_condition_data_name
+get_alerts_response_alert_condition_data_name
= element name
{
text
}
-# The event that must happen for escalation.
-get_escalators_response_escalator_event
+# The event that must happen for the alert to occur.
+get_alerts_response_alert_event
= element event
{
text
- & get_escalators_response_escalator_event_data*
+ & get_alerts_response_alert_event_data*
}
# Some data that defines the event.
-get_escalators_response_escalator_event_data
+get_alerts_response_alert_event_data
= element data
{
text
- & get_escalators_response_escalator_event_data_name
+ & get_alerts_response_alert_event_data_name
}
# The name of the event data.
-get_escalators_response_escalator_event_data_name
+get_alerts_response_alert_event_data_name
= element name
{
text
}
-# The method by which escalation must occur.
-get_escalators_response_escalator_method
+# The method by which he alert must occur.
+get_alerts_response_alert_method
= element method
{
text
- & get_escalators_response_escalator_method_data*
+ & get_alerts_response_alert_method_data*
}
# Some data that defines the method.
-get_escalators_response_escalator_method_data
+get_alerts_response_alert_method_data
= element data
{
text
- & get_escalators_response_escalator_method_data_name
+ & get_alerts_response_alert_method_data_name
}
# The name of the method data.
-get_escalators_response_escalator_method_data_name
+get_alerts_response_alert_method_data_name
= element name
{
text
@@ -6079,7 +6079,7 @@
& get_tasks_response_task_progress
& get_tasks_response_task_config
& get_tasks_response_task_target
- & get_tasks_response_task_escalator
+ & get_tasks_response_task_alert
& get_tasks_response_task_observers
& get_tasks_response_task_schedule
& get_tasks_response_task_slave
@@ -6182,24 +6182,24 @@
boolean
}
-# An escalator that applies to the task.
-get_tasks_response_task_escalator
- = element escalator
+# An alert that applies to the task.
+get_tasks_response_task_alert
+ = element alert
{
attribute id { uuid_or_empty }
- & get_tasks_response_task_escalator_name
- & get_tasks_response_task_escalator_trash
+ & get_tasks_response_task_alert_name
+ & get_tasks_response_task_alert_trash
}
-# The name of the escalator.
-get_tasks_response_task_escalator_name
+# The name of the alert.
+get_tasks_response_task_alert_name
= element name
{
name
}
-# Whether the escalator is in the trashcan.
-get_tasks_response_task_escalator_trash
+# Whether the alert is in the trashcan.
+get_tasks_response_task_alert_trash
= element trash
{
boolean
@@ -6838,10 +6838,10 @@
& attribute status_text { text }
}
-## Response to test_escalator
+## Response to test_alert
-test_escalator_response
- = element test_escalator_response
+test_alert_response
+ = element test_alert_response
{
attribute status { status }
& attribute status_text { text }
Modified: trunk/openvas-manager/src/manage.c
===================================================================
--- trunk/openvas-manager/src/manage.c 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/manage.c 2012-03-28 10:52:59 UTC (rev 13163)
@@ -243,25 +243,25 @@
report_t current_report = (report_t) 0;
-/* Escalators. */
+/* Alerts. */
/**
- * @brief Get the name of an escalator condition.
+ * @brief Get the name of an alert condition.
*
* @param[in] condition Condition.
*
* @return The name of the condition (for example, "Always").
*/
const char*
-escalator_condition_name (escalator_condition_t condition)
+alert_condition_name (alert_condition_t condition)
{
switch (condition)
{
- case ESCALATOR_CONDITION_ALWAYS:
+ case ALERT_CONDITION_ALWAYS:
return "Always";
- case ESCALATOR_CONDITION_THREAT_LEVEL_AT_LEAST:
+ case ALERT_CONDITION_THREAT_LEVEL_AT_LEAST:
return "Threat level at least";
- case ESCALATOR_CONDITION_THREAT_LEVEL_CHANGED:
+ case ALERT_CONDITION_THREAT_LEVEL_CHANGED:
return "Threat level changed";
default:
return "Internal Error";
@@ -269,7 +269,7 @@
}
/**
- * @brief Get the name of an escalator event.
+ * @brief Get the name of an alert event.
*
* @param[in] event Event.
*
@@ -286,34 +286,34 @@
}
/**
- * @brief Get a description of an escalator condition.
+ * @brief Get a description of an alert condition.
*
* @param[in] condition Condition.
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
*
* @return Freshly allocated description of condition.
*/
gchar*
-escalator_condition_description (escalator_condition_t condition,
- escalator_t escalator)
+alert_condition_description (alert_condition_t condition,
+ alert_t alert)
{
switch (condition)
{
- case ESCALATOR_CONDITION_ALWAYS:
+ case ALERT_CONDITION_ALWAYS:
return g_strdup ("Always");
- case ESCALATOR_CONDITION_THREAT_LEVEL_AT_LEAST:
+ case ALERT_CONDITION_THREAT_LEVEL_AT_LEAST:
{
- char *level = escalator_data (escalator, "condition", "level");
+ char *level = alert_data (alert, "condition", "level");
gchar *ret = g_strdup_printf ("Task threat level is at least '%s'",
level);
free (level);
return ret;
break;
}
- case ESCALATOR_CONDITION_THREAT_LEVEL_CHANGED:
+ case ALERT_CONDITION_THREAT_LEVEL_CHANGED:
{
char *direction;
- direction = escalator_data (escalator, "condition", "direction");
+ direction = alert_data (alert, "condition", "direction");
gchar *ret = g_strdup_printf ("Task threat level %s", direction);
free (direction);
return ret;
@@ -325,7 +325,7 @@
}
/**
- * @brief Get a description of an escalator event.
+ * @brief Get a description of an alert event.
*
* @param[in] event Event.
* @param[in] event_data Event data.
@@ -353,42 +353,42 @@
}
/**
- * @brief Get the name of an escalator method.
+ * @brief Get the name of an alert method.
*
* @param[in] method Method.
*
* @return The name of the method (for example, "Email" or "SNMP").
*/
const char*
-escalator_method_name (escalator_method_t method)
+alert_method_name (alert_method_t method)
{
switch (method)
{
- case ESCALATOR_METHOD_EMAIL: return "Email";
- case ESCALATOR_METHOD_HTTP_GET: return "HTTP Get";
- case ESCALATOR_METHOD_SOURCEFIRE: return "Sourcefire Connector";
- case ESCALATOR_METHOD_SYSLOG: return "Syslog";
- default: return "Internal Error";
+ case ALERT_METHOD_EMAIL: return "Email";
+ case ALERT_METHOD_HTTP_GET: return "HTTP Get";
+ case ALERT_METHOD_SOURCEFIRE: return "Sourcefire Connector";
+ case ALERT_METHOD_SYSLOG: return "Syslog";
+ default: return "Internal Error";
}
}
/**
- * @brief Get an escalator condition from a name.
+ * @brief Get an alert condition from a name.
*
* @param[in] name Condition name.
*
* @return The condition.
*/
-escalator_condition_t
-escalator_condition_from_name (const char* name)
+alert_condition_t
+alert_condition_from_name (const char* name)
{
if (strcasecmp (name, "Always") == 0)
- return ESCALATOR_CONDITION_ALWAYS;
+ return ALERT_CONDITION_ALWAYS;
if (strcasecmp (name, "Threat level at least") == 0)
- return ESCALATOR_CONDITION_THREAT_LEVEL_AT_LEAST;
+ return ALERT_CONDITION_THREAT_LEVEL_AT_LEAST;
if (strcasecmp (name, "Threat level changed") == 0)
- return ESCALATOR_CONDITION_THREAT_LEVEL_CHANGED;
- return ESCALATOR_CONDITION_ERROR;
+ return ALERT_CONDITION_THREAT_LEVEL_CHANGED;
+ return ALERT_CONDITION_ERROR;
}
/**
@@ -407,24 +407,24 @@
}
/**
- * @brief Get an escalator method from a name.
+ * @brief Get an alert method from a name.
*
* @param[in] name Method name.
*
* @return The method.
*/
-escalator_method_t
-escalator_method_from_name (const char* name)
+alert_method_t
+alert_method_from_name (const char* name)
{
if (strcasecmp (name, "Email") == 0)
- return ESCALATOR_METHOD_EMAIL;
+ return ALERT_METHOD_EMAIL;
if (strcasecmp (name, "HTTP Get") == 0)
- return ESCALATOR_METHOD_HTTP_GET;
+ return ALERT_METHOD_HTTP_GET;
if (strcasecmp (name, "Sourcefire Connector") == 0)
- return ESCALATOR_METHOD_SOURCEFIRE;
+ return ALERT_METHOD_SOURCEFIRE;
if (strcasecmp (name, "Syslog") == 0)
- return ESCALATOR_METHOD_SYSLOG;
- return ESCALATOR_METHOD_ERROR;
+ return ALERT_METHOD_SYSLOG;
+ return ALERT_METHOD_ERROR;
}
Modified: trunk/openvas-manager/src/manage.h
===================================================================
--- trunk/openvas-manager/src/manage.h 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/manage.h 2012-03-28 10:52:59 UTC (rev 13163)
@@ -163,7 +163,7 @@
typedef long long int agent_t;
typedef long long int config_t;
-typedef long long int escalator_t;
+typedef long long int alert_t;
typedef long long int slave_t;
typedef long long int target_t;
typedef long long int task_t;
@@ -192,7 +192,7 @@
} iterator_t;
-/* Events and Escalators. */
+/* Events and Alerts. */
/**
* @brief Types of task events.
@@ -204,78 +204,78 @@
} event_t;
/**
- * @brief Types of escalators.
+ * @brief Types of alerts.
*/
typedef enum
{
- ESCALATOR_METHOD_ERROR,
- ESCALATOR_METHOD_EMAIL,
- ESCALATOR_METHOD_HTTP_GET,
- ESCALATOR_METHOD_SOURCEFIRE,
- ESCALATOR_METHOD_SYSLOG
-} escalator_method_t;
+ ALERT_METHOD_ERROR,
+ ALERT_METHOD_EMAIL,
+ ALERT_METHOD_HTTP_GET,
+ ALERT_METHOD_SOURCEFIRE,
+ ALERT_METHOD_SYSLOG
+} alert_method_t;
/**
- * @brief Types of escalator conditions.
+ * @brief Types of alert conditions.
*/
typedef enum
{
- ESCALATOR_CONDITION_ERROR,
- ESCALATOR_CONDITION_ALWAYS,
- ESCALATOR_CONDITION_THREAT_LEVEL_AT_LEAST,
- ESCALATOR_CONDITION_THREAT_LEVEL_CHANGED
-} escalator_condition_t;
+ ALERT_CONDITION_ERROR,
+ ALERT_CONDITION_ALWAYS,
+ ALERT_CONDITION_THREAT_LEVEL_AT_LEAST,
+ ALERT_CONDITION_THREAT_LEVEL_CHANGED
+} alert_condition_t;
int
-create_escalator (const char*, const char*, event_t, GPtrArray*,
- escalator_condition_t, GPtrArray*, escalator_method_t,
- GPtrArray*, escalator_t*);
+create_alert (const char*, const char*, event_t, GPtrArray*,
+ alert_condition_t, GPtrArray*, alert_method_t,
+ GPtrArray*, alert_t*);
int
-delete_escalator (const char *, int);
+delete_alert (const char *, int);
int
-escalator_uuid (escalator_t, char **);
+alert_uuid (alert_t, char **);
gboolean
-find_escalator (const char*, escalator_t*);
+find_alert (const char*, alert_t*);
int
-escalate (escalator_t, task_t, event_t, const void*);
+manage_alert (alert_t, task_t, event_t, const void*);
void
-init_escalator_iterator (iterator_t*, escalator_t, task_t, event_t, int, int,
+init_alert_iterator (iterator_t*, alert_t, task_t, event_t, int, int,
const char*);
-escalator_t
-escalator_iterator_escalator (iterator_t*);
+alert_t
+alert_iterator_alert (iterator_t*);
const char*
-escalator_iterator_uuid (iterator_t*);
+alert_iterator_uuid (iterator_t*);
const char*
-escalator_iterator_name (iterator_t*);
+alert_iterator_name (iterator_t*);
int
-escalator_iterator_in_use (iterator_t*);
+alert_iterator_in_use (iterator_t*);
const char *
-escalator_iterator_comment (iterator_t*);
+alert_iterator_comment (iterator_t*);
int
-escalator_iterator_event (iterator_t*);
+alert_iterator_event (iterator_t*);
int
-escalator_iterator_condition (iterator_t*);
+alert_iterator_condition (iterator_t*);
int
-escalator_iterator_method (iterator_t*);
+alert_iterator_method (iterator_t*);
const char*
-escalator_condition_name (escalator_condition_t);
+alert_condition_name (alert_condition_t);
gchar*
-escalator_condition_description (escalator_condition_t, escalator_t);
+alert_condition_description (alert_condition_t, alert_t);
const char*
event_name (event_t);
@@ -284,34 +284,34 @@
event_description (event_t, const void *, const char *);
const char*
-escalator_method_name (escalator_method_t);
+alert_method_name (alert_method_t);
-escalator_condition_t
-escalator_condition_from_name (const char*);
+alert_condition_t
+alert_condition_from_name (const char*);
event_t
event_from_name (const char*);
-escalator_method_t
-escalator_method_from_name (const char*);
+alert_method_t
+alert_method_from_name (const char*);
void
-init_escalator_data_iterator (iterator_t *, escalator_t, int, const char *);
+init_alert_data_iterator (iterator_t *, alert_t, int, const char *);
const char*
-escalator_data_iterator_name (iterator_t*);
+alert_data_iterator_name (iterator_t*);
const char*
-escalator_data_iterator_data (iterator_t*);
+alert_data_iterator_data (iterator_t*);
void
-init_escalator_task_iterator (iterator_t*, escalator_t, int);
+init_alert_task_iterator (iterator_t*, alert_t, int);
const char*
-escalator_task_iterator_name (iterator_t*);
+alert_task_iterator_name (iterator_t*);
const char*
-escalator_task_iterator_uuid (iterator_t*);
+alert_task_iterator_uuid (iterator_t*);
/* Task global variables and preprocessor variables. */
@@ -434,22 +434,22 @@
set_task_end_time (task_t task, char* time);
char*
-task_escalator_name (task_t);
+task_alert_name (task_t);
char*
-task_escalator_uuid (task_t);
+task_alert_uuid (task_t);
-escalator_t
-task_escalator (task_t);
+alert_t
+task_alert (task_t);
int
-task_escalator_in_trash (task_t);
+task_alert_in_trash (task_t);
void
-add_task_escalator (task_t, escalator_t);
+add_task_alert (task_t, alert_t);
void
-set_task_escalator (task_t, escalator_t);
+set_task_alert (task_t, alert_t);
int
set_task_schedule (task_t, schedule_t);
Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/manage_sql.c 2012-03-28 10:52:59 UTC (rev 13163)
@@ -955,14 +955,14 @@
sql ("CREATE TABLE IF NOT EXISTS config_preferences_trash (id INTEGER PRIMARY KEY, config INTEGER, type, name, value);");
sql ("CREATE TABLE IF NOT EXISTS configs (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, nvt_selector, comment, family_count INTEGER, nvt_count INTEGER, families_growing INTEGER, nvts_growing INTEGER);");
sql ("CREATE TABLE IF NOT EXISTS configs_trash (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, nvt_selector, comment, family_count INTEGER, nvt_count INTEGER, families_growing INTEGER, nvts_growing INTEGER);");
- sql ("CREATE TABLE IF NOT EXISTS escalator_condition_data (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
- sql ("CREATE TABLE IF NOT EXISTS escalator_condition_data_trash (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
- sql ("CREATE TABLE IF NOT EXISTS escalator_event_data (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
- sql ("CREATE TABLE IF NOT EXISTS escalator_event_data_trash (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
- sql ("CREATE TABLE IF NOT EXISTS escalator_method_data (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
- sql ("CREATE TABLE IF NOT EXISTS escalator_method_data_trash (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
- sql ("CREATE TABLE IF NOT EXISTS escalators (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment, event INTEGER, condition INTEGER, method INTEGER);");
- sql ("CREATE TABLE IF NOT EXISTS escalators_trash (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment, event INTEGER, condition INTEGER, method INTEGER);");
+ sql ("CREATE TABLE IF NOT EXISTS alert_condition_data (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql ("CREATE TABLE IF NOT EXISTS alert_condition_data_trash (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql ("CREATE TABLE IF NOT EXISTS alert_event_data (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql ("CREATE TABLE IF NOT EXISTS alert_event_data_trash (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql ("CREATE TABLE IF NOT EXISTS alert_method_data (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql ("CREATE TABLE IF NOT EXISTS alert_method_data_trash (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql ("CREATE TABLE IF NOT EXISTS alerts (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment, event INTEGER, condition INTEGER, method INTEGER);");
+ sql ("CREATE TABLE IF NOT EXISTS alerts_trash (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment, event INTEGER, condition INTEGER, method INTEGER);");
sql ("CREATE TABLE IF NOT EXISTS lsc_credentials (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, login, password, comment, public_key TEXT, private_key TEXT, rpm TEXT, deb TEXT, exe TEXT);");
sql ("CREATE TABLE IF NOT EXISTS lsc_credentials_trash (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, login, password, comment, public_key TEXT, private_key TEXT, rpm TEXT, deb TEXT, exe TEXT);");
sql ("CREATE TABLE IF NOT EXISTS meta (id INTEGER PRIMARY KEY, name UNIQUE, value);");
@@ -1011,7 +1011,7 @@
sql ("CREATE TABLE IF NOT EXISTS targets (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, hosts, comment, lsc_credential INTEGER, ssh_port, smb_lsc_credential INTEGER, port_range);");
sql ("CREATE TABLE IF NOT EXISTS targets_trash (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, hosts, comment, lsc_credential INTEGER, ssh_port, smb_lsc_credential INTEGER, port_range, ssh_location INTEGER, smb_location INTEGER, port_list_location INTEGER);");
sql ("CREATE TABLE IF NOT EXISTS task_files (id INTEGER PRIMARY KEY, task INTEGER, name, content);");
- sql ("CREATE TABLE IF NOT EXISTS task_escalators (id INTEGER PRIMARY KEY, task INTEGER, escalator INTEGER, escalator_location INTEGER);");
+ sql ("CREATE TABLE IF NOT EXISTS task_alerts (id INTEGER PRIMARY KEY, task INTEGER, alert INTEGER, alert_location INTEGER);");
sql ("CREATE TABLE IF NOT EXISTS task_preferences (id INTEGER PRIMARY KEY, task INTEGER, name, value);");
sql ("CREATE TABLE IF NOT EXISTS tasks (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, hidden INTEGER, time, comment, description, run_status INTEGER, start_time, end_time, config INTEGER, target INTEGER, schedule INTEGER, schedule_next_time, slave INTEGER, config_location INTEGER, target_location INTEGER, schedule_location INTEGER, slave_location INTEGER, upload_result_count INTEGER);");
sql ("CREATE TABLE IF NOT EXISTS task_users (id INTEGER PRIMARY KEY, task INTEGER, user INTEGER, actions INTEGER);");
@@ -5421,6 +5421,97 @@
}
/**
+ * @brief Migrate the database from version 56 to version 57.
+ *
+ * @return 0 success, -1 error.
+ */
+static int
+migrate_56_to_57 ()
+{
+ sql ("BEGIN EXCLUSIVE;");
+
+ /* Ensure that the database is currently version 56. */
+
+ if (manage_db_version () != 56)
+ {
+ sql ("ROLLBACK;");
+ return -1;
+ }
+
+ /* Update the database. */
+
+ /** @todo ROLLBACK on failure. */
+
+ /* Escalators were renamed to alerts. */
+
+ sql ("CREATE TABLE alert_condition_data"
+ " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql_rename_column ("escalator_condition_data", "alert_condition_data",
+ "escalator", "alert");
+ sql ("DROP TABLE escalator_condition_data;");
+
+ sql ("CREATE TABLE alert_event_data"
+ " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql_rename_column ("escalator_event_data", "alert_event_data",
+ "escalator", "alert");
+ sql ("DROP TABLE escalator_event_data;");
+
+ sql ("CREATE TABLE alert_event_data_trash"
+ " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql_rename_column ("escalator_event_data_trash", "alert_event_data_trash",
+ "escalator", "alert");
+ sql ("DROP TABLE escalator_event_data_trash;");
+
+ sql ("CREATE TABLE alert_method_data"
+ " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql_rename_column ("escalator_method_data", "alert_method_data",
+ "escalator", "alert");
+ sql ("DROP TABLE escalator_method_data;");
+
+ sql ("CREATE TABLE alert_method_data_trash"
+ " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
+ sql_rename_column ("escalator_method_data_trash", "alert_method_data_trash",
+ "escalator", "alert");
+ sql ("DROP TABLE escalator_method_data_trash;");
+
+ sql ("CREATE TABLE alerts"
+ " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
+ " event INTEGER, condition INTEGER, method INTEGER);");
+ sql_rename_column ("escalators", "alerts",
+ "escalator", "alert");
+ sql ("DROP TABLE escalators;");
+
+ sql ("CREATE TABLE alerts_trash"
+ " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
+ " event INTEGER, condition INTEGER, method INTEGER);");
+ sql_rename_column ("escalators_trash", "alerts_trash",
+ "escalator", "alert");
+ sql ("DROP TABLE escalators_trash;");
+
+ sql ("CREATE TABLE task_alerts_56"
+ " (id INTEGER PRIMARY KEY, task INTEGER, alert INTEGER,"
+ " escalator_location INTEGER);");
+ sql_rename_column ("task_escalators", "task_alerts_56",
+ "escalator", "alert");
+ sql ("DROP TABLE task_escalators;");
+
+ sql ("CREATE TABLE task_alerts"
+ " (id INTEGER PRIMARY KEY, task INTEGER, alert INTEGER,"
+ " alert_location INTEGER);");
+ sql_rename_column ("task_alerts_56", "task_alerts",
+ "escalator_location", "alert_location");
+ sql ("DROP TABLE task_alerts_56;");
+
+ /* Set the database version to 57. */
+
+ set_db_version (57);
+
+ sql ("COMMIT;");
+
+ return 0;
+}
+
+/**
* @brief Array of database version migrators.
*/
static migrator_t database_migrators[]
@@ -5481,6 +5572,7 @@
{54, migrate_53_to_54},
{55, migrate_54_to_55},
{56, migrate_55_to_56},
+ {57, migrate_56_to_57},
/* End marker. */
{-1, NULL}};
@@ -5882,35 +5974,35 @@
DEF_ACCESS (task_user_iterator_name, 4);
-/* Events and Escalators. */
+/* Events and Alerts. */
/**
- * @brief Find an escalator given a UUID.
+ * @brief Find an alert given a UUID.
*
- * @param[in] uuid UUID of escalator.
- * @param[out] escalator Return. 0 if succesfully failed to find escalator.
+ * @param[in] uuid UUID of alert.
+ * @param[out] alert Return. 0 if succesfully failed to find alert.
*
- * @return FALSE on success (including if failed to find escalator), TRUE on
+ * @return FALSE on success (including if failed to find alert), TRUE on
* error.
*/
gboolean
-find_escalator (const char* uuid, escalator_t* escalator)
+find_alert (const char* uuid, alert_t* alert)
{
gchar *quoted_uuid = sql_quote (uuid);
- if (user_owns_uuid ("escalator", quoted_uuid) == 0)
+ if (user_owns_uuid ("alert", quoted_uuid) == 0)
{
g_free (quoted_uuid);
- *escalator = 0;
+ *alert = 0;
return FALSE;
}
- switch (sql_int64 (escalator, 0, 0,
- "SELECT ROWID FROM escalators WHERE uuid = '%s';",
+ switch (sql_int64 (alert, 0, 0,
+ "SELECT ROWID FROM alerts WHERE uuid = '%s';",
quoted_uuid))
{
case 0:
break;
case 1: /* Too few rows in result of query. */
- *escalator = 0;
+ *alert = 0;
break;
default: /* Programming error. */
assert (0);
@@ -5984,26 +6076,26 @@
}
/**
- * @brief Create an escalator.
+ * @brief Create an alert.
*
- * @param[in] name Name of escalator.
- * @param[in] comment Comment on escalator.
+ * @param[in] name Name of alert.
+ * @param[in] comment Comment on alert.
* @param[in] event Type of event.
* @param[in] event_data Type-specific event data.
* @param[in] condition Event condition.
* @param[in] condition_data Condition-specific data.
* @param[in] method Escalation method.
* @param[in] method_data Data for escalation method.
- * @param[out] escalator Created escalator on success.
+ * @param[out] alert Created alert on success.
*
* @return 0 success, 1 escalation exists already, 2 validation of email failed.
*/
int
-create_escalator (const char* name, const char* comment,
+create_alert (const char* name, const char* comment,
event_t event, GPtrArray* event_data,
- escalator_condition_t condition, GPtrArray* condition_data,
- escalator_method_t method, GPtrArray* method_data,
- escalator_t *escalator)
+ alert_condition_t condition, GPtrArray* condition_data,
+ alert_method_t method, GPtrArray* method_data,
+ alert_t *alert)
{
int index;
gchar *item, *quoted_comment;
@@ -6014,7 +6106,7 @@
sql ("BEGIN IMMEDIATE;");
if (sql_int (0, 0,
- "SELECT COUNT(*) FROM escalators WHERE name = '%s'"
+ "SELECT COUNT(*) FROM alerts WHERE name = '%s'"
" AND ((owner IS NULL) OR (owner ="
" (SELECT users.ROWID FROM users WHERE users.uuid = '%s')));",
quoted_name,
@@ -6027,7 +6119,7 @@
quoted_comment = comment ? sql_quote (comment) : NULL;
- sql ("INSERT INTO escalators (uuid, owner, name, comment, event, condition,"
+ sql ("INSERT INTO alerts (uuid, owner, name, comment, event, condition,"
" method)"
" VALUES (make_uuid (),"
" (SELECT ROWID FROM users WHERE users.uuid = '%s'),"
@@ -6042,16 +6134,16 @@
g_free (quoted_comment);
g_free (quoted_name);
- *escalator = sqlite3_last_insert_rowid (task_db);
+ *alert = sqlite3_last_insert_rowid (task_db);
index = 0;
while ((item = (gchar*) g_ptr_array_index (condition_data, index++)))
{
gchar *name = sql_quote (item);
gchar *data = sql_quote (item + strlen (item) + 1);
- sql ("INSERT INTO escalator_condition_data (escalator, name, data)"
+ sql ("INSERT INTO alert_condition_data (alert, name, data)"
" VALUES (%llu, '%s', '%s');",
- *escalator,
+ *alert,
name,
data);
g_free (name);
@@ -6063,9 +6155,9 @@
{
gchar *name = sql_quote (item);
gchar *data = sql_quote (item + strlen (item) + 1);
- sql ("INSERT INTO escalator_event_data (escalator, name, data)"
+ sql ("INSERT INTO alert_event_data (alert, name, data)"
" VALUES (%llu, '%s', '%s');",
- *escalator,
+ *alert,
name,
data);
g_free (name);
@@ -6077,7 +6169,7 @@
{
gchar *name = sql_quote (item);
gchar *data = sql_quote (item + strlen (item) + 1);
- if (method == ESCALATOR_METHOD_EMAIL
+ if (method == ALERT_METHOD_EMAIL
&& (strcmp (name, "to_address") == 0
|| strcmp (name, "from_address") == 0)
&& validate_email (data))
@@ -6088,9 +6180,9 @@
return 2;
}
- sql ("INSERT INTO escalator_method_data (escalator, name, data)"
+ sql ("INSERT INTO alert_method_data (alert, name, data)"
" VALUES (%llu, '%s', '%s');",
- *escalator,
+ *alert,
name,
data);
g_free (name);
@@ -6103,35 +6195,35 @@
}
/**
- * @brief Delete an escalator.
+ * @brief Delete an alert.
*
- * @param[in] escalator_id UUID of escalator.
+ * @param[in] alert_id UUID of alert.
* @param[in] ultimate Whether to remove entirely, or to trashcan.
*
- * @return 0 success, 1 fail because a task refers to the escalator, 2 failed
+ * @return 0 success, 1 fail because a task refers to the alert, 2 failed
* to find target, -1 error.
*/
int
-delete_escalator (const char *escalator_id, int ultimate)
+delete_alert (const char *alert_id, int ultimate)
{
- escalator_t escalator = 0;
+ alert_t alert = 0;
sql ("BEGIN IMMEDIATE;");
- if (find_escalator (escalator_id, &escalator))
+ if (find_alert (alert_id, &alert))
{
sql ("ROLLBACK;");
return -1;
}
- if (escalator == 0)
+ if (alert == 0)
{
- if (find_trash ("escalator", escalator_id, &escalator))
+ if (find_trash ("alert", alert_id, &alert))
{
sql ("ROLLBACK;");
return -1;
}
- if (escalator == 0)
+ if (alert == 0)
{
sql ("ROLLBACK;");
return 2;
@@ -6145,33 +6237,33 @@
/* Check if it's in use by a task in the trashcan. */
if (sql_int (0, 0,
- "SELECT count(*) FROM task_escalators"
- " WHERE escalator = %llu"
- " AND escalator_location = " G_STRINGIFY (LOCATION_TRASH) ";",
- escalator))
+ "SELECT count(*) FROM task_alerts"
+ " WHERE alert = %llu"
+ " AND alert_location = " G_STRINGIFY (LOCATION_TRASH) ";",
+ alert))
{
sql ("ROLLBACK;");
return 1;
}
- sql ("DELETE FROM escalator_condition_data_trash WHERE escalator = %llu;",
- escalator);
- sql ("DELETE FROM escalator_event_data_trash WHERE escalator = %llu;",
- escalator);
- sql ("DELETE FROM escalator_method_data_trash WHERE escalator = %llu;",
- escalator);
- sql ("DELETE FROM escalators_trash WHERE ROWID = %llu;", escalator);
+ sql ("DELETE FROM alert_condition_data_trash WHERE alert = %llu;",
+ alert);
+ sql ("DELETE FROM alert_event_data_trash WHERE alert = %llu;",
+ alert);
+ sql ("DELETE FROM alert_method_data_trash WHERE alert = %llu;",
+ alert);
+ sql ("DELETE FROM alerts_trash WHERE ROWID = %llu;", alert);
sql ("COMMIT;");
return 0;
}
if (sql_int (0, 0,
- "SELECT count(*) FROM task_escalators"
- " WHERE escalator = %llu"
- " AND escalator_location = " G_STRINGIFY (LOCATION_TABLE) ";",
+ "SELECT count(*) FROM task_alerts"
+ " WHERE alert = %llu"
+ " AND alert_location = " G_STRINGIFY (LOCATION_TABLE) ";",
" AND (SELECT hidden < 2 FROM tasks"
- " WHERE ROWID = task_escalators.task);",
- escalator))
+ " WHERE ROWID = task_alerts.task);",
+ alert))
{
sql ("ROLLBACK;");
return 1;
@@ -6179,131 +6271,131 @@
if (ultimate == 0)
{
- escalator_t trash_escalator;
+ alert_t trash_alert;
- sql ("INSERT INTO escalators_trash"
+ sql ("INSERT INTO alerts_trash"
" (uuid, owner, name, comment, event, condition, method)"
" SELECT uuid, owner, name, comment, event, condition, method"
- " FROM escalators WHERE ROWID = %llu;",
- escalator);
+ " FROM alerts WHERE ROWID = %llu;",
+ alert);
- trash_escalator = sqlite3_last_insert_rowid (task_db);
+ trash_alert = sqlite3_last_insert_rowid (task_db);
- sql ("INSERT INTO escalator_condition_data_trash"
- " (escalator, name, data)"
+ sql ("INSERT INTO alert_condition_data_trash"
+ " (alert, name, data)"
" SELECT %llu, name, data"
- " FROM escalator_condition_data WHERE ROWID = %llu;",
- trash_escalator);
+ " FROM alert_condition_data WHERE ROWID = %llu;",
+ trash_alert);
- sql ("INSERT INTO escalator_event_data_trash"
- " (escalator, name, data)"
+ sql ("INSERT INTO alert_event_data_trash"
+ " (alert, name, data)"
" SELECT %llu, name, data"
- " FROM escalator_event_data WHERE ROWID = %llu;",
- trash_escalator);
+ " FROM alert_event_data WHERE ROWID = %llu;",
+ trash_alert);
- sql ("INSERT INTO escalator_method_data_trash"
- " (escalator, name, data)"
+ sql ("INSERT INTO alert_method_data_trash"
+ " (alert, name, data)"
" SELECT %llu, name, data"
- " FROM escalator_method_data WHERE ROWID = %llu;",
- trash_escalator);
+ " FROM alert_method_data WHERE ROWID = %llu;",
+ trash_alert);
- /* Update the location of the escalator in any trashcan tasks. */
- sql ("UPDATE task_escalators"
- " SET escalator = %llu,"
- " escalator_location = " G_STRINGIFY (LOCATION_TRASH)
- " WHERE escalator = %llu"
- " AND escalator_location = " G_STRINGIFY (LOCATION_TABLE) ";",
- trash_escalator,
- escalator);
+ /* Update the location of the alert in any trashcan tasks. */
+ sql ("UPDATE task_alerts"
+ " SET alert = %llu,"
+ " alert_location = " G_STRINGIFY (LOCATION_TRASH)
+ " WHERE alert = %llu"
+ " AND alert_location = " G_STRINGIFY (LOCATION_TABLE) ";",
+ trash_alert,
+ alert);
}
- sql ("DELETE FROM escalator_condition_data WHERE escalator = %llu;",
- escalator);
- sql ("DELETE FROM escalator_event_data WHERE escalator = %llu;", escalator);
- sql ("DELETE FROM escalator_method_data WHERE escalator = %llu;", escalator);
- sql ("DELETE FROM escalators WHERE ROWID = %llu;", escalator);
+ sql ("DELETE FROM alert_condition_data WHERE alert = %llu;",
+ alert);
+ sql ("DELETE FROM alert_event_data WHERE alert = %llu;", alert);
+ sql ("DELETE FROM alert_method_data WHERE alert = %llu;", alert);
+ sql ("DELETE FROM alerts WHERE ROWID = %llu;", alert);
sql ("COMMIT;");
return 0;
}
/**
- * @brief Return the UUID of a escalator.
+ * @brief Return the UUID of a alert.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[out] id Pointer to a newly allocated string.
*
* @return 0.
*/
int
-escalator_uuid (escalator_t escalator, char ** id)
+alert_uuid (alert_t alert, char ** id)
{
*id = sql_string (0, 0,
- "SELECT uuid FROM escalators WHERE ROWID = %llu;",
- escalator);
+ "SELECT uuid FROM alerts WHERE ROWID = %llu;",
+ alert);
return 0;
}
/**
- * @brief Return the condition associated with an escalator.
+ * @brief Return the condition associated with an alert.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
*
* @return Condition.
*/
-static escalator_condition_t
-escalator_condition (escalator_t escalator)
+static alert_condition_t
+alert_condition (alert_t alert)
{
return sql_int (0, 0,
- "SELECT condition FROM escalators WHERE ROWID = %llu;",
- escalator);
+ "SELECT condition FROM alerts WHERE ROWID = %llu;",
+ alert);
}
/**
- * @brief Return the method associated with an escalator.
+ * @brief Return the method associated with an alert.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
*
* @return Method.
*/
-static escalator_method_t
-escalator_method (escalator_t escalator)
+static alert_method_t
+alert_method (alert_t alert)
{
return sql_int (0, 0,
- "SELECT method FROM escalators WHERE ROWID = %llu;",
- escalator);
+ "SELECT method FROM alerts WHERE ROWID = %llu;",
+ alert);
}
/**
- * @brief Initialise an escalator iterator.
+ * @brief Initialise an alert iterator.
*
* @param[in] iterator Iterator.
- * @param[in] escalator Single escalator to iterator over, 0 for all.
- * @param[in] task Iterate over escalators for this task. 0 for all.
- * @param[in] event Iterate over escalators handling this event. 0 for
+ * @param[in] alert Single alert to iterator over, 0 for all.
+ * @param[in] task Iterate over alerts for this task. 0 for all.
+ * @param[in] event Iterate over alerts handling this event. 0 for
* all.
- * @param[in] trash Whether to iterate over trashcan escalators.
+ * @param[in] trash Whether to iterate over trashcan alerts.
* @param[in] ascending Whether to sort ascending or descending.
* @param[in] sort_field Field to sort on, or NULL for "ROWID".
*/
void
-init_escalator_iterator (iterator_t *iterator, escalator_t escalator,
+init_alert_iterator (iterator_t *iterator, alert_t alert,
task_t task, event_t event, int trash, int ascending,
const char *sort_field)
{
- assert (escalator ? task == 0 : (task ? escalator == 0 : 1));
- assert (escalator ? event == 0 : (event ? escalator == 0 : 1));
+ assert (alert ? task == 0 : (task ? alert == 0 : 1));
+ assert (alert ? event == 0 : (event ? alert == 0 : 1));
assert (event ? task : 1);
assert (current_credentials.uuid);
assert (task ? trash == 0 : 1);
- if (escalator)
+ if (alert)
init_iterator (iterator,
- "SELECT escalators%s.ROWID, uuid, name, comment,"
+ "SELECT alerts%s.ROWID, uuid, name, comment,"
" 0, event, condition, method,"
- " (SELECT count(*) > 0 FROM task_escalators"
- " WHERE task_escalators.escalator = escalators%s.ROWID"
+ " (SELECT count(*) > 0 FROM task_alerts"
+ " WHERE task_alerts.alert = alerts%s.ROWID"
" %s)"
- " FROM escalators%s"
+ " FROM alerts%s"
" WHERE ROWID = %llu"
" AND ((owner IS NULL) OR (owner ="
" (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
@@ -6311,83 +6403,83 @@
trash ? "_trash" : "",
trash ? "_trash" : "",
(trash
- ? " AND escalator_location"
+ ? " AND alert_location"
" = " G_STRINGIFY (LOCATION_TRASH)
- : " AND escalator_location"
+ : " AND alert_location"
" = " G_STRINGIFY (LOCATION_TABLE)
" AND (SELECT hidden FROM tasks"
- " WHERE ROWID = task_escalators.task)"
+ " WHERE ROWID = task_alerts.task)"
" < 2"), /* Task in table. */
trash ? "_trash" : "",
- escalator,
+ alert,
current_credentials.uuid,
- sort_field ? sort_field : "escalators.ROWID",
+ sort_field ? sort_field : "alerts.ROWID",
ascending ? "ASC" : "DESC");
else if (task)
init_iterator (iterator,
- "SELECT escalators.ROWID, uuid, name, comment,"
- " task_escalators.task, event, condition, method, 1"
- " FROM escalators, task_escalators"
- " WHERE task_escalators.escalator = escalators.ROWID"
- " AND task_escalators.task = %llu AND event = %i"
+ "SELECT alerts.ROWID, uuid, name, comment,"
+ " task_alerts.task, event, condition, method, 1"
+ " FROM alerts, task_alerts"
+ " WHERE task_alerts.alert = alerts.ROWID"
+ " AND task_alerts.task = %llu AND event = %i"
" AND ((owner IS NULL) OR (owner ="
" (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
" ORDER BY %s %s;",
task,
event,
current_credentials.uuid,
- sort_field ? sort_field : "escalators.ROWID",
+ sort_field ? sort_field : "alerts.ROWID",
ascending ? "ASC" : "DESC");
else
init_iterator (iterator,
- "SELECT escalators%s.ROWID, uuid, name, comment,"
+ "SELECT alerts%s.ROWID, uuid, name, comment,"
" 0, event, condition, method,"
- " (SELECT count(*) > 0 FROM task_escalators"
- " WHERE task_escalators.escalator = escalators%s.ROWID"
+ " (SELECT count(*) > 0 FROM task_alerts"
+ " WHERE task_alerts.alert = alerts%s.ROWID"
" %s)"
- " FROM escalators%s"
+ " FROM alerts%s"
" WHERE ((owner IS NULL) OR (owner ="
" (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
" ORDER BY %s %s;",
trash ? "_trash" : "",
trash ? "_trash" : "",
(trash
- ? " AND escalator_location"
+ ? " AND alert_location"
" = " G_STRINGIFY (LOCATION_TRASH)
- : " AND escalator_location"
+ : " AND alert_location"
" = " G_STRINGIFY (LOCATION_TABLE)
" AND (SELECT hidden FROM tasks"
- " WHERE ROWID = task_escalators.task)"
+ " WHERE ROWID = task_alerts.task)"
" < 2"), /* Task in table. */
trash ? "_trash" : "",
current_credentials.uuid,
- sort_field ? sort_field : "escalators.ROWID",
+ sort_field ? sort_field : "alerts.ROWID",
ascending ? "ASC" : "DESC");
}
/**
- * @brief Return the escalator from an escalator iterator.
+ * @brief Return the alert from an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return Escalator of the iterator or NULL if iteration is complete.
+ * @return Alert of the iterator or NULL if iteration is complete.
*/
-escalator_t
-escalator_iterator_escalator (iterator_t* iterator)
+alert_t
+alert_iterator_alert (iterator_t* iterator)
{
if (iterator->done) return 0;
return sqlite3_column_int64 (iterator->stmt, 0);
}
/**
- * @brief Return the UUID from an escalator iterator.
+ * @brief Return the UUID from an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return UUID of the escalator or NULL if iteration is complete.
+ * @return UUID of the alert or NULL if iteration is complete.
*/
const char*
-escalator_iterator_uuid (iterator_t* iterator)
+alert_iterator_uuid (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -6396,14 +6488,14 @@
}
/**
- * @brief Return the name from an escalator iterator.
+ * @brief Return the name from an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return Name the escalator or NULL if iteration is complete.
+ * @return Name the alert or NULL if iteration is complete.
*/
const char*
-escalator_iterator_name (iterator_t* iterator)
+alert_iterator_name (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -6412,14 +6504,14 @@
}
/**
- * @brief Return the comment on an escalator iterator.
+ * @brief Return the comment on an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return Comment on the escalator or NULL if iteration is complete.
+ * @return Comment on the alert or NULL if iteration is complete.
*/
const char *
-escalator_iterator_comment (iterator_t* iterator)
+alert_iterator_comment (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -6428,14 +6520,14 @@
}
/**
- * @brief Return the event from an escalator iterator.
+ * @brief Return the event from an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return Event of the escalator or NULL if iteration is complete.
+ * @return Event of the alert or NULL if iteration is complete.
*/
int
-escalator_iterator_event (iterator_t* iterator)
+alert_iterator_event (iterator_t* iterator)
{
int ret;
if (iterator->done) return -1;
@@ -6444,14 +6536,14 @@
}
/**
- * @brief Return the condition from an escalator iterator.
+ * @brief Return the condition from an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return Condition of the escalator or NULL if iteration is complete.
+ * @return Condition of the alert or NULL if iteration is complete.
*/
int
-escalator_iterator_condition (iterator_t* iterator)
+alert_iterator_condition (iterator_t* iterator)
{
int ret;
if (iterator->done) return -1;
@@ -6460,14 +6552,14 @@
}
/**
- * @brief Return the method from an escalator iterator.
+ * @brief Return the method from an alert iterator.
*
* @param[in] iterator Iterator.
*
- * @return Method of the escalator or NULL if iteration is complete.
+ * @return Method of the alert or NULL if iteration is complete.
*/
int
-escalator_iterator_method (iterator_t* iterator)
+alert_iterator_method (iterator_t* iterator)
{
int ret;
if (iterator->done) return -1;
@@ -6476,14 +6568,14 @@
}
/**
- * @brief Return whether an escalator is in use.
+ * @brief Return whether an alert is in use.
*
* @param[in] iterator Iterator.
*
- * @return Use state of the escalator or NULL if iteration is complete.
+ * @return Use state of the alert or NULL if iteration is complete.
*/
int
-escalator_iterator_in_use (iterator_t* iterator)
+alert_iterator_in_use (iterator_t* iterator)
{
int ret;
if (iterator->done) return -1;
@@ -6492,36 +6584,36 @@
}
/**
- * @brief Initialise an escalator data iterator.
+ * @brief Initialise an alert data iterator.
*
* @param[in] iterator Iterator.
- * @param[in] escalator Escalator.
- * @param[in] trash Whether to iterate over trashcan escalator data.
+ * @param[in] alert Alert.
+ * @param[in] trash Whether to iterate over trashcan alert data.
* @param[in] table Type of data: "condition", "event" or "method",
* corresponds to substring of the table to select
* from.
*/
void
-init_escalator_data_iterator (iterator_t *iterator, escalator_t escalator,
+init_alert_data_iterator (iterator_t *iterator, alert_t alert,
int trash, const char *table)
{
init_iterator (iterator,
- "SELECT name, data FROM escalator_%s_data%s"
- " WHERE escalator = %llu;",
+ "SELECT name, data FROM alert_%s_data%s"
+ " WHERE alert = %llu;",
table,
trash ? "_trash" : "",
- escalator);
+ alert);
}
/**
- * @brief Return the name from an escalator data iterator.
+ * @brief Return the name from an alert data iterator.
*
* @param[in] iterator Iterator.
*
- * @return Name of the escalator data or NULL if iteration is complete.
+ * @return Name of the alert data or NULL if iteration is complete.
*/
const char*
-escalator_data_iterator_name (iterator_t* iterator)
+alert_data_iterator_name (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -6530,15 +6622,15 @@
}
/**
- * @brief Return the data from an escalator data iterator.
+ * @brief Return the data from an alert data iterator.
*
* @param[in] iterator Iterator.
*
*
- * @return Data of the escalator data or NULL if iteration is complete.
+ * @return Data of the alert data or NULL if iteration is complete.
*/
const char*
-escalator_data_iterator_data (iterator_t* iterator)
+alert_data_iterator_data (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -6547,16 +6639,16 @@
}
/**
- * @brief Return data associated with an escalator.
+ * @brief Return data associated with an alert.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[in] type Type of data: "condition", "event" or "method".
* @param[in] name Name of the data.
*
* @return Freshly allocated data if it exists, else NULL.
*/
char *
-escalator_data (escalator_t escalator, const char *type, const char *name)
+alert_data (alert_t alert, const char *type, const char *name)
{
gchar *quoted_name;
char *data;
@@ -6567,10 +6659,10 @@
quoted_name = sql_quote (name);
data = sql_string (0, 0,
- "SELECT data FROM escalator_%s_data"
- " WHERE escalator = %llu AND name = '%s';",
+ "SELECT data FROM alert_%s_data"
+ " WHERE alert = %llu AND name = '%s';",
type,
- escalator,
+ alert,
quoted_name);
g_free (quoted_name);
return data;
@@ -6914,7 +7006,7 @@
script_dir = g_build_filename (OPENVAS_DATA_DIR,
"openvasmd",
- "global_escalator_methods",
+ "global_alert_methods",
"cd1f5a34-6bdc-11e0-9827-002264764cea",
NULL);
@@ -7022,7 +7114,7 @@
}
/**
- * @brief Format string for simple notice escalator email.
+ * @brief Format string for simple notice alert email.
*/
#define REPORT_NOTICE_FORMAT \
"Task '%s': %s\n" \
@@ -7050,7 +7142,7 @@
#define MAX_CONTENT_LENGTH 20000
/**
- * @brief Format string for attached report escalator email.
+ * @brief Format string for attached report alert email.
*/
#define REPORT_ATTACH_FORMAT \
"Task '%s': %s\n" \
@@ -7075,7 +7167,7 @@
#define MAX_ATTACH_LENGTH 1048576
/**
- * @brief Format string for simple notice escalator email.
+ * @brief Format string for simple notice alert email.
*/
#define SIMPLE_NOTICE_FORMAT \
"%s.\n" \
@@ -7095,13 +7187,13 @@
/**
* @brief Escalate an event.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[in] task Task.
* @param[in] report Report. 0 for most recent report.
* @param[in] event Event.
* @param[in] event_data Event data.
- * @param[in] method Method from escalator.
- * @param[in] condition Condition from escalator, which was met by event.
+ * @param[in] method Method from alert.
+ * @param[in] condition Condition from alert, which was met by event.
* @param[in] sort_order Whether to sort ascending or descending.
* @param[in] sort_field Field to sort on, or NULL for "type".
* @param[in] result_hosts_only Whether to show only hosts with results.
@@ -7125,9 +7217,9 @@
* @return 0 success, -1 error.
*/
static int
-escalate_2 (escalator_t escalator, task_t task, report_t report, event_t event,
- const void* event_data, escalator_method_t method,
- escalator_condition_t condition,
+escalate_2 (alert_t alert, task_t task, report_t report, event_t event,
+ const void* event_data, alert_method_t method,
+ alert_condition_t condition,
/* Report filtering. */
int sort_order, const char* sort_field,
int result_hosts_only, const char *min_cvss_base,
@@ -7136,20 +7228,20 @@
int overrides, int overrides_details, int first_result,
int max_results)
{
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "The escalator for task %s was triggered "
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "The alert for task %s was triggered "
"(Event: %s, Condition: %s)",
task_name (task),
event_description (event, event_data, NULL),
- escalator_condition_description (condition, escalator));
+ alert_condition_description (condition, alert));
switch (method)
{
- case ESCALATOR_METHOD_EMAIL:
+ case ALERT_METHOD_EMAIL:
{
char *to_address;
- to_address = escalator_data (escalator, "method", "to_address");
+ to_address = alert_data (alert, "method", "to_address");
if (to_address)
{
@@ -7162,11 +7254,11 @@
type = NULL;
extension = NULL;
- from_address = escalator_data (escalator,
+ from_address = alert_data (alert,
"method",
"from_address");
- notice = escalator_data (escalator, "method", "notice");
+ notice = alert_data (alert, "method", "notice");
name = task_name (task);
if (notice && strcmp (notice, "0") == 0)
{
@@ -7199,7 +7291,7 @@
return -1;
}
- format_uuid = escalator_data (escalator,
+ format_uuid = alert_data (alert,
"method",
"notice_report_format");
if (((format_uuid == NULL)
@@ -7222,8 +7314,8 @@
format_name = report_format_name (report_format);
event_desc = event_description (event, event_data, NULL);
- condition_desc = escalator_condition_description (condition,
- escalator);
+ condition_desc = alert_condition_description (condition,
+ alert);
subject = g_strdup_printf ("[OpenVAS-Manager] Task '%s': %s",
name ? name : "Internal Error",
event_desc);
@@ -7304,7 +7396,7 @@
return -1;
}
- format_uuid = escalator_data (escalator,
+ format_uuid = alert_data (alert,
"method",
"notice_attach_format");
if (((format_uuid == NULL)
@@ -7327,8 +7419,8 @@
format_name = report_format_name (report_format);
event_desc = event_description (event, event_data, NULL);
- condition_desc = escalator_condition_description (condition,
- escalator);
+ condition_desc = alert_condition_description (condition,
+ alert);
subject = g_strdup_printf ("[OpenVAS-Manager] Task '%s': %s",
name ? name : "Internal Error",
event_desc);
@@ -7376,8 +7468,8 @@
/* Simple notice message. */
event_desc = event_description (event, event_data, name);
generic_desc = event_description (event, event_data, NULL);
- condition_desc = escalator_condition_description (condition,
- escalator);
+ condition_desc = alert_condition_description (condition,
+ alert);
subject = g_strdup_printf ("[OpenVAS-Manager] Task '%s':"
" An event occurred",
name);
@@ -7403,11 +7495,11 @@
return -1;
break;
}
- case ESCALATOR_METHOD_HTTP_GET:
+ case ALERT_METHOD_HTTP_GET:
{
char *url;
- url = escalator_data (escalator, "method", "URL");
+ url = alert_data (alert, "method", "URL");
if (url)
{
@@ -7429,8 +7521,8 @@
case 'c':
{
gchar *condition_desc;
- condition_desc = escalator_condition_description
- (condition, escalator);
+ condition_desc = alert_condition_description
+ (condition, alert);
g_string_append (new_url, condition_desc);
g_free (condition_desc);
break;
@@ -7471,7 +7563,7 @@
return -1;
break;
}
- case ESCALATOR_METHOD_SOURCEFIRE:
+ case ALERT_METHOD_SOURCEFIRE:
{
char *ip, *port, *pkcs12;
gchar *report_content;
@@ -7517,11 +7609,11 @@
if (report_content == NULL)
return -1;
- ip = escalator_data (escalator, "method", "defense_center_ip");
- port = escalator_data (escalator, "method", "defense_center_port");
+ ip = alert_data (alert, "method", "defense_center_ip");
+ port = alert_data (alert, "method", "defense_center_port");
if (port == NULL)
port = g_strdup ("8307");
- pkcs12 = escalator_data (escalator, "method", "pkcs12");
+ pkcs12 = alert_data (alert, "method", "pkcs12");
tracef (" sourcefire ip: %s", ip);
tracef (" sourcefire port: %s", port);
@@ -7537,7 +7629,7 @@
return ret;
break;
}
- case ESCALATOR_METHOD_SYSLOG:
+ case ALERT_METHOD_SYSLOG:
{
char *submethod;
gchar *message, *event_desc, *level;
@@ -7546,7 +7638,7 @@
message = g_strdup_printf ("%s: %s", event_name (event), event_desc);
g_free (event_desc);
- submethod = escalator_data (escalator, "method", "submethod");
+ submethod = alert_data (alert, "method", "submethod");
level = g_strdup_printf ("event %s", submethod);
g_free (submethod);
@@ -7561,7 +7653,7 @@
return 0;
break;
}
- case ESCALATOR_METHOD_ERROR:
+ case ALERT_METHOD_ERROR:
default:
break;
}
@@ -7571,21 +7663,21 @@
/**
* @brief Escalate an event with preset report filtering.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[in] task Task.
* @param[in] event Event.
* @param[in] event_data Event data.
- * @param[in] method Method from escalator.
- * @param[in] condition Condition from escalator, which was met by event.
+ * @param[in] method Method from alert.
+ * @param[in] condition Condition from alert, which was met by event.
*
* @return 0 success, -1 error.
*/
static int
-escalate_1 (escalator_t escalator, task_t task, event_t event,
- const void* event_data, escalator_method_t method,
- escalator_condition_t condition)
+escalate_1 (alert_t alert, task_t task, event_t event,
+ const void* event_data, alert_method_t method,
+ alert_condition_t condition)
{
- return escalate_2 (escalator, task, 0, event, event_data, method, condition,
+ return escalate_2 (alert, task, 0, event, event_data, method, condition,
1, /* Ascending. */
NULL, /* Sort field. */
0, /* Result hosts only. */
@@ -7599,13 +7691,13 @@
0, /* Overrides details. */
0, /* First results. */
/* Max results. */
- (method == ESCALATOR_METHOD_EMAIL ? 1000 : -1));
+ (method == ALERT_METHOD_EMAIL ? 1000 : -1));
}
/**
- * @brief Escalate an escalator with task and event data.
+ * @brief Escalate an alert with task and event data.
*
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[in] task Task.
* @param[in] event Event.
* @param[in] event_data Event data.
@@ -7613,43 +7705,43 @@
* @return 0 success, -1 error.
*/
int
-escalate (escalator_t escalator, task_t task, event_t event,
- const void* event_data)
+manage_alert (alert_t alert, task_t task, event_t event,
+ const void* event_data)
{
- escalator_condition_t condition = escalator_condition (escalator);
- escalator_method_t method = escalator_method (escalator);
- return escalate_1 (escalator, task, event, event_data, method, condition);
+ alert_condition_t condition = alert_condition (alert);
+ alert_method_t method = alert_method (alert);
+ return escalate_1 (alert, task, event, event_data, method, condition);
}
/**
- * @brief Return whether an event applies to a task and an escalator.
+ * @brief Return whether an event applies to a task and an alert.
*
* @param[in] event Event.
* @param[in] event_data Event data.
* @param[in] task Task.
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
*
* @return 1 if event applies, else 0.
*/
static int
event_applies (event_t event, const void *event_data, task_t task,
- escalator_t escalator)
+ alert_t alert)
{
switch (event)
{
case EVENT_TASK_RUN_STATUS_CHANGED:
{
int ret;
- char *escalator_event_data;
+ char *alert_event_data;
- escalator_event_data = escalator_data (escalator, "event", "status");
- if (escalator_event_data == NULL)
+ alert_event_data = alert_data (alert, "event", "status");
+ if (alert_event_data == NULL)
return 0;
ret = (task_run_status (task) == (task_status_t) event_data)
- && (strcmp (escalator_event_data,
+ && (strcmp (alert_event_data,
run_status_name ((task_status_t) event_data))
== 0);
- free (escalator_event_data);
+ free (alert_event_data);
return ret;
break;
}
@@ -7660,24 +7752,24 @@
}
/**
- * @brief Return whether the condition of an escalator is met by a task.
+ * @brief Return whether the condition of an alert is met by a task.
*
* @param[in] task Task.
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[in] condition Condition.
*
* @return 1 if met, else 0.
*/
static int
-condition_met (task_t task, escalator_t escalator,
- escalator_condition_t condition)
+condition_met (task_t task, alert_t alert,
+ alert_condition_t condition)
{
switch (condition)
{
- case ESCALATOR_CONDITION_ALWAYS:
+ case ALERT_CONDITION_ALWAYS:
return 1;
break;
- case ESCALATOR_CONDITION_THREAT_LEVEL_AT_LEAST:
+ case ALERT_CONDITION_THREAT_LEVEL_AT_LEAST:
{
char *condition_level;
const char *report_level;
@@ -7685,7 +7777,7 @@
/* True if the threat level of the last finished report is at
* least the given level. */
- condition_level = escalator_data (escalator, "condition", "level");
+ condition_level = alert_data (alert, "condition", "level");
report_level = task_threat_level (task);
if (condition_level
&& report_level
@@ -7702,7 +7794,7 @@
free (condition_level);
break;
}
- case ESCALATOR_CONDITION_THREAT_LEVEL_CHANGED:
+ case ALERT_CONDITION_THREAT_LEVEL_CHANGED:
{
char *direction;
const char *last_level, *second_last_level;
@@ -7711,7 +7803,7 @@
* in the given direction with respect to the second last finished
* report. */
- direction = escalator_data (escalator, "condition", "direction");
+ direction = alert_data (alert, "condition", "direction");
last_level = task_threat_level (task);
second_last_level = task_previous_threat_level (task);
if (direction
@@ -7767,67 +7859,67 @@
static void
event (task_t task, event_t event, void* event_data)
{
- iterator_t escalators;
+ iterator_t alerts;
tracef (" EVENT %i on task %llu", event, task);
- init_escalator_iterator (&escalators, 0, task, event, 0, 1, NULL);
- while (next (&escalators))
+ init_alert_iterator (&alerts, 0, task, event, 0, 1, NULL);
+ while (next (&alerts))
{
- escalator_t escalator = escalator_iterator_escalator (&escalators);
- if (event_applies (event, event_data, task, escalator))
+ alert_t alert = alert_iterator_alert (&alerts);
+ if (event_applies (event, event_data, task, alert))
{
- escalator_condition_t condition;
+ alert_condition_t condition;
- condition = escalator_iterator_condition (&escalators);
- if (condition_met (task, escalator, condition))
- escalate_1 (escalator,
+ condition = alert_iterator_condition (&alerts);
+ if (condition_met (task, alert, condition))
+ escalate_1 (alert,
task,
event,
event_data,
- escalator_iterator_method (&escalators),
+ alert_iterator_method (&alerts),
condition);
}
}
- cleanup_iterator (&escalators);
+ cleanup_iterator (&alerts);
}
/**
- * @brief Initialise an escalator task iterator.
+ * @brief Initialise an alert task iterator.
*
- * Iterate over all tasks that use the escalator.
+ * Iterate over all tasks that use the alert.
*
* @param[in] iterator Iterator.
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
* @param[in] ascending Whether to sort ascending or descending.
*/
void
-init_escalator_task_iterator (iterator_t* iterator, escalator_t escalator,
+init_alert_task_iterator (iterator_t* iterator, alert_t alert,
int ascending)
{
- assert (escalator);
+ assert (alert);
assert (current_credentials.uuid);
init_iterator (iterator,
- "SELECT tasks.name, tasks.uuid FROM tasks, task_escalators"
- " WHERE tasks.ROWID = task_escalators.task"
- " AND task_escalators.escalator = %llu"
+ "SELECT tasks.name, tasks.uuid FROM tasks, task_alerts"
+ " WHERE tasks.ROWID = task_alerts.task"
+ " AND task_alerts.alert = %llu"
" AND hidden = 0"
" AND ((tasks.owner IS NULL) OR (tasks.owner ="
" (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
" ORDER BY tasks.name %s;",
- escalator,
+ alert,
current_credentials.uuid,
ascending ? "ASC" : "DESC");
}
/**
- * @brief Return the name from an escalator task iterator.
+ * @brief Return the name from an alert task iterator.
*
* @param[in] iterator Iterator.
*
* @return Name of the task or NULL if iteration is complete.
*/
const char*
-escalator_task_iterator_name (iterator_t* iterator)
+alert_task_iterator_name (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -7836,14 +7928,14 @@
}
/**
- * @brief Return the uuid from an escalator task iterator.
+ * @brief Return the uuid from an alert task iterator.
*
* @param[in] iterator Iterator.
*
* @return UUID of the task or NULL if iteration is complete.
*/
const char*
-escalator_task_iterator_uuid (iterator_t* iterator)
+alert_task_iterator_uuid (iterator_t* iterator)
{
const char *ret;
if (iterator->done) return NULL;
@@ -10881,58 +10973,58 @@
}
/**
- * @brief Return the name of the escalator of a task.
+ * @brief Return the name of the alert of a task.
*
* @param[in] task Task.
*
- * @return Name of escalator of task if any, else NULL.
+ * @return Name of alert of task if any, else NULL.
*/
char*
-task_escalator_name (task_t task)
+task_alert_name (task_t task)
{
return sql_string (0, 0,
- "SELECT name FROM escalators"
+ "SELECT name FROM alerts"
" WHERE ROWID ="
- " (SELECT escalator FROM task_escalators"
+ " (SELECT alert FROM task_alerts"
" WHERE task = %llu LIMIT 1);",
task);
}
/**
- * @brief Return the UUID of the escalator of a task.
+ * @brief Return the UUID of the alert of a task.
*
* @param[in] task Task.
*
- * @return UUID of escalator of task if any, else NULL.
+ * @return UUID of alert of task if any, else NULL.
*/
char*
-task_escalator_uuid (task_t task)
+task_alert_uuid (task_t task)
{
return sql_string (0, 0,
- "SELECT uuid FROM escalators"
+ "SELECT uuid FROM alerts"
" WHERE ROWID ="
- " (SELECT escalator FROM task_escalators"
+ " (SELECT alert FROM task_alerts"
" WHERE task = %llu LIMIT 1);",
task);
}
/**
- * @brief Return the escalator of a task.
+ * @brief Return the alert of a task.
*
* @param[in] task Task.
*
- * @return Escalator of task if any, else NULL.
+ * @return Alert of task if any, else NULL.
*/
-escalator_t
-task_escalator (task_t task)
+alert_t
+task_alert (task_t task)
{
- escalator_t escalator = 0;
- switch (sql_int64 (&escalator, 0, 0,
- "SELECT escalator FROM tasks WHERE ROWID = %llu;",
+ alert_t alert = 0;
+ switch (sql_int64 (&alert, 0, 0,
+ "SELECT alert FROM tasks WHERE ROWID = %llu;",
task))
{
case 0:
- return escalator;
+ return alert;
break;
case 1: /* Too few rows in result of query. */
default: /* Programming error. */
@@ -10944,53 +11036,53 @@
}
/**
- * @brief Return whether the escalator of a task is in the trashcan.
+ * @brief Return whether the alert of a task is in the trashcan.
*
- * Caller must check that there is an escalator on the task.
+ * Caller must check that there is an alert on the task.
*
* @param[in] task Task.
*
* @return 1 if in trashcan, else 0.
*/
int
-task_escalator_in_trash (task_t task)
+task_alert_in_trash (task_t task)
{
return sql_int (0, 0,
- "SELECT escalator_location = " G_STRINGIFY (LOCATION_TRASH)
- " FROM task_escalators"
+ "SELECT alert_location = " G_STRINGIFY (LOCATION_TRASH)
+ " FROM task_alerts"
" WHERE task = %llu;",
task);
}
/**
- * @brief Add an escalator to a task.
+ * @brief Add an alert to a task.
*
* @param[in] task Task.
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
*/
void
-add_task_escalator (task_t task, escalator_t escalator)
+add_task_alert (task_t task, alert_t alert)
{
- sql ("INSERT INTO task_escalators (task, escalator, escalator_location)"
+ sql ("INSERT INTO task_alerts (task, alert, alert_location)"
" VALUES (%llu, %llu, " G_STRINGIFY (LOCATION_TABLE) ");",
task,
- escalator);
+ alert);
}
/**
- * @brief Add an escalator to a task, removing any existing ones.
+ * @brief Add an alert to a task, removing any existing ones.
*
* @param[in] task Task.
- * @param[in] escalator Escalator.
+ * @param[in] alert Alert.
*/
void
-set_task_escalator (task_t task, escalator_t escalator)
+set_task_alert (task_t task, alert_t alert)
{
- sql ("DELETE FROM task_escalators where task = %llu;", task);
- sql ("INSERT INTO task_escalators (task, escalator, escalator_location)"
+ sql ("DELETE FROM task_alerts where task = %llu;", task);
+ sql ("INSERT INTO task_alerts (task, alert, alert_location)"
" VALUES (%llu, %llu, " G_STRINGIFY (LOCATION_TABLE) ");",
task,
- escalator);
+ alert);
}
/**
@@ -19571,7 +19663,7 @@
* @param[in] send Function to write to client.
* @param[in] send_data_1 Second argument to \p send.
* @param[in] send_data_2 Third argument to \p send.
- * @param[in] escalator_id ID of escalator to escalate report with,
+ * @param[in] alert_id ID of alert to escalate report with,
* instead of getting report. NULL to get
* report.
* @param[in] type Type of report: NULL, "scan" or "assets".
@@ -19588,7 +19680,7 @@
* are 0 indexed.
* @param[in] host_max_results The host maximum number of results returned.
*
- * @return 0 success, -1 error, 1 failed to find escalator.
+ * @return 0 success, -1 error, 1 failed to find alert.
*/
int
manage_send_report (report_t report, report_t delta_report,
@@ -19602,7 +19694,7 @@
int base64,
gboolean (*send) (const char *, int (*) (void*), void*),
int (*send_data_1) (void*), void *send_data_2,
- const char *escalator_id, const char *type,
+ const char *alert_id, const char *type,
const char *host, int pos, const char *host_search_phrase,
const char *host_levels, int host_first_result,
int host_max_results)
@@ -19622,22 +19714,22 @@
/* Escalate instead, if requested. */
- if (escalator_id)
+ if (alert_id)
{
- escalator_t escalator = 0;
- escalator_condition_t condition;
- escalator_method_t method;
+ alert_t alert = 0;
+ alert_condition_t condition;
+ alert_method_t method;
- if (find_escalator (escalator_id, &escalator))
+ if (find_alert (alert_id, &alert))
return -1;
- if (escalator == 0)
+ if (alert == 0)
return 1;
- condition = escalator_condition (escalator);
- method = escalator_method (escalator);
+ condition = alert_condition (alert);
+ method = alert_method (alert);
- return escalate_2 (escalator, task, report, EVENT_TASK_RUN_STATUS_CHANGED,
+ return escalate_2 (alert, task, report, EVENT_TASK_RUN_STATUS_CHANGED,
(void*) TASK_STATUS_DONE, method, condition,
/* Report filtering. */
sort_order, sort_field, result_hosts_only,
@@ -20688,7 +20780,7 @@
sql ("DELETE FROM results WHERE task = %llu;", task);
sql ("DELETE FROM tasks WHERE ROWID = %llu;", task);
- sql ("DELETE FROM task_escalators WHERE task = %llu;", task);
+ sql ("DELETE FROM task_alerts WHERE task = %llu;", task);
sql ("DELETE FROM task_files WHERE task = %llu;", task);
sql ("DELETE FROM task_preferences WHERE task = %llu;", task);
sql ("COMMIT;");
@@ -20770,7 +20862,7 @@
sql ("DELETE FROM results WHERE task = %llu;", task);
sql ("DELETE FROM tasks WHERE ROWID = %llu;", task);
- sql ("DELETE FROM task_escalators WHERE task = %llu;", task);
+ sql ("DELETE FROM task_alerts WHERE task = %llu;", task);
sql ("DELETE FROM task_files WHERE task = %llu;", task);
sql ("DELETE FROM task_preferences WHERE task = %llu;", task);
}
@@ -20847,7 +20939,7 @@
sql ("DELETE FROM results WHERE task = %llu;", task);
sql ("DELETE FROM tasks WHERE ROWID = %llu;", task);
- sql ("DELETE FROM task_escalators WHERE task = %llu;", task);
+ sql ("DELETE FROM task_alerts WHERE task = %llu;", task);
sql ("DELETE FROM task_files WHERE task = %llu;", task);
sql ("DELETE FROM task_preferences WHERE task = %llu;", task);
}
@@ -35888,9 +35980,9 @@
return 0;
}
- /* Escalator. */
+ /* Alert. */
- if (find_trash ("escalator", id, &resource))
+ if (find_trash ("alert", id, &resource))
{
sql ("ROLLBACK;");
return -1;
@@ -35898,12 +35990,12 @@
if (resource)
{
- escalator_t escalator;
+ alert_t alert;
if (sql_int (0, 0,
- "SELECT count(*) FROM escalators"
+ "SELECT count(*) FROM alerts"
" WHERE name ="
- " (SELECT name FROM escalators_trash WHERE ROWID = %llu)"
+ " (SELECT name FROM alerts_trash WHERE ROWID = %llu)"
" AND ((owner IS NULL) OR (owner ="
" (SELECT ROWID FROM users WHERE users.uuid = '%s')));",
resource,
@@ -35913,51 +36005,51 @@
return 3;
}
- sql ("INSERT INTO escalators"
+ sql ("INSERT INTO alerts"
" (uuid, owner, name, comment, event, condition, method)"
" SELECT uuid, owner, name, comment, event, condition, method"
- " FROM escalators_trash WHERE ROWID = %llu;",
+ " FROM alerts_trash WHERE ROWID = %llu;",
resource);
- escalator = sqlite3_last_insert_rowid (task_db);
+ alert = sqlite3_last_insert_rowid (task_db);
- sql ("INSERT INTO escalator_condition_data"
- " (escalator, name, data)"
+ sql ("INSERT INTO alert_condition_data"
+ " (alert, name, data)"
" SELECT %llu, name, data"
- " FROM escalator_condition_data_trash WHERE escalator = %llu;",
- escalator,
+ " FROM alert_condition_data_trash WHERE alert = %llu;",
+ alert,
resource);
- sql ("INSERT INTO escalator_event_data"
- " (escalator, name, data)"
+ sql ("INSERT INTO alert_event_data"
+ " (alert, name, data)"
" SELECT %llu, name, data"
- " FROM escalator_event_data_trash WHERE escalator = %llu;",
- escalator,
+ " FROM alert_event_data_trash WHERE alert = %llu;",
+ alert,
resource);
- sql ("INSERT INTO escalator_method_data"
- " (escalator, name, data)"
+ sql ("INSERT INTO alert_method_data"
+ " (alert, name, data)"
" SELECT %llu, name, data"
- " FROM escalator_method_data_trash WHERE escalator = %llu;",
- escalator,
+ " FROM alert_method_data_trash WHERE alert = %llu;",
+ alert,
resource);
- /* Update the escalator in any trashcan tasks. */
- sql ("UPDATE task_escalators"
- " SET escalator = %llu,"
- " escalator_location = " G_STRINGIFY (LOCATION_TABLE)
- " WHERE escalator = %llu"
- " AND escalator_location = " G_STRINGIFY (LOCATION_TRASH),
- escalator,
+ /* Update the alert in any trashcan tasks. */
+ sql ("UPDATE task_alerts"
+ " SET alert = %llu,"
+ " alert_location = " G_STRINGIFY (LOCATION_TABLE)
+ " WHERE alert = %llu"
+ " AND alert_location = " G_STRINGIFY (LOCATION_TRASH),
+ alert,
resource);
- sql ("DELETE FROM escalator_condition_data_trash WHERE escalator = %llu;",
+ sql ("DELETE FROM alert_condition_data_trash WHERE alert = %llu;",
resource);
- sql ("DELETE FROM escalator_event_data_trash WHERE escalator = %llu;",
+ sql ("DELETE FROM alert_event_data_trash WHERE alert = %llu;",
resource);
- sql ("DELETE FROM escalator_method_data_trash WHERE escalator = %llu;",
+ sql ("DELETE FROM alert_method_data_trash WHERE alert = %llu;",
resource);
- sql ("DELETE FROM escalators_trash WHERE ROWID = %llu;",
+ sql ("DELETE FROM alerts_trash WHERE ROWID = %llu;",
resource);
sql ("COMMIT;");
return 0;
@@ -36381,9 +36473,9 @@
" OR (config_location = " G_STRINGIFY (LOCATION_TRASH) ")"
" OR (schedule_location = " G_STRINGIFY (LOCATION_TRASH) ")"
" OR (slave_location = " G_STRINGIFY (LOCATION_TRASH) ")"
- " OR (SELECT count(*) > 0 FROM task_escalators"
+ " OR (SELECT count(*) > 0 FROM task_alerts"
" WHERE task = tasks.ROWID"
- " AND escalator_location = " G_STRINGIFY (LOCATION_TRASH) ")"
+ " AND alert_location = " G_STRINGIFY (LOCATION_TRASH) ")"
" FROM tasks WHERE ROWID = %llu;",
resource))
{
@@ -36416,10 +36508,10 @@
" (SELECT nvt_selector FROM configs_trash);");
sql ("DELETE FROM config_preferences_trash;");
sql ("DELETE FROM configs_trash;");
- sql ("DELETE FROM escalator_condition_data_trash;");
- sql ("DELETE FROM escalator_event_data_trash;");
- sql ("DELETE FROM escalator_method_data_trash;");
- sql ("DELETE FROM escalators_trash;");
+ sql ("DELETE FROM alert_condition_data_trash;");
+ sql ("DELETE FROM alert_event_data_trash;");
+ sql ("DELETE FROM alert_method_data_trash;");
+ sql ("DELETE FROM alerts_trash;");
sql ("DELETE FROM lsc_credentials_trash;");
sql ("DELETE FROM port_ranges_trash;");
sql ("DELETE FROM port_lists_trash;");
Modified: trunk/openvas-manager/src/manage_sql.h
===================================================================
--- trunk/openvas-manager/src/manage_sql.h 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/manage_sql.h 2012-03-28 10:52:59 UTC (rev 13163)
@@ -63,7 +63,7 @@
int create_current_report (task_t, char **, task_status_t);
-char *escalator_data (escalator_t, const char *, const char *);
+char *alert_data (alert_t, const char *, const char *);
time_t add_months (time_t, int);
Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/omp.c 2012-03-28 10:52:59 UTC (rev 13163)
@@ -340,7 +340,7 @@
" COMMANDS Run a list of commands.\n"
" CREATE_AGENT Create an agent.\n"
" CREATE_CONFIG Create a config.\n"
-" CREATE_ESCALATOR Create an escalator.\n"
+" CREATE_ALERT Create an alert.\n"
" CREATE_LSC_CREDENTIAL Create a local security check credential.\n"
" CREATE_NOTE Create a note.\n"
" CREATE_OVERRIDE Create an override.\n"
@@ -354,7 +354,7 @@
" CREATE_TASK Create a task.\n"
" DELETE_AGENT Delete an agent.\n"
" DELETE_CONFIG Delete a config.\n"
-" DELETE_ESCALATOR Delete an escalator.\n"
+" DELETE_ALERT Delete an alert.\n"
" DELETE_LSC_CREDENTIAL Delete a local security check credential.\n"
" DELETE_NOTE Delete a note.\n"
" DELETE_OVERRIDE Delete an override.\n"
@@ -370,7 +370,7 @@
" GET_AGENTS Get all agents.\n"
" GET_CONFIGS Get all configs.\n"
" GET_DEPENDENCIES Get dependencies for all available NVTs.\n"
-" GET_ESCALATORS Get all escalators.\n"
+" GET_ALERTS Get all alerts.\n"
" GET_LSC_CREDENTIALS Get all local security check credentials.\n"
" GET_NOTES Get all notes.\n"
" GET_NVTS Get one or all available NVTs.\n"
@@ -406,7 +406,7 @@
" RESUME_STOPPED_TASK Resume a stopped task.\n"
" START_TASK Manually start an existing task.\n"
" STOP_TASK Stop a running task.\n"
-" TEST_ESCALATOR Run an escalator.\n"
+" TEST_ALERT Run an alert.\n"
" VERIFY_AGENT Verify an agent.\n"
" VERIFY_REPORT_FORMAT Verify a report format.\n";
@@ -742,7 +742,7 @@
}
/**
- * @brief Command data for the create_escalator command.
+ * @brief Command data for the create_alert command.
*
* The pointers in the *_data arrays point to memory that contains two
* strings concatentated, with a single \\0 between them. The first string
@@ -752,16 +752,16 @@
typedef struct
{
char *comment; ///< Comment.
- char *condition; ///< Condition for escalation, e.g. "Always".
+ char *condition; ///< Condition for alert, e.g. "Always".
array_t *condition_data; ///< Array of pointers. Extra data for condition.
- char *event; ///< Event that will cause escalation.
+ char *event; ///< Event that will cause alert.
array_t *event_data; ///< Array of pointers. Extra data for event.
- char *method; ///< Method of escalation, e.g. "Email".
+ char *method; ///< Method of alert, e.g. "Email".
array_t *method_data; ///< Array of pointer. Extra data for method.
- char *name; ///< Name of escalator.
+ char *name; ///< Name of alert.
char *part_data; ///< Second part of data during *_data: value.
char *part_name; ///< First part of data during *_data: name.
-} create_escalator_data_t;
+} create_alert_data_t;
/**
* @brief Reset command data.
@@ -769,7 +769,7 @@
* @param[in] data Command data.
*/
static void
-create_escalator_data_reset (create_escalator_data_t *data)
+create_alert_data_reset (create_alert_data_t *data)
{
free (data->comment);
free (data->condition);
@@ -782,7 +782,7 @@
free (data->part_data);
free (data->part_name);
- memset (data, 0, sizeof (create_escalator_data_t));
+ memset (data, 0, sizeof (create_alert_data_t));
}
/**
@@ -1260,7 +1260,7 @@
typedef struct
{
char *config_id; ///< ID of task config.
- char *escalator_id; ///< ID of task escalator.
+ char *alert_id; ///< ID of task alert.
char *observers; ///< Space separated names of observer users.
name_value_t *preference; ///< Current preference.
array_t *preferences; ///< Preferences.
@@ -1279,7 +1279,7 @@
create_task_data_reset (create_task_data_t *data)
{
free (data->config_id);
- free (data->escalator_id);
+ free (data->alert_id);
free (data->observers);
if (data->preferences)
{
@@ -1348,13 +1348,13 @@
}
/**
- * @brief Command data for the delete_escalator command.
+ * @brief Command data for the delete_alert command.
*/
typedef struct
{
- char *escalator_id; ///< ID of escalator to delete.
+ char *alert_id; ///< ID of alert to delete.
int ultimate; ///< Boolean. Whether to remove entirely or to trashcan.
-} delete_escalator_data_t;
+} delete_alert_data_t;
/**
* @brief Reset command data.
@@ -1362,11 +1362,11 @@
* @param[in] data Command data.
*/
static void
-delete_escalator_data_reset (delete_escalator_data_t *data)
+delete_alert_data_reset (delete_alert_data_t *data)
{
- free (data->escalator_id);
+ free (data->alert_id);
- memset (data, 0, sizeof (delete_escalator_data_t));
+ memset (data, 0, sizeof (delete_alert_data_t));
}
/**
@@ -1686,15 +1686,15 @@
}
/**
- * @brief Command data for the get_escalators command.
+ * @brief Command data for the get_alerts command.
*/
typedef struct
{
- char *escalator_id; ///< ID of single escalator to get.
+ char *alert_id; ///< ID of single alert to get.
char *sort_field; ///< Field to sort results on.
int sort_order; ///< Result sort order: 0 descending, else ascending.
- int trash; ///< Boolean. Whether to return escalators from trashcan.
-} get_escalators_data_t;
+ int trash; ///< Boolean. Whether to return alerts from trashcan.
+} get_alerts_data_t;
/**
* @brief Reset command data.
@@ -1702,12 +1702,12 @@
* @param[in] data Command data.
*/
static void
-get_escalators_data_reset (get_escalators_data_t *data)
+get_alerts_data_reset (get_alerts_data_t *data)
{
- free (data->escalator_id);
+ free (data->alert_id);
free (data->sort_field);
- memset (data, 0, sizeof (get_escalators_data_t));
+ memset (data, 0, sizeof (get_alerts_data_t));
}
/**
@@ -1954,7 +1954,7 @@
char *delta_report_id; ///< ID of report to compare single report to.
char *delta_states; ///< Delta states (Changed Gone New Same) to include.
char *format_id; ///< ID of report format.
- char *escalator_id; ///< ID of escalator.
+ char *alert_id; ///< ID of alert.
char *report_id; ///< ID of single report to get.
int first_result; ///< Skip over results before this result number.
int max_results; ///< Maximum number of results return.
@@ -1988,7 +1988,7 @@
free (data->delta_report_id);
free (data->delta_states);
free (data->format_id);
- free (data->escalator_id);
+ free (data->alert_id);
free (data->report_id);
free (data->sort_field);
free (data->levels);
@@ -2381,7 +2381,7 @@
{
char *action; ///< What to do to file: "update" or "remove".
char *comment; ///< Comment.
- char *escalator_id; ///< ID of new escalator for task.
+ char *alert_id; ///< ID of new alert for task.
char *file; ///< File to attach to task.
char *file_name; ///< Name of file to attach to task.
char *name; ///< New name for task.
@@ -2404,7 +2404,7 @@
{
free (data->action);
free (data->comment);
- free (data->escalator_id);
+ free (data->alert_id);
free (data->file);
free (data->file_name);
free (data->name);
@@ -2659,12 +2659,12 @@
}
/**
- * @brief Command data for the test_escalator command.
+ * @brief Command data for the test_alert command.
*/
typedef struct
{
- char *escalator_id; ///< ID of escalator to test.
-} test_escalator_data_t;
+ char *alert_id; ///< ID of alert to test.
+} test_alert_data_t;
/**
* @brief Reset command data.
@@ -2672,11 +2672,11 @@
* @param[in] data Command data.
*/
static void
-test_escalator_data_reset (test_escalator_data_t *data)
+test_alert_data_reset (test_alert_data_t *data)
{
- free (data->escalator_id);
+ free (data->alert_id);
- memset (data, 0, sizeof (test_escalator_data_t));
+ memset (data, 0, sizeof (test_alert_data_t));
}
/**
@@ -2728,7 +2728,7 @@
{
create_agent_data_t create_agent; ///< create_agent
create_config_data_t create_config; ///< create_config
- create_escalator_data_t create_escalator; ///< create_escalator
+ create_alert_data_t create_alert; ///< create_alert
create_lsc_credential_data_t create_lsc_credential; ///< create_lsc_credential
create_note_data_t create_note; ///< create_note
create_override_data_t create_override; ///< create_override
@@ -2742,7 +2742,7 @@
create_task_data_t create_task; ///< create_task
delete_agent_data_t delete_agent; ///< delete_agent
delete_config_data_t delete_config; ///< delete_config
- delete_escalator_data_t delete_escalator; ///< delete_escalator
+ delete_alert_data_t delete_alert; ///< delete_alert
delete_lsc_credential_data_t delete_lsc_credential; ///< delete_lsc_credential
delete_note_data_t delete_note; ///< delete_note
delete_override_data_t delete_override; ///< delete_override
@@ -2757,7 +2757,7 @@
get_agents_data_t get_agents; ///< get_agents
get_configs_data_t get_configs; ///< get_configs
get_dependencies_data_t get_dependencies; ///< get_dependencies
- get_escalators_data_t get_escalators; ///< get_escalators
+ get_alerts_data_t get_alerts; ///< get_alerts
get_info_data_t get_info; ///< get_info
get_lsc_credentials_data_t get_lsc_credentials; ///< get_lsc_credentials
get_notes_data_t get_notes; ///< get_notes
@@ -2789,7 +2789,7 @@
resume_stopped_task_data_t resume_stopped_task; ///< resume_stopped_task
start_task_data_t start_task; ///< start_task
stop_task_data_t stop_task; ///< stop_task
- test_escalator_data_t test_escalator; ///< test_escalator
+ test_alert_data_t test_alert; ///< test_alert
verify_agent_data_t verify_agent; ///< verify_agent
verify_report_format_data_t verify_report_format; ///< verify_report_format
} command_data_t;
@@ -2824,10 +2824,10 @@
= (create_config_data_t*) &(command_data.create_config);
/**
- * @brief Parser callback data for CREATE_ESCALATOR.
+ * @brief Parser callback data for CREATE_ALERT.
*/
-create_escalator_data_t *create_escalator_data
- = (create_escalator_data_t*) &(command_data.create_escalator);
+create_alert_data_t *create_alert_data
+ = (create_alert_data_t*) &(command_data.create_alert);
/**
* @brief Parser callback data for CREATE_LSC_CREDENTIAL.
@@ -2908,10 +2908,10 @@
= (delete_config_data_t*) &(command_data.delete_config);
/**
- * @brief Parser callback data for DELETE_ESCALATOR.
+ * @brief Parser callback data for DELETE_ALERT.
*/
-delete_escalator_data_t *delete_escalator_data
- = (delete_escalator_data_t*) &(command_data.delete_escalator);
+delete_alert_data_t *delete_alert_data
+ = (delete_alert_data_t*) &(command_data.delete_alert);
/**
* @brief Parser callback data for DELETE_LSC_CREDENTIAL.
@@ -2998,10 +2998,10 @@
= &(command_data.get_dependencies);
/**
- * @brief Parser callback data for GET_ESCALATORS.
+ * @brief Parser callback data for GET_ALERTS.
*/
-get_escalators_data_t *get_escalators_data
- = &(command_data.get_escalators);
+get_alerts_data_t *get_alerts_data
+ = &(command_data.get_alerts);
/**
* @brief Parser callback data for GET_INFO.
@@ -3208,10 +3208,10 @@
= (stop_task_data_t*) &(command_data.stop_task);
/**
- * @brief Parser callback data for TEST_ESCALATOR.
+ * @brief Parser callback data for TEST_ALERT.
*/
-test_escalator_data_t *test_escalator_data
- = (test_escalator_data_t*) &(command_data.test_escalator);
+test_alert_data_t *test_alert_data
+ = (test_alert_data_t*) &(command_data.test_alert);
/**
* @brief Parser callback data for VERIFY_AGENT.
@@ -3310,18 +3310,18 @@
CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NVT_NAME,
CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_TYPE,
CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_VALUE,
- CLIENT_CREATE_ESCALATOR,
- CLIENT_CREATE_ESCALATOR_COMMENT,
- CLIENT_CREATE_ESCALATOR_CONDITION,
- CLIENT_CREATE_ESCALATOR_CONDITION_DATA,
- CLIENT_CREATE_ESCALATOR_CONDITION_DATA_NAME,
- CLIENT_CREATE_ESCALATOR_EVENT,
- CLIENT_CREATE_ESCALATOR_EVENT_DATA,
- CLIENT_CREATE_ESCALATOR_EVENT_DATA_NAME,
- CLIENT_CREATE_ESCALATOR_METHOD,
- CLIENT_CREATE_ESCALATOR_METHOD_DATA,
- CLIENT_CREATE_ESCALATOR_METHOD_DATA_NAME,
- CLIENT_CREATE_ESCALATOR_NAME,
+ CLIENT_CREATE_ALERT,
+ CLIENT_CREATE_ALERT_COMMENT,
+ CLIENT_CREATE_ALERT_CONDITION,
+ CLIENT_CREATE_ALERT_CONDITION_DATA,
+ CLIENT_CREATE_ALERT_CONDITION_DATA_NAME,
+ CLIENT_CREATE_ALERT_EVENT,
+ CLIENT_CREATE_ALERT_EVENT_DATA,
+ CLIENT_CREATE_ALERT_EVENT_DATA_NAME,
+ CLIENT_CREATE_ALERT_METHOD,
+ CLIENT_CREATE_ALERT_METHOD_DATA,
+ CLIENT_CREATE_ALERT_METHOD_DATA_NAME,
+ CLIENT_CREATE_ALERT_NAME,
CLIENT_CREATE_LSC_CREDENTIAL,
CLIENT_CREATE_LSC_CREDENTIAL_COMMENT,
CLIENT_CREATE_LSC_CREDENTIAL_NAME,
@@ -3474,7 +3474,7 @@
CLIENT_CREATE_TASK,
CLIENT_CREATE_TASK_COMMENT,
CLIENT_CREATE_TASK_CONFIG,
- CLIENT_CREATE_TASK_ESCALATOR,
+ CLIENT_CREATE_TASK_ALERT,
CLIENT_CREATE_TASK_NAME,
CLIENT_CREATE_TASK_OBSERVERS,
CLIENT_CREATE_TASK_PREFERENCES,
@@ -3487,7 +3487,7 @@
CLIENT_CREATE_TASK_TARGET,
CLIENT_DELETE_AGENT,
CLIENT_DELETE_CONFIG,
- CLIENT_DELETE_ESCALATOR,
+ CLIENT_DELETE_ALERT,
CLIENT_DELETE_LSC_CREDENTIAL,
CLIENT_DELETE_NOTE,
CLIENT_DELETE_OVERRIDE,
@@ -3503,7 +3503,7 @@
CLIENT_GET_AGENTS,
CLIENT_GET_CONFIGS,
CLIENT_GET_DEPENDENCIES,
- CLIENT_GET_ESCALATORS,
+ CLIENT_GET_ALERTS,
CLIENT_GET_LSC_CREDENTIALS,
CLIENT_GET_NOTES,
CLIENT_GET_NVTS,
@@ -3577,7 +3577,7 @@
CLIENT_MODIFY_SETTING_VALUE,
CLIENT_MODIFY_TASK,
CLIENT_MODIFY_TASK_COMMENT,
- CLIENT_MODIFY_TASK_ESCALATOR,
+ CLIENT_MODIFY_TASK_ALERT,
CLIENT_MODIFY_TASK_FILE,
CLIENT_MODIFY_TASK_NAME,
CLIENT_MODIFY_TASK_OBSERVERS,
@@ -3595,7 +3595,7 @@
CLIENT_RESUME_STOPPED_TASK,
CLIENT_START_TASK,
CLIENT_STOP_TASK,
- CLIENT_TEST_ESCALATOR,
+ CLIENT_TEST_ALERT,
CLIENT_VERIFY_AGENT,
CLIENT_VERIFY_REPORT_FORMAT
} client_state_t;
@@ -4105,21 +4105,21 @@
openvas_append_string (&create_config_data->name, "");
set_client_state (CLIENT_CREATE_CONFIG);
}
- else if (strcasecmp ("CREATE_ESCALATOR", element_name) == 0)
+ else if (strcasecmp ("CREATE_ALERT", element_name) == 0)
{
- create_escalator_data->condition_data = make_array ();
- create_escalator_data->event_data = make_array ();
- create_escalator_data->method_data = make_array ();
+ create_alert_data->condition_data = make_array ();
+ create_alert_data->event_data = make_array ();
+ create_alert_data->method_data = make_array ();
- openvas_append_string (&create_escalator_data->part_data, "");
- openvas_append_string (&create_escalator_data->part_name, "");
- openvas_append_string (&create_escalator_data->comment, "");
- openvas_append_string (&create_escalator_data->name, "");
- openvas_append_string (&create_escalator_data->condition, "");
- openvas_append_string (&create_escalator_data->method, "");
- openvas_append_string (&create_escalator_data->event, "");
+ openvas_append_string (&create_alert_data->part_data, "");
+ openvas_append_string (&create_alert_data->part_name, "");
+ openvas_append_string (&create_alert_data->comment, "");
+ openvas_append_string (&create_alert_data->name, "");
+ openvas_append_string (&create_alert_data->condition, "");
+ openvas_append_string (&create_alert_data->method, "");
+ openvas_append_string (&create_alert_data->event, "");
- set_client_state (CLIENT_CREATE_ESCALATOR);
+ set_client_state (CLIENT_CREATE_ALERT);
}
else if (strcasecmp ("CREATE_LSC_CREDENTIAL", element_name) == 0)
{
@@ -4184,18 +4184,18 @@
delete_config_data->ultimate = 0;
set_client_state (CLIENT_DELETE_CONFIG);
}
- else if (strcasecmp ("DELETE_ESCALATOR", element_name) == 0)
+ else if (strcasecmp ("DELETE_ALERT", element_name) == 0)
{
const gchar* attribute;
append_attribute (attribute_names, attribute_values,
- "escalator_id",
- &delete_escalator_data->escalator_id);
+ "alert_id",
+ &delete_alert_data->alert_id);
if (find_attribute (attribute_names, attribute_values,
"ultimate", &attribute))
- delete_escalator_data->ultimate = strcmp (attribute, "0");
+ delete_alert_data->ultimate = strcmp (attribute, "0");
else
- delete_escalator_data->ultimate = 0;
- set_client_state (CLIENT_DELETE_ESCALATOR);
+ delete_alert_data->ultimate = 0;
+ set_client_state (CLIENT_DELETE_ALERT);
}
else if (strcasecmp ("DELETE_LSC_CREDENTIAL", element_name) == 0)
{
@@ -4373,26 +4373,26 @@
&get_dependencies_data->nvt_oid);
set_client_state (CLIENT_GET_DEPENDENCIES);
}
- else if (strcasecmp ("GET_ESCALATORS", element_name) == 0)
+ else if (strcasecmp ("GET_ALERTS", element_name) == 0)
{
const gchar* attribute;
append_attribute (attribute_names, attribute_values,
- "escalator_id",
- &get_escalators_data->escalator_id);
+ "alert_id",
+ &get_alerts_data->alert_id);
if (find_attribute (attribute_names, attribute_values,
"trash", &attribute))
- get_escalators_data->trash = strcmp (attribute, "0");
+ get_alerts_data->trash = strcmp (attribute, "0");
else
- get_escalators_data->trash = 0;
+ get_alerts_data->trash = 0;
append_attribute (attribute_names, attribute_values, "sort_field",
- &get_escalators_data->sort_field);
+ &get_alerts_data->sort_field);
if (find_attribute (attribute_names, attribute_values,
"sort_order", &attribute))
- get_escalators_data->sort_order = strcmp (attribute,
+ get_alerts_data->sort_order = strcmp (attribute,
"descending");
else
- get_escalators_data->sort_order = 1;
- set_client_state (CLIENT_GET_ESCALATORS);
+ get_alerts_data->sort_order = 1;
+ set_client_state (CLIENT_GET_ALERTS);
}
else if (strcasecmp ("GET_LSC_CREDENTIALS", element_name) == 0)
{
@@ -4598,8 +4598,8 @@
"delta_report_id",
&get_reports_data->delta_report_id);
- append_attribute (attribute_names, attribute_values, "escalator_id",
- &get_reports_data->escalator_id);
+ append_attribute (attribute_names, attribute_values, "alert_id",
+ &get_reports_data->alert_id);
append_attribute (attribute_names, attribute_values, "format_id",
&get_reports_data->format_id);
@@ -5049,12 +5049,12 @@
&stop_task_data->task_id);
set_client_state (CLIENT_STOP_TASK);
}
- else if (strcasecmp ("TEST_ESCALATOR", element_name) == 0)
+ else if (strcasecmp ("TEST_ALERT", element_name) == 0)
{
append_attribute (attribute_names, attribute_values,
- "escalator_id",
- &test_escalator_data->escalator_id);
- set_client_state (CLIENT_TEST_ESCALATOR);
+ "alert_id",
+ &test_alert_data->alert_id);
+ set_client_state (CLIENT_TEST_ALERT);
}
else if (strcasecmp ("VERIFY_AGENT", element_name) == 0)
{
@@ -5269,11 +5269,11 @@
openvas_append_string (&modify_task_data->comment, "");
set_client_state (CLIENT_MODIFY_TASK_COMMENT);
}
- else if (strcasecmp ("ESCALATOR", element_name) == 0)
+ else if (strcasecmp ("ALERT", element_name) == 0)
{
append_attribute (attribute_names, attribute_values, "id",
- &modify_task_data->escalator_id);
- set_client_state (CLIENT_MODIFY_TASK_ESCALATOR);
+ &modify_task_data->alert_id);
+ set_client_state (CLIENT_MODIFY_TASK_ALERT);
}
else if (strcasecmp ("NAME", element_name) == 0)
set_client_state (CLIENT_MODIFY_TASK_NAME);
@@ -5449,48 +5449,48 @@
(CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NVT_NAME);
ELSE_ERROR ("create_config");
- case CLIENT_CREATE_ESCALATOR:
+ case CLIENT_CREATE_ALERT:
if (strcasecmp ("COMMENT", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_COMMENT);
+ set_client_state (CLIENT_CREATE_ALERT_COMMENT);
else if (strcasecmp ("CONDITION", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_CONDITION);
+ set_client_state (CLIENT_CREATE_ALERT_CONDITION);
else if (strcasecmp ("EVENT", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_EVENT);
+ set_client_state (CLIENT_CREATE_ALERT_EVENT);
else if (strcasecmp ("METHOD", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_METHOD);
+ set_client_state (CLIENT_CREATE_ALERT_METHOD);
else if (strcasecmp ("NAME", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_NAME);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_NAME);
+ ELSE_ERROR ("create_alert");
- case CLIENT_CREATE_ESCALATOR_CONDITION:
+ case CLIENT_CREATE_ALERT_CONDITION:
if (strcasecmp ("DATA", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_CONDITION_DATA);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_CONDITION_DATA);
+ ELSE_ERROR ("create_alert");
- case CLIENT_CREATE_ESCALATOR_CONDITION_DATA:
+ case CLIENT_CREATE_ALERT_CONDITION_DATA:
if (strcasecmp ("NAME", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_CONDITION_DATA_NAME);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_CONDITION_DATA_NAME);
+ ELSE_ERROR ("create_alert");
- case CLIENT_CREATE_ESCALATOR_EVENT:
+ case CLIENT_CREATE_ALERT_EVENT:
if (strcasecmp ("DATA", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_EVENT_DATA);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_EVENT_DATA);
+ ELSE_ERROR ("create_alert");
- case CLIENT_CREATE_ESCALATOR_EVENT_DATA:
+ case CLIENT_CREATE_ALERT_EVENT_DATA:
if (strcasecmp ("NAME", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_EVENT_DATA_NAME);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_EVENT_DATA_NAME);
+ ELSE_ERROR ("create_alert");
- case CLIENT_CREATE_ESCALATOR_METHOD:
+ case CLIENT_CREATE_ALERT_METHOD:
if (strcasecmp ("DATA", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_METHOD_DATA);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_METHOD_DATA);
+ ELSE_ERROR ("create_alert");
- case CLIENT_CREATE_ESCALATOR_METHOD_DATA:
+ case CLIENT_CREATE_ALERT_METHOD_DATA:
if (strcasecmp ("NAME", element_name) == 0)
- set_client_state (CLIENT_CREATE_ESCALATOR_METHOD_DATA_NAME);
- ELSE_ERROR ("create_escalator");
+ set_client_state (CLIENT_CREATE_ALERT_METHOD_DATA_NAME);
+ ELSE_ERROR ("create_alert");
case CLIENT_CREATE_LSC_CREDENTIAL:
if (strcasecmp ("COMMENT", element_name) == 0)
@@ -6079,11 +6079,11 @@
&create_task_data->config_id);
set_client_state (CLIENT_CREATE_TASK_CONFIG);
}
- else if (strcasecmp ("ESCALATOR", element_name) == 0)
+ else if (strcasecmp ("ALERT", element_name) == 0)
{
append_attribute (attribute_names, attribute_values, "id",
- &create_task_data->escalator_id);
- set_client_state (CLIENT_CREATE_TASK_ESCALATOR);
+ &create_task_data->alert_id);
+ set_client_state (CLIENT_CREATE_TASK_ALERT);
}
else if (strcasecmp ("OBSERVERS", element_name) == 0)
set_client_state (CLIENT_CREATE_TASK_OBSERVERS);
@@ -8603,7 +8603,7 @@
break;
}
- if (get_reports_data->escalator_id == NULL)
+ if (get_reports_data->alert_id == NULL)
SEND_TO_CLIENT_OR_FAIL
("<get_reports_response"
" status=\"" STATUS_OK "\""
@@ -8657,7 +8657,7 @@
send_to_client,
write_to_client,
write_to_client_data,
- get_reports_data->escalator_id,
+ get_reports_data->alert_id,
"assets",
get_reports_data->host,
pos,
@@ -8728,7 +8728,7 @@
send_to_client,
write_to_client,
write_to_client_data,
- get_reports_data->escalator_id,
+ get_reports_data->alert_id,
"prognostic",
get_reports_data->host,
pos,
@@ -8765,7 +8765,7 @@
content_type = report_format_content_type (report_format);
extension = report_format_extension (report_format);
- if (get_reports_data->escalator_id == NULL)
+ if (get_reports_data->alert_id == NULL)
SENDF_TO_CLIENT_OR_FAIL
("<report"
" type=\"scan\""
@@ -8805,12 +8805,12 @@
send_to_client,
write_to_client,
write_to_client_data,
- get_reports_data->escalator_id,
+ get_reports_data->alert_id,
get_reports_data->type,
NULL, 0, NULL, NULL, 0, 0);
if (ret)
{
- if (get_reports_data->escalator_id)
+ if (get_reports_data->alert_id)
switch (ret)
{
case 0:
@@ -8818,8 +8818,8 @@
case 1:
if (send_find_error_to_client
("get_reports",
- "escalator",
- get_reports_data->escalator_id,
+ "alert",
+ get_reports_data->alert_id,
write_to_client,
write_to_client_data))
{
@@ -8852,12 +8852,12 @@
return;
}
}
- if (get_reports_data->escalator_id == NULL)
+ if (get_reports_data->alert_id == NULL)
SEND_TO_CLIENT_OR_FAIL ("</report>");
}
cleanup_iterator (&reports);
- if (get_reports_data->escalator_id)
+ if (get_reports_data->alert_id)
SEND_TO_CLIENT_OR_FAIL (XML_OK ("get_reports"));
else
SEND_TO_CLIENT_OR_FAIL ("</get_reports_response>");
@@ -9311,56 +9311,56 @@
set_client_state (CLIENT_AUTHENTIC);
break;
- case CLIENT_DELETE_ESCALATOR:
- assert (strcasecmp ("DELETE_ESCALATOR", element_name) == 0);
- if (delete_escalator_data->escalator_id)
+ case CLIENT_DELETE_ALERT:
+ assert (strcasecmp ("DELETE_ALERT", element_name) == 0);
+ if (delete_alert_data->alert_id)
{
- switch (delete_escalator (delete_escalator_data->escalator_id,
- delete_escalator_data->ultimate))
+ switch (delete_alert (delete_alert_data->alert_id,
+ delete_alert_data->ultimate))
{
case 0:
- SEND_TO_CLIENT_OR_FAIL (XML_OK ("delete_escalator"));
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator %s has been deleted",
- delete_escalator_data->escalator_id);
+ SEND_TO_CLIENT_OR_FAIL (XML_OK ("delete_alert"));
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert %s has been deleted",
+ delete_alert_data->alert_id);
break;
case 1:
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("delete_escalator",
- "Escalator is in use"));
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator %s could not be deleted",
- delete_escalator_data->escalator_id);
+ (XML_ERROR_SYNTAX ("delete_alert",
+ "Alert is in use"));
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert %s could not be deleted",
+ delete_alert_data->alert_id);
break;
case 2:
if (send_find_error_to_client
- ("delete_escalator",
- "escalator",
- delete_escalator_data->escalator_id,
+ ("delete_alert",
+ "alert",
+ delete_alert_data->alert_id,
write_to_client,
write_to_client_data))
{
error_send_to_client (error);
return;
}
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator %s could not be deleted",
- delete_escalator_data->escalator_id);
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert %s could not be deleted",
+ delete_alert_data->alert_id);
break;
default:
SEND_TO_CLIENT_OR_FAIL
- (XML_INTERNAL_ERROR ("delete_escalator"));
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator %s could not be deleted",
- delete_escalator_data->escalator_id);
+ (XML_INTERNAL_ERROR ("delete_alert"));
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert %s could not be deleted",
+ delete_alert_data->alert_id);
}
}
else
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("delete_escalator",
- "DELETE_ESCALATOR requires an escalator_id"
+ (XML_ERROR_SYNTAX ("delete_alert",
+ "DELETE_ALERT requires an alert_id"
" attribute"));
- delete_escalator_data_reset (delete_escalator_data);
+ delete_alert_data_reset (delete_alert_data);
set_client_state (CLIENT_AUTHENTIC);
break;
@@ -10326,7 +10326,7 @@
}
}
else if ((modify_task_data->action
- || modify_task_data->escalator_id
+ || modify_task_data->alert_id
|| modify_task_data->name
|| modify_task_data->rcfile)
== 0)
@@ -10335,7 +10335,7 @@
"Too few parameters"));
else if (modify_task_data->action
&& (modify_task_data->comment
- || modify_task_data->escalator_id
+ || modify_task_data->alert_id
|| modify_task_data->name
|| modify_task_data->rcfile))
SEND_TO_CLIENT_OR_FAIL
@@ -10343,7 +10343,7 @@
"Too many parameters at once"));
else if ((task_target (task) == 0)
&& (modify_task_data->rcfile
- || modify_task_data->escalator_id
+ || modify_task_data->alert_id
|| modify_task_data->schedule_id
|| modify_task_data->slave_id))
SEND_TO_CLIENT_OR_FAIL
@@ -10474,25 +10474,25 @@
}
}
- if (fail == 0 && modify_task_data->escalator_id)
+ if (fail == 0 && modify_task_data->alert_id)
{
- escalator_t escalator = 0;
+ alert_t alert = 0;
- if (strcmp (modify_task_data->escalator_id, "0") == 0)
+ if (strcmp (modify_task_data->alert_id, "0") == 0)
{
- set_task_escalator (task, 0);
+ set_task_alert (task, 0);
}
- else if ((fail = find_escalator
- (modify_task_data->escalator_id,
- &escalator)))
+ else if ((fail = find_alert
+ (modify_task_data->alert_id,
+ &alert)))
SEND_TO_CLIENT_OR_FAIL
(XML_INTERNAL_ERROR ("modify_task"));
- else if (escalator == 0)
+ else if (alert == 0)
{
if (send_find_error_to_client
("modify_task",
- "escalator",
- modify_task_data->escalator_id,
+ "alert",
+ modify_task_data->alert_id,
write_to_client,
write_to_client_data))
{
@@ -10503,7 +10503,7 @@
}
else
{
- set_task_escalator (task, escalator);
+ set_task_alert (task, alert);
}
}
@@ -10596,7 +10596,7 @@
set_client_state (CLIENT_AUTHENTIC);
break;
CLOSE (CLIENT_MODIFY_TASK, COMMENT);
- CLOSE (CLIENT_MODIFY_TASK, ESCALATOR);
+ CLOSE (CLIENT_MODIFY_TASK, ALERT);
CLOSE (CLIENT_MODIFY_TASK, NAME);
CLOSE (CLIENT_MODIFY_TASK, OBSERVERS);
CLOSE (CLIENT_MODIFY_TASK, PREFERENCES);
@@ -10979,200 +10979,200 @@
CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, TYPE);
CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, VALUE);
- case CLIENT_CREATE_ESCALATOR:
+ case CLIENT_CREATE_ALERT:
{
event_t event;
- escalator_condition_t condition;
- escalator_method_t method;
- escalator_t new_escalator;
+ alert_condition_t condition;
+ alert_method_t method;
+ alert_t new_alert;
- assert (strcasecmp ("CREATE_ESCALATOR", element_name) == 0);
- assert (create_escalator_data->name != NULL);
- assert (create_escalator_data->condition != NULL);
- assert (create_escalator_data->method != NULL);
- assert (create_escalator_data->event != NULL);
+ assert (strcasecmp ("CREATE_ALERT", element_name) == 0);
+ assert (create_alert_data->name != NULL);
+ assert (create_alert_data->condition != NULL);
+ assert (create_alert_data->method != NULL);
+ assert (create_alert_data->event != NULL);
- array_terminate (create_escalator_data->condition_data);
- array_terminate (create_escalator_data->event_data);
- array_terminate (create_escalator_data->method_data);
+ array_terminate (create_alert_data->condition_data);
+ array_terminate (create_alert_data->event_data);
+ array_terminate (create_alert_data->method_data);
if (openvas_is_user_observer (current_credentials.username))
{
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
+ (XML_ERROR_SYNTAX ("create_alert",
"CREATE is forbidden for observer users"));
}
- else if (strlen (create_escalator_data->name) == 0)
+ else if (strlen (create_alert_data->name) == 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
- "CREATE_ESCALATOR requires NAME element which"
+ (XML_ERROR_SYNTAX ("create_alert",
+ "CREATE_ALERT requires NAME element which"
" is at least one character long"));
- else if (strlen (create_escalator_data->condition) == 0)
+ else if (strlen (create_alert_data->condition) == 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
- "CREATE_ESCALATOR requires a value in a"
+ (XML_ERROR_SYNTAX ("create_alert",
+ "CREATE_ALERT requires a value in a"
" CONDITION element"));
- else if (strlen (create_escalator_data->event) == 0)
+ else if (strlen (create_alert_data->event) == 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
- "CREATE_ESCALATOR requires a value in an"
+ (XML_ERROR_SYNTAX ("create_alert",
+ "CREATE_ALERT requires a value in an"
" EVENT element"));
- else if (strlen (create_escalator_data->method) == 0)
+ else if (strlen (create_alert_data->method) == 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
- "CREATE_ESCALATOR requires a value in a"
+ (XML_ERROR_SYNTAX ("create_alert",
+ "CREATE_ALERT requires a value in a"
" METHOD element"));
- else if ((condition = escalator_condition_from_name
- (create_escalator_data->condition))
+ else if ((condition = alert_condition_from_name
+ (create_alert_data->condition))
== 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
+ (XML_ERROR_SYNTAX ("create_alert",
"Failed to recognise condition name"));
- else if ((event = event_from_name (create_escalator_data->event))
+ else if ((event = event_from_name (create_alert_data->event))
== 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
+ (XML_ERROR_SYNTAX ("create_alert",
"Failed to recognise event name"));
- else if ((method = escalator_method_from_name
- (create_escalator_data->method))
+ else if ((method = alert_method_from_name
+ (create_alert_data->method))
== 0)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
+ (XML_ERROR_SYNTAX ("create_alert",
"Failed to recognise method name"));
else
{
- switch (create_escalator (create_escalator_data->name,
- create_escalator_data->comment,
+ switch (create_alert (create_alert_data->name,
+ create_alert_data->comment,
event,
- create_escalator_data->event_data,
+ create_alert_data->event_data,
condition,
- create_escalator_data->condition_data,
+ create_alert_data->condition_data,
method,
- create_escalator_data->method_data,
- &new_escalator))
+ create_alert_data->method_data,
+ &new_alert))
{
case 0:
{
char *uuid;
- escalator_uuid (new_escalator, &uuid);
+ alert_uuid (new_alert, &uuid);
SENDF_TO_CLIENT_OR_FAIL
- (XML_OK_CREATED_ID ("create_escalator"), uuid);
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator %s has been created", uuid);
+ (XML_OK_CREATED_ID ("create_alert"), uuid);
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert %s has been created", uuid);
free (uuid);
break;
}
case 1:
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
- "Escalator exists already"));
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator could not be created");
+ (XML_ERROR_SYNTAX ("create_alert",
+ "Alert exists already"));
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert could not be created");
break;
case 2:
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("create_escalator",
+ (XML_ERROR_SYNTAX ("create_alert",
"Validation of email address failed"));
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator could not be created");
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert could not be created");
break;
default:
assert (0);
case -1:
SEND_TO_CLIENT_OR_FAIL
- (XML_INTERNAL_ERROR ("create_escalator"));
- g_log ("event escalator", G_LOG_LEVEL_MESSAGE,
- "Escalator could not be created");
+ (XML_INTERNAL_ERROR ("create_alert"));
+ g_log ("event alert", G_LOG_LEVEL_MESSAGE,
+ "Alert could not be created");
break;
}
}
- create_escalator_data_reset (create_escalator_data);
+ create_alert_data_reset (create_alert_data);
set_client_state (CLIENT_AUTHENTIC);
break;
}
- CLOSE (CLIENT_CREATE_ESCALATOR, COMMENT);
- CLOSE (CLIENT_CREATE_ESCALATOR, CONDITION);
- CLOSE (CLIENT_CREATE_ESCALATOR, EVENT);
- CLOSE (CLIENT_CREATE_ESCALATOR, METHOD);
- CLOSE (CLIENT_CREATE_ESCALATOR, NAME);
+ CLOSE (CLIENT_CREATE_ALERT, COMMENT);
+ CLOSE (CLIENT_CREATE_ALERT, CONDITION);
+ CLOSE (CLIENT_CREATE_ALERT, EVENT);
+ CLOSE (CLIENT_CREATE_ALERT, METHOD);
+ CLOSE (CLIENT_CREATE_ALERT, NAME);
- case CLIENT_CREATE_ESCALATOR_CONDITION_DATA:
+ case CLIENT_CREATE_ALERT_CONDITION_DATA:
{
gchar *string;
assert (strcasecmp ("DATA", element_name) == 0);
- assert (create_escalator_data->condition_data);
- assert (create_escalator_data->part_data);
- assert (create_escalator_data->part_name);
+ assert (create_alert_data->condition_data);
+ assert (create_alert_data->part_data);
+ assert (create_alert_data->part_name);
- string = g_strconcat (create_escalator_data->part_name,
+ string = g_strconcat (create_alert_data->part_name,
"0",
- create_escalator_data->part_data,
+ create_alert_data->part_data,
NULL);
- string[strlen (create_escalator_data->part_name)] = '\0';
- array_add (create_escalator_data->condition_data, string);
+ string[strlen (create_alert_data->part_name)] = '\0';
+ array_add (create_alert_data->condition_data, string);
- openvas_free_string_var (&create_escalator_data->part_data);
- openvas_free_string_var (&create_escalator_data->part_name);
- openvas_append_string (&create_escalator_data->part_data, "");
- openvas_append_string (&create_escalator_data->part_name, "");
- set_client_state (CLIENT_CREATE_ESCALATOR_CONDITION);
+ openvas_free_string_var (&create_alert_data->part_data);
+ openvas_free_string_var (&create_alert_data->part_name);
+ openvas_append_string (&create_alert_data->part_data, "");
+ openvas_append_string (&create_alert_data->part_name, "");
+ set_client_state (CLIENT_CREATE_ALERT_CONDITION);
break;
}
- case CLIENT_CREATE_ESCALATOR_CONDITION_DATA_NAME:
+ case CLIENT_CREATE_ALERT_CONDITION_DATA_NAME:
assert (strcasecmp ("NAME", element_name) == 0);
- set_client_state (CLIENT_CREATE_ESCALATOR_CONDITION_DATA);
+ set_client_state (CLIENT_CREATE_ALERT_CONDITION_DATA);
break;
- case CLIENT_CREATE_ESCALATOR_EVENT_DATA:
+ case CLIENT_CREATE_ALERT_EVENT_DATA:
{
gchar *string;
assert (strcasecmp ("DATA", element_name) == 0);
- assert (create_escalator_data->event_data);
- assert (create_escalator_data->part_data);
- assert (create_escalator_data->part_name);
+ assert (create_alert_data->event_data);
+ assert (create_alert_data->part_data);
+ assert (create_alert_data->part_name);
- string = g_strconcat (create_escalator_data->part_name,
+ string = g_strconcat (create_alert_data->part_name,
"0",
- create_escalator_data->part_data,
+ create_alert_data->part_data,
NULL);
- string[strlen (create_escalator_data->part_name)] = '\0';
- array_add (create_escalator_data->event_data, string);
+ string[strlen (create_alert_data->part_name)] = '\0';
+ array_add (create_alert_data->event_data, string);
- openvas_free_string_var (&create_escalator_data->part_data);
- openvas_free_string_var (&create_escalator_data->part_name);
- openvas_append_string (&create_escalator_data->part_data, "");
- openvas_append_string (&create_escalator_data->part_name, "");
- set_client_state (CLIENT_CREATE_ESCALATOR_EVENT);
+ openvas_free_string_var (&create_alert_data->part_data);
+ openvas_free_string_var (&create_alert_data->part_name);
+ openvas_append_string (&create_alert_data->part_data, "");
+ openvas_append_string (&create_alert_data->part_name, "");
+ set_client_state (CLIENT_CREATE_ALERT_EVENT);
break;
}
- CLOSE (CLIENT_CREATE_ESCALATOR_EVENT_DATA, NAME);
+ CLOSE (CLIENT_CREATE_ALERT_EVENT_DATA, NAME);
- case CLIENT_CREATE_ESCALATOR_METHOD_DATA:
+ case CLIENT_CREATE_ALERT_METHOD_DATA:
{
gchar *string;
assert (strcasecmp ("DATA", element_name) == 0);
- assert (create_escalator_data->method_data);
- assert (create_escalator_data->part_data);
- assert (create_escalator_data->part_name);
+ assert (create_alert_data->method_data);
+ assert (create_alert_data->part_data);
+ assert (create_alert_data->part_name);
- string = g_strconcat (create_escalator_data->part_name,
+ string = g_strconcat (create_alert_data->part_name,
"0",
- create_escalator_data->part_data,
+ create_alert_data->part_data,
NULL);
- string[strlen (create_escalator_data->part_name)] = '\0';
- array_add (create_escalator_data->method_data, string);
+ string[strlen (create_alert_data->part_name)] = '\0';
+ array_add (create_alert_data->method_data, string);
- openvas_free_string_var (&create_escalator_data->part_data);
- openvas_free_string_var (&create_escalator_data->part_name);
- openvas_append_string (&create_escalator_data->part_data, "");
- openvas_append_string (&create_escalator_data->part_name, "");
- set_client_state (CLIENT_CREATE_ESCALATOR_METHOD);
+ openvas_free_string_var (&create_alert_data->part_data);
+ openvas_free_string_var (&create_alert_data->part_name);
+ openvas_append_string (&create_alert_data->part_data, "");
+ openvas_append_string (&create_alert_data->part_name, "");
+ set_client_state (CLIENT_CREATE_ALERT_METHOD);
break;
}
- CLOSE (CLIENT_CREATE_ESCALATOR_METHOD_DATA, NAME);
+ CLOSE (CLIENT_CREATE_ALERT_METHOD_DATA, NAME);
case CLIENT_CREATE_LSC_CREDENTIAL:
{
@@ -12693,12 +12693,12 @@
|| (create_task_data->config_id
&& create_task_data->target_id));
- /* Set any escalator. */
+ /* Set any alert. */
- if (create_task_data->escalator_id)
+ if (create_task_data->alert_id)
{
- escalator_t escalator;
- if (find_escalator (create_task_data->escalator_id, &escalator))
+ alert_t alert;
+ if (find_alert (create_task_data->alert_id, &alert))
{
request_delete_task (&create_task_data->task);
free (tsk_uuid);
@@ -12708,19 +12708,19 @@
set_client_state (CLIENT_AUTHENTIC);
break;
}
- if (escalator == 0)
+ if (alert == 0)
{
request_delete_task (&create_task_data->task);
free (tsk_uuid);
free (description);
SEND_TO_CLIENT_OR_FAIL
(XML_ERROR_SYNTAX ("create_task",
- "CREATE_TASK escalator must exist"));
+ "CREATE_TASK alert must exist"));
create_task_data_reset (create_task_data);
set_client_state (CLIENT_AUTHENTIC);
break;
}
- add_task_escalator (create_task_data->task, escalator);
+ add_task_alert (create_task_data->task, alert);
}
/* Set any schedule. */
@@ -13000,7 +13000,7 @@
}
CLOSE (CLIENT_CREATE_TASK, COMMENT);
CLOSE (CLIENT_CREATE_TASK, CONFIG);
- CLOSE (CLIENT_CREATE_TASK, ESCALATOR);
+ CLOSE (CLIENT_CREATE_TASK, ALERT);
CLOSE (CLIENT_CREATE_TASK, NAME);
CLOSE (CLIENT_CREATE_TASK, OBSERVERS);
CLOSE (CLIENT_CREATE_TASK, PREFERENCES);
@@ -13269,20 +13269,20 @@
CLOSE (CLIENT_MODIFY_OVERRIDE, TEXT);
CLOSE (CLIENT_MODIFY_OVERRIDE, THREAT);
- case CLIENT_TEST_ESCALATOR:
- if (test_escalator_data->escalator_id)
+ case CLIENT_TEST_ALERT:
+ if (test_alert_data->alert_id)
{
- escalator_t escalator;
+ alert_t alert;
task_t task;
- if (find_escalator (test_escalator_data->escalator_id, &escalator))
- SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("test_escalator"));
- else if (escalator == 0)
+ if (find_alert (test_alert_data->alert_id, &alert))
+ SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("test_alert"));
+ else if (alert == 0)
{
if (send_find_error_to_client
- ("test_escalator",
- "escalator",
- test_escalator_data->escalator_id,
+ ("test_alert",
+ "alert",
+ test_alert_data->alert_id,
write_to_client,
write_to_client_data))
{
@@ -13291,34 +13291,34 @@
}
}
else if (find_task (MANAGE_EXAMPLE_TASK_UUID, &task))
- SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("test_escalator"));
+ SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("test_alert"));
else if (task == 0)
- SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("test_escalator"));
- else switch (escalate (escalator,
- task,
- EVENT_TASK_RUN_STATUS_CHANGED,
- (void*) TASK_STATUS_DONE))
+ SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("test_alert"));
+ else switch (manage_alert (alert,
+ task,
+ EVENT_TASK_RUN_STATUS_CHANGED,
+ (void*) TASK_STATUS_DONE))
{
case 0:
- SEND_TO_CLIENT_OR_FAIL (XML_OK ("test_escalator"));
+ SEND_TO_CLIENT_OR_FAIL (XML_OK ("test_alert"));
break;
case -1:
SEND_TO_CLIENT_OR_FAIL
- (XML_INTERNAL_ERROR ("test_escalator"));
+ (XML_INTERNAL_ERROR ("test_alert"));
break;
default: /* Programming error. */
assert (0);
SEND_TO_CLIENT_OR_FAIL
- (XML_INTERNAL_ERROR ("test_escalator"));
+ (XML_INTERNAL_ERROR ("test_alert"));
break;
}
}
else
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("test_escalator",
- "TEST_ESCALATOR requires an escalator_id"
+ (XML_ERROR_SYNTAX ("test_alert",
+ "TEST_ALERT requires an alert_id"
" attribute"));
- test_escalator_data_reset (test_escalator_data);
+ test_alert_data_reset (test_alert_data);
set_client_state (CLIENT_AUTHENTIC);
break;
@@ -14295,25 +14295,25 @@
break;
}
- case CLIENT_GET_ESCALATORS:
+ case CLIENT_GET_ALERTS:
{
- escalator_t escalator = 0;
+ alert_t alert = 0;
- assert (strcasecmp ("GET_ESCALATORS", element_name) == 0);
+ assert (strcasecmp ("GET_ALERTS", element_name) == 0);
- if (get_escalators_data->escalator_id && get_escalators_data->trash)
+ if (get_alerts_data->alert_id && get_alerts_data->trash)
SEND_TO_CLIENT_OR_FAIL
- (XML_ERROR_SYNTAX ("get_escalators",
- "GET_ESCALATORS trash given with"
- " escalator_id"));
- else if (get_escalators_data->escalator_id
- && find_escalator (get_escalators_data->escalator_id, &escalator))
- SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("get_escalators"));
- else if (get_escalators_data->escalator_id && escalator == 0)
+ (XML_ERROR_SYNTAX ("get_alerts",
+ "GET_ALERTS trash given with"
+ " alert_id"));
+ else if (get_alerts_data->alert_id
+ && find_alert (get_alerts_data->alert_id, &alert))
+ SEND_TO_CLIENT_OR_FAIL (XML_INTERNAL_ERROR ("get_alerts"));
+ else if (get_alerts_data->alert_id && alert == 0)
{
- if (send_find_error_to_client ("get_escalators",
- "escalator",
- get_escalators_data->escalator_id,
+ if (send_find_error_to_client ("get_alerts",
+ "alert",
+ get_alerts_data->alert_id,
write_to_client,
write_to_client_data))
{
@@ -14323,90 +14323,90 @@
}
else
{
- iterator_t escalators;
+ iterator_t alerts;
- SEND_TO_CLIENT_OR_FAIL ("<get_escalators_response"
+ SEND_TO_CLIENT_OR_FAIL ("<get_alerts_response"
" status=\"" STATUS_OK "\""
" status_text=\"" STATUS_OK_TEXT "\">");
- init_escalator_iterator (&escalators,
- escalator,
+ init_alert_iterator (&alerts,
+ alert,
(task_t) 0,
(event_t) 0,
- get_escalators_data->trash,
- get_escalators_data->sort_order,
- get_escalators_data->sort_field);
- while (next (&escalators))
+ get_alerts_data->trash,
+ get_alerts_data->sort_order,
+ get_alerts_data->sort_field);
+ while (next (&alerts))
{
iterator_t data;
- SENDF_TO_CLIENT_OR_FAIL ("<escalator id=\"%s\">"
+ SENDF_TO_CLIENT_OR_FAIL ("<alert id=\"%s\">"
"<name>%s</name>"
"<comment>%s</comment>"
"<in_use>%i</in_use>",
- escalator_iterator_uuid (&escalators),
- escalator_iterator_name (&escalators),
- escalator_iterator_comment (&escalators),
- escalator_iterator_in_use (&escalators));
+ alert_iterator_uuid (&alerts),
+ alert_iterator_name (&alerts),
+ alert_iterator_comment (&alerts),
+ alert_iterator_in_use (&alerts));
/* Condition. */
SENDF_TO_CLIENT_OR_FAIL ("<condition>%s",
- escalator_condition_name
- (escalator_iterator_condition
- (&escalators)));
- init_escalator_data_iterator (&data,
- escalator_iterator_escalator
- (&escalators),
- get_escalators_data->trash,
+ alert_condition_name
+ (alert_iterator_condition
+ (&alerts)));
+ init_alert_data_iterator (&data,
+ alert_iterator_alert
+ (&alerts),
+ get_alerts_data->trash,
"condition");
while (next (&data))
SENDF_TO_CLIENT_OR_FAIL ("<data>"
"<name>%s</name>"
"%s"
"</data>",
- escalator_data_iterator_name (&data),
- escalator_data_iterator_data (&data));
+ alert_data_iterator_name (&data),
+ alert_data_iterator_data (&data));
cleanup_iterator (&data);
SEND_TO_CLIENT_OR_FAIL ("</condition>");
/* Event. */
SENDF_TO_CLIENT_OR_FAIL ("<event>%s",
- event_name (escalator_iterator_event
- (&escalators)));
- init_escalator_data_iterator (&data,
- escalator_iterator_escalator
- (&escalators),
- get_escalators_data->trash,
+ event_name (alert_iterator_event
+ (&alerts)));
+ init_alert_data_iterator (&data,
+ alert_iterator_alert
+ (&alerts),
+ get_alerts_data->trash,
"event");
while (next (&data))
SENDF_TO_CLIENT_OR_FAIL ("<data>"
"<name>%s</name>"
"%s"
"</data>",
- escalator_data_iterator_name (&data),
- escalator_data_iterator_data (&data));
+ alert_data_iterator_name (&data),
+ alert_data_iterator_data (&data));
cleanup_iterator (&data);
SEND_TO_CLIENT_OR_FAIL ("</event>");
/* Method. */
SENDF_TO_CLIENT_OR_FAIL ("<method>%s",
- escalator_method_name
- (escalator_iterator_method
- (&escalators)));
- init_escalator_data_iterator (&data,
- escalator_iterator_escalator
- (&escalators),
- get_escalators_data->trash,
+ alert_method_name
+ (alert_iterator_method
+ (&alerts)));
+ init_alert_data_iterator (&data,
+ alert_iterator_alert
+ (&alerts),
+ get_alerts_data->trash,
"method");
while (next (&data))
SENDF_TO_CLIENT_OR_FAIL ("<data>"
"<name>%s</name>"
"%s"
"</data>",
- escalator_data_iterator_name (&data),
- escalator_data_iterator_data (&data));
+ alert_data_iterator_name (&data),
+ alert_data_iterator_data (&data));
cleanup_iterator (&data);
SEND_TO_CLIENT_OR_FAIL ("</method>");
@@ -14418,32 +14418,32 @@
* by some other mechanism, like a details flag.
*/
- if (escalator)
+ if (alert)
{
iterator_t tasks;
SEND_TO_CLIENT_OR_FAIL ("<tasks>");
- init_escalator_task_iterator
+ init_alert_task_iterator
(&tasks,
- escalator,
- get_escalators_data->sort_order);
+ alert,
+ get_alerts_data->sort_order);
while (next (&tasks))
SENDF_TO_CLIENT_OR_FAIL
("<task id=\"%s\">"
"<name>%s</name>"
"</task>",
- escalator_task_iterator_uuid (&tasks),
- escalator_task_iterator_name (&tasks));
+ alert_task_iterator_uuid (&tasks),
+ alert_task_iterator_name (&tasks));
cleanup_iterator (&tasks);
SEND_TO_CLIENT_OR_FAIL ("</tasks>");
}
- SEND_TO_CLIENT_OR_FAIL ("</escalator>");
+ SEND_TO_CLIENT_OR_FAIL ("</alert>");
}
- cleanup_iterator (&escalators);
- SEND_TO_CLIENT_OR_FAIL ("</get_escalators_response>");
+ cleanup_iterator (&alerts);
+ SEND_TO_CLIENT_OR_FAIL ("</get_alerts_response>");
}
- get_escalators_data_reset (get_escalators_data);
+ get_alerts_data_reset (get_alerts_data);
set_client_state (CLIENT_AUTHENTIC);
break;
}
@@ -15116,7 +15116,7 @@
target_t target;
slave_t slave;
char *name, *config, *config_uuid;
- char *escalator, *escalator_uuid;
+ char *alert, *alert_uuid;
char *task_target_uuid, *task_target_name, *hosts;
char *task_slave_uuid, *task_slave_name;
char *task_schedule_uuid, *task_schedule_name, *comment;
@@ -15384,8 +15384,8 @@
comment = task_comment (task);
owner = task_owner_name (task);
observers = task_observers (task);
- escalator = task_escalator_name (task);
- escalator_uuid = task_escalator_uuid (task);
+ alert = task_alert_name (task);
+ alert_uuid = task_alert_uuid (task);
config = task_config_name (task);
config_uuid = task_config_uuid (task);
task_target_uuid = target_uuid (target);
@@ -15413,9 +15413,9 @@
"<config id=\"%s\">"
"<name>%s</name>"
"</config>"
- "<escalator id=\"%s\">"
+ "<alert id=\"%s\">"
"<name>%s</name>"
- "</escalator>"
+ "</alert>"
"<target id=\"%s\">"
"<name>%s</name>"
"</target>"
@@ -15444,8 +15444,8 @@
: observers,
config_uuid ? config_uuid : "",
config ? config : "",
- escalator_uuid ? escalator_uuid : "",
- escalator ? escalator : "",
+ alert_uuid ? alert_uuid : "",
+ alert ? alert : "",
task_target_uuid ? task_target_uuid : "",
task_target_name ? task_target_name : "",
task_slave_uuid ? task_slave_uuid : "",
@@ -15466,7 +15466,7 @@
last_report,
second_last_report);
free (config);
- free (escalator);
+ free (alert);
free (task_target_name);
free (task_target_uuid);
g_free (progress_xml);
@@ -15549,7 +15549,7 @@
target_t target;
slave_t slave;
char *tsk_uuid, *config, *config_uuid;
- char *escalator, *escalator_uuid;
+ char *alert, *alert_uuid;
char *task_target_uuid, *task_target_name, *hosts;
char *task_slave_uuid, *task_slave_name;
char *task_schedule_uuid, *task_schedule_name;
@@ -15824,8 +15824,8 @@
config = task_config_name (index);
config_uuid = task_config_uuid (index);
- escalator = task_escalator_name (index);
- escalator_uuid = task_escalator_uuid (index);
+ alert = task_alert_name (index);
+ alert_uuid = task_alert_uuid (index);
if (target_in_trash)
{
task_target_uuid = trash_target_uuid (target);
@@ -15871,10 +15871,10 @@
"<name>%s</name>"
"<trash>%i</trash>"
"</config>"
- "<escalator id=\"%s\">"
+ "<alert id=\"%s\">"
"<name>%s</name>"
"<trash>%i</trash>"
- "</escalator>"
+ "</alert>"
"<target id=\"%s\">"
"<name>%s</name>"
"<trash>%i</trash>"
@@ -15908,10 +15908,10 @@
config_uuid ? config_uuid : "",
config ? config : "",
task_config_in_trash (index),
- escalator_uuid ? escalator_uuid : "",
- escalator ? escalator : "",
- escalator
- ? task_escalator_in_trash (index)
+ alert_uuid ? alert_uuid : "",
+ alert ? alert : "",
+ alert
+ ? task_alert_in_trash (index)
: 0,
task_target_uuid ? task_target_uuid : "",
task_target_name ? task_target_name : "",
@@ -15937,8 +15937,8 @@
last_report,
second_last_report);
free (config);
- free (escalator);
- free (escalator_uuid);
+ free (alert);
+ free (alert_uuid);
free (task_target_name);
free (task_target_uuid);
g_free (progress_xml);
@@ -16336,40 +16336,40 @@
&create_lsc_credential_data->password);
- APPEND (CLIENT_CREATE_ESCALATOR_COMMENT,
- &create_escalator_data->comment);
+ APPEND (CLIENT_CREATE_ALERT_COMMENT,
+ &create_alert_data->comment);
- APPEND (CLIENT_CREATE_ESCALATOR_CONDITION,
- &create_escalator_data->condition);
+ APPEND (CLIENT_CREATE_ALERT_CONDITION,
+ &create_alert_data->condition);
- APPEND (CLIENT_CREATE_ESCALATOR_EVENT,
- &create_escalator_data->event);
+ APPEND (CLIENT_CREATE_ALERT_EVENT,
+ &create_alert_data->event);
- APPEND (CLIENT_CREATE_ESCALATOR_METHOD,
- &create_escalator_data->method);
+ APPEND (CLIENT_CREATE_ALERT_METHOD,
+ &create_alert_data->method);
- APPEND (CLIENT_CREATE_ESCALATOR_NAME,
- &create_escalator_data->name);
+ APPEND (CLIENT_CREATE_ALERT_NAME,
+ &create_alert_data->name);
- APPEND (CLIENT_CREATE_ESCALATOR_CONDITION_DATA,
- &create_escalator_data->part_data);
+ APPEND (CLIENT_CREATE_ALERT_CONDITION_DATA,
+ &create_alert_data->part_data);
- APPEND (CLIENT_CREATE_ESCALATOR_EVENT_DATA,
- &create_escalator_data->part_data);
+ APPEND (CLIENT_CREATE_ALERT_EVENT_DATA,
+ &create_alert_data->part_data);
- APPEND (CLIENT_CREATE_ESCALATOR_METHOD_DATA,
- &create_escalator_data->part_data);
+ APPEND (CLIENT_CREATE_ALERT_METHOD_DATA,
+ &create_alert_data->part_data);
- APPEND (CLIENT_CREATE_ESCALATOR_CONDITION_DATA_NAME,
- &create_escalator_data->part_name);
+ APPEND (CLIENT_CREATE_ALERT_CONDITION_DATA_NAME,
+ &create_alert_data->part_name);
- APPEND (CLIENT_CREATE_ESCALATOR_EVENT_DATA_NAME,
- &create_escalator_data->part_name);
+ APPEND (CLIENT_CREATE_ALERT_EVENT_DATA_NAME,
+ &create_alert_data->part_name);
- APPEND (CLIENT_CREATE_ESCALATOR_METHOD_DATA_NAME,
- &create_escalator_data->part_name);
+ APPEND (CLIENT_CREATE_ALERT_METHOD_DATA_NAME,
+ &create_alert_data->part_name);
APPEND (CLIENT_CREATE_NOTE_ACTIVE,
Modified: trunk/openvas-manager/src/schema_formats/XML/OMP.xml
===================================================================
--- trunk/openvas-manager/src/schema_formats/XML/OMP.xml 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/schema_formats/XML/OMP.xml 2012-03-28 10:52:59 UTC (rev 13163)
@@ -61,7 +61,7 @@
<name>OpenVAS Management Protocol</name>
<abbreviation>OMP</abbreviation>
<summary>The "management" protocol of the Open Vulnerability Assessment System</summary>
- <version>3.0</version>
+ <version>4.0</version>
<type>
<name>actions</name>
<summary>A specifier of actions: get, modify, use</summary>
@@ -1228,8 +1228,8 @@
<c>authenticate</c>
<c>commands</c>
<c>create_agent</c>
+ <c>create_alert</c>
<c>create_config</c>
- <c>create_escalator</c>
<c>create_lsc_credential</c>
<c>create_note</c>
<c>create_override</c>
@@ -1241,8 +1241,8 @@
<c>create_target</c>
<c>create_task</c>
<c>delete_agent</c>
+ <c>delete_alert</c>
<c>delete_config</c>
- <c>delete_escalator</c>
<c>delete_lsc_credential</c>
<c>delete_note</c>
<c>delete_override</c>
@@ -1256,9 +1256,9 @@
<c>delete_task</c>
<c>empty_trashcan</c>
<c>get_agents</c>
+ <c>get_alerts</c>
<c>get_configs</c>
<c>get_dependencies</c>
- <c>get_escalators</c>
<c>get_info</c>
<c>get_lsc_credentials</c>
<c>get_notes</c>
@@ -1293,7 +1293,7 @@
<c>resume_stopped_task</c>
<c>start_task</c>
<c>stop_task</c>
- <c>test_escalator</c>
+ <c>test_alert</c>
</or>
</any>
</pattern>
@@ -1314,8 +1314,8 @@
<r>authenticate</r>
<r>commands</r>
<r>create_agent</r>
+ <r>create_alert</r>
<r>create_config</r>
- <r>create_escalator</r>
<r>create_lsc_credential</r>
<r>create_note</r>
<r>create_override</r>
@@ -1326,8 +1326,8 @@
<r>create_target</r>
<r>create_task</r>
<r>delete_agent</r>
+ <r>delete_alert</r>
<r>delete_config</r>
- <r>delete_escalator</r>
<r>delete_lsc_credential</r>
<r>delete_note</r>
<r>delete_override</r>
@@ -1341,9 +1341,9 @@
<r>delete_task</r>
<r>empty_trashcan</r>
<r>get_agents</r>
+ <r>get_alerts</r>
<r>get_configs</r>
<r>get_dependencies</r>
- <r>get_escalators</r>
<r>get_info</r>
<r>get_lsc_credentials</r>
<r>get_notes</r>
@@ -1378,7 +1378,7 @@
<r>resume_stopped_task</r>
<r>start_task</r>
<r>stop_task</r>
- <r>test_escalator</r>
+ <r>test_alert</r>
</or>
</any>
</pattern>
@@ -1606,12 +1606,12 @@
</example>
</command>
<command>
- <name>create_escalator</name>
- <summary>Create an escalator</summary>
+ <name>create_alert</name>
+ <summary>Create an alert</summary>
<description>
<p>
- The client uses the create_escalator command to create a new
- escalator.
+ The client uses the create_alert command to create a new
+ alert.
</p>
</description>
<pattern>
@@ -1623,19 +1623,21 @@
</pattern>
<ele>
<name>name</name>
- <summary>A name for the escalator</summary>
+ <summary>A name for the alert</summary>
<pattern><t>name</t></pattern>
</ele>
<ele>
<name>comment</name>
- <summary>A comment on the escalator</summary>
+ <summary>A comment on the alert</summary>
<pattern>
text
</pattern>
</ele>
<ele>
<name>condition</name>
- <summary>The condition that must be satisfied for escalation</summary>
+ <summary>
+ The condition that must be satisfied for the alert to occur
+ </summary>
<pattern>
text
<any><e>data</e></any>
@@ -1658,7 +1660,9 @@
</ele>
<ele>
<name>event</name>
- <summary>The event that must happen for escalation</summary>
+ <summary>
+ The event that must happen for the alert to occur
+ </summary>
<pattern>
text
<any><e>data</e></any>
@@ -1681,7 +1685,7 @@
</ele>
<ele>
<name>method</name>
- <summary>The method by which escalation must occur</summary>
+ <summary>The method by which the user is alerted</summary>
<pattern>
text
<any><e>data</e></any>
@@ -1722,9 +1726,9 @@
</pattern>
</response>
<example>
- <summary>Create an escalator</summary>
+ <summary>Create an alert</summary>
<request>
- <create_escalator>
+ <create_alert>
<name>emergency</name>
<condition>
Threat level at least
@@ -1751,13 +1755,13 @@
bob at example.org
</data>
</method>
- </create_escalator>
+ </create_alert>
</request>
<response>
- <create_escalator_response status="201"
- status_text="OK, resource created"
- id="254cd3ef-bbe1-4d58-859d-21b8d0c046c6">
- </create_escalator_response>
+ <create_alert_response status="201"
+ status_text="OK, resource created"
+ id="254cd3ef-bbe1-4d58-859d-21b8d0c046c6">
+ </create_alert_response>
</response>
</example>
</command>
@@ -2862,7 +2866,7 @@
<o><e>comment</e></o>
<e>config</e>
<e>target</e>
- <o><e>escalator</e></o>
+ <o><e>alert</e></o>
<o><e>schedule</e></o>
<o><e>slave</e></o>
<o><e>observers</e></o>
@@ -2904,8 +2908,8 @@
</pattern>
</ele>
<ele>
- <name>escalator</name>
- <summary>An escalator that applies to the task</summary>
+ <name>alert</name>
+ <summary>An alert that applies to the task</summary>
<pattern>
<attrib>
<name>id</name>
@@ -3110,12 +3114,12 @@
</example>
</command>
<command>
- <name>delete_escalator</name>
- <summary>Delete an escalator</summary>
+ <name>delete_alert</name>
+ <summary>Delete an alert</summary>
<description>
<p>
- The client uses the delete_escalator command to delete an existing
- escalator.
+ The client uses the delete_alert command to delete an existing
+ alert.
</p>
<p>
Since this is a destructive command, the client is advised to ask
@@ -3125,7 +3129,7 @@
</description>
<pattern>
<attrib>
- <name>escalator_id</name>
+ <name>alert_id</name>
<type>uuid</type>
<required>1</required>
</attrib>
@@ -3151,13 +3155,13 @@
</pattern>
</response>
<example>
- <summary>Delete an escalator</summary>
+ <summary>Delete an alert</summary>
<request>
- <delete_escalator escalator_id="267a3405-e84a-47da-97b2-5fa0d2e8995e">
- </delete_escalator>
+ <delete_alert alert_id="267a3405-e84a-47da-97b2-5fa0d2e8995e">
+ </delete_alert>
</request>
<response>
- <delete_escalator_response status="200" status_text="OK"/>
+ <delete_alert_response status="200" status_text="OK"/>
</response>
</example>
</command>
@@ -4382,22 +4386,22 @@
</example>
</command>
<command>
- <name>get_escalators</name>
- <summary>Get all escalators</summary>
+ <name>get_alerts</name>
+ <summary>Get all alerts</summary>
<description>
- The client uses the get_escalators command to get escalator information.
+ The client uses the get_alerts command to get alert information.
If the command sent by the client was valid, the manager will
- reply with a list of escalators to the client.
+ reply with a list of alerts to the client.
</description>
<pattern>
<attrib>
- <name>escalator_id</name>
- <summary>ID of single escalator to get</summary>
+ <name>alert_id</name>
+ <summary>ID of single alert to get</summary>
<type>uuid</type>
</attrib>
<attrib>
<name>trash</name>
- <summary>Whether to get the trashcan escalators instead</summary>
+ <summary>Whether to get the trashcan alerts instead</summary>
<type>boolean</type>
</attrib>
<attrib>
@@ -4421,10 +4425,10 @@
<type>text</type>
<required>1</required>
</attrib>
- <any><e>escalator</e></any>
+ <any><e>alert</e></any>
</pattern>
<ele>
- <name>escalator</name>
+ <name>alert</name>
<pattern>
<e>name</e>
<e>comment</e>
@@ -4435,24 +4439,26 @@
</pattern>
<ele>
<name>name</name>
- <summary>The name of the escalator</summary>
+ <summary>The name of the alert</summary>
<pattern><t>name</t></pattern>
</ele>
<ele>
<name>comment</name>
- <summary>The comment on the escalator</summary>
+ <summary>The comment on the alert</summary>
<pattern>
text
</pattern>
</ele>
<ele>
<name>in_use</name>
- <summary>Whether any tasks are using the escalator</summary>
+ <summary>Whether any tasks are using the alert</summary>
<pattern><t>boolean</t></pattern>
</ele>
<ele>
<name>condition</name>
- <summary>The condition that must be satisfied for escalation</summary>
+ <summary>
+ The condition that must be satisfied for the alert to occur
+ </summary>
<pattern>
text
<any><e>data</e></any>
@@ -4475,7 +4481,7 @@
</ele>
<ele>
<name>event</name>
- <summary>The event that must happen for escalation</summary>
+ <summary>The event that must happen for the alert to occur</summary>
<pattern>
text
<any><e>data</e></any>
@@ -4498,7 +4504,7 @@
</ele>
<ele>
<name>method</name>
- <summary>The method by which escalation must occur</summary>
+ <summary>The method by which he alert must occur</summary>
<pattern>
text
<any><e>data</e></any>
@@ -4522,13 +4528,13 @@
</ele>
</response>
<example>
- <summary>Get the escalators</summary>
+ <summary>Get the alerts</summary>
<request>
- <get_escalators></get_escalators>
+ <get_alerts></get_alerts>
</request>
<response>
- <get_escalators_response status="200" status_text="OK">
- <escalator id="6181e65d-8ba0-4937-9c44-8f2b10b0def7">
+ <get_alerts_response status="200" status_text="OK">
+ <alert id="6181e65d-8ba0-4937-9c44-8f2b10b0def7">
<name>Team alert</name>
<comment></comment>
<in_use>1</in_use>
@@ -4561,9 +4567,9 @@
0
</data>
</method>
- </escalator>
+ </alert>
<truncated>...</truncated>
- </get_escalators_response>
+ </get_alerts_response>
</response>
</example>
</command>
@@ -6315,8 +6321,8 @@
<type>uuid</type>
</attrib>
<attrib>
- <name>escalator_id</name>
- <summary>ID of escalator to pass generated report to</summary>
+ <name>alert_id</name>
+ <summary>ID of alert to pass generated report to</summary>
<description>
<p>
In this case the response is empty, and simply indicates success
@@ -8051,7 +8057,7 @@
<e>progress</e>
<e>config</e>
<e>target</e>
- <e>escalator</e>
+ <e>alert</e>
<e>observers</e>
<e>schedule</e>
<e>slave</e>
@@ -8146,8 +8152,8 @@
</ele>
</ele>
<ele>
- <name>escalator</name>
- <summary>An escalator that applies to the task</summary>
+ <name>alert</name>
+ <summary>An alert that applies to the task</summary>
<pattern>
<attrib>
<name>id</name>
@@ -8159,12 +8165,12 @@
</pattern>
<ele>
<name>name</name>
- <summary>The name of the escalator</summary>
+ <summary>The name of the alert</summary>
<pattern><t>name</t></pattern>
</ele>
<ele>
<name>trash</name>
- <summary>Whether the escalator is in the trashcan</summary>
+ <summary>Whether the alert is in the trashcan</summary>
<pattern><t>boolean</t></pattern>
</ele>
</ele>
@@ -8511,9 +8517,9 @@
<config id="daba56c8-73ec-11df-a475-002264764cea">
<name>Full and fast</name>
</config>
- <escalator id="">
+ <alert id="">
<name></name>
- </escalator>
+ </alert>
<target id="1f28d970-17ef-4c69-ba8a-13827059f2b9">
<name>dik</name>
</target>
@@ -8597,9 +8603,9 @@
<config id="daba56c8-73ec-11df-a475-002264764cea">
<name>Full and fast</name>
</config>
- <escalator id="">
+ <alert id="">
<name></name>
- </escalator>
+ </alert>
<target id="1f28d970-17ef-4c69-ba8a-13827059f2b9">
<name>dik</name>
</target>
@@ -8841,7 +8847,7 @@
COMMANDS Run a list of commands.
CREATE_AGENT Create an agent.
CREATE_CONFIG Create a config.
- CREATE_ESCALATOR Create an escalator.
+ CREATE_ALERT Create an alert.
CREATE_LSC_CREDENTIAL Create a local security check credential.
CREATE_NOTE Create a note.
CREATE_OVERRIDE Create an override.
@@ -8855,7 +8861,7 @@
CREATE_TASK Create a task.
DELETE_AGENT Delete an agent.
DELETE_CONFIG Delete a config.
- DELETE_ESCALATOR Delete an escalator.
+ DELETE_ALERT Delete an alert.
DELETE_LSC_CREDENTIAL Delete a local security check credential.
DELETE_NOTE Delete a note.
DELETE_OVERRIDE Delete an override.
@@ -8871,7 +8877,7 @@
GET_AGENTS Get all agents.
GET_CONFIGS Get all configs.
GET_DEPENDENCIES Get dependencies for all available NVTs.
- GET_ESCALATORS Get all escalators.
+ GET_ALERTS Get all alerts.
GET_LSC_CREDENTIALS Get all local security check credentials.
GET_NOTES Get all notes.
GET_NVTS Get one or all available NVTs.
@@ -8907,7 +8913,7 @@
RESUME_STOPPED_TASK Resume a stopped task.
START_TASK Manually start an existing task.
STOP_TASK Stop a running task.
- TEST_ESCALATOR Run an escalator.
+ TEST_ALERT Run an alert.
VERIFY_AGENT Verify an agent.
VERIFY_REPORT_FORMAT Verify a report format.
</help_response>
@@ -9796,7 +9802,7 @@
</attrib>
<or>
<e>comment</e>
- <e>escalator</e>
+ <e>alert</e>
<e>name</e>
<e>observers</e>
<e>preferences</e>
@@ -9814,8 +9820,8 @@
</pattern>
</ele>
<ele>
- <name>escalator</name>
- <summary>Task escalator</summary>
+ <name>alert</name>
+ <summary>Task alert</summary>
<pattern>
<attrib>
<name>id</name>
@@ -10221,17 +10227,17 @@
</example>
</command>
<command>
- <name>test_escalator</name>
- <summary>Run an escalator</summary>
+ <name>test_alert</name>
+ <summary>Run an alert</summary>
<description>
<p>
- The client uses the test_escalator command to invoke a test run of
- an escalator.
+ The client uses the test_alert command to invoke a test run of
+ an alert.
</p>
</description>
<pattern>
<attrib>
- <name>escalator_id</name>
+ <name>alert_id</name>
<type>uuid</type>
<required>1</required>
</attrib>
@@ -10251,13 +10257,13 @@
</pattern>
</response>
<example>
- <summary>Test an escalator</summary>
+ <summary>Test an alert</summary>
<request>
- <test_escalator escalator_id="97390ade-e075-11df-9973-002264764cea">
- </test_escalator>
+ <test_alert alert_id="97390ade-e075-11df-9973-002264764cea">
+ </test_alert>
</request>
<response>
- <test_escalator_response status="200" status_text="OK"/>
+ <test_alert_response status="200" status_text="OK"/>
</response>
</example>
</command>
Modified: trunk/openvas-manager/src/sql.c
===================================================================
--- trunk/openvas-manager/src/sql.c 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/sql.c 2012-03-28 10:52:59 UTC (rev 13163)
@@ -274,7 +274,7 @@
*
* @return 0 success, 1 too few rows, -1 error.
*/
- int
+int
sql_x (/*@unused@*/ unsigned int col, unsigned int row, char* sql,
va_list args, sqlite3_stmt** stmt_return)
{
@@ -669,6 +669,67 @@
sqlite3_result_int (context, time (NULL));
}
+/**
+ * @brief Move data from a table to a new table, heeding column rename.
+ *
+ * @param[in] old_table Existing table.
+ * @param[in] new_table New empty table with renamed column.
+ * @param[in] old_name Name of column in old table.
+ * @param[in] new_name Name of column in new table.
+ */
+void
+sql_rename_column (const char *old_table, const char *new_table,
+ const char *old_name, const char *new_name)
+{
+ iterator_t rows;
+
+ /* Get a row with all columns. */
+
+ init_iterator (&rows, "SELECT * FROM %s LIMIT 1;", old_table);
+ if (next (&rows))
+ {
+ GString *one, *two;
+ int end, column, first;
+
+ /* Build the INSERT query from the column names in the row. */
+
+ one = g_string_new ("");
+ g_string_append_printf (one, "INSERT INTO %s (", new_table);
+
+ two = g_string_new (") SELECT ");
+
+ end = iterator_column_count (&rows);
+ first = 1;
+ for (column = 0; column < end; column++)
+ {
+ const char *name;
+ name = iterator_column_name (&rows, column);
+ g_string_append_printf (one, "%s%s",
+ (first ? "" : ", "),
+ (strcmp (name, old_name) == 0
+ ? new_name
+ : name));
+ if (first)
+ first = 0;
+ else
+ g_string_append (two, ", ");
+ g_string_append (two, name);
+ }
+ cleanup_iterator (&rows);
+
+ g_string_append_printf (one, "%s FROM %s;", two->str, old_table);
+
+ /* Run the INSERT query. */
+
+ sql (one->str);
+
+ g_string_free (one, TRUE);
+ g_string_free (two, TRUE);
+ }
+ else
+ cleanup_iterator (&rows);
+}
+
/* Iterators. */
@@ -749,6 +810,35 @@
}
/**
+ * @brief Get a column name from an iterator.
+ *
+ * @param[in] iterator Iterator.
+ * @param[in] col Column offset.
+ *
+ * @return Name of given column.
+ */
+const char*
+iterator_column_name (iterator_t* iterator, int col)
+{
+ if (iterator->done) abort ();
+ return (const char*) sqlite3_column_name (iterator->stmt, col);
+}
+
+/**
+ * @brief Get number of columns from an iterator.
+ *
+ * @param[in] iterator Iterator.
+ *
+ * @return Number of columns.
+ */
+int
+iterator_column_count (iterator_t* iterator)
+{
+ if (iterator->done) abort ();
+ return sqlite3_column_count (iterator->stmt);
+}
+
+/**
* @brief Cleanup an iterator.
*
* @param[in] iterator Iterator.
Modified: trunk/openvas-manager/src/sql.h
===================================================================
--- trunk/openvas-manager/src/sql.h 2012-03-28 09:41:54 UTC (rev 13162)
+++ trunk/openvas-manager/src/sql.h 2012-03-28 10:52:59 UTC (rev 13163)
@@ -79,6 +79,9 @@
void
sql_now (sqlite3_context *, int argc, sqlite3_value **);
+void
+sql_rename_column (const char *, const char *, const char *, const char *);
+
/* Iterators. */
@@ -91,6 +94,12 @@
const char*
iterator_string (iterator_t*, int);
+const char*
+iterator_column_name (iterator_t*, int);
+
+int
+iterator_column_count (iterator_t*);
+
void
cleanup_iterator (iterator_t*);
More information about the Openvas-commits
mailing list