From b1591618ae9f7c02d1268920a35123656df0e27d Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 27 Jan 2021 09:57:26 +0100 Subject: [PATCH] admin: handle FlowNonApplicableException during flow plan --- authentik/admin/views/flows.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/authentik/admin/views/flows.py b/authentik/admin/views/flows.py index 1578615fb..2c9d4f199 100644 --- a/authentik/admin/views/flows.py +++ b/authentik/admin/views/flows.py @@ -17,6 +17,7 @@ from authentik.admin.views.utils import ( SearchListMixin, UserPaginateListMixin, ) +from authentik.flows.exceptions import FlowNonApplicableException from authentik.flows.forms import FlowForm, FlowImportForm from authentik.flows.models import Flow from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER @@ -25,7 +26,7 @@ from authentik.flows.transfer.exporter import FlowExporter from authentik.flows.transfer.importer import FlowImporter from authentik.flows.views import SESSION_KEY_PLAN, FlowPlanner from authentik.lib.utils.urls import redirect_with_qs -from authentik.lib.views import CreateAssignPermView +from authentik.lib.views import CreateAssignPermView, bad_request_message class FlowListView( @@ -103,8 +104,17 @@ class FlowDebugExecuteView(LoginRequiredMixin, PermissionRequiredMixin, DetailVi flow: Flow = self.get_object() planner = FlowPlanner(flow) planner.use_cache = False - plan = planner.plan(self.request, {PLAN_CONTEXT_PENDING_USER: request.user}) - self.request.session[SESSION_KEY_PLAN] = plan + try: + plan = planner.plan(self.request, {PLAN_CONTEXT_PENDING_USER: request.user}) + self.request.session[SESSION_KEY_PLAN] = plan + except FlowNonApplicableException as exc: + return bad_request_message( + request, + _( + "Flow not applicable to current user/request: %(messages)s" + % {"messages": str(exc)} + ), + ) return redirect_with_qs( "authentik_flows:flow-executor-shell", self.request.GET,