Changeset 46:5ec77d2dcdb4 in ralphm-patches

Timestamp:

Feb 12, 2011, 7:16:51 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Raise exception on duplicate entities, always use bare JIDs.

File:

• pubsub_manage_affiliations.patch (modified) (9 diffs)

pubsub_manage_affiliations.patch

@@ -1 +1 @@
 # HG changeset patch
 # Parent f69b08281becebb5483f3f2dfb0451ad3086a463
+Add support for managing affiliations of Publish-Subscribe nodes.
 
 diff -r f69b08281bec wokkel/iwokkel.py
 --- a/wokkel/iwokkel.py Sat Feb 12 00:08:30 2011 +0100
-+++ b/wokkel/iwokkel.py Sat Feb 12 09:41:40 2011 +0100
-@@ -767,3 +767,17 @@
++++ b/wokkel/iwokkel.py Sat Feb 12 19:16:00 2011 +0100
+@@ -767,3 +767,36 @@
                   deleted.
          @rtype: L{defer.Deferred}
@@ -22 +23 @@
 +            or C{u'outcast'}.
 +        @rtype: L{defer.Deferred}
++
++        @note: Affiliations are always on the bare JID. An implementation of
++        this method MUST NOT return JIDs with a resource part.
++        """
++
++
++    def affiliationsSet(request):
++        """
++        Called when a affiliations modify request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with C{None} when the affiliation
++            changes were succesfully processed..
++        @rtype: L{defer.Deferred}
++
++        @note: Affiliations are always on the bare JID. The JIDs in
++        L{wokkel.pubsub.PubSubRequest.affiliations} are already stripped of
++        any resource.
 +        """
 diff -r f69b08281bec wokkel/pubsub.py
 --- a/wokkel/pubsub.py  Sat Feb 12 00:08:30 2011 +0100
-+++ b/wokkel/pubsub.py  Sat Feb 12 09:41:40 2011 +0100
++++ b/wokkel/pubsub.py  Sat Feb 12 19:16:00 2011 +0100
 @@ -220,6 +220,9 @@
      @ivar subscriptions: Subscriptions to be modified, as a set of
@@ -53 +73 @@
          'subscriptionsSet': [],
      }
-@@ -526,6 +530,22 @@
+@@ -526,6 +530,27 @@
              self._render_options(optionsElement)
  
@@ -63 +83 @@
 +                element.name == 'affiliation'):
 +                try:
-+                    entity = jid.internJID(element['jid'])
++                    entity = jid.internJID(element['jid']).userhostJID()
 +                except KeyError:
 +                    raise BadRequest(text='Missing jid attribute')
++
++                if entity in self.affiliations:
++                    raise BadRequest(text='Multiple affiliations for an entity')
++
 +                try:
 +                    affiliation = element['affiliation']
 +                except KeyError:
 +                    raise BadRequest(text='Missing affiliation attribute')
++
 +                self.affiliations[entity] = affiliation
 +
@@ -76 +101 @@
          """
          Parse the publish-subscribe verb and parameters out of a request.
-@@ -1303,6 +1323,22 @@
+@@ -1303,6 +1328,22 @@
  
          return message
@@ -101 +126 @@
 diff -r f69b08281bec wokkel/test/test_pubsub.py
 --- a/wokkel/test/test_pubsub.py        Sat Feb 12 00:08:30 2011 +0100
-+++ b/wokkel/test/test_pubsub.py        Sat Feb 12 09:41:40 2011 +0100
++++ b/wokkel/test/test_pubsub.py        Sat Feb 12 19:16:00 2011 +0100
 @@ -3192,7 +3192,45 @@
  
@@ -149 +174 @@
  
          xml = """
-@@ -3204,44 +3242,44 @@
+@@ -3204,39 +3242,90 @@
          </iq>
          """
@@ -193 +218 @@
          """
  
--        def cb(result):
++        def affiliationsSet(request):
++            self.assertEquals(u'test', request.nodeIdentifier)
++            otherJID = JID(u'other@example.org')
++            self.assertIn(otherJID, request.affiliations)
++            self.assertEquals(u'publisher', request.affiliations[otherJID])
++
++        self.resource.affiliationsSet = affiliationsSet
++        return self.handleRequest(xml)
++
++
++    def test_on_affiliationsSetBareJID(self):
++        """
++        Affiliations are always on the bare JID.
++        """
++
++        xml = """
++        <iq type='set' to='pubsub.example.org'
++                       from='user@example.org'>
++          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
++            <affiliations node='test'>
++              <affiliation jid='other@example.org/Home'
++                           affiliation='publisher'/>
++            </affiliations>
++          </pubsub>
++        </iq>
++        """
++
++        def affiliationsSet(request):
++            otherJID = JID(u'other@example.org')
++            self.assertIn(otherJID, request.affiliations)
++
++        self.resource.affiliationsSet = affiliationsSet
++        return self.handleRequest(xml)
++
++
++    def test_on_affiliationsSetMultipleForSameEntity(self):
++        """
++        Setting node affiliations can only have one item per entity.
++        """
++
++        xml = """
++        <iq type='set' to='pubsub.example.org'
++                       from='user@example.org'>
++          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
++            <affiliations node='test'>
++              <affiliation jid='other@example.org' affiliation='publisher'/>
++              <affiliation jid='other@example.org' affiliation='owner'/>
++            </affiliations>
++          </pubsub>
++        </iq>
++        """
++
+         def cb(result):
 -            self.assertEquals('feature-not-implemented', result.condition)
 -            self.assertEquals('unsupported', result.appCondition.name)
@@ -199 +276 @@
 -            self.assertEquals('modify-affiliations',
 -                              result.appCondition['feature'])
--
--        d = self.handleRequest(xml)
--        self.assertFailure(d, error.StanzaError)
--        d.addCallback(cb)
--        return d
-+        def affiliationsSet(request):
-+            self.assertEquals(u'test', request.nodeIdentifier)
-+            otherJID = JID(u'other@example.org')
-+            self.assertIn(otherJID, request.affiliations)
-+            self.assertEquals(u'publisher', request.affiliations[otherJID])
-+
-+        self.resource.affiliationsSet = affiliationsSet
-+        return self.handleRequest(xml)
- 
- 
- 
-@@ -3914,3 +3952,39 @@
++            self.assertEquals('bad-request', result.condition)
+ 
+         d = self.handleRequest(xml)
+         self.assertFailure(d, error.StanzaError)
+@@ -3914,3 +4003,39 @@
          self.assertFailure(d, error.StanzaError)
          d.addCallback(cb)