Add roster/removed-from-rp-subscribed.py, adapted from Gabble

2 files changed, 149 insertions, 0 deletions

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index ab4588b..9e7b780 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -6,6 +6,7 @@ TWISTED_TESTS = \
 	presence/presence.py \
 	roster/initial-roster.py \
 	roster/publish.py \
+	roster/removed-from-rp-subscribe.py \
 	roster/subscribe.py \
 	text/destroy.py \
 	text/ensure.py \
diff --git a/tests/twisted/roster/removed-from-rp-subscribe.py b/tests/twisted/roster/removed-from-rp-subscribe.py
new file mode 100644
index 0000000..a399063
--- /dev/null
+++ b/tests/twisted/roster/removed-from-rp-subscribe.py
@@ -0,0 +1,148 @@
+"""
+Regression tests for rescinding outstanding subscription requests.
+"""
+
+from twisted.words.protocols.jabber.client import IQ
+
+from servicetest import (EventPattern, wrap_channel, assertLength,
+        assertEquals, call_async, sync_dbus)
+from hazetest import exec_test
+import constants as cs
+import ns
+
+jid = 'marco@barisione.lit'
+
+def test(q, bus, conn, stream, remove, local):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged',
+            args=[cs.CONN_STATUS_CONNECTED, cs.CSR_REQUESTED])
+
+    call_async(q, conn.Requests, 'EnsureChannel',{
+        cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
+        cs.TARGET_ID: 'subscribe',
+        })
+    e = q.expect('dbus-return', method='EnsureChannel')
+    subscribe = wrap_channel(bus.get_object(conn.bus_name, e.value[1]),
+            cs.CHANNEL_TYPE_CONTACT_LIST)
+
+    call_async(q, conn.Requests, 'EnsureChannel',{
+        cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
+        cs.TARGET_ID: 'publish',
+        })
+    e = q.expect('dbus-return', method='EnsureChannel')
+    publish = wrap_channel(bus.get_object(conn.bus_name, e.value[1]),
+            cs.CHANNEL_TYPE_CONTACT_LIST)
+
+    h = conn.RequestHandles(cs.HT_CONTACT, [jid])[0]
+
+    # Another client logged into our account (Gajim, say) wants to subscribe to
+    # Marco's presence. First, per RFC 3921 it 'SHOULD perform a "roster set"
+    # for the new roster item':
+    #
+    #   <iq type='set'>
+    #     <query xmlns='jabber:iq:roster'>
+    #       <item jid='marco@barisione.lit'/>
+    #     </query>
+    #   </iq>
+    #
+    # 'As a result, the user's server (1) MUST initiate a roster push for the
+    # new roster item to all available resources associated with this user that
+    # have requested the roster, setting the 'subscription' attribute to a
+    # value of "none"':
+    iq = IQ(stream, "set")
+    item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+    item['jid'] = jid
+    item['subscription'] = 'none'
+    stream.send(iq)
+
+    # In response, Haze adds Marco to the roster, which we guess (wrongly,
+    # in this case) means subscribe
+    q.expect('dbus-signal', signal='MembersChanged',
+        args=['', [h], [], [], [], 0, 0], path=subscribe.object_path)
+
+    # Gajim sends a <presence type='subscribe'/> to Marco. 'As a result, the
+    # user's server MUST initiate a second roster push to all of the user's
+    # available resources that have requested the roster, setting [...]
+    # ask='subscribe' attribute in the roster item [for Marco]:
+    iq = IQ(stream, "set")
+    item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+    item['jid'] = jid
+    item['subscription'] = 'none'
+    item['ask'] = 'subscribe'
+    stream.send(iq)
+
+    # In response, Haze should add Marco to subscribe:remote-pending,
+    # but libpurple has no such concept, so nothing much happens.
+
+    # The user decides that they don't care what Marco's baking after all
+    # (maybe they read his blog instead?) and:
+    if remove:
+        # ...removes him from the roster...
+        if local:
+            # ...by telling Haze to remove him from subscribe (which is
+            # really more like stored)
+            subscribe.Group.RemoveMembers([h], '')
+
+            event = q.expect('stream-iq', iq_type='set', query_ns=ns.ROSTER)
+            item = event.query.firstChildElement()
+            assertEquals(jid, item['jid'])
+            assertEquals('remove', item['subscription'])
+        else:
+            # ...using the other client.
+            pass
+
+        # The server must 'inform all of the user's available resources that
+        # have requested the roster of the roster item removal':
+        iq = IQ(stream, "set")
+        item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+        item['jid'] = jid
+        item['subscription'] = 'remove'
+        # When Marco found this bug, this roster update included:
+        item['ask'] = 'subscribe'
+        # which is a bit weird: I don't think the server should send that when
+        # the contact's being removed. I think CMs should ignore it, so I'm
+        # including it in the test.
+        stream.send(iq)
+
+        # In response, Haze should announce that Marco has been removed from
+        # subscribe:remote-pending and stored:members: but it has no stored
+        # channel.
+        q.expect_many(
+            EventPattern('dbus-signal', signal='MembersChanged',
+                args=['', [], [h], [], [], 0, 0],
+                path=subscribe.object_path),
+            )
+    else:
+        # ...rescinds the subscription request...
+        if local:
+            raise AssertionError("Haze can't do this ")
+        else:
+            # ...in the other client.
+            pass
+
+        # In response, the server sends a roster update:
+        iq = IQ(stream, "set")
+        item = iq.addElement((ns.ROSTER, 'query')).addElement('item')
+        item['jid'] = jid
+        item['subscription'] = 'none'
+        # no ask='subscribe' any more.
+        stream.send(iq)
+
+        # In response, Haze should announce that Marco has been removed from
+        # subscribe:remote-pending; but it can't know that, so nothing happens.
+
+def test_remove_local(q, bus, conn, stream):
+    test(q, bus, conn, stream, remove=True, local=True)
+
+def test_remove_remote(q, bus, conn, stream):
+    test(q, bus, conn, stream, remove=True, local=False)
+
+def test_unsubscribe_remote(q, bus, conn, stream):
+    test(q, bus, conn, stream, remove=False, local=False)
+
+if __name__ == '__main__':
+    exec_test(test_remove_local)
+    exec_test(test_remove_remote)
+    exec_test(test_unsubscribe_remote)