From 302b047f1aa6ab2da5c873b3cedb357e8cc3a4a1 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 26 Apr 2021 14:26:31 +0200 Subject: [PATCH] outposts/ldap: add controllers Signed-off-by: Jens Langhammer --- authentik/outposts/tasks.py | 46 ++++++++++++------- .../providers/ldap/controllers/__init__.py | 0 .../providers/ldap/controllers/docker.py | 14 ++++++ .../providers/ldap/controllers/kubernetes.py | 14 ++++++ 4 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 authentik/providers/ldap/controllers/__init__.py create mode 100644 authentik/providers/ldap/controllers/docker.py create mode 100644 authentik/providers/ldap/controllers/kubernetes.py diff --git a/authentik/outposts/tasks.py b/authentik/outposts/tasks.py index ece820add..aa5d569ce 100644 --- a/authentik/outposts/tasks.py +++ b/authentik/outposts/tasks.py @@ -3,7 +3,7 @@ from os import R_OK, access from os.path import expanduser from pathlib import Path from socket import gethostname -from typing import Any +from typing import Any, Optional from urllib.parse import urlparse import yaml @@ -19,7 +19,7 @@ from structlog.stdlib import get_logger from authentik.events.monitored_tasks import MonitoredTask, TaskResult, TaskResultStatus from authentik.lib.utils.reflection import path_to_class -from authentik.outposts.controllers.base import ControllerException +from authentik.outposts.controllers.base import BaseController, ControllerException from authentik.outposts.models import ( DockerServiceConnection, KubernetesServiceConnection, @@ -29,6 +29,8 @@ from authentik.outposts.models import ( OutpostState, OutpostType, ) +from authentik.providers.ldap.controllers.docker import LDAPDockerController +from authentik.providers.ldap.controllers.kubernetes import LDAPKubernetesController from authentik.providers.proxy.controllers.docker import ProxyDockerController from authentik.providers.proxy.controllers.kubernetes import ProxyKubernetesController from authentik.root.celery import CELERY_APP @@ -36,6 +38,24 @@ from authentik.root.celery import CELERY_APP LOGGER = get_logger() +def controller_for_outpost(outpost: Outpost) -> Optional[BaseController]: + """Get a controller for the outpost, when a service connection is defined""" + if not outpost.service_connection: + return None + service_connection = outpost.service_connection + if outpost.type == OutpostType.PROXY: + if isinstance(service_connection, DockerServiceConnection): + return ProxyDockerController(outpost, service_connection) + if isinstance(service_connection, KubernetesServiceConnection): + return ProxyKubernetesController(outpost, service_connection) + if outpost.type == OutpostType.LDAP: + if isinstance(service_connection, DockerServiceConnection): + return LDAPDockerController(outpost, service_connection) + if isinstance(service_connection, KubernetesServiceConnection): + return LDAPKubernetesController(outpost, service_connection) + return None + + @CELERY_APP.task() def outpost_controller_all(): """Launch Controller for all Outposts which support it""" @@ -76,16 +96,10 @@ def outpost_controller(self: MonitoredTask, outpost_pk: str): outpost: Outpost = Outpost.objects.get(pk=outpost_pk) self.set_uid(slugify(outpost.name)) try: - if not outpost.service_connection: + controller = controller_for_outpost(outpost) + if not controller: return - if outpost.type == OutpostType.PROXY: - service_connection = outpost.service_connection - if isinstance(service_connection, DockerServiceConnection): - logs = ProxyDockerController(outpost, service_connection).up_with_logs() - if isinstance(service_connection, KubernetesServiceConnection): - logs = ProxyKubernetesController( - outpost, service_connection - ).up_with_logs() + logs = controller.up_with_logs() LOGGER.debug("---------------Outpost Controller logs starting----------------") for log in logs: LOGGER.debug(log) @@ -100,12 +114,10 @@ def outpost_controller(self: MonitoredTask, outpost_pk: str): def outpost_pre_delete(outpost_pk: str): """Delete outpost objects before deleting the DB Object""" outpost = Outpost.objects.get(pk=outpost_pk) - if outpost.type == OutpostType.PROXY: - service_connection = outpost.service_connection - if isinstance(service_connection, DockerServiceConnection): - ProxyDockerController(outpost, service_connection).down() - if isinstance(service_connection, KubernetesServiceConnection): - ProxyKubernetesController(outpost, service_connection).down() + controller = controller_for_outpost(outpost) + if not controller: + return + controller.down() @CELERY_APP.task(bind=True, base=MonitoredTask) diff --git a/authentik/providers/ldap/controllers/__init__.py b/authentik/providers/ldap/controllers/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/authentik/providers/ldap/controllers/docker.py b/authentik/providers/ldap/controllers/docker.py new file mode 100644 index 000000000..f2d93e93d --- /dev/null +++ b/authentik/providers/ldap/controllers/docker.py @@ -0,0 +1,14 @@ +"""LDAP Provider Docker Contoller""" +from authentik.outposts.controllers.base import DeploymentPort +from authentik.outposts.controllers.docker import DockerController +from authentik.outposts.models import DockerServiceConnection, Outpost + + +class LDAPDockerController(DockerController): + """LDAP Provider Docker Contoller""" + + def __init__(self, outpost: Outpost, connection: DockerServiceConnection): + super().__init__(outpost, connection) + self.deployment_ports = [ + DeploymentPort(3389, "ldap", "tcp"), + ] diff --git a/authentik/providers/ldap/controllers/kubernetes.py b/authentik/providers/ldap/controllers/kubernetes.py new file mode 100644 index 000000000..924f9bf9b --- /dev/null +++ b/authentik/providers/ldap/controllers/kubernetes.py @@ -0,0 +1,14 @@ +"""LDAP Provider Kubernetes Contoller""" +from authentik.outposts.controllers.base import DeploymentPort +from authentik.outposts.controllers.kubernetes import KubernetesController +from authentik.outposts.models import KubernetesServiceConnection, Outpost + + +class LDAPKubernetesController(KubernetesController): + """LDAP Provider Kubernetes Contoller""" + + def __init__(self, outpost: Outpost, connection: KubernetesServiceConnection): + super().__init__(outpost, connection) + self.deployment_ports = [ + DeploymentPort(3389, "ldap", "tcp"), + ]