Changeset 69:cc2fc0173c4d in ralphm-patches

Timestamp:

Oct 27, 2012, 1:55:56 AM (7 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Use stanzas, use methods on SessionManager? to retrieve sessions.

File:

• c2s_stanza_handlers.patch (modified) (13 diffs)

c2s_stanza_handlers.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 0010b81dc2caab48246d1e3d3d4f555af549688c
+# Parent eb898b91399636715feb9530c3d3e0090628926a
 Add c2s protocol handlers for iq, message and presence stanzas.
 
@@ -95 +95 @@
 +
 +sessionManager.connectionManager = c2sFactory
+diff --git a/wokkel/client.py b/wokkel/client.py
+--- a/wokkel/client.py
++++ b/wokkel/client.py
+@@ -589,13 +589,38 @@
+         return defer.succeed(entity)
+ 
+ 
++    def lookupSessions(self, entity):
++        """
++        Return all sessions for a user.
++
++        @param entity: Entity to retrieve sessions for. This the resource part
++            will be ignored.
++        @type entity: L{JID<twisted.words.protocols.jabber.jid.JID>}
++
++        @return: Mapping of sessions keyed by resource.
++        @rtype: C{dict}
++        """
++        localpart = entity.user
++
++        try:
++            return self.sessions[localpart]
++        except:
++            return {}
++
++
+     def lookupSession(self, entity):
+-        localpart = entity.user
+-        resource = entity.resource
++        """
++        Return the session for a particular resource of an entity.
+ 
+-        userSessions = self.sessions[localpart]
+-        session = userSessions[resource]
+-        return session
++        @param entity: Entity to retrieve sessions for.
++        @type entity: L{JID<twisted.words.protocols.jabber.jid.JID>}
++
++        @return: C{UserSession}.
++        """
++
++        userSessions = self.lookupSessions(entity)
++        return userSessions[entity.resource]
++
+ 
+ 
+     def unbindResource(self, session, reason=None):
 diff --git a/wokkel/test/test_xmppim.py b/wokkel/test/test_xmppim.py
 --- a/wokkel/test/test_xmppim.py
@@ -241 +288 @@
  
  
-@@ -1067,6 +1075,440 @@
+@@ -1035,6 +1043,13 @@
+         return element
+ 
+ 
++    @classmethod
++    def fromElement(cls, element):
++        stanza = super(Message, cls).fromElement(element)
++        stanza.stanzaType = stanza.stanzaType or 'normal'
++        return stanza
++
++
+ 
+ class MessageProtocol(XMPPHandler):
+     """
+@@ -1067,6 +1082,441 @@
  
  
@@ -270 +331 @@
 +            return
 +
-+        try:
-+            recipient = JID(iq['to'])
-+        except KeyError:
++        stanza = Stanza.fromElement(iq)
++        recipient = stanza.recipient
++
++        if not recipient:
++            # This stanza doesn't have a recipient, ignore it.
 +            return
-+
-+        if not recipient.user:
++        elif not recipient.user:
 +            # This is not for an account, ignore it
 +            return
@@ -285 +347 @@
 +            return
 +
-+        userSessions = self.sessionManager.sessions.get(recipient.user,
-+                                                        {})
++        userSessions = self.sessionManager.lookupSessions(recipient)
 +        if recipient.resource in userSessions:
 +            self.sessionManager.deliverStanza(iq, recipient)
@@ -292 +353 @@
 +            # Full JID without connected resource, return error
 +            exc = error.StanzaError('service-unavailable')
-+            if iq['type'] in ('result', 'error'):
++            if stanza.stanzaType in ('result', 'error'):
 +                log.err(exc, 'Could not deliver IQ response')
 +            else:
@@ -312 +373 @@
 +
 +
-+    def onMessage(self, message):
++    def onMessage(self, element):
 +        """
 +        Handler for message stanzas to user accounts.
 +        """
 +
-+        if message.handled:
++        if element.handled:
 +            return
 +
++        message = Message.fromElement(element)
++        recipient = message.recipient
++        stanzaType = message.stanzaType or 'normal'
++
 +        try:
-+            recipient = JID(message['to'])
-+        except KeyError:
-+            return
-+
-+        stanzaType = message.getAttribute('type', 'normal')
-+
-+        try:
++            if not recipient:
++                # This stanza doesn't have a recipient, ignore it.
++                return
 +            if not recipient.user:
 +                # This is not for an account, ignore it
@@ -335 +396 @@
 +                return
 +            elif recipient.resource:
-+                userSessions = self.sessionManager.sessions.get(recipient.user,
-+                                                                {})
++                userSessions = self.sessionManager.lookupSessions(recipient)
 +                if recipient.resource in userSessions:
-+                    self.sessionManager.deliverStanza(message, recipient)
++                    self.sessionManager.deliverStanza(element, recipient)
 +                else:
 +                    if stanzaType in ('normal', 'chat', 'headline'):
-+                        self.onMessageBareJID(message, recipient.userhostJID())
++                        self.onMessageBareJID(message)
 +                    elif stanzaType == 'error':
 +                        log.msg("Dropping message to unconnected resource %r" %
@@ -348 +408 @@
 +                        raise error.StanzaError('service-unavailable')
 +            else:
-+                self.onMessageBareJID(message, recipient)
++                self.onMessageBareJID(message)
 +        except error.StanzaError, exc:
 +            if stanzaType == 'error':
 +                log.err(exc, "Undeliverable error")
 +            else:
-+                self.send(exc.toResponse(message))
-+
-+        message.handled = True
-+
-+
-+    def onMessageBareJID(self, message, bareJID):
-+        stanzaType = message.getAttribute('type', 'normal')
-+
-+        userSessions = self.sessionManager.sessions.get(bareJID.user, {})
++                self.send(exc.toResponse(element))
++
++        element.handled = True
++
++
++    def onMessageBareJID(self, message):
++        userSessions = self.sessionManager.lookupSessions(message.recipient)
 +
 +        recipients = set()
 +
-+        if stanzaType == 'headline':
-+            for session in userSessions:
++        if message.stanzaType == 'headline':
++            for session in userSessions.itervalues():
 +                if session.presence.priority >= 0:
 +                    recipients.add(session.entity)
-+        elif stanzaType in ('chat', 'normal'):
++        elif message.stanzaType in ('chat', 'normal'):
 +            priorities = {}
 +            for session in userSessions.itervalues():
@@ -377 +435 @@
 +                if priority >= 0:
 +                    priorities.setdefault(priority, set()).add(session.entity)
++            if priorities:
 +                maxPriority = max(priorities.keys())
 +                recipients.update(priorities[maxPriority])
-+        elif stanzaType == 'groupchat':
++        elif message.stanzaType == 'groupchat':
 +            raise error.StanzaError('service-unavailable')
 +
 +        if recipients:
 +            for recipient in recipients:
-+                self.sessionManager.deliverStanza(message, recipient)
-+        elif stanzaType in ('chat', 'normal'):
++                self.sessionManager.deliverStanza(message.element, recipient)
++        elif message.stanzaType in ('chat', 'normal'):
 +            raise error.StanzaError('service-unavailable')
 +        else:
 +            # silently discard
-+            log.msg("Discarding message to %r" % message['to'])
++            log.msg("Discarding message to %r" % message.recipient)
 +
 +
@@ -535 +594 @@
 +        # save presence
 +        self.presences[user][resource] = presence
-+        self.sessionManager.sessions[user][resource].presence = presence
++        session = self.sessionManager.lookupSession(fromJID)
++        session.presence = presence
 +
 +        return True
@@ -556 +616 @@
 +        toJID = presence.recipient
 +
-+        if toJID.user not in self.roster:
++        if not toJID.user:
++            # This is not for an account, ignore it.
 +            return False
-+
-+        if toJID.user in self.presences:
++        elif toJID.user not in self.roster:
++            # This is not for a known account, ignore it.
++            return False
++        elif toJID.user not in self.presences:
++            # No available resource, drop it.
++            return True
++        else:
 +            for resource in self.presences[toJID.user]:
 +                resourceJID = JID(tuple=(toJID.user,
@@ -566 +632 @@
 +                self.sessionManager.deliverStanza(presence.element, resourceJID)
 +            self.remotePresences[toJID.user][fromJID] = presence
-+        else:
-+            # no such user or no available resource, ignore this stanza
-+            pass
-+
-+        return True
++            return True
 +
 +