Skip to content

fix: #238, avoid calling has_eval in enforcing loop #240

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
Jan 13, 2022
Merged

fix: #238, avoid calling has_eval in enforcing loop #240

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
8 changes: 4 additions & 4 deletions casbin/core_enforcer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ def enforce_ex(self, *rvals):
raise RuntimeError("invalid request size")

exp_string = self.model["m"][mtype].value
has_eval = util.has_eval(exp_string)
if not has_eval:
exp_has_eval = util.has_eval(exp_string)
if not exp_has_eval:
expression = self._get_expression(exp_string, functions)

policy_effects = set()
Expand All @@ -385,7 +385,7 @@ def enforce_ex(self, *rvals):
p_parameters = dict(zip(p_tokens, pvals))
parameters = dict(r_parameters, **p_parameters)

if util.has_eval(exp_string):
if exp_has_eval:
rule_names = util.get_eval_value(exp_string)
rules = [
util.escape_assertion(p_parameters[rule_name])
Expand Down Expand Up @@ -427,7 +427,7 @@ def enforce_ex(self, *rvals):
break

else:
if has_eval:
if exp_has_eval:
raise RuntimeError(
"please make sure rule exists in policy when using eval() in matcher"
)
Expand Down
⚡