From e1ef196283696d5f319c7dc482563bb396ca7b1e Mon Sep 17 00:00:00 2001
From: Jens L <jens@beryju.org>
Date: Thu, 25 Nov 2021 13:38:31 +0100
Subject: [PATCH] core: remove dump_config, handle directly in config loader
 without booting django, don't check database

---
 authentik/core/management/__init__.py             |  0
 authentik/core/management/commands/__init__.py    |  0
 authentik/core/management/commands/dump_config.py | 15 ---------------
 authentik/lib/config.py                           |  5 ++++-
 lifecycle/ak                                      | 12 +++++++++---
 5 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 authentik/core/management/__init__.py
 delete mode 100644 authentik/core/management/commands/__init__.py
 delete mode 100644 authentik/core/management/commands/dump_config.py

diff --git a/authentik/core/management/__init__.py b/authentik/core/management/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/authentik/core/management/commands/__init__.py b/authentik/core/management/commands/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/authentik/core/management/commands/dump_config.py b/authentik/core/management/commands/dump_config.py
deleted file mode 100644
index fae23a022..000000000
--- a/authentik/core/management/commands/dump_config.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Output full config"""
-from json import dumps
-
-from django.core.management.base import BaseCommand, no_translations
-
-from authentik.lib.config import CONFIG
-
-
-class Command(BaseCommand):  # pragma: no cover
-    """Output full config"""
-
-    @no_translations
-    def handle(self, *args, **options):
-        """Check permissions for all apps"""
-        print(dumps(CONFIG.raw, indent=4))
diff --git a/authentik/lib/config.py b/authentik/lib/config.py
index c54345987..a4cf1348d 100644
--- a/authentik/lib/config.py
+++ b/authentik/lib/config.py
@@ -183,4 +183,7 @@ class ConfigLoader:
 CONFIG = ConfigLoader()
 
 if __name__ == "__main__":
-    print(CONFIG.y(argv[1]))
+    if len(argv) < 2:
+        print(dumps(CONFIG.raw, indent=4))
+    else:
+        print(CONFIG.y(argv[1]))
diff --git a/lifecycle/ak b/lifecycle/ak
index 0cae0285c..d1d3f5025 100755
--- a/lifecycle/ak
+++ b/lifecycle/ak
@@ -1,11 +1,12 @@
 #!/bin/bash -e
-python -m lifecycle.wait_for_db
-
 function log {
     printf '{"event": "%s", "level": "info", "logger": "bootstrap"}\n' "$@" > /dev/stderr
 }
 
-log "Bootstrap completed"
+function wait_for_db {
+    python -m lifecycle.wait_for_db
+    log "Bootstrap completed"
+}
 
 function check_if_root {
     if [[ $EUID -ne 0 ]]; then
@@ -58,6 +59,7 @@ function restore {
 MODE_FILE="/tmp/authentik-mode"
 
 if [[ "$1" == "server" ]]; then
+    wait_for_db
     echo "server" > $MODE_FILE
     # We only set prometheus_multiproc_dir for serer, as with the worker it just fills up the disk
     export prometheus_multiproc_dir=/dev/shm/
@@ -67,8 +69,10 @@ elif [[ "$1" == "worker" ]]; then
     echo "worker" > $MODE_FILE
     check_if_root "celery -A authentik.root.celery worker --autoscale 3,1 -E -B -s /tmp/celerybeat-schedule -Q authentik,authentik_scheduled,authentik_events"
 elif [[ "$1" == "backup" ]]; then
+    wait_for_db
     python -m manage dbbackup --clean
 elif [[ "$1" == "restore" ]]; then
+    wait_for_db
     restore $@
 elif [[ "$1" == "bash" ]]; then
     /bin/bash
@@ -84,6 +88,8 @@ elif [[ "$1" == "healthcheck" ]]; then
     elif [[ $mode == "worker" ]]; then
         celery -A authentik.root.celery inspect ping -d celery@$HOSTNAME --timeout 5 -j
     fi
+elif [[ "$1" == "dump_config" ]]; then
+    python -m authentik.lib.config
 else
     python -m manage "$@"
 fi