From d19bfebce30d41094d02e11edee5c312b813ba9a Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 17 Jan 2021 19:59:58 +0100 Subject: [PATCH] policies: detect when running in a daemon process and run policies sync --- authentik/policies/engine.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/authentik/policies/engine.py b/authentik/policies/engine.py index 92acd0d6a..1f38356d9 100644 --- a/authentik/policies/engine.py +++ b/authentik/policies/engine.py @@ -1,6 +1,6 @@ """authentik policy engine""" from enum import Enum -from multiprocessing import Pipe, set_start_method +from multiprocessing import Pipe, current_process from multiprocessing.connection import Connection from typing import Iterator, List, Optional @@ -16,9 +16,7 @@ from authentik.policies.process import PolicyProcess, cache_key from authentik.policies.types import PolicyRequest, PolicyResult LOGGER = get_logger() -# This is only really needed for macOS, because Python 3.8 changed the default to spawn -# spawn causes issues with objects that aren't picklable, and also the django setup -set_start_method("fork") +CURRENT_PROCESS = current_process() class PolicyProcessInfo: @@ -117,14 +115,19 @@ class PolicyEngine: LOGGER.debug("P_ENG: Evaluating policy", policy=binding.policy) our_end, task_end = Pipe(False) task = PolicyProcess(binding, self.request, task_end) + task.daemon = False LOGGER.debug("P_ENG: Starting Process", policy=binding.policy) - task.start() + if CURRENT_PROCESS._config.get("daemon"): + task.run() + else: + task.start() self.__processes.append( PolicyProcessInfo(process=task, connection=our_end, binding=binding) ) # If all policies are cached, we have an empty list here. for proc_info in self.__processes: - proc_info.process.join(proc_info.binding.timeout) + if proc_info.process.is_alive(): + proc_info.process.join(proc_info.binding.timeout) # Only call .recv() if no result is saved, otherwise we just deadlock here if not proc_info.result: proc_info.result = proc_info.connection.recv()