reject None for Netcore

praekeltfoundation · Apr 8, 2014 · 2186619 · 2186619
1 parent 977df49
commit 2186619
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/vumi/transports/netcore/netcore.py b/vumi/transports/netcore/netcore.py
@@ -48,6 +48,11 @@ def render_POST(self, request):
             return ('Not all expected parameters received. '
                     'Only allowing: %r, received: %r' % (
                         expected_keys, request.args.keys()))
+        param_values = [param[0] for param in request.args.values()]
+        if not all(param_values):
+            request.setResponseCode(http.BAD_REQUEST)
+            return ('Not all parameters have values. '
+                    'Received: %r' % (param_values,))
 
         self.handle_request(request)
         return NOT_DONE_YET

diff --git a/vumi/transports/netcore/tests/test_netcore.py b/vumi/transports/netcore/tests/test_netcore.py
@@ -51,6 +51,23 @@ def test_inbound_sms_failure(self):
         self.assertEqual(
             [], self.tx_helper.get_dispatched_inbound())
 
+    @inlineCallbacks
+    def test_inbound_missing_values(self):
+        transport = yield self.get_transport()
+        resp = yield request(transport, 'POST', {
+            'to_addr': '10010',
+            'from_addr': '8800000000',
+            'content': '',  # Intentionally empty!
+            'source': 'sms',
+            'circle': 'of life',
+        })
+        self.assertEqual(resp.code, http.BAD_REQUEST)
+        self.assertEqual(resp.delivered_body, (
+            "Not all parameters have values. "
+            "Received: ['', 'sms', 'of life', '10010', '8800000000']"))
+        self.assertEqual(
+            [], self.tx_helper.get_dispatched_inbound())
+
     @inlineCallbacks
     def test_inbound_sms_success(self):
         transport = yield self.get_transport()