Changeset 94:c0473c62802d for wokkel

Timestamp:

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

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Catch KeyError? for unsupported verbs in legacy PubSubService? usage.

Author: ralphm.
Fixes: #70.

Because requests are now parsed by PubSubRequest?, it can happen that a request
is succesfully parsed, but there is no legacy handler available. This used
to raise a KeyError?, resulting in a internal-server-error being returned.
Now it returns a feature-not-implemented error.

Location:

wokkel

Files:

• pubsub.py (modified) (2 diffs)
• test/test_pubsub.py (modified) (1 diff)

wokkel/pubsub.py

@@ -1182 +1182 @@
                 handler = getattr(resource, request.verb)
             except AttributeError:
-                # fix lookup feature
                 text = "Request verb: %s" % request.verb
                 return defer.fail(Unsupported('', text))
@@ -1188 +1187 @@
             d = handler(request)
         else:
-            handlerName, argNames = self._legacyHandlers[request.verb]
+            try:
+                handlerName, argNames = self._legacyHandlers[request.verb]
+            except KeyError:
+                text = "Request verb: %s" % request.verb
+                return defer.fail(Unsupported('', text))
+
             handler = getattr(self, handlerName)
+
             args = [getattr(request, arg) for arg in argNames]
             if 'options' in argNames:
                 args[argNames.index('options')] = request.options.getValues()
+
             d = handler(*args)
 

wokkel/test/test_pubsub.py

@@ -3802 +3802 @@
 
 
+    def test_unknown(self):
+        """
+        Unknown verb yields unsupported error.
+        """
+        xml = """
+        <iq type='get' to='pubsub.example.org'
+                       from='user@example.org'>
+          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
+            <affiliations node='test'/>
+          </pubsub>
+        </iq>
+        """
+
+        def cb(result):
+            self.assertEquals('feature-not-implemented', result.condition)
+            self.assertEquals('unsupported', result.appCondition.name)
+            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
+
+        d = self.handleRequest(xml)
+        self.assertFailure(d, error.StanzaError)
+        d.addCallback(cb)
+        return d
+
+
 
 class PubSubResourceTest(unittest.TestCase):