Merge branch 'master' into version-2021.3

Pipfile.lock

@@ -95,10 +95,10 @@
         },
         "autobahn": {
             "hashes": [
-                "sha256:884f79c50fdc55ade2c315946a9caa145e8b10075eee9d2c2594ea5e8f5226aa",
+                "sha256:9195df8af03b0ff29ccd4b7f5abbde957ee90273465942205f9a1bad6c3f07ac",
-                "sha256:bf7a9d302a34d0f719d43c57f65ca1f2f5c982dd6ea0c11e1e190ef6f43710fe"
+                "sha256:e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03"
             ],
-            "version": "==21.2.2"
+            "version": "==21.3.1"
         },
         "automat": {
             "hashes": [
@@ -116,18 +116,18 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:3570a3c0fbd80bcb30449f87cf9d2f7abb67fac2a5e317d002f9921c59be9b17",
+                "sha256:c9513a9ea00f8d17ecdc02c391ae956bf0f990aa07deec11c421607c09b294e1",
-                "sha256:ceff2f32ba05acc9ee35a6dd82e29ea285d63e889bed39a6ba7a700146f43749"
+                "sha256:f84ca60e9605af69022f039c035b33d519531eeaac52724b9223a5465f4a8b6b"
             ],
             "index": "pypi",
-            "version": "==1.17.18"
+            "version": "==1.17.19"
         },
         "botocore": {
             "hashes": [
-                "sha256:51900b10da4ae45be4b16045e5b2ff7d1158a7955d9d7cc5e5a9ba3170f10586",
+                "sha256:135b5f30e6662b46d804f993bf31d9c7769c6c0848321ed0aa0393f5b9c19a94",
-                "sha256:b181f32d9075e5419a89fa9636ce95946c15459c9bfadfabb53ca902fc8072b8"
+                "sha256:8e42c78d2eb888551635309158c04ef2648a96d8c2c70dbce7712c6ce8629759"
             ],
-            "version": "==1.20.18"
+            "version": "==1.20.19"
         },
         "cachetools": {
             "hashes": [
@@ -1249,10 +1249,10 @@
         },
         "websocket-client": {
             "hashes": [
-                "sha256:0fc45c961324d79c781bab301359d5a1b00b13ad1b10415a4780229ef71a5549",
+                "sha256:44b5df8f08c74c3d82d28100fdc81f4536809ce98a17f0757557813275fbb663",
-                "sha256:d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010"
+                "sha256:63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f"
             ],
-            "version": "==0.57.0"
+            "version": "==0.58.0"
         },
         "websockets": {
             "hashes": [

authentik/admin/api/tasks.py

@@ -7,14 +7,14 @@ from django.http.response import Http404
 from django.utils.translation import gettext_lazy as _
 from drf_yasg2.utils import swagger_auto_schema
 from rest_framework.decorators import action
-from rest_framework.fields import CharField, DateTimeField, IntegerField, ListField
+from rest_framework.fields import CharField, ChoiceField, DateTimeField, ListField
 from rest_framework.permissions import IsAdminUser
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.serializers import Serializer
 from rest_framework.viewsets import ViewSet
 
-from authentik.events.monitored_tasks import TaskInfo
+from authentik.events.monitored_tasks import TaskInfo, TaskResultStatus
 
 
 class TaskSerializer(Serializer):
@@ -24,7 +24,10 @@ class TaskSerializer(Serializer):
     task_description = CharField()
     task_finish_timestamp = DateTimeField(source="finish_timestamp")
 
-    status = IntegerField(source="result.status.value")
+    status = ChoiceField(
+        source="result.status.name",
+        choices=[(x.name, x.name) for x in TaskResultStatus],
+    )
     messages = ListField(source="result.messages")
 
     def create(self, validated_data: dict) -> Model:

authentik/admin/api/version.py

@@ -55,7 +55,7 @@ class VersionViewSet(ListModelMixin, GenericViewSet):
     def get_queryset(self):  # pragma: no cover
         return None
 
-    @swagger_auto_schema(responses={200: VersionSerializer(many=True)})
+    @swagger_auto_schema(responses={200: VersionSerializer(many=False)})
     def list(self, request: Request) -> Response:
         """Get running and latest version."""
         return Response(VersionSerializer(True).data)

authentik/api/pagination_schema.py

@@ -0,0 +1,97 @@
+"""Swagger Pagination Schema class"""
+from typing import OrderedDict
+
+from drf_yasg2 import openapi
+from drf_yasg2.inspectors import PaginatorInspector
+
+
+class PaginationInspector(PaginatorInspector):
+    """Swagger Pagination Schema class"""
+
+    def get_paginated_response(self, paginator, response_schema):
+        """
+        :param BasePagination paginator: the paginator
+        :param openapi.Schema response_schema: the response schema that must be paged.
+        :rtype: openapi.Schema
+        """
+
+        return openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            properties=OrderedDict(
+                (
+                    (
+                        "pagination",
+                        openapi.Schema(
+                            type=openapi.TYPE_OBJECT,
+                            properties=OrderedDict(
+                                (
+                                    ("next", openapi.Schema(type=openapi.TYPE_NUMBER)),
+                                    (
+                                        "previous",
+                                        openapi.Schema(type=openapi.TYPE_NUMBER),
+                                    ),
+                                    ("count", openapi.Schema(type=openapi.TYPE_NUMBER)),
+                                    (
+                                        "current",
+                                        openapi.Schema(type=openapi.TYPE_NUMBER),
+                                    ),
+                                    (
+                                        "total_pages",
+                                        openapi.Schema(type=openapi.TYPE_NUMBER),
+                                    ),
+                                    (
+                                        "start_index",
+                                        openapi.Schema(type=openapi.TYPE_NUMBER),
+                                    ),
+                                    (
+                                        "end_index",
+                                        openapi.Schema(type=openapi.TYPE_NUMBER),
+                                    ),
+                                )
+                            ),
+                            required=[
+                                "next",
+                                "previous",
+                                "count",
+                                "current",
+                                "total_pages",
+                                "start_index",
+                                "end_index",
+                            ],
+                        ),
+                    ),
+                    ("results", response_schema),
+                )
+            ),
+            required=["results", "pagination"],
+        )
+
+    def get_paginator_parameters(self, paginator):
+        """
+        Get the pagination parameters for a single paginator **instance**.
+
+        Should return :data:`.NotHandled` if this inspector
+        does not know how to handle the given `paginator`.
+
+        :param BasePagination paginator: the paginator
+        :rtype: list[openapi.Parameter]
+        """
+
+        return [
+            openapi.Parameter(
+                "page",
+                openapi.IN_QUERY,
+                "Page Index",
+                False,
+                None,
+                openapi.TYPE_INTEGER,
+            ),
+            openapi.Parameter(
+                "page_size",
+                openapi.IN_QUERY,
+                "Page Size",
+                False,
+                None,
+                openapi.TYPE_INTEGER,
+            ),
+        ]

authentik/api/v2/config.py

@@ -1,10 +1,11 @@
 """core Configs API"""
 from django.db.models import Model
 from drf_yasg2.utils import swagger_auto_schema
+from rest_framework.fields import BooleanField, CharField
 from rest_framework.permissions import AllowAny
 from rest_framework.request import Request
 from rest_framework.response import Response
-from rest_framework.serializers import ReadOnlyField, Serializer
+from rest_framework.serializers import Serializer
 from rest_framework.viewsets import ViewSet
 
 from authentik.lib.config import CONFIG
@@ -13,12 +14,12 @@ from authentik.lib.config import CONFIG
 class ConfigSerializer(Serializer):
     """Serialize authentik Config into DRF Object"""
 
-    branding_logo = ReadOnlyField()
+    branding_logo = CharField(read_only=True)
-    branding_title = ReadOnlyField()
+    branding_title = CharField(read_only=True)
 
-    error_reporting_enabled = ReadOnlyField()
+    error_reporting_enabled = BooleanField(read_only=True)
-    error_reporting_environment = ReadOnlyField()
+    error_reporting_environment = CharField(read_only=True)
-    error_reporting_send_pii = ReadOnlyField()
+    error_reporting_send_pii = BooleanField(read_only=True)
 
     def create(self, validated_data: dict) -> Model:
         raise NotImplementedError
@@ -32,7 +33,7 @@ class ConfigsViewSet(ViewSet):
 
     permission_classes = [AllowAny]
 
-    @swagger_auto_schema(responses={200: ConfigSerializer(many=True)})
+    @swagger_auto_schema(responses={200: ConfigSerializer(many=False)})
     def list(self, request: Request) -> Response:
         """Retrive public configuration options"""
         config = ConfigSerializer(

authentik/api/v2/messages.py

@@ -1,37 +0,0 @@
-"""core messages API"""
-from django.contrib.messages import get_messages
-from django.db.models import Model
-from drf_yasg2.utils import swagger_auto_schema
-from rest_framework.permissions import AllowAny
-from rest_framework.request import Request
-from rest_framework.response import Response
-from rest_framework.serializers import ReadOnlyField, Serializer
-from rest_framework.viewsets import ViewSet
-
-
-class MessageSerializer(Serializer):
-    """Serialize Django Message into DRF Object"""
-
-    message = ReadOnlyField()
-    level = ReadOnlyField()
-    tags = ReadOnlyField()
-    extra_tags = ReadOnlyField()
-    level_tag = ReadOnlyField()
-
-    def create(self, validated_data: dict) -> Model:
-        raise NotImplementedError
-
-    def update(self, instance: Model, validated_data: dict) -> Model:
-        raise NotImplementedError
-
-
-class MessagesViewSet(ViewSet):
-    """Read-only view set that returns the current session's messages"""
-
-    permission_classes = [AllowAny]
-
-    @swagger_auto_schema(responses={200: MessageSerializer(many=True)})
-    def list(self, request: Request) -> Response:
-        """List current messages and pass into Serializer"""
-        all_messages = list(get_messages(request))
-        return Response(MessageSerializer(all_messages, many=True).data)

authentik/api/v2/urls.py

@@ -10,7 +10,6 @@ from authentik.admin.api.tasks import TaskViewSet
 from authentik.admin.api.version import VersionViewSet
 from authentik.admin.api.workers import WorkerViewSet
 from authentik.api.v2.config import ConfigsViewSet
-from authentik.api.v2.messages import MessagesViewSet
 from authentik.core.api.applications import ApplicationViewSet
 from authentik.core.api.groups import GroupViewSet
 from authentik.core.api.propertymappings import PropertyMappingViewSet
@@ -77,7 +76,6 @@ from authentik.stages.user_write.api import UserWriteStageViewSet
 
 router = routers.DefaultRouter()
 
-router.register("root/messages", MessagesViewSet, basename="messages")
 router.register("root/config", ConfigsViewSet, basename="configs")
 
 router.register("admin/version", VersionViewSet, basename="admin_version")

authentik/core/tasks.py

@@ -46,8 +46,7 @@ def backup_database(self: MonitoredTask):  # pragma: no cover
             TaskResult(
                 TaskResultStatus.SUCCESSFUL,
                 [
-                    f"Successfully finished database backup {naturaltime(start)}",
+                    f"Successfully finished database backup {naturaltime(start)} {out.getvalue()}",
-                    out.getvalue(),
                 ],
             )
         )

authentik/core/templates/user/settings.html

@@ -13,7 +13,7 @@
                 <p>{% trans "Configure settings relevant to your user profile." %}</p>
             </div>
         </section>
-        <ak-tabs>
+        <ak-tabs vertical="true">
             <section slot="page-1" data-tab-title="{% trans 'User details' %}" class="pf-c-page__main-section pf-m-no-padding-mobile">
                 <div class="pf-u-display-flex pf-u-justify-content-center">
                     <div class="pf-u-w-75">

authentik/events/api/event.py

@@ -29,7 +29,7 @@ class EventSerializer(ModelSerializer):
         ]
 
 
-class EventTopPerUserSerialier(Serializer):
+class EventTopPerUserSerializer(Serializer):
     """Response object of Event's top_per_user"""
 
     application = DictField()
@@ -60,7 +60,7 @@ class EventViewSet(ReadOnlyModelViewSet):
     filterset_fields = ["action"]
 
     @swagger_auto_schema(
-        method="GET", responses={200: EventTopPerUserSerialier(many=True)}
+        method="GET", responses={200: EventTopPerUserSerializer(many=True)}
     )
     @action(detail=False, methods=["GET"])
     def top_per_user(self, request: Request):

authentik/outposts/controllers/kubernetes.py

@@ -5,6 +5,7 @@ from typing import Type
 from kubernetes.client import OpenApiException
 from kubernetes.client.api_client import ApiClient
 from structlog.testing import capture_logs
+from urllib3.exceptions import HTTPError
 from yaml import dump_all
 
 from authentik.outposts.controllers.base import BaseController, ControllerException
@@ -42,7 +43,7 @@ class KubernetesController(BaseController):
                 reconciler = self.reconcilers[reconcile_key](self)
                 reconciler.up()
 
-        except OpenApiException as exc:
+        except (OpenApiException, HTTPError) as exc:
             raise ControllerException from exc
 
     def up_with_logs(self) -> list[str]:
@@ -54,7 +55,7 @@ class KubernetesController(BaseController):
                     reconciler.up()
                 all_logs += [f"{reconcile_key.title()}: {x['event']}" for x in logs]
             return all_logs
-        except OpenApiException as exc:
+        except (OpenApiException, HTTPError) as exc:
             raise ControllerException from exc
 
     def down(self):

authentik/root/settings.py

@@ -139,6 +139,9 @@ GUARDIAN_MONKEY_PATCH = False
 
 SWAGGER_SETTINGS = {
     "DEFAULT_INFO": "authentik.api.v2.urls.info",
+    "DEFAULT_PAGINATOR_INSPECTORS": [
+        "authentik.api.pagination_schema.PaginationInspector",
+    ],
     "SECURITY_DEFINITIONS": {
         "token": {"type": "apiKey", "name": "Authorization", "in": "header"}
     },
@@ -147,7 +150,6 @@ SWAGGER_SETTINGS = {
 REST_FRAMEWORK = {
     "DEFAULT_PAGINATION_CLASS": "authentik.api.pagination.Pagination",
     "PAGE_SIZE": 100,
-    "DATETIME_FORMAT": "%s",
     "DEFAULT_FILTER_BACKENDS": [
         "rest_framework_guardian.filters.ObjectPermissionsFilter",
         "django_filters.rest_framework.DjangoFilterBackend",

authentik/stages/authenticator_validate/forms.py

@@ -1,9 +1,6 @@
 """OTP Validate stage forms"""
 from django import forms
-from django.utils.translation import gettext_lazy as _
-from django_otp import match_token
 
-from authentik.core.models import User
 from authentik.flows.models import NotConfiguredAction
 from authentik.stages.authenticator_validate.models import (
     AuthenticatorValidateStage,
@@ -11,35 +8,6 @@ from authentik.stages.authenticator_validate.models import (
 )
 
 
-class ValidationForm(forms.Form):
-    """OTP Validate stage forms"""
-
-    user: User
-
-    code = forms.CharField(
-        label=_("Please enter the token from your device."),
-        widget=forms.TextInput(
-            attrs={
-                "autocomplete": "one-time-code",
-                "placeholder": "123456",
-                "autofocus": "autofocus",
-            }
-        ),
-    )
-
-    def __init__(self, user, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.user = user
-
-    def clean_code(self):
-        """Validate code against all confirmed devices"""
-        code = self.cleaned_data.get("code")
-        device = match_token(self.user, code)
-        if not device:
-            raise forms.ValidationError(_("Invalid Token"))
-        return code
-
-
 class AuthenticatorValidateStageForm(forms.ModelForm):
     """OTP Validate stage forms"""
 

azure-pipelines.yml

@@ -378,8 +378,8 @@ stages:
               python ./scripts/az_do_set_branch.py
         - task: Docker@2
           inputs:
-            containerRegistry: 'GHCR'
+            containerRegistry: 'beryjuorg-harbor'
-            repository: 'beryju/authentik'
+            repository: 'authentik/server'
             command: 'buildAndPush'
             Dockerfile: 'Dockerfile'
             tags: "gh-$(branchName)"

outpost/azure-pipelines.yml

@@ -98,8 +98,8 @@ stages:
                 python ./scripts/az_do_set_branch.py
           - task: Docker@2
             inputs:
-              containerRegistry: 'GHCR'
+              containerRegistry: 'beryjuorg-harbor'
-              repository: 'beryju/authentik-proxy'
+              repository: 'authentik/proxy'
               command: 'buildAndPush'
               Dockerfile: 'outpost/proxy.Dockerfile'
               buildContext: 'outpost/'

web/azure-pipelines.yml

@@ -78,8 +78,8 @@ stages:
               python ./scripts/az_do_set_branch.py
         - task: Docker@2
           inputs:
-            containerRegistry: 'GHCR'
+            containerRegistry: 'beryjuorg-harbor'
-            repository: 'beryju/authentik-static'
+            repository: 'authentik/static'
             command: 'buildAndPush'
             Dockerfile: 'web/Dockerfile'
             tags: "gh-$(branchName)"

web/src/api/Client.ts

@@ -1,3 +1,5 @@
+import { gettext } from "django";
+import { showMessage } from "../elements/messages/MessageContainer";
 import { getCookie } from "../utils";
 import { NotFoundError, RequestError } from "./Error";
 
@@ -47,6 +49,13 @@ export class Client {
                 }
                 return r;
             })
+            .catch((e) => {
+                showMessage({
+                    level_tag: "error",
+                    message: gettext(`Unexpected error while fetching: ${e.toString()}`),
+                });
+                return e;
+            })
             .then((r) => r.json())
             .then((r) => <T>r);
     }

web/src/elements/AdminLoginsChart.ts

@@ -1,16 +1,21 @@
 import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
 import Chart from "chart.js";
-import { showMessage } from "./messages/MessageContainer";
+import { DefaultClient } from "../api/Client";
 
 interface TickValue {
     value: number;
     major: boolean;
 }
 
+export interface LoginMetrics {
+    logins_failed_per_1h: { x: number, y: number }[];
+    logins_per_1h: { x: number, y: number }[];
+}
+
 @customElement("ak-admin-logins-chart")
 export class AdminLoginsChart extends LitElement {
-    @property()
+    @property({type: Array})
-    url = "";
+    url: string[] = [];
 
     chart?: Chart;
 
@@ -40,15 +45,7 @@ export class AdminLoginsChart extends LitElement {
     }
 
     firstUpdated(): void {
-        fetch(this.url)
+        DefaultClient.fetch<LoginMetrics>(this.url)
-            .then((r) => r.json())
-            .catch((e) => {
-                showMessage({
-                    level_tag: "error",
-                    message: "Unexpected error"
-                });
-                console.error(e);
-            })
             .then((r) => {
                 const canvas = <HTMLCanvasElement>this.shadowRoot?.querySelector("canvas");
                 if (!canvas) {

web/src/elements/Tabs.ts

@@ -12,10 +12,17 @@ export class Tabs extends LitElement {
     @property()
     currentPage?: string;
 
+    @property({type: Boolean})
+    vertical = false;
+
     static get styles(): CSSResult[] {
         return [GlobalsStyle, TabsStyle, css`
             ::slotted(*) {
                 height: 100%;
+                flex-grow: 2;
+            }
+            :host([vertical]) {
+                display: flex;
             }
         `];
     }
@@ -39,7 +46,7 @@ export class Tabs extends LitElement {
             }
             this.currentPage = pages[0].attributes.getNamedItem("slot")?.value;
         }
-        return html`<div class="pf-c-tabs">
+        return html`<div class="pf-c-tabs ${this.vertical ? "pf-m-vertical pf-m-box" : ""}">
                 <ul class="pf-c-tabs__list">
                     ${pages.map((page) => this.renderTab(page))}
                 </ul>

web/src/elements/messages/MessageContainer.ts

@@ -1,6 +1,5 @@
 import { gettext } from "django";
 import { LitElement, html, customElement, TemplateResult, property } from "lit-element";
-import { DefaultClient } from "../../api/Client";
 import "./Message";
 import { APIMessage } from "./Message";
 
@@ -15,7 +14,6 @@ export function showMessage(message: APIMessage): void {
 
 @customElement("ak-message-container")
 export class MessageContainer extends LitElement {
-    url = DefaultClient.makeUrl(["root", "messages"]);
 
     @property({attribute: false})
     messages: APIMessage[] = [];
@@ -36,10 +34,6 @@ export class MessageContainer extends LitElement {
         }
     }
 
-    firstUpdated(): void {
-        this.fetchMessages();
-    }
-
     connect(): void {
         const wsUrl = `${window.location.protocol.replace("http", "ws")}//${
             window.location.host
@@ -74,21 +68,6 @@ export class MessageContainer extends LitElement {
         });
     }
 
-    /* Fetch messages which were stored in the session.
-     * This mostly gets messages which were created when the user arrives/leaves the site
-     * and especially the login flow */
-    fetchMessages(): Promise<void> {
-        console.debug("authentik/messages: fetching messages over direct api");
-        return fetch(this.url)
-            .then((r) => r.json())
-            .then((r: APIMessage[]) => {
-                r.forEach((m: APIMessage) => {
-                    this.messages.push(m);
-                    this.requestUpdate();
-                });
-            });
-    }
-
     render(): TemplateResult {
         return html`<ul class="pf-c-alert-group pf-m-toast">
             ${this.messages.map((m) => {

web/src/elements/stages/authenticator_validate/AuthenticatorValidateStage.ts

@@ -119,13 +119,15 @@ export class AuthenticatorValidateStage extends BaseStage implements StageHost {
             return html`<ak-stage-authenticator-validate-code
                 .host=${this}
                 .challenge=${this.challenge}
-                .deviceChallenge=${this.selectedDeviceChallenge}>
+                .deviceChallenge=${this.selectedDeviceChallenge}
+                .showBackButton=${(this.challenge?.device_challenges.length || []) > 1}>
             </ak-stage-authenticator-validate-code>`;
         case DeviceClasses.WEBAUTHN:
             return html`<ak-stage-authenticator-validate-webauthn
                 .host=${this}
                 .challenge=${this.challenge}
-                .deviceChallenge=${this.selectedDeviceChallenge}>
+                .deviceChallenge=${this.selectedDeviceChallenge}
+                .showBackButton=${(this.challenge?.device_challenges.length || []) > 1}>
             </ak-stage-authenticator-validate-webauthn>`;
         }
     }

web/src/elements/stages/authenticator_validate/AuthenticatorValidateStageCode.ts

@@ -14,6 +14,9 @@ export class AuthenticatorValidateStageWebCode extends BaseStage {
     @property({ attribute: false })
     deviceChallenge?: DeviceChallenge;
 
+    @property({ type: Boolean })
+    showBackButton = false;
+
     static get styles(): CSSResult[] {
         return COMMON_STYLES;
     }
@@ -61,14 +64,16 @@ export class AuthenticatorValidateStageWebCode extends BaseStage {
         </div>
         <footer class="pf-c-login__main-footer">
             <ul class="pf-c-login__main-footer-links">
-                <li class="pf-c-login__main-footer-links-item">
+                ${this.showBackButton ?
-                    <button class="pf-c-button pf-m-secondary pf-m-block" @click=${() => {
+                    html`<li class="pf-c-login__main-footer-links-item">
-                        if (!this.host) return;
+                        <button class="pf-c-button pf-m-secondary pf-m-block" @click=${() => {
-                        (this.host as AuthenticatorValidateStage).selectedDeviceChallenge = undefined;
+                            if (!this.host) return;
-                    }}>
+                            (this.host as AuthenticatorValidateStage).selectedDeviceChallenge = undefined;
-                        ${gettext("Return to device picker")}
+                        }}>
-                    </button>
+                            ${gettext("Return to device picker")}
-                </li>
+                        </button>
+                    </li>`:
+                    html``}
             </ul>
         </footer>`;
     }

web/src/elements/stages/authenticator_validate/AuthenticatorValidateStageWebAuthn.ts

@@ -21,6 +21,9 @@ export class AuthenticatorValidateStageWebAuthn extends BaseStage {
     @property()
     authenticateMessage = "";
 
+    @property({type: Boolean})
+    showBackButton = false;
+
     static get styles(): CSSResult[] {
         return COMMON_STYLES;
     }
@@ -98,14 +101,16 @@ export class AuthenticatorValidateStageWebAuthn extends BaseStage {
         </div>
         <footer class="pf-c-login__main-footer">
             <ul class="pf-c-login__main-footer-links">
-                <li class="pf-c-login__main-footer-links-item">
+                ${this.showBackButton ?
-                    <button class="pf-c-button pf-m-secondary pf-m-block" @click=${() => {
+                    html`<li class="pf-c-login__main-footer-links-item">
-                        if (!this.host) return;
+                        <button class="pf-c-button pf-m-secondary pf-m-block" @click=${() => {
-                        (this.host as AuthenticatorValidateStage).selectedDeviceChallenge = undefined;
+                            if (!this.host) return;
-                    }}>
+                            (this.host as AuthenticatorValidateStage).selectedDeviceChallenge = undefined;
-                        ${gettext("Return to device picker")}
+                        }}>
-                    </button>
+                            ${gettext("Return to device picker")}
-                </li>
+                        </button>
+                    </li>`:
+                    html``}
             </ul>
         </footer>`;
     }

web/src/pages/admin-overview/AdminOverviewPage.ts

@@ -1,6 +1,5 @@
 import { gettext } from "django";
 import { CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
-import { DefaultClient } from "../../api/Client";
 import { COMMON_STYLES } from "../../common/styles";
 
 import "../../elements/AdminLoginsChart";
@@ -31,7 +30,7 @@ export class AdminOverviewPage extends LitElement {
         <section class="pf-c-page__main-section">
             <div class="pf-l-gallery pf-m-gutter">
                 <ak-aggregate-card class="pf-l-gallery__item pf-m-4-col" icon="pf-icon pf-icon-server" header="Logins over the last 24 hours" style="grid-column-end: span 3;grid-row-end: span 2;">
-                    <ak-admin-logins-chart url="${DefaultClient.makeUrl(["admin", "metrics"])}"></ak-admin-logins-chart>
+                    <ak-admin-logins-chart .url="${["admin", "metrics"]}"></ak-admin-logins-chart>
                 </ak-aggregate-card>
                 <ak-aggregate-card class="pf-l-gallery__item pf-m-4-col" icon="pf-icon pf-icon-server" header="Apps with most usage" style="grid-column-end: span 2;grid-row-end: span 3;">
                     <ak-top-applications-table></ak-top-applications-table>

web/src/pages/applications/ApplicationViewPage.ts

@@ -1,7 +1,6 @@
 import { gettext } from "django";
 import { css, CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element";
 import { Application } from "../../api/Applications";
-import { DefaultClient } from "../../api/Client";
 import { COMMON_STYLES } from "../../common/styles";
 
 import "../../elements/Tabs";
@@ -71,7 +70,7 @@ export class ApplicationViewPage extends LitElement {
                             <div class="pf-c-card__body">
                                 ${this.application ? html`
                                     <ak-admin-logins-chart
-                                        url="${DefaultClient.makeUrl(["core", "applications", this.application?.slug, "metrics"])}">
+                                        .url="${["core", "applications", this.application?.slug, "metrics"]}">
                                     </ak-admin-logins-chart>`: ""}
                             </div>
                         </div>

website/docs/expressions/index.md

@@ -12,8 +12,8 @@ These functions/objects are available wherever expressions are used. For more sp
 
 ## Global objects
 
--   `ak_logger`: structlog BoundLogger. ([ref](https://www.structlog.org/en/stable/api.html#structlog.BoundLogger))
+- `ak_logger`: structlog BoundLogger. ([ref](https://www.structlog.org/en/stable/api.html#structlog.BoundLogger))
--   `requests`: requests Session object. ([ref](https://requests.readthedocs.io/en/master/user/advanced/))
+- `requests`: requests Session object. ([ref](https://requests.readthedocs.io/en/master/user/advanced/))
 
 ## Generally available functions
 

website/docs/expressions/reference/user-object.md

@@ -4,16 +4,16 @@ title: User Object
 
 The User object has the following attributes:
 
--   `username`: User's username.
+- `username`: User's username.
--   `email` User's email.
+- `email` User's email.
--   `name` User's display name.
+- `name` User's display name.
--   `is_staff` Boolean field if user is staff.
+- `is_staff` Boolean field if user is staff.
--   `is_active` Boolean field if user is active.
+- `is_active` Boolean field if user is active.
--   `date_joined` Date user joined/was created.
+- `date_joined` Date user joined/was created.
--   `password_change_date` Date password was last changed.
+- `password_change_date` Date password was last changed.
--   `attributes` Dynamic attributes.
+- `attributes` Dynamic attributes.
--   `group_attributes` Merged attributes of all groups the user is member of and the user's own attributes.
+- `group_attributes` Merged attributes of all groups the user is member of and the user's own attributes.
--   `ak_groups` This is a queryset of all the user's groups.
+- `ak_groups` This is a queryset of all the user's groups.
 
     You can do additional filtering like `user.ak_groups.filter(name__startswith='test')`, see [here](https://docs.djangoproject.com/en/3.1/ref/models/querysets/#id4)
 

website/docs/flow/stages/authenticator_static/index.md

@@ -1,5 +1,5 @@
 ---
-title: Static Authenticator stage
+title: Static Authentication Setup stage
 ---
 
 This stage configures static OTP Tokens, which can be used as a backup method to time-based OTP tokens.

website/docs/flow/stages/authenticator_totp/index.md

@@ -1,7 +1,7 @@
 ---
-title: TOTP stage
+title: TOTP Authentication Setup stage
 ---
 
 This stage configures a time-based OTP Device, such as Google Authenticator or Authy.
 
-You can configure how many digest should be used for the OTP Token.
+You can configure how many digits should be used for the OTP Token.

website/docs/flow/stages/authenticator_validate/index.md

@@ -2,7 +2,16 @@
 title: Authenticator Validation Stage
 ---
 
-This stage validates an already configured OTP Device. This device has to be configured using any of the other authenticator stages:
+This stage validates an already configured Authenticator Device. This device has to be configured using any of the other authenticator stages:
 
 - [TOTP authenticator stage](../authenticator_totp/index.md)
 - [Static authenticator stage](../authenticator_static/index.md).
+- [WebAuth authenticator stage](../authenticator_webauthn/index.md).
+
+You can select which type of device classes are allowed.
+
+Using the `Not configured action`, you can choose what happens when a user does not have any matching devices.
+
+- Skip: Validation is skipped and the flow continues
+- Deny: Access is denied, the flow execution ends
+- Configure: This option requires a *Configuration stage* to be set. The validation stage will be marked as successful, and the configuration stage will be injected into the flow.

website/docs/flow/stages/authenticator_webauthn/index.md

@@ -0,0 +1,7 @@
+---
+title: WebAuthn Authentication Setup stage
+---
+
+This stage configures a WebAuthn-based Authenticator. This can either be a browser, biometrics or a Security stick like a YubiKey.
+
+There are no stage-specific settings.

website/docs/flow/stages/deny.md

@@ -0,0 +1,10 @@
+---
+title: Deny stage
+---
+
+This stage stops the execution of a flow. This can be used to conditionally deny users access to a flow,
+even if they are not signed in (and permissions can't be checked via groups).
+
+:::caution
+To effectively use this stage, make sure to **disable** *Evaluate on plan* on the Stage binding.
+:::

website/docs/flow/stages/identification/index.md

@@ -11,8 +11,8 @@ This stage provides a ready-to-go form for users to identify themselves.
 Select which fields the user can use to identify themselves. Multiple fields can be specified and separated with a comma.
 Valid choices:
 
--   email
+- email
--   username
+- username
 
 ### Template
 

website/docs/integrations/services/apache-guacamole/index.mdx

@@ -0,0 +1,62 @@
+---
+title: Apache Guacamole™
+---
+
+## What is Apache Guacamole™
+
+From https://guacamole.apache.org/
+
+:::note
+Apache Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH.
+:::
+
+## Preparation
+
+The following placeholders will be used:
+
+- `guacamole.company` is the FQDN of the Guacamole install.
+- `authentik.company` is the FQDN of the authentik install.
+
+Create an OAuth2/OpenID provider with the following parameters:
+
+- Client Type: `Confidential`
+- JWT Algorithm: `RS256`
+- Redirect URIs: `https://guacamole.company/` (depending on your Tomcat setup, you might have to add `/guacamole/` if the application runs in a subfolder)
+- Scopes: OpenID, Email and Profile
+
+Note the Client ID value. Create an application, using the provider you've created above.
+
+## Guacamole
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+<Tabs
+  defaultValue="docker"
+  values={[
+    {label: 'Docker', value: 'docker'},
+    {label: 'Standalone', value: 'standalone'},
+  ]}>
+  <TabItem value="docker">
+    The docker containers are configured via environment variables. The following variables are required:
+
+```yaml
+OPENID_AUTHORIZATION_ENDPOINT: https://authentik.company/application/o/authorize/
+OPENID_CLIENT_ID: # client ID from above
+OPENID_ISSUER: https://authentik.company/application/o/apache-guacamole/
+OPENID_JWKS_ENDPOINT: https://authentik.company/application/o/apache-guacamole/jwks/
+OPENID_REDIRECT_URI: https://guacamole.company/ # This must match the redirect URI above
+```
+  </TabItem>
+  <TabItem value="standalone">
+    Standalone Guacamole is configured using the `guacamole.properties` file. Add the following settings:
+
+```
+openid-authorization-endpoint=https://authentik.company/application/o/authorize/
+openid-client-id=# client ID from above
+openid-issuer=https://authentik.company/application/o/apache-guacamole/
+openid-jwks-endpoint=https://authentik.company/application/o/apache-guacamole/jwks/
+openid-redirect-uri=https://guacamole.company/ # This must match the redirect URI above
+```
+  </TabItem>
+</Tabs>

website/docs/integrations/services/aws/index.md

@@ -12,14 +12,14 @@ Amazon Web Services (AWS) is the world’s most comprehensive and broadly adopte
 
 The following placeholders will be used:
 
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create an application in authentik and note the slug, as this will be used later. Create a SAML provider with the following parameters:
 
--   ACS URL: `https://signin.aws.amazon.com/saml`
+- ACS URL: `https://signin.aws.amazon.com/saml`
--   Audience: `urn:amazon:webservices`
+- Audience: `urn:amazon:webservices`
--   Issuer: `authentik`
+- Issuer: `authentik`
--   Binding: `Post`
+- Binding: `Post`
 
 You can of course use a custom signing certificate, and adjust durations.
 

website/docs/integrations/services/awx-tower/index.md

@@ -20,15 +20,15 @@ AWX is the open-source version of Tower. The term "AWX" will be used interchange
 
 The following placeholders will be used:
 
--   `awx.company` is the FQDN of the AWX/Tower install.
+- `awx.company` is the FQDN of the AWX/Tower install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create an application in authentik and note the slug, as this will be used later. Create a SAML provider with the following parameters:
 
--   ACS URL: `https://awx.company/sso/complete/saml/`
+- ACS URL: `https://awx.company/sso/complete/saml/`
--   Audience: `awx`
+- Audience: `awx`
--   Service Provider Binding: Post
+- Service Provider Binding: Post
--   Issuer: `https://awx.company/sso/metadata/saml/`
+- Issuer: `https://awx.company/sso/metadata/saml/`
 
 You can of course use a custom signing certificate, and adjust durations.
 

website/docs/integrations/services/gitlab/index.md

@@ -14,15 +14,15 @@ GitLab is a complete DevOps platform, delivered as a single application. This ma
 
 The following placeholders will be used:
 
--   `gitlab.company` is the FQDN of the GitLab Install
+- `gitlab.company` is the FQDN of the GitLab Install
--   `authentik.company` is the FQDN of the authentik Install
+- `authentik.company` is the FQDN of the authentik Install
 
 Create an application in authentik and note the slug, as this will be used later. Create a SAML provider with the following parameters:
 
--   ACS URL: `https://gitlab.company/users/auth/saml/callback`
+- ACS URL: `https://gitlab.company/users/auth/saml/callback`
--   Audience: `https://gitlab.company`
+- Audience: `https://gitlab.company`
--   Issuer: `https://gitlab.company`
+- Issuer: `https://gitlab.company`
--   Binding: `Post`
+- Binding: `Post`
 
 You can of course use a custom signing certificate, and adjust durations. To get the value for `idp_cert_fingerprint`, you can use a tool like [this](https://www.samltool.com/fingerprint.php).
 

website/docs/integrations/services/grafana/index.mdx

@@ -14,21 +14,31 @@ Grafana is a multi-platform open source analytics and interactive visualization
 
 The following placeholders will be used:
 
--   `grafana.company` is the FQDN of the Grafana install.
+- `grafana.company` is the FQDN of the Grafana install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create an application in authentik. Create an OAuth2/OpenID provider with the following parameters:
 
--   Client Type: `Confidential`
+- Client Type: `Confidential`
--   JWT Algorithm: `RS256`
+- JWT Algorithm: `RS256`
--   Scopes: OpenID, Email and Profile
+- Scopes: OpenID, Email and Profile
--   RSA Key: Select any available key
+- RSA Key: Select any available key
--   Redirect URIs: `https://grafana.company/login/generic_oauth`
+- Redirect URIs: `https://grafana.company/login/generic_oauth`
 
 Note the Client ID and Client Secret values. Create an application, using the provider you've created above. Note the slug of the application you've created.
 
 ## Grafana
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+<Tabs
+  defaultValue="docker"
+  values={[
+    {label: 'Docker', value: 'docker'},
+    {label: 'Standalone', value: 'standalone'},
+  ]}>
+  <TabItem value="docker">
 If your Grafana is running in docker, set the following environment variables:
 
 ```yaml
@@ -45,7 +55,8 @@ environment:
     # Optionally enable auto-login
     GF_AUTH_OAUTH_AUTO_LOGIN: "true"
 ```
-
+  </TabItem>
+  <TabItem value="standalone">
 If you are using a config-file instead, you have to set these options:
 
 ```ini
@@ -64,3 +75,5 @@ auth_url = https://authentik.company/application/o/authorize/
 token_url = https://authentik.company/application/o/token/
 api_url = https://authentik.company/application/o/userinfo/
 ```
+  </TabItem>
+</Tabs>

website/docs/integrations/services/harbor/index.md

@@ -14,15 +14,15 @@ Harbor is an open source container image registry that secures images with role-
 
 The following placeholders will be used:
 
--   `harbor.company` is the FQDN of the Harbor install.
+- `harbor.company` is the FQDN of the Harbor install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create an OAuth2/OpenID provider with the following parameters:
 
--   Client Type: `Confidential`
+- Client Type: `Confidential`
--   JWT Algorithm: `RS256`
+- JWT Algorithm: `RS256`
--   Redirect URIs: `https://harbor.company/c/oidc/callback`
+- Redirect URIs: `https://harbor.company/c/oidc/callback`
--   Scopes: OpenID, Email and Profile
+- Scopes: OpenID, Email and Profile
 
 Note the Client ID and Client Secret values. Create an application, using the provider you've created above.
 

website/docs/integrations/services/home-assistant/index.md

@@ -14,8 +14,8 @@ Open source home automation that puts local control and privacy first. Powered b
 
 The following placeholders will be used:
 
--   `hass.company` is the FQDN of the Home-Assistant install.
+- `hass.company` is the FQDN of the Home-Assistant install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 :::note
 This setup uses https://github.com/BeryJu/hass-auth-header and the authentik proxy for authentication. When this [PR](https://github.com/home-assistant/core/pull/32926) is merged, this will no longer be necessary.
@@ -42,13 +42,13 @@ additionalHeaders:
 
 Create a Proxy Provider with the following values
 
--   Internal host
+- Internal host
 
     If Home-Assistant is running in docker, and you're deploying the authentik proxy on the same host, set the value to `http://homeassistant:8123`, where Home-Assistant is the name of your container.
 
     If Home-Assistant is running on a different server than where you are deploying the authentik proxy, set the value to `http://hass.company:8123`.
 
--   External host
+- External host
 
     Set this to the external URL you will be accessing Home-Assistant from.
 

website/docs/integrations/services/nextcloud/index.md

@@ -22,17 +22,17 @@ In case something goes wrong with the configuration, you can use the URL `http:/
 
 The following placeholders will be used:
 
--   `nextcloud.company` is the FQDN of the NextCloud install.
+- `nextcloud.company` is the FQDN of the NextCloud install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create an application in authentik and note the slug, as this will be used later. Create a SAML provider with the following parameters:
 
--   ACS URL: `https://nextcloud.company/apps/user_saml/saml/acs`
+- ACS URL: `https://nextcloud.company/apps/user_saml/saml/acs`
--   Issuer: `https://authentik.company`
+- Issuer: `https://authentik.company`
--   Service Provider Binding: `Post`
+- Service Provider Binding: `Post`
--   Audience: `https://nextcloud.company/apps/user_saml/saml/metadata`
+- Audience: `https://nextcloud.company/apps/user_saml/saml/metadata`
--   Signing Keypair: Select any certificate you have.
+- Signing Keypair: Select any certificate you have.
--   Property mappings: Select all Managed mappings.
+- Property mappings: Select all Managed mappings.
 
 You can of course use a custom signing certificate, and adjust durations.
 

website/docs/integrations/services/sentry/index.md

@@ -18,16 +18,16 @@ better software faster with Sentry. Won’t you join them?
 
 The following placeholders will be used:
 
--   `sentry.company` is the FQDN of the Sentry install.
+- `sentry.company` is the FQDN of the Sentry install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create an application in authentik. Create a SAML Provider with the following values
 
--   ACS URL: `https://sentry.company/saml/acs/<sentry organisation name>/`
+- ACS URL: `https://sentry.company/saml/acs/<sentry organisation name>/`
--   Audience: `https://sentry.company/saml/metadata/<sentry organisation name>/`
+- Audience: `https://sentry.company/saml/metadata/<sentry organisation name>/`
--   Issuer: `authentik`
+- Issuer: `authentik`
--   Service Provider Binding: `Post`
+- Service Provider Binding: `Post`
--   Property Mapping: Select all Managed Mappings
+- Property Mapping: Select all Managed Mappings
 
 ## Sentry
 

website/docs/integrations/services/sonarr/index.md

@@ -20,18 +20,18 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 
 The following placeholders will be used:
 
--   `sonarr.company` is the FQDN of the Sonarr install.
+- `sonarr.company` is the FQDN of the Sonarr install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Create a Proxy Provider with the following values
 
--   Internal host
+- Internal host
 
     If Sonarr is running in docker, and you're deploying the authentik proxy on the same host, set the value to `http://sonarr:8989`, where sonarr is the name of your container.
 
     If Sonarr is running on a different server than where you are deploying the authentik proxy, set the value to `http://sonarr.company:8989`.
 
--   External host
+- External host
 
     Set this to the external URL you will be accessing Sonarr from.
 

website/docs/integrations/services/tautulli/index.md

@@ -14,8 +14,8 @@ Tautulli is a 3rd party application that you can run alongside your Plex Media S
 
 The following placeholders will be used:
 
--   `tautulli.company` is the FQDN of the Tautulli install.
+- `tautulli.company` is the FQDN of the Tautulli install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 ## authentik Setup
 
@@ -30,13 +30,13 @@ Add all Tautulli users to the Group. You should also create a Group Membership P
 
 Create an application in authentik. Create a Proxy provider with the following parameters:
 
--   Internal host
+- Internal host
 
     If Tautulli is running in docker, and you're deploying the authentik proxy on the same host, set the value to `http://tautulli:3579`, where tautulli is the name of your container.
 
     If Tautulli is running on a different server to where you are deploying the authentik proxy, set the value to `http://tautulli.company:3579`.
 
--   External host
+- External host
 
     Set this to the external URL you will be accessing Tautulli from.
 

website/docs/integrations/services/ubuntu-landscape/index.md

@@ -18,8 +18,8 @@ This requires authentik 0.10.3 or newer.
 
 The following placeholders will be used:
 
--   `landscape.company` is the FQDN of the Landscape server.
+- `landscape.company` is the FQDN of the Landscape server.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Landscape uses the OpenID-Connect Protocol for single-sign on.
 

website/docs/integrations/services/veeam-enterprise-manager/index.md

@@ -14,8 +14,8 @@ Veeam Backup Enterprise Manager (Enterprise Manager) is a management and reporti
 
 The following placeholders will be used:
 
--   `veeam.company` is the FQDN of the Veeam Enterprise Manager install.
+- `veeam.company` is the FQDN of the Veeam Enterprise Manager install.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 You will need an existing group or multiple in authentik to assign roles in Veeam Enterprise Manager to.
 

website/docs/integrations/services/vmware-vcenter/index.md

@@ -26,8 +26,8 @@ It seems that the vCenter still needs to be joined to the Active Directory Domai
 
 The following placeholders will be used:
 
--   `vcenter.company` is the FQDN of the vCenter server.
+- `vcenter.company` is the FQDN of the vCenter server.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 Since vCenter only allows OpenID-Connect in combination with Active Directory, it is recommended to have authentik sync with the same Active Directory.
 
@@ -53,11 +53,11 @@ Under _Sources_, click _Edit_ and ensure that "authentik default Active Director
 
 Under _Providers_, create an OAuth2/OpenID provider with these settings:
 
--   Client Type: Confidential
+- Client Type: Confidential
--   JWT Algorithm: RS256
+- JWT Algorithm: RS256
--   Redirect URI: `https://vcenter.company/ui/login/oauth2/authcode`
+- Redirect URI: `https://vcenter.company/ui/login/oauth2/authcode`
--   Sub Mode: If your Email address Schema matches your UPN, select "Based on the User's Email...", otherwise select "Based on the User's UPN...".
+- Sub Mode: If your Email address Schema matches your UPN, select "Based on the User's Email...", otherwise select "Based on the User's UPN...".
--   Scopes: Select the Scope Mapping you've created in Step 1
+- Scopes: Select the Scope Mapping you've created in Step 1
 
 ![](./authentik_setup.png)
 

website/docs/integrations/services/wiki-js/index.md

@@ -0,0 +1,72 @@
+---
+title: Wiki.js
+---
+
+## What is Wiki.js
+
+From https://en.wikipedia.org/wiki/Wiki.js
+
+:::note
+Wiki.js is a wiki engine running on Node.js and written in JavaScript. It is free software released under the Affero GNU General Public License. It is available as a self-hosted solution or using "single-click" install on the DigitalOcean and AWS marketplace.
+:::
+
+:::note
+This is based on authentik 2021.3 and Wiki.js 2.5. Instructions may differ between versions.
+:::
+
+## Preparation
+
+The following placeholders will be used:
+
+- `wiki.company` is the FQDN of Wiki.js.
+- `authentik.company` is the FQDN of authentik.
+
+### Step 1
+
+In Wiki.js, navigate to the _Authentication_ section in the _Administration_ interface.
+
+Add a _Generic OpenID Connect / OAuth2_ strategy and note the _Callback URL / Redirect URI_ in the _Configuration Reference_ section at the bottom.
+
+### Step 2
+
+In authentik, under _Providers_, create an _OAuth2/OpenID Provider_ with these settings:
+
+- Client Type: Confidential
+- JWT Algorithm: RS256
+- Redirect URI: The _Callback URL / Redirect URI_ you noted from the previous step.
+- Scopes: Default OAUth mappings for: OpenID, email, profile.
+- RSA Key: Choose a certificate.
+- Sub Mode: Based on username.
+
+Note the _client ID_ and _client secret_, then save the provider. If you need to retrieve these values, you can do so by editing the provider.
+
+![](./authentik_provider.png)
+
+### Step 3
+
+In Wiki.js, configure the authentication strategy with these settings:
+
+- Client ID: Client ID from the authentik provider.
+- Client Secret: Client Secret from the authentik provider.
+- Authorization Endpoint URL: https://authentik.company/application/o/authorize/
+- Token Endpoint URL: https://authentik.company/application/o/token/
+- User Info Endpont URL: https://authentik.company/application/o/userinfo/
+- Issuer: https://authentik.company/application/o/wikijs/
+- Logout URL: https://authentik.company/application/o/wikijs/end-session/
+- Allow self-registration: Enabled
+- Assign to group: The group to which new users logging in from authentik should be assigned.
+
+![](./wiki-js_strategy.png)
+
+:::note
+You do not have to enable "Allow self-registration" and select a group to which new users should be assigned, but if you don't you will have to manually provision users in Wiki.js and ensure that their usernames match the username they have in authentik.
+:::
+
+### Step 5
+
+In authentik, create an application which uses this provider. Optionally apply access restrictions to the application using policy bindings.
+
+Set the Launch URL to the _Callback URL / Redirect URI_ without the `/callback` at the end, as shown below. This will skip Wiki.js' login prompt and log you in directly.
+
+![](./authentik_application.png)
+

website/docs/integrations/sources/active-directory/index.md

@@ -6,8 +6,8 @@ title: Active Directory
 
 The following placeholders will be used:
 
--   `ad.company` is the Name of the Active Directory domain.
+- `ad.company` is the Name of the Active Directory domain.
--   `authentik.company` is the FQDN of the authentik install.
+- `authentik.company` is the FQDN of the authentik install.
 
 ## Active Directory Setup
 
@@ -33,25 +33,25 @@ In authentik, create a new LDAP Source in Administration -> Sources.
 
 Use these settings:
 
--   Server URI: `ldap://ad.company`
+- Server URI: `ldap://ad.company`
 
     For authentik to be able to write passwords back to Active Directory, make sure to use `ldaps://`
 
--   Bind CN: `<name of your service user>@ad.company`
+- Bind CN: `<name of your service user>@ad.company`
--   Bind Password: The password you've given the user above
+- Bind Password: The password you've given the user above
--   Base DN: The base DN which you want authentik to sync
+- Base DN: The base DN which you want authentik to sync
--   Property mappings: Control/Command-select all Mappings which start with "authentik default LDAP" and "authentik default Active Directory"
+- Property mappings: Control/Command-select all Mappings which start with "authentik default LDAP" and "authentik default Active Directory"
--   Group property mappings: Select "authentik default LDAP Mapping: Name"
+- Group property mappings: Select "authentik default LDAP Mapping: Name"
 
 The other settings might need to be adjusted based on the setup of your domain.
 
--   Addition User/Group DN: Additional DN which is _prepended_ to your Base DN for user synchronization.
+- Addition User/Group DN: Additional DN which is _prepended_ to your Base DN for user synchronization.
--   Addition Group DN: Additional DN which is _prepended_ to your Base DN for group synchronization.
+- Addition Group DN: Additional DN which is _prepended_ to your Base DN for group synchronization.
--   User object filter: Which objects should be considered users.
+- User object filter: Which objects should be considered users.
--   Group object filter: Which objects should be considered groups.
+- Group object filter: Which objects should be considered groups.
--   Group membership field: Which user field saves the group membership
+- Group membership field: Which user field saves the group membership
--   Object uniqueness field: A user field which contains a unique Identifier
+- Object uniqueness field: A user field which contains a unique Identifier
--   Sync parent group: If enabled, all synchronized groups will be given this group as a parent.
+- Sync parent group: If enabled, all synchronized groups will be given this group as a parent.
 
 After you save the source, a synchronization will start in the background. When its done, you cen see the summary on the System Tasks page.
 

website/docs/outposts/outposts.md

@@ -10,12 +10,12 @@ Upon creation, a service account and a token is generated. The service account o
 
 authentik can manage the deployment, updating and general lifecycle of an Outpost. To communicate with the underlying platforms on which the outpost is deployed, authentik has "Service Connections".
 
--   If you've deployed authentik on docker-compose, authentik automatically create a Service Connection for the local docker socket.
+- If you've deployed authentik on docker-compose, authentik automatically create a Service Connection for the local docker socket.
--   If you've deployed authentik on Kubernetes, with `kubernetesIntegration` set to true (default), authentik automatically creates a Service Connection for the local Kubernetes Cluster.
+- If you've deployed authentik on Kubernetes, with `kubernetesIntegration` set to true (default), authentik automatically creates a Service Connection for the local Kubernetes Cluster.
 
 To deploy an outpost with these service connections, simply selected them during the creation of an Outpost. A background task is started, which creates the container/deployment. You can see that Status on the System Tasks page.
 
 To deploy an outpost manually, see:
 
--   [Kubernetes](./manual-deploy-kubernetes.md)
+- [Kubernetes](./manual-deploy-kubernetes.md)
--   [docker-compose](./manual-deploy-docker-compose.md)
+- [docker-compose](./manual-deploy-docker-compose.md)

website/docs/policies/expression.md

@@ -23,14 +23,14 @@ return False
 
 ### Context variables
 
--   `request`: A PolicyRequest object, which has the following properties:
+- `request`: A PolicyRequest object, which has the following properties:
-    -   `request.user`: The current user, against which the policy is applied. ([ref](../expressions/reference/user-object.md))
+    - `request.user`: The current user, against which the policy is applied. ([ref](../expressions/reference/user-object.md))
-    -   `request.http_request`: The Django HTTP Request. ([ref](https://docs.djangoproject.com/en/3.0/ref/request-response/#httprequest-objects))
+    - `request.http_request`: The Django HTTP Request. ([ref](https://docs.djangoproject.com/en/3.0/ref/request-response/#httprequest-objects))
-    -   `request.obj`: A Django Model instance. This is only set if the policy is ran against an object.
+    - `request.obj`: A Django Model instance. This is only set if the policy is ran against an object.
-    -   `request.context`: A dictionary with dynamic data. This depends on the origin of the execution.
+    - `request.context`: A dictionary with dynamic data. This depends on the origin of the execution.
--   `geoip`: `geoip2.models.City` object, which is added when GeoIP is enabled.
+- `geoip`: `geoip2.models.City` object, which is added when GeoIP is enabled.
--   `ak_is_sso_flow`: Boolean which is true if request was initiated by authenticating through an external provider.
+- `ak_is_sso_flow`: Boolean which is true if request was initiated by authenticating through an external provider.
--   `ak_client_ip`: Client's IP Address or 255.255.255.255 if no IP Address could be extracted. Can be [compared](../expressions/index.md#comparing-ip-addresses), for example
+- `ak_client_ip`: Client's IP Address or 255.255.255.255 if no IP Address could be extracted. Can be [compared](../expressions/index.md#comparing-ip-addresses), for example
 
     ```python
     return ak_client_ip in ip_network('10.0.0.0/24')
@@ -40,6 +40,6 @@ Additionally, when the policy is executed from a flow, every variable from the f
 
 This includes the following:
 
--   `prompt_data`: Data which has been saved from a prompt stage or an external source.
+- `prompt_data`: Data which has been saved from a prompt stage or an external source.
--   `application`: The application the user is in the process of authorizing.
+- `application`: The application the user is in the process of authorizing.
--   `pending_user`: The currently pending user
+- `pending_user`: The currently pending user

website/docs/policies/index.md

@@ -25,11 +25,11 @@ See [Expression Policy](expression.md).
 This policy allows you to specify password rules, such as length and required characters.
 The following rules can be set:
 
--   Minimum amount of uppercase characters.
+- Minimum amount of uppercase characters.
--   Minimum amount of lowercase characters.
+- Minimum amount of lowercase characters.
--   Minimum amount of symbols characters.
+- Minimum amount of symbols characters.
--   Minimum length.
+- Minimum length.
--   Symbol charset (define which characters are counted as symbols).
+- Symbol charset (define which characters are counted as symbols).
 
 ### Have I Been Pwned Policy
 

website/docs/property-mappings/expression.md

@@ -10,6 +10,6 @@ These variables are available in addition to the common variables/functions defi
 
 ### Context Variables
 
--   `user`: The current user. This may be `None` if there is no contextual user. ([ref](../expressions/reference/user-object.md))
+- `user`: The current user. This may be `None` if there is no contextual user. ([ref](../expressions/reference/user-object.md))
--   `request`: The current request. This may be `None` if there is no contextual request. ([ref](https://docs.djangoproject.com/en/3.0/ref/request-response/#httprequest-objects))
+- `request`: The current request. This may be `None` if there is no contextual request. ([ref](https://docs.djangoproject.com/en/3.0/ref/request-response/#httprequest-objects))
--   Other arbitrary arguments given by the provider, this is documented on the Provider/Source.
+- Other arbitrary arguments given by the provider, this is documented on the Provider/Source.

website/docs/providers/oauth2.md

@@ -12,7 +12,6 @@ Scopes can be configured using Scope Mappings, a type of [Property Mappings](../
 | Token                | `/application/o/token/`                                              |
 | User Info            | `/application/o/userinfo/`                                           |
 | End Session          | `/application/o/end-session/`                                        |
-| Introspect           | `/application/o/end-session/`                                        |
 | JWKS                 | `/application/o/<application slug>/jwks/`                            |
 | OpenID Configuration | `/application/o/<application slug>/.well-known/openid-configuration` |
 

website/docs/releases/0.10.md

@@ -4,33 +4,33 @@ title: Release 0.10
 
 This update brings a lot of big features, such as:
 
--   New OAuth2/OpenID Provider
+- New OAuth2/OpenID Provider
 
     This new provider merges both OAuth2 and OpenID. It is based on the codebase of the old provider, which has been simplified and cleaned from the ground up. Support for Property Mappings has also been added. Because of this change, OpenID and OAuth2 Providers will have to be re-created.
 
--   Proxy Provider
+- Proxy Provider
 
     Due to this new OAuth2 Provider, the Application Gateway Provider, now simply called "Proxy Provider" has been revamped as well. The new authentik Proxy integrates more tightly with authentik via the new Outposts system. The new proxy also supports multiple applications per proxy instance, can configure TLS based on authentik Keypairs, and more.
 
     See [Proxy](../providers/proxy.md)
 
--   Outpost System
+- Outpost System
 
     This is a new Object type, currently used only by the Proxy Provider. It manages the creation and permissions of service accounts, which are used by the outposts to communicate with authentik.
 
     See [Outposts](../outposts/outposts.md)
 
--   Flow Import/Export
+- Flow Import/Export
 
     Flows can now be imported and exported. This feature can be used as a backup system, or to share complex flows with other people. Example flows have also been added to the documentation to help you get going with authentik.
 
 ## Under the hood
 
--   authentik now runs on Django 3.1 and Channels with complete ASGI enabled
+- authentik now runs on Django 3.1 and Channels with complete ASGI enabled
--   uwsgi has been replaced with Gunicorn and uvicorn
+- uwsgi has been replaced with Gunicorn and uvicorn
--   Elastic APM has been replaced with Sentry Performance metrics
+- Elastic APM has been replaced with Sentry Performance metrics
--   Flow title is now configurable separately from the name
+- Flow title is now configurable separately from the name
--   All logging output is now json
+- All logging output is now json
 
 ## Upgrading
 
@@ -54,7 +54,7 @@ docker-compose up -d
 
 A few options have changed:
 
--   `error_reporting` was changed from a simple boolean to a dictionary:
+- `error_reporting` was changed from a simple boolean to a dictionary:
 
 ```yaml
 error_reporting:
@@ -63,8 +63,8 @@ error_reporting:
     send_pii: false
 ```
 
--   The `apm` and `monitoring` blocks have been removed.
+- The `apm` and `monitoring` blocks have been removed.
--   `serverReplicas` and `workerReplicas` have been added
+- `serverReplicas` and `workerReplicas` have been added
 
 ### Upgrading
 

website/docs/releases/0.11.md

@@ -4,18 +4,18 @@ title: Release 0.11
 
 This update brings these headline features:
 
--   Add Backup and Restore, currently only externally schedulable, documented [here](../maintenance/backups/index.md)
+- Add Backup and Restore, currently only externally schedulable, documented [here](../maintenance/backups/index.md)
--   New Admin Dashboard with more metrics and Charts
+- New Admin Dashboard with more metrics and Charts
 
     Shows successful and failed logins from the last 24 hours, as well as the most used applications
 
--   Add search to all table views
+- Add search to all table views
--   Outpost now supports a Docker Controller, which installs the Outpost on the same host as authentik, updates and manages it
+- Outpost now supports a Docker Controller, which installs the Outpost on the same host as authentik, updates and manages it
--   Add Token Identifier
+- Add Token Identifier
 
     Tokens now have an identifier which is used to reference to them, so the Primary key is not shown in URLs
 
--   `core/applications/list` API now shows applications the user has access to via policies
+- `core/applications/list` API now shows applications the user has access to via policies
 
 ## Upgrading
 

website/docs/releases/0.9.md

@@ -6,14 +6,14 @@ Due to some database changes that had to be rather sooner than later, there is n
 
 To export data from your old instance, run this command:
 
--   docker-compose
+- docker-compose
 
 ```
 docker-compose exec server ./manage.py dumpdata -o /tmp/authentik_dump.json authentik_core.User authentik_core.Group authentik_crypto.CertificateKeyPair authentik_audit.Event otp_totp.totpdevice otp_static.staticdevice otp_static.statictoken
 docker cp authentik_server_1:/tmp/authentik_dump.json authentik_dump.json
 ```
 
--   kubernetes
+- kubernetes
 
 ```
 kubectl exec -it authentik-web-... -- ./manage.py dumpdata -o /tmp/authentik_dump.json authentik_core.User authentik_core.Group authentik_crypto.CertificateKeyPair authentik_audit.Event otp_totp.totpdevice otp_static.staticdevice otp_static.statictoken
@@ -22,14 +22,14 @@ kubectl cp authentik-web-...:/tmp/authentik_dump.json authentik_dump.json
 
 After that, create a new authentik instance in a different namespace (kubernetes) or in a different folder (docker-compose). Once this instance is running, you can use the following commands to restore the data. On docker-compose, you still have to run the `migrate` command, to create all database structures.
 
--   docker-compose
+- docker-compose
 
 ```
 docker cp authentik_dump.json new_authentik_server_1:/tmp/authentik_dump.json
 docker-compose exec server ./manage.py loaddata /tmp/authentik_dump.json
 ```
 
--   kubernetes
+- kubernetes
 
 ```
 kubectl cp authentik_dump.json authentik-web-...:/tmp/authentik_dump.json

website/docs/sources.md

@@ -10,12 +10,12 @@ Sources allow you to connect authentik to an existing user directory. They can a
 
 This source allows users to enroll themselves with an external OAuth-based Identity Provider. The generic provider expects the endpoint to return OpenID-Connect compatible information. Vendor-specific implementations have their own OAuth Source.
 
--   Policies: Allow/Forbid users from linking their accounts with this provider.
+- Policies: Allow/Forbid users from linking their accounts with this provider.
--   Request Token URL: This field is used for OAuth v1 implementations and will be provided by the provider.
+- Request Token URL: This field is used for OAuth v1 implementations and will be provided by the provider.
--   Authorization URL: This value will be provided by the provider.
+- Authorization URL: This value will be provided by the provider.
--   Access Token URL: This value will be provided by the provider.
+- Access Token URL: This value will be provided by the provider.
--   Profile URL: This URL is called by authentik to retrieve user information upon successful authentication.
+- Profile URL: This URL is called by authentik to retrieve user information upon successful authentication.
--   Consumer key/Consumer secret: These values will be provided by the provider.
+- Consumer key/Consumer secret: These values will be provided by the provider.
 
 ## SAML Source
 
@@ -29,17 +29,17 @@ This source allows you to import users and groups from an LDAP Server.
 For Active Directory, follow the [Active Directory Integration](https://goauthentik.io/docs/integrations/sources/active-directory/index)
 :::
 
--   Server URI: URI to your LDAP server/Domain Controller.
+- Server URI: URI to your LDAP server/Domain Controller.
--   Bind CN: CN of the bind user. This can also be a UPN in the format of `user@domain.tld`.
+- Bind CN: CN of the bind user. This can also be a UPN in the format of `user@domain.tld`.
--   Bind password: Password used during the bind process.
+- Bind password: Password used during the bind process.
--   Enable StartTLS: Enables StartTLS functionality. To use LDAPS instead, use port `636`.
+- Enable StartTLS: Enables StartTLS functionality. To use LDAPS instead, use port `636`.
--   Base DN: Base DN used for all LDAP queries.
+- Base DN: Base DN used for all LDAP queries.
--   Addition User DN: Prepended to the base DN for user queries.
+- Addition User DN: Prepended to the base DN for user queries.
--   Addition Group DN: Prepended to the base DN for group queries.
+- Addition Group DN: Prepended to the base DN for group queries.
--   User object filter: Consider objects matching this filter to be users.
+- User object filter: Consider objects matching this filter to be users.
--   Group object filter: Consider objects matching this filter to be groups.
+- Group object filter: Consider objects matching this filter to be groups.
--   User group membership field: This field contains the user's group memberships.
+- User group membership field: This field contains the user's group memberships.
--   Object uniqueness field: This field contains a unique identifier.
+- Object uniqueness field: This field contains a unique identifier.
--   Sync groups: Enable/disable group synchronization. Groups are synced in the background every 5 minutes.
+- Sync groups: Enable/disable group synchronization. Groups are synced in the background every 5 minutes.
--   Sync parent group: Optionally set this group as the parent group for all synced groups. An example use case of this would be to import Active Directory groups under a root `imported-from-ad` group.
+- Sync parent group: Optionally set this group as the parent group for all synced groups. An example use case of this would be to import Active Directory groups under a root `imported-from-ad` group.
--   Property mappings: Define which LDAP properties map to which authentik properties. The default set of property mappings is generated for Active Directory. See also [LDAP Property Mappings](property-mappings/index.md#ldap-property-mapping)
+- Property mappings: Define which LDAP properties map to which authentik properties. The default set of property mappings is generated for Active Directory. See also [LDAP Property Mappings](property-mappings/index.md#ldap-property-mapping)

website/sidebars.js

@@ -49,7 +49,9 @@ module.exports = {
                 "flow/stages/authenticator_static/index",
                 "flow/stages/authenticator_totp/index",
                 "flow/stages/authenticator_validate/index",
+                "flow/stages/authenticator_webauthn/index",
                 "flow/stages/captcha/index",
+                "flow/stages/deny",
                 "flow/stages/email/index",
                 "flow/stages/identification/index",
                 "flow/stages/invitation/index",
@@ -106,6 +108,7 @@ module.exports = {
                     type: "category",
                     label: "as Provider",
                     items: [
+                        "integrations/services/apache-guacamole/index",
                         "integrations/services/aws/index",
                         "integrations/services/awx-tower/index",
                         "integrations/services/gitlab/index",
@@ -120,6 +123,7 @@ module.exports = {
                         "integrations/services/ubuntu-landscape/index",
                         "integrations/services/veeam-enterprise-manager/index",
                         "integrations/services/vmware-vcenter/index",
+                        "integrations/services/wiki-js/index",
                     ],
                 },
             ],
@@ -141,6 +145,7 @@ module.exports = {
                 "releases/0.14",
                 "releases/2021.1",
                 "releases/2021.2",
+                "releases/2021.3",
             ],
         },
         {