source: ralphm-patches/roster_item_more.patch @ 54:03ec57713c90

wokkel/im.py

@@ -371 +371 @@
     @ivar groups: Set of groups this contact is categorized in. Groups are
                   represented by an opaque identifier of type C{unicode}.
     @type groups: C{set}
+    @ivar approved: Signals pre-approved subscription.
+    @type approved: C{bool}
+    @ivar remove: Signals roster item removal.
+    @type remove: C{bool}
+    @ivar sender: The JID of the entity that sent this roster item.
+    @type sender: L{JID}
     """
 
     __subscriptionStates = {(False, False): None,
@@ -381 +387 @@
     def __init__(self, entity, subscriptionTo=False, subscriptionFrom=False,
                        name=None, groups=None):
         self.entity = entity
+        self.name = name
         self.subscriptionTo = subscriptionTo
         self.subscriptionFrom = subscriptionFrom
-        self.name = name
         self.groups = groups or set()
 
         self.pendingOut = False
         self.approved = False
         self.remove = False
 
+        self.sender = None
+
 
     def toElement(self):
         element = domish.Element((NS_ROSTER, 'item'))
@@ -505 +513 @@
             raise error.StanzaError('service-unavailable')
 
         item = RosterItem.fromElement(iq.query.item)
+        if iq.hasAttribute('from'):
+            item.sender = jid.internJID(iq['from'])
 
         if item.remove:
             d = defer.maybeDeferred(self.onRosterRemove, item.entity)

wokkel/test/test_im.py

@@ -764 +764 @@
         return d
 
 
-    def test_onRosterSetUntrusted(self):
+    def test_onRosterSetIgnored(self):
         """
-        Roster pushes from untrusted sources will be not be handled.
+        Ignored roster pushes return a service unavailable error.
         """
         xml = """
           <iq type='set' from='bad@example.org'>
@@ -790 +790 @@
         return d
 
 
+    def test_onRosterSetOtherSource(self):
+        """
+        Roster pushes can be sent from other entities, too.
+        """
+        xml = """
+          <iq type='set' from='other@example.org'>
+            <query xmlns='jabber:iq:roster'>
+              <item jid='user@example.org'/>
+            </query>
+          </iq>
+        """
+
+        items = []
+
+        def onRosterSet(item):
+            items.append(item)
+
+        def cb(result):
+            item = items[0]
+            self.assertEquals(JID('other@example.org'), item.sender)
+
+        self.service.onRosterSet = onRosterSet
+
+        d = self.handleRequest(xml)
+        d.addCallback(cb)
+        return d
+
+
     def test_onRosterRemove(self):
         """
         A roster push causes onRosterSet to be called with the parsed item.