From d045c344212e597e160afb5eab76ee14217d3b5e Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Mon, 2 Dec 2013 23:59:19 +0000
Subject: [PATCH] Deny API requests where context doesn't match path

We shouldn't overwrite the context tenant_id (which comes from the
scope of the auth_token) with that from the path, instead raise a
HTTPForbidden exception if the path-provided tenant_id doesn't match
the context.

Change-Id: Ib6fb9881103312f7492081a20178f12309f35d81
Closes-Bug: #1256983
---
 heat/api/openstack/v1/util.py            |  5 +++--
 heat/tests/test_api_openstack_v1.py      | 16 ++++------------
 heat/tests/test_api_openstack_v1_util.py | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/heat/api/openstack/v1/util.py b/heat/api/openstack/v1/util.py
index 2235857..3d403ce 100644
--- a/heat/api/openstack/v1/util.py
+++ b/heat/api/openstack/v1/util.py
@@ -21,12 +21,13 @@ from heat.common import identifier
 
 def tenant_local(handler):
     '''
-    Decorator for a handler method that sets the correct tenant_id in the
+    Decorator for a handler method that checks the path matches the
     request context.
     '''
     @wraps(handler)
     def handle_stack_method(controller, req, tenant_id, **kwargs):
-        req.context.tenant_id = tenant_id
+        if req.context.tenant_id != tenant_id:
+            raise exc.HTTPForbidden()
         return handler(controller, req, **kwargs)
 
     return handle_stack_method
diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index 34be822..0ded60f 100644
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -361,7 +361,7 @@ class StackControllerTest(ControllerTest, HeatTestCase):
         req = self._get('/stacks', params=params)
         mock_call.return_value = []
 
-        result = self.controller.index(req, tenant_id='fake_tenant_id')
+        result = self.controller.index(req, tenant_id=self.tenant)
 
         rpc_call_args, _ = mock_call.call_args
         engine_args = rpc_call_args[2]['args']
@@ -382,7 +382,7 @@ class StackControllerTest(ControllerTest, HeatTestCase):
         req = self._get('/stacks', params=params)
         mock_call.return_value = []
 
-        result = self.controller.index(req, tenant_id='fake_tenant_id')
+        result = self.controller.index(req, tenant_id=self.tenant)
 
         rpc_call_args, _ = mock_call.call_args
         engine_args = rpc_call_args[2]['args']
@@ -947,14 +947,6 @@ class StackControllerTest(ControllerTest, HeatTestCase):
 
         req = self._get('/stacks/%(stack_name)s/%(stack_id)s' % identity)
 
-        error = heat_exc.InvalidTenant(target='a', actual='b')
-        self.m.StubOutWithMock(rpc, 'call')
-        rpc.call(req.context, self.topic,
-                 {'namespace': None,
-                  'method': 'show_stack',
-                  'args': {'stack_identity': dict(identity)},
-                  'version': self.api_version},
-                 None).AndRaise(to_remote_error(error))
         self.m.ReplayAll()
 
         resp = request_with_middleware(fault.FaultWrapper,
@@ -963,8 +955,8 @@ class StackControllerTest(ControllerTest, HeatTestCase):
                                        stack_name=identity.stack_name,
                                        stack_id=identity.stack_id)
 
-        self.assertEqual(resp.json['code'], 403)
-        self.assertEqual(resp.json['error']['type'], 'InvalidTenant')
+        self.assertEqual(resp.status_int, 403)
+        self.assertIn('403 Forbidden', str(resp))
         self.m.VerifyAll()
 
     def test_get_template(self):
diff --git a/heat/tests/test_api_openstack_v1_util.py b/heat/tests/test_api_openstack_v1_util.py
index e1d859c..f9868b9 100644
--- a/heat/tests/test_api_openstack_v1_util.py
+++ b/heat/tests/test_api_openstack_v1_util.py
@@ -12,7 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from webob import exc
+
 from heat.api.openstack.v1 import util
+from heat.common import context
 from heat.common.wsgi import Request
 from heat.tests.common import HeatTestCase
 
@@ -77,3 +80,21 @@ class TestGetAllowedParams(HeatTestCase):
         self.whitelist = {'foo': 'blah'}
         result = util.get_allowed_params(self.params, self.whitelist)
         self.assertNotIn('foo', result)
+
+
+class TestTenantLocal(HeatTestCase):
+    def setUp(self):
+        super(TestTenantLocal, self).setUp()
+        self.req = Request({})
+        self.req.context = context.RequestContext(tenant_id='foo')
+
+    def test_tenant_local(self):
+        @util.tenant_local
+        def an_action(controller, req):
+            return 'woot'
+
+        self.assertEqual('woot',
+                         an_action(None, self.req, tenant_id='foo'))
+
+        self.assertRaises(exc.HTTPForbidden,
+                          an_action, None, self.req, tenant_id='bar')
-- 
1.8.3.1