Skip to content

perf: judge whether use domain_matching_func #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leeqvip merged 1 commit into from
Dec 17, 2021
+25 −13
Merged

perf: judge whether use domain_matching_func #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions casbin/enforcer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ def get_implicit_permissions_for_user(
res = []

# policy domain should be matched by domain_match_fn of DomainManager
if domain:
domain = partial(self.get_role_manager().domain_matching_func, domain)
domain_matching_func = self.get_role_manager().domain_matching_func
if domain and domain_matching_func != None:
domain = partial(domain_matching_func, domain)

for role in roles:
permissions = self.get_permissions_for_user_in_domain(
Expand Down
33 changes: 22 additions & 11 deletions casbin/rbac/default_role_manager/role_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def __init__(self, max_hierarchy_level=10):
self.logger = logging.getLogger(__name__)
self.max_hierarchy_level = max_hierarchy_level
self.matching_func = None
self.domain_matching_func = None
self.all_links = list()
self.all_roles = dict()

Expand Down Expand Up @@ -200,7 +201,8 @@ def __init__(self, max_hierarchy_level=10):
self.logger = logging.getLogger(__name__)
self.all_links = dict()
self.max_hierarchy_level = max_hierarchy_level
self.domain_matching_func = lambda domain1, domain2: domain1 == domain2
self.matching_func = None
self.domain_matching_func = None
self.matching_func = lambda name1, name2: name1 == name2

def add_matching_func(self, fn):
Expand Down Expand Up @@ -229,11 +231,14 @@ def _get_links(self, *domain):

def _get_role_manager(self, *domain):
domain1 = self._get_domain(*domain)
domain_links = []
domain_links = self.all_links.get(domain1, [])

for domain2, links in self.all_links.items():
if match_error_handler(self.domain_matching_func, domain1, domain2):
domain_links = domain_links + links
if self.domain_matching_func != None:
for domain2, links in self.all_links.items():
if domain1 != domain2 and match_error_handler(
self.domain_matching_func, domain1, domain2
):
domain_links = domain_links + links

rm = RoleManager(max_hierarchy_level=self.max_hierarchy_level)
rm.add_matching_func(self.matching_func)
Expand Down Expand Up @@ -289,13 +294,19 @@ def _get_role_manager(self, *domain):

def _affected_role_managers(self, *domain):
domain_pattern = self._get_domain(*domain)
return [
self.rm_map[domain_str]
for domain_str in self.rm_map.keys()
if match_error_handler(
self.domain_matching_func, domain_str, domain_pattern

if self.domain_matching_func != None:
return [
self.rm_map[domain_str]
for domain_str in self.rm_map.keys()
if match_error_handler(
self.domain_matching_func, domain_str, domain_pattern
)
]
else:
return (
[self.rm_map[domain_pattern]] if domain_pattern in self.rm_map else []
)
]

def add_matching_func(self, fn):
super().add_matching_func(fn)
Expand Down