openstack/nova
Code Issues Proposed changes

Merge "Remove db layer hard-code permission checks for security_group_default_rule_destroy"

Browse Source
This commit is contained in:
Jenkins 2015-06-23 21:00:24 +00:00 committed by Gerrit Code Review
commit ca59f81ec1
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/api/openstack/compute/contrib/security_group_default_rules.py
View File

@ -88,6 +88,9 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
def delete(self, req, id): def delete(self, req, id):
context = sg._authorize_context(req) context = sg._authorize_context(req)
authorize(context) authorize(context)
# NOTE(shaohe-feng): back-compatible with db layer hard-code
# admin permission checks.
nova_context.require_admin_context(context)
try: try:
id = self.security_group_api.validate_id(id) id = self.security_group_api.validate_id(id)

1
nova/db/sqlalchemy/api.py
View File

@ -4285,7 +4285,6 @@ def security_group_default_rule_get(context, security_group_rule_default_id):
return result return result
@require_admin_context
def security_group_default_rule_destroy(context, def security_group_default_rule_destroy(context,
security_group_rule_default_id): security_group_rule_default_id):
session = get_session() session = get_session()

5
nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py
View File

@ -337,6 +337,11 @@ class TestSecurityGroupDefaultRulesV2(test.TestCase):
self.assertRaises(exception.AdminRequired, self.controller.create, self.assertRaises(exception.AdminRequired, self.controller.create,
self.non_admin_req, sgr_dict) self.non_admin_req, sgr_dict)
def test_delete_security_group_default_rules_with_non_admin(self):
self.controller = self.controller_cls()
self.assertRaises(exception.AdminRequired,
self.controller.delete, self.non_admin_req, 1)
class SecurityGroupDefaultRulesPolicyEnforcementV21(test.NoDBTestCase): class SecurityGroupDefaultRulesPolicyEnforcementV21(test.NoDBTestCase):