From e5237392b1657e9a1373b49852946d245ba077bb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 10 Jun 2024 09:36:38 -0400 Subject: [PATCH] user/authentik: add missing depends --- user/authentik/APKBUILD | 19 +++++++++++++------ user/authentik/authentik-manage.sh | 1 - user/authentik/authentik-worker.openrc | 4 ++-- user/authentik/fix-ak-bash.patch | 10 ++++++++++ .../root-settings-csrf_trusted_origins.patch | 8 ++++---- 5 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 user/authentik/fix-ak-bash.patch diff --git a/user/authentik/APKBUILD b/user/authentik/APKBUILD index 83e18a3..e9c3b87 100644 --- a/user/authentik/APKBUILD +++ b/user/authentik/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=authentik pkgver=2024.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="An open-source Identity Provider focused on flexibility and versatility" url="https://github.com/goauthentik/authentik" # s390x: missing py3-celery py3-flower and py3-kombu @@ -60,8 +60,10 @@ depends=" py3-django-otp py3-django-prometheus py3-django-redis - py3-django-rest-framework + py3-django-rest-framework~=3.14.0 py3-django-rest-framework-guardian + py3-django-storages + py3-django-tenants py3-docker-py py3-dotenv py3-dumb-init @@ -69,6 +71,7 @@ depends=" py3-drf-spectacular py3-email-validator py3-facebook-sdk + py3-fido2 py3-flower py3-frozenlist py3-geoip2 @@ -101,7 +104,6 @@ depends=" py3-prompt_toolkit py3-psycopg py3-psycopg-c - py3-pycryptodome py3-pydantic-scim py3-pynacl py3-pyrsistent @@ -110,6 +112,8 @@ depends=" py3-requests py3-requests-oauthlib py3-rsa + py3-scim2-filter-parser + py3-setproctitle py3-sentry-sdk py3-service_identity py3-setuptools @@ -122,6 +126,7 @@ depends=" py3-twilio py3-twisted py3-txaio + py3-tenant-schemas-celery py3-typing-extensions py3-tz py3-ua-parser @@ -158,6 +163,7 @@ source=" authentik-ldap.openrc authentik-ldap.conf authentik-manage.sh + fix-ak-bash.patch root-settings-csrf_trusted_origins.patch " builddir="$srcdir/"authentik-version-$pkgver @@ -238,9 +244,10 @@ package() { sha512sums=" 58642829e320b1480706363712a73c82e55f79ed6451d5db82482c51b9c1ee13b9999caf152da0944ca277344d38c99a5636a7e9e718f858ca558f17ae9da104 authentik-2024.4.2.tar.gz 4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1 authentik.openrc -5d7f28bf5a9f358a0fc3634b2bac6d070c276c3f8181d26fa7e94a17503a4d54556bf7c3207ccd6cb924b81754ed965795d5e2a8aa1af409fd9e32d390ec4cf5 authentik-worker.openrc +6cb03b9b69df39bb4539fe05c966536314d766b2e9307a92d87070ba5f5b7e7ab70f1b5ee1ab3c0c50c23454f9c5a4caec29e63fdf411bbb7a124ad687569b89 authentik-worker.openrc 351e6920d987861f8bf0d7ab2f942db716a8dbdad1f690ac662a6ef29ac0fd46cf817cf557de08f1c024703503d36bc8b46f0d9eb1ecaeb399dce4c3bb527d17 authentik-ldap.openrc 89ee5f0ffdade1c153f3a56ff75b25a7104aa81d8c7a97802a8f4b0eab34850cee39f874dabe0f3c6da3f71d6a0f938f5e8904169e8cdd34d407c8984adee6b0 authentik-ldap.conf -d2df285e09d05bb78b17cdbf156cb19883764d0ae61d4c8faed599c015277b75c3f51e5fcb35e01fc25d5847f667ff2089d5e6c48b85a3a6b4523278b2eea89d authentik-manage.sh -a50ceddb239851d869212cd5064df117ab977d0e01bf0bc5fa7b5fa6e6428a4af59f802ca223a7e840753f86bfdb0df17d330f9ba4cbaa30a167f51d8aecb9bd root-settings-csrf_trusted_origins.patch +f1a3cb215b6210fa7d857a452a9f2bc4dc0520e49b9fa7027547cff093d740a7e2548f1bf1f8831f7d5ccb80c8e523ee0c8bafcc4dc42d2788725f2137d21bee authentik-manage.sh +3e47db684a3f353dcecdb7bab8836b9d5198766735d77f676a51d952141a0cf9903fcb92e6306c48d2522d7a1f3028b37247fdc1dc74d4d6e043da7eb4f36d49 fix-ak-bash.patch +5c60e54b6a7829d611af66f5cb8184a002b5ae927efbd024c054a7c176fcb9efcfbe5685279ffcf0390b0f0abb3bb03e02782c6867c2b38d1ad2d508aae83fa0 root-settings-csrf_trusted_origins.patch " diff --git a/user/authentik/authentik-manage.sh b/user/authentik/authentik-manage.sh index 43244b0..ef7357d 100644 --- a/user/authentik/authentik-manage.sh +++ b/user/authentik/authentik-manage.sh @@ -1,4 +1,3 @@ - #!/bin/sh BUNDLE_DIR='/usr/share/webapps/authentik' diff --git a/user/authentik/authentik-worker.openrc b/user/authentik/authentik-worker.openrc index e7970cc..f0fa964 100644 --- a/user/authentik/authentik-worker.openrc +++ b/user/authentik/authentik-worker.openrc @@ -4,8 +4,8 @@ name="$RC_SVCNAME" cfgfile="/etc/conf.d/$RC_SVCNAME.conf" pidfile="/run/$RC_SVCNAME.pid" working_directory="/usr/share/webapps/authentik" -command="celery" -command_args="-A authentik.root.celery worker -Ofair --max-tasks-per-child=1 --autoscale 3,1 -E -B -s /tmp/celerybeat-schedule -Q authentik,authentik_scheduled,authentik_events" +command="/usr/bin/authentik-manage" +command_args="worker" command_user="authentik" command_group="authentik" start_stop_daemon_args="" diff --git a/user/authentik/fix-ak-bash.patch b/user/authentik/fix-ak-bash.patch new file mode 100644 index 0000000..c6afafb --- /dev/null +++ b/user/authentik/fix-ak-bash.patch @@ -0,0 +1,10 @@ +diff --git a/lifecycle/ak.orig b/lifecycle/ak +index 615bfe9..1646274 100755 +--- a/lifecycle/ak.orig ++++ b/lifecycle/ak +@@ -1,4 +1,4 @@ +-#!/usr/bin/env -S bash -e ++#!/usr/bin/env bash + MODE_FILE="${TMPDIR}/authentik-mode" + + function log { diff --git a/user/authentik/root-settings-csrf_trusted_origins.patch b/user/authentik/root-settings-csrf_trusted_origins.patch index 52a892f..4c235f9 100644 --- a/user/authentik/root-settings-csrf_trusted_origins.patch +++ b/user/authentik/root-settings-csrf_trusted_origins.patch @@ -1,8 +1,8 @@ -diff --git a/authentik/root/settings.py.orig b/authentik/root/settings.py -index ebfc471..ce1ef3b 100644 ---- a/authentik/root/settings.py.orig +diff --git a/authentik/root/settings.py b/authentik/root/settings.py +index 15e689b06..8b0c1d744 100644 +--- a/authentik/root/settings.py +++ b/authentik/root/settings.py -@@ -56,6 +56,7 @@ AUTH_USER_MODEL = "authentik_core.User" +@@ -33,6 +33,7 @@ AUTH_USER_MODEL = "authentik_core.User" CSRF_COOKIE_NAME = "authentik_csrf" CSRF_HEADER_NAME = "HTTP_X_AUTHENTIK_CSRF"