diff --git a/xep-0060.xml b/xep-0060.xml index 8ed4ae90..b89d6ba9 100644 --- a/xep-0060.xml +++ b/xep-0060.xml @@ -49,8 +49,8 @@ &ralphm; - 1.10pre7 - in progress, last updated 2007-08-17 + 1.10pre8 + in progress, last updated 2007-08-24 psa @@ -404,7 +405,7 @@ And by opposing end them? Pubsub ServiceAn XMPP server or component that adheres to the protocol defined herein. Roster Access ModelA node access model under which any entity that is subscribed to the owner's presence and in the specified roster group(s) may subscribe to the node and retrieve items from the node; this access model applies mainly to instant messaging systems. SubscriberAn entity that is subscribed to a node. - Whitelist Access ModelA node access model under which an entity can subscribe only through being added by a node owner (subscription requests are rejected) and only subscribers may retrieve items. + Whitelist Access ModelA node access model under which an entity may subscribe and retrieve items only if explicitly allowed to do so by the node owner (subscription requests from unauthorized entities are rejected). @@ -444,11 +445,12 @@ And by opposing end them? Affiliation Subscribe - Publish Items - Purge Items + Retrieve Items + Publish Item + Delete Item Configure Node Delete Node - Delete Item + Purge Node Owner @@ -458,16 +460,28 @@ And by opposing end them? Yes Yes Yes + Yes Publisher Yes Yes - No + Yes + Yes No No Yes/No * + + Member + Yes + Yes + No + No + No + No + No + None Yes @@ -476,6 +490,7 @@ And by opposing end them? No No No + No Outcast @@ -485,6 +500,7 @@ And by opposing end them? No No No + No

* Note: A service MAY allow any publisher to delete any item once it has been published to that node instead of allowing only the original publisher to remove it (this is discoverable via the "pubsub#delete-any" feature).

@@ -494,6 +510,7 @@ And by opposing end them?   Outcast None + Member Publisher Owner @@ -501,6 +518,7 @@ And by opposing end them? Outcast -- Owner removes ban + Owner adds entity to member list Owner adds entity to publisher list Owner adds entity to owner list @@ -508,6 +526,15 @@ And by opposing end them? None Owner bans entity -- + Owner adds entity to member list + Owner adds entity to publisher list + Owner adds entity to owner list + + + Member + Owner bans entity + Owner removes entity from member list + -- Owner adds entity to publisher list Owner adds entity to owner list @@ -515,6 +542,7 @@ And by opposing end them? Publisher Owner bans entity Owner removes entity from publisher list + n/a -- Owner adds entity to owner list @@ -523,6 +551,7 @@ And by opposing end them? n/a Owner resigns n/a + n/a -- @@ -617,7 +646,7 @@ And by opposing end them? Whitelist - An entity may be subscribed only through being added to a whitelist by the node owner (unsolicited subscription requests are rejected), and only subscribers may retrieve items from the node. In effect, the default affiliation is outcast. The node owner MUST automatically be on the whitelist. In order to add entities to the whitelist, the node owner SHOULD use the protocol specified in the Manage Affiliated Entities section of this document. + An entity may subscribe or retrieve items only if on a whitelist managed by the node owner. The node owner MUST automatically be on the whitelist. In order to add entities to the whitelist, the node owner SHOULD use the protocol specified in the Manage Affiliated Entities section of this document, specifically by setting the affiliation to "member".

A generic publish-subscribe implementation SHOULD support all of the defined access models, although specialized publish-subscribe implementations MAY support only a subset of the access models. Which access models are provided in a particular deployment is a matter of service provisioning (e.g., some restricted deployments may wish to lock down permissions so that only the "authorize" and "whitelist" access models are provided, or even only the "whitelist" access model).

@@ -5746,6 +5775,8 @@ O, what a rogue and peasant slave am I! ]]> + +