[Openvas-commits] r12934 - in trunk/openvas-administrator: . doc src/schema_formats/XML
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 29 11:43:04 CET 2012
Author: felix
Date: 2012-02-29 11:43:04 +0100 (Wed, 29 Feb 2012)
New Revision: 12934
Modified:
trunk/openvas-administrator/ChangeLog
trunk/openvas-administrator/doc/oap.html
trunk/openvas-administrator/doc/oap.rnc
trunk/openvas-administrator/src/schema_formats/XML/OAP.xml
Log:
* src/schema_formats/XML/OAP.xml (create_user, get_users, modify_user):
Add sources to users.
* doc/oap.html, doc/oap.rnc: Update from source.
Modified create_user, modify_user and get_users.
Modified: trunk/openvas-administrator/ChangeLog
===================================================================
--- trunk/openvas-administrator/ChangeLog 2012-02-29 10:37:29 UTC (rev 12933)
+++ trunk/openvas-administrator/ChangeLog 2012-02-29 10:43:04 UTC (rev 12934)
@@ -1,5 +1,13 @@
2012-02-29 Felix Wolfsteller <felix.wolfsteller at greenbone.net>
+ * src/schema_formats/XML/OAP.xml (create_user, get_users, modify_user):
+ Add sources to users.
+
+ * doc/oap.html, doc/oap.rnc: Update from source.
+ Modified create_user, modify_user and get_users.
+
+2012-02-29 Felix Wolfsteller <felix.wolfsteller at greenbone.net>
+
Modified create_user, modify_user and get_users such that
a list of (authentication) sources can be given/retrieved.
The only source setting that will matter for now is the
Modified: trunk/openvas-administrator/doc/oap.html
===================================================================
--- trunk/openvas-administrator/doc/oap.html 2012-02-29 10:37:29 UTC (rev 12933)
+++ trunk/openvas-administrator/doc/oap.html 2012-02-29 10:43:04 UTC (rev 12934)
@@ -124,6 +124,10 @@
<td id="index"><a href="#element_command_definition">command_definition</a></td>
<td id="index"><div style="margin-left: 15px;">Definition of a command in OAP describing HELP command.</div></td>
</tr>
+<tr id="index">
+<td id="index"><a href="#element_sources">sources</a></td>
+<td id="index"><div style="margin-left: 15px;">List of authentication sources associated to a user.</div></td>
+</tr>
</table>
<h2 id="command_summary">3 Summary of Commands</h2>
<table id="index">
@@ -855,6 +859,31 @@
}
</pre></div></div>
</div>
+<div>
+<div><h3 id="element_sources">6.9
+ Element <tt>sources</tt>
+</h3></div>
+<p>In short: List of authentication sources associated to a user.</p>
+<h4>6.9.1 Structure</h4>
+<ul style="list-style: none"><li><ul style="list-style: none"><li>
+ <<b>source</b>>
+ *<div style="margin-left: 15px; display: inline;">The name of the authentication source.</div>
+<ul style="list-style: none"></ul>
+</li></ul></li></ul>
+<h4>6.9.2 RNC</h4>
+<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><div style="margin-left: 5%"><pre>sources
+ = element sources
+ {
+ sources_source*
+ }
+
+sources_source
+ = element source
+ {
+ text
+ }
+</pre></div></div>
+</div>
<h2 id="command_details">7 Command Details</h2>
<div>
<div><h3 id="command_authenticate">7.1
@@ -1694,6 +1723,12 @@
0 forbidden, 1 allowed, 2 all allowed, 3 custom.
</li></ul>
</li>
+<li>
+ <<b>sources</b>>
+ <div style="margin-left: 15px; display: inline;">(<a href="#element_sources">sources</a>)</div>
+<div style="margin-left: 15px; display: inline;">Sources allowed for authentication for this user.</div>
+<ul style="list-style: none"></ul>
+</li>
</ul>
</li>
</ul>
@@ -1721,6 +1756,7 @@
get_users_response_user_name
& get_users_response_user_role
& get_users_response_user_hosts
+ & get_users_response_user_sources
}
get_users_response_user_name
@@ -1741,6 +1777,12 @@
text
& attribute allow { xsd:token { pattern = "0|1|2|3" } }
}
+
+get_users_response_user_sources
+ = element sources # type sources
+ {
+ sources_source*
+ }
</pre></div>
</div>
<h4>7.8.3 Example: Get the users</h4>
@@ -1753,6 +1795,9 @@
<name>foobar</name>
<role>User</role>
<hosts allow="2"/>
+ <sources>
+ <source>file</source>
+ </sources>
</user>
</get_users_response>
</pre></div>
@@ -2260,6 +2305,12 @@
(<a href="#type_boolean">boolean</a>)
</li></ul>
</li>
+<li>
+ <<b>sources</b>>
+ ?<div style="margin-left: 15px; display: inline;">(<a href="#element_sources">sources</a>)</div>
+<div style="margin-left: 15px; display: inline;">List of authentication sources for this user.</div>
+<ul style="list-style: none"></ul>
+</li>
</ul>
</li>
<li style="margin-top: 15px;">
@@ -2284,6 +2335,7 @@
& modify_user_password?
& modify_user_role
& modify_user_hosts?
+ & modify_user_sources?
}
modify_user_name
@@ -2310,6 +2362,12 @@
{
xsd:token { pattern = "Administrator|User|Observer" }
}
+
+modify_user_sources
+ = element sources # type sources
+ {
+ sources_source*
+ }
</pre></div>
<i>Response</i><div style="margin-left: 5%"><pre>modify_user_response
= element modify_user_response
Modified: trunk/openvas-administrator/doc/oap.rnc
===================================================================
--- trunk/openvas-administrator/doc/oap.rnc 2012-02-29 10:37:29 UTC (rev 12933)
+++ trunk/openvas-administrator/doc/oap.rnc 2012-02-29 10:43:04 UTC (rev 12934)
@@ -329,6 +329,23 @@
& command_definition_example*
}
+## Element Type sources
+##
+## List of authentication sources associated to a user.
+
+sources
+ = element sources
+ {
+ sources_source*
+ }
+
+# The name of the authentication source.
+sources_source
+ = element source
+ {
+ text
+ }
+
### Commands
## Command authenticate
@@ -539,6 +556,7 @@
& modify_user_password?
& modify_user_role
& modify_user_hosts?
+ & modify_user_sources?
}
# The name of the user to be modified.
@@ -570,6 +588,13 @@
xsd:token { pattern = "Administrator|User|Observer" }
}
+# List of authentication sources for this user.
+modify_user_sources
+ = element sources # type sources
+ {
+ sources_source*
+ }
+
## Command sync_feed
##
## Synchronize with an NVT feed.
@@ -736,6 +761,7 @@
get_users_response_user_name
& get_users_response_user_role
& get_users_response_user_hosts
+ & get_users_response_user_sources
}
# The name of the user.
@@ -761,6 +787,13 @@
attribute allow { xsd:token { pattern = "0|1|2|3" } }
}
+# Sources allowed for authentication for this user.
+get_users_response_user_sources
+ = element sources # type sources
+ {
+ sources_source*
+ }
+
## Response to get_version
get_version_response
Modified: trunk/openvas-administrator/src/schema_formats/XML/OAP.xml
===================================================================
--- trunk/openvas-administrator/src/schema_formats/XML/OAP.xml 2012-02-29 10:37:29 UTC (rev 12933)
+++ trunk/openvas-administrator/src/schema_formats/XML/OAP.xml 2012-02-29 10:43:04 UTC (rev 12934)
@@ -328,6 +328,19 @@
<type>command_definition</type>
</ele>
</element>
+ <element>
+ <name>sources</name>
+ <summary>List of authentication sources associated to a user</summary>
+ <pattern>
+ <any><e>source</e></any>
+ </pattern>
+ <ele>
+ <name>source</name>
+ <summary>The name of the authentication source</summary>
+ <description>The name must be unique</description>
+ <pattern><t>text</t></pattern>
+ </ele>
+ </element>
<command>
<name>authenticate</name>
<summary>Authenticate with the Administrator</summary>
@@ -837,6 +850,7 @@
<e>name</e>
<e>role</e>
<e>hosts</e>
+ <e>sources</e>
</pattern>
<ele>
<name>name</name>
@@ -876,6 +890,11 @@
text
</pattern>
</ele>
+ <ele>
+ <name>sources</name>
+ <summary>Sources allowed for authentication for this user</summary>
+ <type>sources</type>
+ </ele>
</ele>
</response>
<example>
@@ -889,6 +908,7 @@
<name>foobar</name>
<role>User</role>
<hosts allow="2"></hosts>
+ <sources><source>file</source></sources>
</user>
</get_users_response>
</response>
@@ -1239,6 +1259,7 @@
<o><e>password</e></o>
<e>role</e>
<o><e>hosts</e></o>
+ <o><e>sources</e></o>
</pattern>
<ele>
<name>name</name>
@@ -1277,6 +1298,11 @@
</t>
</pattern>
</ele>
+ <ele>
+ <name>sources</name>
+ <summary>List of authentication sources for this user</summary>
+ <type>sources</type>
+ </ele>
<response>
<pattern>
<attrib>
More information about the Openvas-commits
mailing list