x/python-ganttclient
Code Issues Proposed changes

Merge "Add default policy rule"

Browse Source
This commit is contained in:
Jenkins
2012-01-17 14:16:04 +00:00
committed by Gerrit Code Review
parent a0d1840a40 4689e3c109
commit ed9eb78e62
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/common/policy.py
View File

@@ -104,13 +104,14 @@ def enforce(match_list, target_dict, credentials_dict):
class Brain(object): class Brain(object):
"""Implements policy checking.""" """Implements policy checking."""
@classmethod @classmethod
def load_json(cls, data): def load_json(cls, data, default_rule=None):
"""Init a brain using json instead of a rules dictionary.""" """Init a brain using json instead of a rules dictionary."""
rules_dict = json.loads(data) rules_dict = json.loads(data)
return cls(rules=rules_dict) return cls(rules=rules_dict, default_rule=default_rule)
def __init__(self, rules=None): def __init__(self, rules=None, default_rule=None):
self.rules = rules or {} self.rules = rules or {}
self.default_rule = default_rule
def add_rule(self, key, match): def add_rule(self, key, match):
self.rules[key] = match self.rules[key] = match
@@ -154,7 +155,11 @@ class Brain(object):
try: try:
new_match_list = self.rules[match] new_match_list = self.rules[match]
except KeyError: except KeyError:
return False if self.default_rule and match != self.default_rule:
new_match_list = ('rule:%s' % self.default_rule,)
else:
return False
return self.check(new_match_list, target_dict, cred_dict) return self.check(new_match_list, target_dict, cred_dict)
def _check_role(self, match, target_dict, cred_dict): def _check_role(self, match, target_dict, cred_dict):