openstack/nova
Code Issues Proposed changes

Change exception type from HTTPBadRequest to HTTPForbidden

Browse Source 
When user without admin permission wants to get a list of servers
which are in 'deleted' state, currently it raises  HTTPBadRequest.
This should be changed to HTTPForbidden exception.

Change-Id: I29da5f055c69e8aba66ffb068a3601ae69b2fc94
Closes-Bug: #1281904
This commit is contained in:
Haiwei Xu
2014-02-19 04:32:38 +09:00
parent b63e2f4143
commit 544745f9da
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/plugins/v3/servers.py
View File

@@ -233,7 +233,7 @@ class ServersController(wsgi.Controller):
search_opts['deleted'] = True
else:
msg = _("Only administrators may list deleted instances")
raise exc.HTTPBadRequest(explanation=msg)
raise exc.HTTPForbidden(explanation=msg)
# If tenant_id is passed as a search parameter this should
# imply that all_tenants is also enabled unless explicitly

2
nova/api/openstack/compute/servers.py
View File

@@ -560,7 +560,7 @@ class Controller(wsgi.Controller):
search_opts['deleted'] = True
else:
msg = _("Only administrators may list deleted instances")
raise exc.HTTPBadRequest(explanation=msg)
raise exc.HTTPForbidden(explanation=msg)
# If all tenants is passed with 0 or false as the value
# then remove it from the search options. Nothing passed as

2
nova/tests/api/openstack/compute/plugins/v3/test_servers.py
View File

@@ -1003,7 +1003,7 @@ class ServersControllerTest(ControllerTest):
def test_get_servers_deleted_status_as_user(self):
req = fakes.HTTPRequestV3.blank('/servers?status=deleted',
use_admin_context=False)
self.assertRaises(webob.exc.HTTPBadRequest,
self.assertRaises(webob.exc.HTTPForbidden,
self.controller.detail, req)
def test_get_servers_deleted_status_as_admin(self):

2
nova/tests/api/openstack/compute/test_servers.py
View File

@@ -923,7 +923,7 @@ class ServersControllerTest(ControllerTest):
def test_get_servers_deleted_status_as_user(self):
req = fakes.HTTPRequest.blank('/fake/servers?status=deleted',
use_admin_context=False)
self.assertRaises(webob.exc.HTTPBadRequest,
self.assertRaises(webob.exc.HTTPForbidden,
self.controller.detail, req)
def test_get_servers_deleted_status_as_admin(self):