diff xmpp/xep-proto-namespace-delegation.xml @ 34:db9316a75306

XEP: updated privileged entity according to discussions following the council's veto (see http://mail.jabber.org/pipermail/standards/2014-December/029378.html): - Big simplification and restriction following council's veto and standard@ discussions - Configuration is not done only on server own configuration - No more client mode - Permissions are adverised using <message/> - The only <iq/> privilege still available is jabber:iq:roster
author Goffi <goffi@goffi.org>
date Thu, 18 Dec 2014 17:48:26 +0100
parents b70084aa0af7
children
line wrap: on
line diff
--- a/xmpp/xep-proto-namespace-delegation.xml	Tue Nov 18 13:26:01 2014 +0100
+++ b/xmpp/xep-proto-namespace-delegation.xml	Thu Dec 18 17:48:26 2014 +0100
@@ -35,6 +35,12 @@
     <jid>goffi@jabber.fr</jid>
   </author>
   <revision>
+    <version>0.0.2</version>
+    <date>2014-11-27</date>
+    <initials>jp</initials>
+    <remark><p></p></remark>
+  </revision>
+  <revision>
     <version>0.0.1</version>
     <date>2014-11-13</date>
     <initials>jp</initials>
@@ -72,12 +78,12 @@
 
     <section2 topic='Delegation Request Use Case' anchor='admin_perm'>
         <section3 topic='Entity Requests Namespace Delegation' anchor='req_delegation'>
-            <p>Once the managing entity is authenticated and stream is started, the entity can request to manage a namespace. It does it by sending an &IQ; stanza with <strong>'urn:xmpp:delegation:0'</strong> namespace. The &QUERY; element MUST have a type of value "request" and MAY have a 'delegation' attribute with the value "admin".</p>
+            <p>Once the managing entity is authenticated and stream is started, the entity can request to manage a namespace. It does it by sending an &IQ; stanza with <strong>'urn:xmpp:delegation:0'</strong> namespace. The &QUERY; element MAY have a 'delegation' attribute with the value "admin".</p>
             <p>Namespace delegations are asked with a &lt;delegate/&gt; element, which MUST contain a 'namespace' attribute set to the requested namespace.</p>
             <p>Only &lt;iq/&gt; stanza namespaces can be delegated.</p>
             <example caption='entity asks for delegation in admin mode'><![CDATA[
 <iq from='pubsub.capulet.lit' type='get' id='delegation1'>
-    <query xmlns='urn:xmpp:delegation:0' type='request' delegation='admin'>
+    <query xmlns='urn:xmpp:delegation:0' delegation='admin'>
         <delegate namespace='jabber:iq:roster'/>
         <delegate namespace='http://jabber.org/protocol/pubsub'/>
     </query>
@@ -88,7 +94,7 @@
             <p>If the server accepts the delegation (e.g.: namespace mapping specified in configuration), it MUST return an &IQ; result stanza, with allowed delegations in &lt;delegate&gt; elements:</p>
             <example caption='server accept namespace delegations'><![CDATA[
 <iq from='capulet.lit' to='pubsub.capulet.lit' type='result' id='delegation1'>
-    <query xmlns='urn:xmpp:delegation:0' type='allowed'>
+    <query xmlns='urn:xmpp:delegation:0'>
         <delegate namespace='jabber:iq:roster'>
         <delegate namespace='http://jabber.org/protocol/pubsub'>
     </query>
@@ -256,7 +262,6 @@
         <example caption='managing entity asks for namespace delegation for one particular entity'><![CDATA[
 <iq from='pubsub.montaigu.lit' to='capulet.lit' type='get' id='delegation1'>
     <query xmlns='urn:xmpp:delegation:0'
-           type='request'
            delegation='client'
            to='juliet@capulet.lit'>
         <delegate namespace='http://jabber.org/protocol/pubsub'/>
@@ -306,12 +311,10 @@
 </message>
         ]]></example>
         <p>Here Juliet allows <em>pubsub.montaigu.lit</em> to manage the PubSub (and then PEP) service.</p>
-        <p>Finaly, the server notifies the entity of the granted delegation. For this it uses a &QUERY; element with the 'allowed' type, and puts the client JID in a 'from' attribute:</p>
+        <p>Finaly, the server notifies the entity of the granted delegation. For this it uses a &QUERY; element with the client JID in a 'from' attribute:</p>
         <example caption='server notify accepted delegations'><![CDATA[
 <iq from='capulet.lit' to='pubsub.montaigu.lit' type='set' id='delegation2'>
-    <query xmlns='urn:xmpp:delegation:0'
-        type='allowed'
-        from='juliet@capulet.lit'>
+    <query xmlns='urn:xmpp:delegation:0' from='juliet@capulet.lit'>
         <delegate namespace='http://jabber.org/protocol/pubsub'/>
     </query>
 </iq>
@@ -541,12 +544,6 @@
 
   <xs:element name='query'>
       <xs:complexType>
-          <xs:attribute name='type' use='required'>
-              <xs:simpleType base='xs:NMTOKEN'>
-                  <xs:enumeration value='request'/>
-                  <xs:enumeration value='allowed'/>
-              </xs:simpleType>
-          </xs:attribute>
           <xs:attribute name='delegation' use='optional'>
               <xs:simpleType base='xs:NMTOKEN'>
                   <xs:enumeration value='admin'/>