From c19afa4f1611ab1f8915452ee349635291e3921b Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 27 Sep 2021 20:49:00 +0200 Subject: [PATCH 01/14] outposts/proxy: fix duplicate protocol in domain auth mode Signed-off-by: Jens Langhammer --- internal/outpost/proxyv2/application/mode_forward.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/outpost/proxyv2/application/mode_forward.go b/internal/outpost/proxyv2/application/mode_forward.go index 58757bfaa..c5e25cb55 100644 --- a/internal/outpost/proxyv2/application/mode_forward.go +++ b/internal/outpost/proxyv2/application/mode_forward.go @@ -3,6 +3,7 @@ package application import ( "fmt" "net/http" + "net/url" "goauthentik.io/api" "goauthentik.io/internal/outpost/proxyv2/constants" @@ -38,7 +39,8 @@ func (a *Application) forwardHandleTraefik(rw http.ResponseWriter, r *http.Reque if *a.proxyConfig.Mode == api.PROXYMODE_FORWARD_SINGLE { host = web.GetHost(r) } else if *a.proxyConfig.Mode == api.PROXYMODE_FORWARD_DOMAIN { - host = a.proxyConfig.ExternalHost + eh, _ := url.Parse(a.proxyConfig.ExternalHost) + host = eh.Host } // set the redirect flag to the current URL we have, since we redirect // to a (possibly) different domain, but we want to be redirected back From c9c177d8f9b63f28e24acec67e98cdc737c6da68 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 29 Sep 2021 09:42:59 +0200 Subject: [PATCH 02/14] web/admin: don't require username nor name for activate/deactivate toggles closes #1491 Signed-off-by: Jens Langhammer --- web/src/locales/en.po | 3 +++ web/src/locales/pseudo-LOCALE.po | 3 +++ web/src/pages/users/UserListPage.ts | 2 -- web/src/pages/users/UserViewPage.ts | 21 ++++++++++++++++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 63bdcc62f..623653975 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -155,6 +155,7 @@ msgid "Actions over the last 24 hours" msgstr "Actions over the last 24 hours" #: src/pages/users/UserListPage.ts +#: src/pages/users/UserViewPage.ts msgid "Activate" msgstr "Activate" @@ -1174,6 +1175,7 @@ msgid "Date Time" msgstr "Date Time" #: src/pages/users/UserListPage.ts +#: src/pages/users/UserViewPage.ts msgid "Deactivate" msgstr "Deactivate" @@ -4946,6 +4948,7 @@ msgstr "Use this tenant for each domain that doesn't have a dedicated tenant." #: src/pages/tokens/TokenForm.ts #: src/pages/tokens/TokenListPage.ts #: src/pages/users/UserListPage.ts +#: src/pages/users/UserViewPage.ts #: src/user/user-settings/tokens/UserTokenList.ts msgid "User" msgstr "User" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 2ef83d86f..67223e965 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -155,6 +155,7 @@ msgid "Actions over the last 24 hours" msgstr "" #: src/pages/users/UserListPage.ts +#: src/pages/users/UserViewPage.ts msgid "Activate" msgstr "" @@ -1168,6 +1169,7 @@ msgid "Date Time" msgstr "" #: src/pages/users/UserListPage.ts +#: src/pages/users/UserViewPage.ts msgid "Deactivate" msgstr "" @@ -4931,6 +4933,7 @@ msgstr "" #: src/pages/tokens/TokenForm.ts #: src/pages/tokens/TokenListPage.ts #: src/pages/users/UserListPage.ts +#: src/pages/users/UserViewPage.ts #: src/user/user-settings/tokens/UserTokenList.ts msgid "User" msgstr "" diff --git a/web/src/pages/users/UserListPage.ts b/web/src/pages/users/UserListPage.ts index ed9104e9f..ac5b8c383 100644 --- a/web/src/pages/users/UserListPage.ts +++ b/web/src/pages/users/UserListPage.ts @@ -157,8 +157,6 @@ export class UserListPage extends TablePage { ).coreUsersPartialUpdate({ id: item.pk || 0, patchedUserRequest: { - username: item.username, - name: item.name, isActive: !item.isActive, }, }); diff --git a/web/src/pages/users/UserViewPage.ts b/web/src/pages/users/UserViewPage.ts index 597b12c62..c34ad93a7 100644 --- a/web/src/pages/users/UserViewPage.ts +++ b/web/src/pages/users/UserViewPage.ts @@ -35,6 +35,7 @@ import "../../elements/oauth/UserCodeList"; import "../../elements/oauth/UserRefreshList"; import "../../elements/user/SessionList"; import "../../elements/user/UserConsentList"; +import "./UserActiveForm"; import "./UserForm"; @customElement("ak-user-view") @@ -132,7 +133,7 @@ export class UserViewPage extends LitElement {
- ${this.user.email} + ${this.user.email || "-"}
@@ -195,6 +196,24 @@ export class UserViewPage extends LitElement { +
+ { + return new CoreApi(DEFAULT_CONFIG).coreUsersPartialUpdate({ + id: this.user?.pk || 0, + patchedUserRequest: { + isActive: !this.user?.isActive, + }, + }); + }} + > + + +
Date: Wed, 29 Sep 2021 09:52:07 +0200 Subject: [PATCH 03/14] root: Use fully qualified names for docker bases base images. (#1490) Signed-off-by: Steven Armstrong --- Dockerfile | 10 +++++----- ldap.Dockerfile | 2 +- proxy.Dockerfile | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 478bee75f..3767c7e4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Lock python dependencies -FROM python:3.9-slim-buster as locker +FROM docker.io/python:3.9-slim-buster as locker COPY ./Pipfile /app/ COPY ./Pipfile.lock /app/ @@ -11,7 +11,7 @@ RUN pip install pipenv && \ pipenv lock -r --dev-only > requirements-dev.txt # Stage 2: Build website -FROM node as website-builder +FROM docker.io/node as website-builder COPY ./website /static/ @@ -19,7 +19,7 @@ ENV NODE_ENV=production RUN cd /static && npm i && npm run build-docs-only # Stage 3: Build webui -FROM node as web-builder +FROM docker.io/node as web-builder COPY ./web /static/ @@ -27,7 +27,7 @@ ENV NODE_ENV=production RUN cd /static && npm i && npm run build # Stage 4: Build go proxy -FROM golang:1.17.1 AS builder +FROM docker.io/golang:1.17.1 AS builder WORKDIR /work @@ -47,7 +47,7 @@ COPY ./go.sum /work/go.sum RUN go build -o /work/authentik ./cmd/server/main.go # Stage 5: Run -FROM python:3.9-slim-buster +FROM docker.io/python:3.9-slim-buster WORKDIR / COPY --from=locker /app/requirements.txt / diff --git a/ldap.Dockerfile b/ldap.Dockerfile index cbd80d273..91777c0f8 100644 --- a/ldap.Dockerfile +++ b/ldap.Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build -FROM golang:1.17.1 AS builder +FROM docker.io/golang:1.17.1 AS builder WORKDIR /go/src/goauthentik.io diff --git a/proxy.Dockerfile b/proxy.Dockerfile index 25fee93fe..804818324 100644 --- a/proxy.Dockerfile +++ b/proxy.Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build website -FROM node as web-builder +FROM docker.io/node as web-builder COPY ./web /static/ @@ -7,7 +7,7 @@ ENV NODE_ENV=production RUN cd /static && npm i && npm run build # Stage 2: Build -FROM golang:1.17.1 AS builder +FROM docker.io/golang:1.17.1 AS builder WORKDIR /go/src/goauthentik.io From ee610a906ac89162c4f733a4496e16d59f256840 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 28 Sep 2021 09:39:21 +0200 Subject: [PATCH 04/14] web: fix linting Signed-off-by: Jens Langhammer --- .github/workflows/ci-web.yml | 2 +- web/src/pages/flows/BoundStagesList.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml index 9034e1df4..c52e56270 100644 --- a/.github/workflows/ci-web.yml +++ b/.github/workflows/ci-web.yml @@ -61,7 +61,7 @@ jobs: npm install - name: Generate API run: make gen-web - - name: prettier + - name: lit-analyse run: | cd web npm run lit-analyse diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/pages/flows/BoundStagesList.ts index e95ec03d1..75b3a2cad 100644 --- a/web/src/pages/flows/BoundStagesList.ts +++ b/web/src/pages/flows/BoundStagesList.ts @@ -53,8 +53,8 @@ export class BoundStagesList extends Table { .objects=${this.selectedElements} .metadata=${(item: FlowStageBinding) => { return [ - { key: t`Stage`, value: item.stageObj?.name }, - { key: t`Stage type`, value: item.stageObj?.verboseName }, + { key: t`Stage`, value: item.stageObj?.name || "" }, + { key: t`Stage type`, value: item.stageObj?.verboseName ||"" }, ]; }} .usedBy=${(item: FlowStageBinding) => { From 8359f0bfb3bfe0d219846a709f720a9c63a8c3bf Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 28 Sep 2021 09:49:22 +0200 Subject: [PATCH 05/14] web: fix linting again Signed-off-by: Jens Langhammer --- web/src/pages/flows/BoundStagesList.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/flows/BoundStagesList.ts b/web/src/pages/flows/BoundStagesList.ts index 75b3a2cad..ed14bbd98 100644 --- a/web/src/pages/flows/BoundStagesList.ts +++ b/web/src/pages/flows/BoundStagesList.ts @@ -54,7 +54,7 @@ export class BoundStagesList extends Table { .metadata=${(item: FlowStageBinding) => { return [ { key: t`Stage`, value: item.stageObj?.name || "" }, - { key: t`Stage type`, value: item.stageObj?.verboseName ||"" }, + { key: t`Stage type`, value: item.stageObj?.verboseName || "" }, ]; }} .usedBy=${(item: FlowStageBinding) => { From f723fdd551436f4b1231c775a198bea0a3693a04 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 29 Sep 2021 21:36:44 +0200 Subject: [PATCH 06/14] web/elements: fix initialLoad not being done when viewportCheck was disabled closes #1497 Signed-off-by: Jens Langhammer --- web/src/elements/forms/ModelForm.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/web/src/elements/forms/ModelForm.ts b/web/src/elements/forms/ModelForm.ts index 52cd35808..8afa0063b 100644 --- a/web/src/elements/forms/ModelForm.ts +++ b/web/src/elements/forms/ModelForm.ts @@ -48,10 +48,16 @@ export abstract class ModelForm extends Form } render(): TemplateResult { - // if we're in viewport now and haven't loaded AND have a PK set, load now - if (this.isInViewport && !this._initialLoad && this._instancePk) { - this.instancePk = this._instancePk; - this._initialLoad = true; + if (this._instancePk) { + if ( + // if we're in viewport now and haven't loaded AND have a PK set, load now + (this.isInViewport && !this._initialLoad) || + // Or if we don't check for viewport in some cases + !this.viewportCheck + ) { + this.instancePk = this._instancePk; + this._initialLoad = true; + } } return super.render(); } From 339eaf37f2d76379b5d39f1986f72902d369983d Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 29 Sep 2021 21:47:38 +0200 Subject: [PATCH 07/14] web/elements: use dedicated button for search clear instead of webkit exclusive one closes #1499 Signed-off-by: Jens Langhammer --- web/src/elements/table/TableSearch.ts | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/web/src/elements/table/TableSearch.ts b/web/src/elements/table/TableSearch.ts index 321cee8ad..91f3cf376 100644 --- a/web/src/elements/table/TableSearch.ts +++ b/web/src/elements/table/TableSearch.ts @@ -1,6 +1,6 @@ import { t } from "@lingui/macro"; -import { CSSResult, html, LitElement, TemplateResult } from "lit"; +import { css, CSSResult, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; @@ -20,7 +20,19 @@ export class TableSearch extends LitElement { onSearch?: (value: string) => void; static get styles(): CSSResult[] { - return [PFBase, PFButton, PFToolbar, PFInputGroup, PFFormControl, AKGlobal]; + return [ + PFBase, + PFButton, + PFToolbar, + PFInputGroup, + PFFormControl, + AKGlobal, + css` + ::-webkit-search-cancel-button { + display: none; + } + `, + ]; } render(): TemplateResult { @@ -50,6 +62,16 @@ export class TableSearch extends LitElement { this.onSearch((ev.target as HTMLInputElement).value); }} /> + From 10b45d954e07550a48844963f6ea2f0cca19f818 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 29 Sep 2021 23:55:22 +0200 Subject: [PATCH 08/14] outposts: allow disabling of docker controller port mapping closes #1474 Signed-off-by: Jens Langhammer --- authentik/outposts/controllers/docker.py | 9 +++++---- authentik/outposts/models.py | 1 + website/docs/outposts/outposts.md | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/authentik/outposts/controllers/docker.py b/authentik/outposts/controllers/docker.py index 03eca20f4..4714750c3 100644 --- a/authentik/outposts/controllers/docker.py +++ b/authentik/outposts/controllers/docker.py @@ -99,15 +99,16 @@ class DockerController(BaseController): "image": image_name, "name": container_name, "detach": True, - "ports": { - f"{port.inner_port or port.port}/{port.protocol.lower()}": port.port - for port in self.deployment_ports - }, "environment": self._get_env(), "labels": self._get_labels(), "restart_policy": {"Name": "unless-stopped"}, "network": self.outpost.config.docker_network, } + if self.outpost.config.docker_map_ports: + container_args["ports"] = { + f"{port.inner_port or port.port}/{port.protocol.lower()}": str(port.port) + for port in self.deployment_ports + } if settings.TEST: del container_args["ports"] del container_args["network"] diff --git a/authentik/outposts/models.py b/authentik/outposts/models.py index ff8116a71..a4a822964 100644 --- a/authentik/outposts/models.py +++ b/authentik/outposts/models.py @@ -72,6 +72,7 @@ class OutpostConfig: object_naming_template: str = field(default="ak-outpost-%(name)s") docker_network: Optional[str] = field(default=None) + docker_map_ports: bool = field(default=True) kubernetes_replicas: int = field(default=1) kubernetes_namespace: str = field(default_factory=get_namespace) diff --git a/website/docs/outposts/outposts.md b/website/docs/outposts/outposts.md index dda6f76a6..4da49af88 100644 --- a/website/docs/outposts/outposts.md +++ b/website/docs/outposts/outposts.md @@ -46,6 +46,9 @@ object_naming_template: ak-outpost-%(name)s ######################################## # Network the outpost container should be connected to docker_network: null +# Optionally disable mapping of ports to outpost container, may be useful when using docker networks +# (Available with 2021.9.4+) +docker_map_ports: true ######################################## # Kubernetes outpost specific settings ######################################## From f25d76fa437e8f6ed73d993f7f9d3c78e7e2a8e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 08:31:57 +0200 Subject: [PATCH 09/14] build(deps): bump sentry-sdk from 1.4.1 to 1.4.2 (#1488) --- Pipfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 29bd4e5aa..a48edd9fe 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -128,11 +128,11 @@ }, "botocore": { "hashes": [ - "sha256:2c25a76f09223b2f00ad578df34492b7b84cd4828fc90c08ccbdd1d70abbd7eb", - "sha256:9d5b70be2f417d0aa30788049fd20473ad27218eccd05e71f545b4b4e09c79a0" + "sha256:0161c3b64e34315928aae7fdbce49e684c9c2cfad2435cb22023b7ad87306f12", + "sha256:eab89183f7d94cabacde79a266060bb9429249e33a39b7ba4c1b15c965095477" ], "markers": "python_version >= '3.6'", - "version": "==1.21.48" + "version": "==1.21.49" }, "cachetools": { "hashes": [ @@ -498,11 +498,11 @@ }, "google-auth": { "hashes": [ - "sha256:7ae5eda089d393ca01658b550df24913cbbbdd34e9e6dedc1cea747485ae0c04", - "sha256:bde03220ed56e4e147dec92339c90ce95159dce657e2cccd0ac1fe82f6a96284" + "sha256:4fa902dd577169dab41881db2b01293a41f3600d1520e4896eaaeb26e72c6eb9", + "sha256:c4b177443571b282dfc9236ec747da6e28669257efdb622a3b48daeaa0891442" ], "markers": "python_version >= '3.6'", - "version": "==2.1.0" + "version": "==2.2.0" }, "gunicorn": { "hashes": [ @@ -1092,11 +1092,11 @@ }, "sentry-sdk": { "hashes": [ - "sha256:4297555ddc37c7136740e6b547b7d68f5bca0b4832f94ac097e5d531a4c77528", - "sha256:ea04bc3be6eb082f34ff3f8f6380ea9c691766592298f3f975a435dafac6bf6a" + "sha256:683e2f677d518b6a203785f5a6c27d3a6b48cca8293d43cc7efc7815ea4dada5", + "sha256:ffb7b1f7c9a2ca771066aa4b502756e1ef08aff246de23ffecaa5d2af1533a62" ], "index": "pypi", - "version": "==1.4.1" + "version": "==1.4.2" }, "service-identity": { "hashes": [ @@ -1582,7 +1582,7 @@ "sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899", "sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2" ], - "markers": "python_version < '4.0' and python_full_version >= '3.6.1'", + "markers": "python_version < '4' and python_full_version >= '3.6.1'", "version": "==5.9.3" }, "lazy-object-proxy": { From afad55a35779d51cb63d21bd0e86e9956d35b760 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 08:40:38 +0200 Subject: [PATCH 10/14] build(deps): bump sentry-sdk from 1.4.2 to 1.4.3 (#1502) --- Pipfile.lock | 83 +++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index a48edd9fe..2af4adc81 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -128,19 +128,19 @@ }, "botocore": { "hashes": [ - "sha256:0161c3b64e34315928aae7fdbce49e684c9c2cfad2435cb22023b7ad87306f12", - "sha256:eab89183f7d94cabacde79a266060bb9429249e33a39b7ba4c1b15c965095477" + "sha256:17a10dd33334e7e3aaa4e12f66317284f96bb53267e20bc877a187c442681772", + "sha256:2089f9fa36a59d8c02435c49d58ccc7b3ceb9c0c054ea4f71631c3c3a1c5245e" ], "markers": "python_version >= '3.6'", - "version": "==1.21.49" + "version": "==1.21.51" }, "cachetools": { "hashes": [ - "sha256:2cc0b89715337ab6dbba85b5b50effe2b0c74e035d83ee8ed637cf52f12ae001", - "sha256:61b5ed1e22a0924aed1d23b478f37e8d52549ff8a961de2909c69bf950020cff" + "sha256:0a3d3556c2c3befdbba2f93b78792c199c66201c999e97947ea0b7437758246b", + "sha256:6a6fa6802188ab7e77bab2db001d676e854499552b0037d999d5b9f211db5250" ], "markers": "python_version ~= '3.5'", - "version": "==4.2.2" + "version": "==4.2.3" }, "cbor2": { "hashes": [ @@ -268,9 +268,11 @@ }, "click-didyoumean": { "hashes": [ - "sha256:112229485c9704ff51362fe34b2d4f0b12fc71cc20f6d2b3afabed4b8bfa6aeb" + "sha256:a0713dc7a1de3f06bc0df5a9567ad19ead2d3d5689b434768a6145bff77c0667", + "sha256:f184f0d851d96b6d29297354ed981b7dd71df7ff500d82fa6d11f0856bee8035" ], - "version": "==0.0.3" + "markers": "python_version < '4' and python_full_version >= '3.6.2'", + "version": "==0.3.0" }, "click-plugins": { "hashes": [ @@ -311,27 +313,28 @@ }, "cryptography": { "hashes": [ - "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e", - "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b", - "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7", - "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085", - "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc", - "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d", - "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a", - "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498", - "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89", - "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9", - "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c", - "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7", - "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb", - "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14", - "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af", - "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e", - "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5", - "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06", - "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7" + "sha256:07bb7fbfb5de0980590ddfc7f13081520def06dc9ed214000ad4372fb4e3c7f6", + "sha256:18d90f4711bf63e2fb21e8c8e51ed8189438e6b35a6d996201ebd98a26abbbe6", + "sha256:1ed82abf16df40a60942a8c211251ae72858b25b7421ce2497c2eb7a1cee817c", + "sha256:22a38e96118a4ce3b97509443feace1d1011d0571fae81fc3ad35f25ba3ea999", + "sha256:2d69645f535f4b2c722cfb07a8eab916265545b3475fdb34e0be2f4ee8b0b15e", + "sha256:4a2d0e0acc20ede0f06ef7aa58546eee96d2592c00f450c9acb89c5879b61992", + "sha256:54b2605e5475944e2213258e0ab8696f4f357a31371e538ef21e8d61c843c28d", + "sha256:7075b304cd567694dc692ffc9747f3e9cb393cc4aa4fb7b9f3abd6f5c4e43588", + "sha256:7b7ceeff114c31f285528ba8b390d3e9cfa2da17b56f11d366769a807f17cbaa", + "sha256:7eba2cebca600a7806b893cb1d541a6e910afa87e97acf2021a22b32da1df52d", + "sha256:928185a6d1ccdb816e883f56ebe92e975a262d31cc536429041921f8cb5a62fd", + "sha256:9933f28f70d0517686bd7de36166dda42094eac49415459d9bdf5e7df3e0086d", + "sha256:a688ebcd08250eab5bb5bca318cc05a8c66de5e4171a65ca51db6bd753ff8953", + "sha256:abb5a361d2585bb95012a19ed9b2c8f412c5d723a9836418fab7aaa0243e67d2", + "sha256:c10c797ac89c746e488d2ee92bd4abd593615694ee17b2500578b63cad6b93a8", + "sha256:ced40344e811d6abba00295ced98c01aecf0c2de39481792d87af4fa58b7b4d6", + "sha256:d57e0cdc1b44b6cdf8af1d01807db06886f10177469312fbde8f44ccbb284bc9", + "sha256:d99915d6ab265c22873f1b4d6ea5ef462ef797b4140be4c9d8b179915e0985c6", + "sha256:eb80e8a1f91e4b7ef8b33041591e6d89b2b8e122d787e87eeb2b08da71bb16ad", + "sha256:ebeddd119f526bcf323a89f853afb12e225902a24d29b55fe18dd6fcb2838a76" ], - "version": "==3.4.8" + "version": "==35.0.0" }, "dacite": { "hashes": [ @@ -498,11 +501,11 @@ }, "google-auth": { "hashes": [ - "sha256:4fa902dd577169dab41881db2b01293a41f3600d1520e4896eaaeb26e72c6eb9", - "sha256:c4b177443571b282dfc9236ec747da6e28669257efdb622a3b48daeaa0891442" + "sha256:2a92b485afed5292946b324e91fcbe03db277ee4cb64c998c6cfa66d4af01dee", + "sha256:6dc8173abd50f25b6e62fc5b42802c96fc7cd9deb9bfeeb10a79f5606225cdf4" ], "markers": "python_version >= '3.6'", - "version": "==2.2.0" + "version": "==2.2.1" }, "gunicorn": { "hashes": [ @@ -626,10 +629,10 @@ }, "jsonschema": { "hashes": [ - "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163", - "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a" + "sha256:bc51325b929171791c42ebc1c70b9713eb134d3bb8ebd5474c8b659b15be6d86", + "sha256:c773028c649441ab980015b5b622f4cd5134cf563daaf0235ca4b73cc3734f20" ], - "version": "==3.2.0" + "version": "==4.0.0" }, "kombu": { "hashes": [ @@ -952,10 +955,10 @@ }, "pyopenssl": { "hashes": [ - "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51", - "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b" + "sha256:5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3", + "sha256:8935bd4920ab9abfebb07c41a4f58296407ed77f04bd1a92914044b848ba1ed6" ], - "version": "==20.0.1" + "version": "==21.0.0" }, "pyparsing": { "hashes": [ @@ -1092,11 +1095,11 @@ }, "sentry-sdk": { "hashes": [ - "sha256:683e2f677d518b6a203785f5a6c27d3a6b48cca8293d43cc7efc7815ea4dada5", - "sha256:ffb7b1f7c9a2ca771066aa4b502756e1ef08aff246de23ffecaa5d2af1533a62" + "sha256:b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828", + "sha256:c091cc7115ff25fe3a0e410dbecd7a996f81a3f6137d2272daef32d6c3cfa6dc" ], "index": "pypi", - "version": "==1.4.2" + "version": "==1.4.3" }, "service-identity": { "hashes": [ From 5f6565ee277d68b3bf52b3db0707ea0e3f2e0377 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 30 Sep 2021 18:09:41 +0200 Subject: [PATCH 11/14] web/admin: fix LDAP Source form not exposing syncParentGroup Signed-off-by: Jens Langhammer --- web/src/locales/en.po | 20 ++++++++- web/src/locales/pseudo-LOCALE.po | 20 ++++++++- .../pages/providers/ldap/LDAPProviderForm.ts | 2 +- web/src/pages/sources/ldap/LDAPSourceForm.ts | 41 ++++++++++++++++++- 4 files changed, 76 insertions(+), 7 deletions(-) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 623653975..e2e0a518f 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -183,6 +183,10 @@ msgstr "Addition User DN" msgid "Additional group DN, prepended to the Base DN." msgstr "Additional group DN, prepended to the Base DN." +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Additional settings" +msgstr "Additional settings" + #: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Additional user DN, prepended to the Base DN." msgstr "Additional user DN, prepended to the Base DN." @@ -203,7 +207,6 @@ msgid "Advanced protocol settings" msgstr "Advanced protocol settings" #: src/pages/policies/password/PasswordPolicyForm.ts -#: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Advanced settings" msgstr "Advanced settings" @@ -1942,7 +1945,7 @@ msgstr "Go to previous page" #: src/pages/events/RuleForm.ts #: src/pages/policies/PolicyBindingForm.ts #: src/pages/policies/PolicyBindingForm.ts -#: src/pages/providers/ldap/LDAPProviderForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/stages/user_write/UserWriteStageForm.ts msgid "Group" msgstr "Group" @@ -2268,6 +2271,10 @@ msgstr "Kubeconfig" msgid "LDAP (Technical preview)" msgstr "LDAP (Technical preview)" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "LDAP Attribute mapping" +msgstr "LDAP Attribute mapping" + #: src/pages/providers/ldap/LDAPProviderForm.ts msgid "LDAP DN under which bind requests and search requests can be made." msgstr "LDAP DN under which bind requests and search requests can be made." @@ -2413,6 +2420,7 @@ msgstr "Loading" #: src/pages/providers/saml/SAMLProviderImportForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/plex/PlexSourceForm.ts @@ -3035,6 +3043,10 @@ msgstr "PEM-encoded Certificate data." msgid "Parent" msgstr "Parent" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Parent group for all the groups imported from LDAP." +msgstr "Parent group for all the groups imported from LDAP." + #: src/pages/policies/dummy/DummyPolicyForm.ts msgid "Pass policy?" msgstr "Pass policy?" @@ -4342,6 +4354,10 @@ msgstr "Sync" msgid "Sync groups" msgstr "Sync groups" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "Sync parent group" +msgstr "Sync parent group" + #: src/pages/sources/ldap/LDAPSourceViewPage.ts msgid "Sync status" msgstr "Sync status" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 67223e965..0a3ad1a61 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -183,6 +183,10 @@ msgstr "" msgid "Additional group DN, prepended to the Base DN." msgstr "" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Additional settings" +msgstr "" + #: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Additional user DN, prepended to the Base DN." msgstr "" @@ -203,7 +207,6 @@ msgid "Advanced protocol settings" msgstr "" #: src/pages/policies/password/PasswordPolicyForm.ts -#: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Advanced settings" msgstr "" @@ -1934,7 +1937,7 @@ msgstr "" #: src/pages/events/RuleForm.ts #: src/pages/policies/PolicyBindingForm.ts #: src/pages/policies/PolicyBindingForm.ts -#: src/pages/providers/ldap/LDAPProviderForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/stages/user_write/UserWriteStageForm.ts msgid "Group" msgstr "" @@ -2260,6 +2263,10 @@ msgstr "" msgid "LDAP (Technical preview)" msgstr "" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "LDAP Attribute mapping" +msgstr "" + #: src/pages/providers/ldap/LDAPProviderForm.ts msgid "LDAP DN under which bind requests and search requests can be made." msgstr "" @@ -2405,6 +2412,7 @@ msgstr "" #: src/pages/providers/saml/SAMLProviderImportForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/plex/PlexSourceForm.ts @@ -3027,6 +3035,10 @@ msgstr "" msgid "Parent" msgstr "" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Parent group for all the groups imported from LDAP." +msgstr "" + #: src/pages/policies/dummy/DummyPolicyForm.ts msgid "Pass policy?" msgstr "" @@ -4334,6 +4346,10 @@ msgstr "" msgid "Sync groups" msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "Sync parent group" +msgstr "" + #: src/pages/sources/ldap/LDAPSourceViewPage.ts msgid "Sync status" msgstr "" diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/pages/providers/ldap/LDAPProviderForm.ts index 1196b305f..dc3f859d8 100644 --- a/web/src/pages/providers/ldap/LDAPProviderForm.ts +++ b/web/src/pages/providers/ldap/LDAPProviderForm.ts @@ -95,7 +95,7 @@ export class LDAPProviderFormPage extends ModelForm { ${t`Flow used for users to authenticate. Currently only identification and password stages are supported.`}

- + + + ${until( + new CoreApi(DEFAULT_CONFIG).coreGroupsList({}).then((groups) => { + return groups.results.map((group) => { + return html``; + }); + }), + html``, + )} + +

+ ${t`Parent group for all the groups imported from LDAP.`} +

+ Date: Thu, 30 Sep 2021 18:47:40 +0200 Subject: [PATCH 12/14] sources/ldap: don't sync ldap source when no property mappings are set Signed-off-by: Jens Langhammer --- authentik/sources/ldap/signals.py | 21 ++++++++++++------- web/src/pages/sources/ldap/LDAPSourceForm.ts | 2 +- .../pages/sources/ldap/LDAPSourceViewPage.ts | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/authentik/sources/ldap/signals.py b/authentik/sources/ldap/signals.py index b33ba2195..0a9c325c4 100644 --- a/authentik/sources/ldap/signals.py +++ b/authentik/sources/ldap/signals.py @@ -25,13 +25,20 @@ from authentik.stages.prompt.signals import password_validate # pylint: disable=unused-argument def sync_ldap_source_on_save(sender, instance: LDAPSource, **_): """Ensure that source is synced on save (if enabled)""" - if instance.enabled: - for sync_class in [ - UserLDAPSynchronizer, - GroupLDAPSynchronizer, - MembershipLDAPSynchronizer, - ]: - ldap_sync.delay(instance.pk, class_to_path(sync_class)) + if not instance.enabled: + return + # Don't sync sources when they don't have any property mappings. This will only happen if: + # - the user forgets to set them or + # - the source is newly created, this is the first save event + # and the mappings are created with an m2m event + if not instance.property_mappings.exists() or not instance.property_mappings_group.exists(): + return + for sync_class in [ + UserLDAPSynchronizer, + GroupLDAPSynchronizer, + MembershipLDAPSynchronizer, + ]: + ldap_sync.delay(instance.pk, class_to_path(sync_class)) @receiver(password_validate) diff --git a/web/src/pages/sources/ldap/LDAPSourceForm.ts b/web/src/pages/sources/ldap/LDAPSourceForm.ts index 3d6311c8c..1a1f8058e 100644 --- a/web/src/pages/sources/ldap/LDAPSourceForm.ts +++ b/web/src/pages/sources/ldap/LDAPSourceForm.ts @@ -162,7 +162,7 @@ export class LDAPSourceForm extends ModelForm {
- + ${t`LDAP Attribute mapping`}
{ return new SourcesApi(DEFAULT_CONFIG) .sourcesLdapPartialUpdate({ From c251b87f8c82531a6dd432e43c7fb8b52ca71e80 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 30 Sep 2021 19:13:48 +0200 Subject: [PATCH 13/14] sources/ldap: add support for Active Directory `userAccountControl` attribute Signed-off-by: Jens Langhammer --- authentik/sources/ldap/sync/users.py | 5 +++ .../sources/ldap/sync/vendor/__init__.py | 0 authentik/sources/ldap/sync/vendor/ad.py | 32 +++++++++++++++++++ authentik/sources/ldap/tests/mock_ad.py | 1 + authentik/sources/ldap/tests/test_sync.py | 3 +- 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 authentik/sources/ldap/sync/vendor/__init__.py create mode 100644 authentik/sources/ldap/sync/vendor/ad.py diff --git a/authentik/sources/ldap/sync/users.py b/authentik/sources/ldap/sync/users.py index 1de08b508..42b6a6f60 100644 --- a/authentik/sources/ldap/sync/users.py +++ b/authentik/sources/ldap/sync/users.py @@ -10,6 +10,7 @@ from pytz import UTC from authentik.core.models import User from authentik.events.models import Event, EventAction from authentik.sources.ldap.sync.base import LDAP_UNIQUENESS, BaseLDAPSynchronizer +from authentik.sources.ldap.sync.vendor.ad import UserAccountControl class UserLDAPSynchronizer(BaseLDAPSynchronizer): @@ -75,4 +76,8 @@ class UserLDAPSynchronizer(BaseLDAPSynchronizer): ) ak_user.set_unusable_password() ak_user.save() + if "userAccountControl" in attributes: + uac = UserAccountControl(attributes.get("userAccountControl")) + ak_user.is_active = not uac.ACCOUNTDISABLE + ak_user.save() return user_count diff --git a/authentik/sources/ldap/sync/vendor/__init__.py b/authentik/sources/ldap/sync/vendor/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/authentik/sources/ldap/sync/vendor/ad.py b/authentik/sources/ldap/sync/vendor/ad.py new file mode 100644 index 000000000..9fceea003 --- /dev/null +++ b/authentik/sources/ldap/sync/vendor/ad.py @@ -0,0 +1,32 @@ +"""Active Directory specific""" +from enum import IntFlag + + +class UserAccountControl(IntFlag): + """UserAccountControl attribute for Active directory users""" + + # https://docs.microsoft.com/en-us/troubleshoot/windows-server/identity + # /useraccountcontrol-manipulate-account-properties + + SCRIPT = 1 + ACCOUNTDISABLE = 2 + HOMEDIR_REQUIRED = 8 + LOCKOUT = 16 + PASSWD_NOTREQD = 32 + PASSWD_CANT_CHANGE = 64 + ENCRYPTED_TEXT_PWD_ALLOWED = 128 + TEMP_DUPLICATE_ACCOUNT = 256 + NORMAL_ACCOUNT = 512 + INTERDOMAIN_TRUST_ACCOUNT = 2048 + WORKSTATION_TRUST_ACCOUNT = 4096 + SERVER_TRUST_ACCOUNT = 8192 + DONT_EXPIRE_PASSWORD = 65536 + MNS_LOGON_ACCOUNT = 131072 + SMARTCARD_REQUIRED = 262144 + TRUSTED_FOR_DELEGATION = 524288 + NOT_DELEGATED = 1048576 + USE_DES_KEY_ONLY = 2097152 + DONT_REQ_PREAUTH = 4194304 + PASSWORD_EXPIRED = 8388608 + TRUSTED_TO_AUTH_FOR_DELEGATION = 16777216 + PARTIAL_SECRETS_ACCOUNT = 67108864 diff --git a/authentik/sources/ldap/tests/mock_ad.py b/authentik/sources/ldap/tests/mock_ad.py index c94519f0f..3418e52af 100644 --- a/authentik/sources/ldap/tests/mock_ad.py +++ b/authentik/sources/ldap/tests/mock_ad.py @@ -54,6 +54,7 @@ def mock_ad_connection(password: str) -> Connection: "objectSid": "user0", "objectClass": "person", "distinguishedName": "cn=user0,ou=users,dc=goauthentik,dc=io", + "userAccountControl": 66050, }, ) # User without SID diff --git a/authentik/sources/ldap/tests/test_sync.py b/authentik/sources/ldap/tests/test_sync.py index 0d158b4db..d833b781f 100644 --- a/authentik/sources/ldap/tests/test_sync.py +++ b/authentik/sources/ldap/tests/test_sync.py @@ -72,7 +72,8 @@ class LDAPSyncTests(TestCase): with patch("authentik.sources.ldap.models.LDAPSource.connection", connection): user_sync = UserLDAPSynchronizer(self.source) user_sync.sync() - self.assertTrue(User.objects.filter(username="user0_sn").exists()) + user = User.objects.filter(username="user0_sn").first() + self.assertFalse(user.is_active) self.assertFalse(User.objects.filter(username="user1_sn").exists()) def test_sync_users_openldap(self): From 1a6ea72c091d13904bfa32e2fbeb2e11561d19d9 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 1 Oct 2021 09:51:51 +0200 Subject: [PATCH 14/14] release: 2021.9.4 --- .bumpversion.cfg | 2 +- .github/workflows/release-publish.yml | 20 +++++++++---------- authentik/__init__.py | 2 +- docker-compose.yml | 4 ++-- internal/constants/constants.go | 2 +- schema.yml | 2 +- web/src/constants.ts | 2 +- website/docs/installation/docker-compose.md | 4 ++-- .../outposts/manual-deploy-docker-compose.md | 4 ++-- .../docs/outposts/manual-deploy-kubernetes.md | 14 ++++++------- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 99f9d9f61..fdc1210c6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2021.9.3 +current_version = 2021.9.4 tag = True commit = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\-?(?P.*) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index b73f1d540..a25e45b8e 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -33,14 +33,14 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik:2021.9.3, + beryju/authentik:2021.9.4, beryju/authentik:latest, - ghcr.io/goauthentik/server:2021.9.3, + ghcr.io/goauthentik/server:2021.9.4, ghcr.io/goauthentik/server:latest platforms: linux/amd64,linux/arm64 context: . - name: Building Docker Image (stable) - if: ${{ github.event_name == 'release' && !contains('2021.9.3', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.9.4', 'rc') }} run: | docker pull beryju/authentik:latest docker tag beryju/authentik:latest beryju/authentik:stable @@ -75,14 +75,14 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-proxy:2021.9.3, + beryju/authentik-proxy:2021.9.4, beryju/authentik-proxy:latest, - ghcr.io/goauthentik/proxy:2021.9.3, + ghcr.io/goauthentik/proxy:2021.9.4, ghcr.io/goauthentik/proxy:latest file: proxy.Dockerfile platforms: linux/amd64,linux/arm64 - name: Building Docker Image (stable) - if: ${{ github.event_name == 'release' && !contains('2021.9.3', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.9.4', 'rc') }} run: | docker pull beryju/authentik-proxy:latest docker tag beryju/authentik-proxy:latest beryju/authentik-proxy:stable @@ -117,14 +117,14 @@ jobs: with: push: ${{ github.event_name == 'release' }} tags: | - beryju/authentik-ldap:2021.9.3, + beryju/authentik-ldap:2021.9.4, beryju/authentik-ldap:latest, - ghcr.io/goauthentik/ldap:2021.9.3, + ghcr.io/goauthentik/ldap:2021.9.4, ghcr.io/goauthentik/ldap:latest file: ldap.Dockerfile platforms: linux/amd64,linux/arm64 - name: Building Docker Image (stable) - if: ${{ github.event_name == 'release' && !contains('2021.9.3', 'rc') }} + if: ${{ github.event_name == 'release' && !contains('2021.9.4', 'rc') }} run: | docker pull beryju/authentik-ldap:latest docker tag beryju/authentik-ldap:latest beryju/authentik-ldap:stable @@ -175,7 +175,7 @@ jobs: SENTRY_PROJECT: authentik SENTRY_URL: https://sentry.beryju.org with: - version: authentik@2021.9.3 + version: authentik@2021.9.4 environment: beryjuorg-prod sourcemaps: './web/dist' url_prefix: '~/static/dist' diff --git a/authentik/__init__.py b/authentik/__init__.py index a51df8b16..cfcd652a8 100644 --- a/authentik/__init__.py +++ b/authentik/__init__.py @@ -1,3 +1,3 @@ """authentik""" -__version__ = "2021.9.3" +__version__ = "2021.9.4" ENV_GIT_HASH_KEY = "GIT_BUILD_HASH" diff --git a/docker-compose.yml b/docker-compose.yml index 735454c2b..19e35e00d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: networks: - internal server: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.3} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.4} restart: unless-stopped command: server environment: @@ -44,7 +44,7 @@ services: - "0.0.0.0:9000:9000" - "0.0.0.0:9443:9443" worker: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.3} + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.4} restart: unless-stopped command: worker networks: diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 7b637332a..63503bba6 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -17,4 +17,4 @@ func OutpostUserAgent() string { return fmt.Sprintf("authentik-outpost@%s (build=%s)", VERSION, BUILD()) } -const VERSION = "2021.9.3" +const VERSION = "2021.9.4" diff --git a/schema.yml b/schema.yml index 04ce2d395..27e7084a2 100644 --- a/schema.yml +++ b/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: authentik - version: 2021.9.3 + version: 2021.9.4 description: Making authentication simple. contact: email: hello@beryju.org diff --git a/web/src/constants.ts b/web/src/constants.ts index d880b9fc3..cf347c990 100644 --- a/web/src/constants.ts +++ b/web/src/constants.ts @@ -3,7 +3,7 @@ export const SUCCESS_CLASS = "pf-m-success"; export const ERROR_CLASS = "pf-m-danger"; export const PROGRESS_CLASS = "pf-m-in-progress"; export const CURRENT_CLASS = "pf-m-current"; -export const VERSION = "2021.9.3"; +export const VERSION = "2021.9.4"; export const PAGE_SIZE = 20; export const TITLE_DEFAULT = "authentik"; export const ROUTE_SEPARATOR = ";"; diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md index fba28808f..a0302a78f 100644 --- a/website/docs/installation/docker-compose.md +++ b/website/docs/installation/docker-compose.md @@ -12,9 +12,9 @@ This installation method is for test-setups and small-scale productive setups. ## Preparation -Download the latest `docker-compose.yml` from [here](https://raw.githubusercontent.com/goauthentik/authentik/version/2021.9.3/docker-compose.yml). Place it in a directory of your choice. +Download the latest `docker-compose.yml` from [here](https://raw.githubusercontent.com/goauthentik/authentik/version/2021.9.4/docker-compose.yml). Place it in a directory of your choice. -To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.9.3 >> .env` +To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.9.4 >> .env` If this is a fresh authentik install run the following commands to generate a password: diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md index 90313d791..50da5123c 100644 --- a/website/docs/outposts/manual-deploy-docker-compose.md +++ b/website/docs/outposts/manual-deploy-docker-compose.md @@ -13,7 +13,7 @@ version: "3.5" services: authentik_proxy: - image: ghcr.io/goauthentik/proxy:2021.9.3 + image: ghcr.io/goauthentik/proxy:2021.9.4 # Optionally specify which networks the container should be # might be needed to reach the core authentik server # networks: @@ -40,7 +40,7 @@ version: "3.5" services: authentik_ldap: - image: ghcr.io/goauthentik/ldap:2021.9.3 + image: ghcr.io/goauthentik/ldap:2021.9.4 # Optionally specify which networks the container should be # might be needed to reach the core authentik server # networks: diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md index d2218c6c8..ab91247fe 100644 --- a/website/docs/outposts/manual-deploy-kubernetes.md +++ b/website/docs/outposts/manual-deploy-kubernetes.md @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.3 + app.kubernetes.io/version: 2021.9.4 name: authentik-outpost-api stringData: authentik_host: "__AUTHENTIK_URL__" @@ -29,7 +29,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.3 + app.kubernetes.io/version: 2021.9.4 name: authentik-outpost spec: ports: @@ -54,7 +54,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.3 + app.kubernetes.io/version: 2021.9.4 name: authentik-outpost spec: selector: @@ -62,14 +62,14 @@ spec: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.3 + app.kubernetes.io/version: 2021.9.4 template: metadata: labels: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.3 + app.kubernetes.io/version: 2021.9.4 spec: containers: - env: @@ -88,7 +88,7 @@ spec: secretKeyRef: key: authentik_host_insecure name: authentik-outpost-api - image: ghcr.io/goauthentik/proxy:2021.9.3 + image: ghcr.io/goauthentik/proxy:2021.9.4 name: proxy ports: - containerPort: 9000 @@ -110,7 +110,7 @@ metadata: app.kubernetes.io/instance: __OUTPOST_NAME__ app.kubernetes.io/managed-by: goauthentik.io app.kubernetes.io/name: authentik-proxy - app.kubernetes.io/version: 2021.9.3 + app.kubernetes.io/version: 2021.9.4 name: authentik-outpost spec: rules: