habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

policies/engine: fix cached policy results being ignored

Browse Source
This commit is contained in:
Jens Langhammer
2020-02-17 15:37:51 +01:00
parent 8808e3afe0
commit 773a9c0692
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
passbook/policies/engine.py
View File

@ -16,6 +16,7 @@ LOGGER = get_logger()
# spawn causes issues with objects that aren't picklable, and also the django setup # spawn causes issues with objects that aren't picklable, and also the django setup
set_start_method("fork") set_start_method("fork")
class PolicyProcessInfo: class PolicyProcessInfo:
"""Dataclass to hold all information and communication channels to a process""" """Dataclass to hold all information and communication channels to a process"""
@ -38,13 +39,15 @@ class PolicyEngine:
policies: List[Policy] = [] policies: List[Policy] = []
request: PolicyRequest request: PolicyRequest
__processes: List[PolicyProcessInfo] = [] __cached_policies: List[PolicyResult]
__processes: List[PolicyProcessInfo]
def __init__(self, policies, user: User, request: HttpRequest = None): def __init__(self, policies, user: User, request: HttpRequest = None):
self.policies = policies self.policies = policies
self.request = PolicyRequest(user) self.request = PolicyRequest(user)
if request: if request:
self.request.http_request = request self.request.http_request = request
self.__cached_policies = []
self.__processes = [] self.__processes = []
def _select_subclasses(self) -> List[Policy]: def _select_subclasses(self) -> List[Policy]:
@ -57,13 +60,12 @@ class PolicyEngine:
def build(self) -> "PolicyEngine": def build(self) -> "PolicyEngine":
"""Build task group""" """Build task group"""
cached_policies = []
for policy in self._select_subclasses(): for policy in self._select_subclasses():
cached_policy = cache.get(cache_key(policy, self.request.user), None) cached_policy = cache.get(cache_key(policy, self.request.user), None)
if cached_policy and self.use_cache: if cached_policy and self.use_cache:
LOGGER.debug("Taking result from cache", policy=policy) LOGGER.debug("Taking result from cache", policy=policy)
cached_policies.append(cached_policy) self.__cached_policies.append(cached_policy)
else: continue
LOGGER.debug("Evaluating policy", policy=policy) LOGGER.debug("Evaluating policy", policy=policy)
our_end, task_end = Pipe(False) our_end, task_end = Pipe(False)
task = PolicyProcess(policy, self.request, task_end) task = PolicyProcess(policy, self.request, task_end)
@ -84,13 +86,14 @@ class PolicyEngine:
def result(self) -> Tuple[bool, List[str]]: def result(self) -> Tuple[bool, List[str]]:
"""Get policy-checking result""" """Get policy-checking result"""
messages: List[str] = [] messages: List[str] = []
for proc_info in self.__processes: process_results: List[PolicyResult] = [
LOGGER.debug( x.result for x in self.__processes if x.result
"Result", policy=proc_info.policy, passing=proc_info.result.passing ]
) for result in process_results + self.__cached_policies:
if proc_info.result.messages: LOGGER.debug("result", passing=result.passing)
messages += proc_info.result.messages if result.messages:
if not proc_info.result.passing: messages += result.messages
if not result.passing:
return False, messages return False, messages
return True, messages return True, messages