WSGI: added the control for non empty X-PROJECT-ID

Closes-bug: #1228249 Change-Id: I6fbf0344fd45f9581a28a55ef852139b32e93ed7
openstack · Sep 27, 2013 · c5d62ed · c5d62ed
1 parent e8e3bae
commit c5d62ed
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/marconi/queues/transport/wsgi/driver.py b/marconi/queues/transport/wsgi/driver.py
@@ -52,6 +52,11 @@ def _check_media_type(req, resp, params):
 
 def _extract_project_id(req, resp, params):
     params['project_id'] = req.get_header('X-PROJECT-ID')
+    if params['project_id'] == "":
+        raise falcon.HTTPBadRequest('Empty project header not allowed',
+                                    _(u'''
+X-PROJECT-ID cannot be an empty string. Specify the right header X-PROJECT-ID
+and retry.'''))
 
 
 class Driver(transport.DriverBase):

diff --git a/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py b/tests/unit/queues/transport/wsgi/test_queue_lifecycle.py
@@ -36,7 +36,22 @@ def setUp(self):
         self.wsgi_cfg = config.namespace(
             'drivers:transport:wsgi').from_options()
 
-    @ddt.data('480924', 'foo', '', None)
+    def test_empty_project_id(self):
+        path = '/v1/queues/gumshoe'
+
+        self.simulate_get(path, '')
+        self.assertEquals(self.srmock.status, falcon.HTTP_400)
+
+        self.simulate_put(path, '')
+        self.assertEquals(self.srmock.status, falcon.HTTP_400)
+
+        self.simulate_head(path, '')
+        self.assertEquals(self.srmock.status, falcon.HTTP_400)
+
+        self.simulate_delete(path, '')
+        self.assertEquals(self.srmock.status, falcon.HTTP_400)
+
+    @ddt.data('480924', 'foo', None)
     def test_basics_thoroughly(self, project_id):
         path = '/v1/queues/gumshoe'