Compare commits
229 Commits
safari-fol
...
npm-worksp
Author | SHA1 | Date | |
---|---|---|---|
ee6b8b596e | |||
1c5e906a3e | |||
c133ba9bd3 | |||
65517f3b7f | |||
b361dd3b59 | |||
40f598f3f1 | |||
b72d0e84c9 | |||
d97297e0ce | |||
1a80353bc0 | |||
beece507fd | |||
e2bec88403 | |||
26b6c2e130 | |||
1a38679ecf | |||
b2334c3680 | |||
13251bb8c4 | |||
9fe6bac99d | |||
7c9fe53b47 | |||
b20c4eab29 | |||
8ca09a9ece | |||
856598fc54 | |||
fdb7b29d9a | |||
3748781368 | |||
99b559893b | |||
8014088c3a | |||
3ee353126f | |||
db76c5d9e2 | |||
61bff69b7d | |||
69651323e3 | |||
75a0ac9588 | |||
941a697397 | |||
4a74db17a1 | |||
0cf6bff93c | |||
814e438422 | |||
2db77a37dd | |||
e40c5ac617 | |||
7440900dac | |||
ca96b27825 | |||
ad4a765a80 | |||
4dcd481010 | |||
d0dc14d84d | |||
7bf960352b | |||
c07d01661b | |||
427597ec14 | |||
7cc77bd387 | |||
381a1a2c49 | |||
08f8222224 | |||
1211c34a18 | |||
22efb57369 | |||
3eeda53be6 | |||
82ace18703 | |||
8589079252 | |||
ae2af6e58e | |||
86a7f98ff6 | |||
3af45371d3 | |||
b01ffd934f | |||
f11ba94603 | |||
7d2aa43364 | |||
f1351a7577 | |||
0611eea0e7 | |||
d0b46fcf9c | |||
dcbdc37d31 | |||
d07f396379 | |||
0972103b83 | |||
b448e76db4 | |||
f2937bd6dd | |||
53c2e3e77c | |||
7dd62c1f55 | |||
33e3510fba | |||
0e5fac2642 | |||
c53b1fe78a | |||
838a7457b2 | |||
a3c07bc9ff | |||
121f2c609d | |||
365affc28e | |||
f367822779 | |||
848198125d | |||
497ac5e3d0 | |||
1773d4d681 | |||
4edbb51939 | |||
c7e97ab48e | |||
31f7faae1c | |||
f5dae2ae92 | |||
2c043dba0b | |||
bda10e5db1 | |||
be9ae7d4f7 | |||
b4a6189bfa | |||
bfdb827ff9 | |||
488a58e1c5 | |||
3f83e69453 | |||
e92fa5df0b | |||
f8c22170df | |||
e3d08a8434 | |||
97d3e9afdc | |||
1eb08def73 | |||
6e3b379e4a | |||
264f59775c | |||
d048f1ecbd | |||
eb31f31584 | |||
fe5c842e92 | |||
b82d3100c9 | |||
49bb668036 | |||
52c70c7700 | |||
b99fd36f86 | |||
8a5381eca3 | |||
2c77830179 | |||
ffcd7def60 | |||
ed121bc2a3 | |||
d5ab9d9167 | |||
a983321ad6 | |||
9c3420ede4 | |||
91b40350aa | |||
1912991682 | |||
71b9117f53 | |||
b5f947f460 | |||
3a2f7e9549 | |||
1582ce0920 | |||
6d3eea5266 | |||
e987208bd1 | |||
0efab8eef7 | |||
9402dac8ae | |||
f57a290eee | |||
5dab0d2b7a | |||
2da6036248 | |||
cdba94cea4 | |||
c59eca664a | |||
d5b205f9c0 | |||
8ad9ad833e | |||
599ce15f68 | |||
91310eff52 | |||
b522d6732a | |||
17d96f204e | |||
65e4667bc3 | |||
f67f9e5ed0 | |||
62dd6a4393 | |||
a46eae8276 | |||
c4acc9fc24 | |||
e748a03082 | |||
e473f28e21 | |||
f70635c295 | |||
70d60c7ab2 | |||
61a26c02b7 | |||
a06645d558 | |||
7730ecbd37 | |||
80e1be8db7 | |||
c528c74e48 | |||
6d7bf36afe | |||
44fb59eb18 | |||
8f8d924935 | |||
602adaa5c5 | |||
5c9e97e11c | |||
2e7c620c9c | |||
30a2770781 | |||
ef49fa0e79 | |||
ac524ef425 | |||
6f3c1c4537 | |||
87886ca1b6 | |||
7ff96e30f9 | |||
b26271557a | |||
15c99ff129 | |||
2a38e08e31 | |||
3696706466 | |||
d0c9635033 | |||
7731014e1c | |||
d478582a5c | |||
6255f380aa | |||
1f02e67c5c | |||
d0bfb894b4 | |||
c5dfdc6deb | |||
d04a66ad9a | |||
a5edaabec0 | |||
daa367bc62 | |||
78345853c2 | |||
f0fa8a3226 | |||
3335fdc6ad | |||
29c2c0f7dc | |||
ada4254f52 | |||
39035de552 | |||
e76d388ce4 | |||
a52f887692 | |||
d8b12a9a07 | |||
ec01f16e99 | |||
9e3aaefc20 | |||
4454592442 | |||
593c953ecc | |||
bcefe7123c | |||
812cf6c4f2 | |||
73b6ef6a73 | |||
b58ebcddbf | |||
8b6ac3c806 | |||
c6aa792076 | |||
ee4792734e | |||
445f11ca6b | |||
8e4810fb20 | |||
96a122c5d1 | |||
3c6b8b10e5 | |||
15999caa5d | |||
57d8375de1 | |||
07ec787076 | |||
bc96bef097 | |||
28869858b5 | |||
cbc5a1c39d | |||
5f6b69c998 | |||
cf065db3d5 | |||
86c65325ce | |||
2b8e10e979 | |||
9298807275 | |||
ed56d6ac50 | |||
8c07b385ad | |||
880db7a86c | |||
99c1250ba5 | |||
5ce126ac83 | |||
dfa21d0725 | |||
e7e4af3894 | |||
931d6ec579 | |||
ff45acb25c | |||
c96557ff2d | |||
734feac4ae | |||
b17a9ed145 | |||
2bef7695db | |||
df472dd842 | |||
98d201d34c | |||
47e89602ab | |||
ceb0851452 | |||
cac2593658 | |||
1c9705bfaa | |||
9e2566cec4 | |||
5bdef1c4f6 | |||
ae41ccd862 | |||
337956672f |
@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 2025.2.4
|
current_version = 2025.4.1
|
||||||
tag = True
|
tag = True
|
||||||
commit = True
|
commit = True
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<rc_t>[a-zA-Z-]+)(?P<rc_n>[1-9]\\d*))?
|
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<rc_t>[a-zA-Z-]+)(?P<rc_n>[1-9]\\d*))?
|
||||||
|
12
.github/dependabot.yml
vendored
12
.github/dependabot.yml
vendored
@ -118,3 +118,15 @@ updates:
|
|||||||
prefix: "core:"
|
prefix: "core:"
|
||||||
labels:
|
labels:
|
||||||
- dependencies
|
- dependencies
|
||||||
|
- package-ecosystem: docker-compose
|
||||||
|
directories:
|
||||||
|
# - /scripts # Maybe
|
||||||
|
- /tests/e2e
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
time: "04:00"
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
commit-message:
|
||||||
|
prefix: "core:"
|
||||||
|
labels:
|
||||||
|
- dependencies
|
||||||
|
1
.github/workflows/api-ts-publish.yml
vendored
1
.github/workflows/api-ts-publish.yml
vendored
@ -53,6 +53,7 @@ jobs:
|
|||||||
signoff: true
|
signoff: true
|
||||||
# ID from https://api.github.com/users/authentik-automation[bot]
|
# ID from https://api.github.com/users/authentik-automation[bot]
|
||||||
author: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
|
author: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
|
||||||
|
labels: dependencies
|
||||||
- uses: peter-evans/enable-pull-request-automerge@v3
|
- uses: peter-evans/enable-pull-request-automerge@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ steps.generate_token.outputs.token }}
|
token: ${{ steps.generate_token.outputs.token }}
|
||||||
|
15
.github/workflows/ci-main.yml
vendored
15
.github/workflows/ci-main.yml
vendored
@ -70,22 +70,18 @@ jobs:
|
|||||||
- name: checkout stable
|
- name: checkout stable
|
||||||
run: |
|
run: |
|
||||||
# Copy current, latest config to local
|
# Copy current, latest config to local
|
||||||
# Temporarly comment the .github backup while migrating to uv
|
|
||||||
cp authentik/lib/default.yml local.env.yml
|
cp authentik/lib/default.yml local.env.yml
|
||||||
# cp -R .github ..
|
cp -R .github ..
|
||||||
cp -R scripts ..
|
cp -R scripts ..
|
||||||
git checkout $(git tag --sort=version:refname | grep '^version/' | grep -vE -- '-rc[0-9]+$' | tail -n1)
|
git checkout $(git tag --sort=version:refname | grep '^version/' | grep -vE -- '-rc[0-9]+$' | tail -n1)
|
||||||
# rm -rf .github/ scripts/
|
rm -rf .github/ scripts/
|
||||||
# mv ../.github ../scripts .
|
mv ../.github ../scripts .
|
||||||
rm -rf scripts/
|
|
||||||
mv ../scripts .
|
|
||||||
- name: Setup authentik env (stable)
|
- name: Setup authentik env (stable)
|
||||||
uses: ./.github/actions/setup
|
uses: ./.github/actions/setup
|
||||||
with:
|
with:
|
||||||
postgresql_version: ${{ matrix.psql }}
|
postgresql_version: ${{ matrix.psql }}
|
||||||
continue-on-error: true
|
|
||||||
- name: run migrations to stable
|
- name: run migrations to stable
|
||||||
run: poetry run python -m lifecycle.migrate
|
run: uv run python -m lifecycle.migrate
|
||||||
- name: checkout current code
|
- name: checkout current code
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
@ -204,7 +200,7 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: web/dist
|
path: web/dist
|
||||||
key: ${{ runner.os }}-web-${{ hashFiles('web/package-lock.json', 'web/src/**') }}
|
key: ${{ runner.os }}-web-${{ hashFiles('web/package-lock.json', 'web/src/**', 'web/packages/sfe/src/**') }}-b
|
||||||
- name: prepare web ui
|
- name: prepare web ui
|
||||||
if: steps.cache-web.outputs.cache-hit != 'true'
|
if: steps.cache-web.outputs.cache-hit != 'true'
|
||||||
working-directory: web
|
working-directory: web
|
||||||
@ -212,6 +208,7 @@ jobs:
|
|||||||
npm ci
|
npm ci
|
||||||
make -C .. gen-client-ts
|
make -C .. gen-client-ts
|
||||||
npm run build
|
npm run build
|
||||||
|
npm run build:sfe
|
||||||
- name: run e2e
|
- name: run e2e
|
||||||
run: |
|
run: |
|
||||||
uv run coverage run manage.py test ${{ matrix.job.glob }}
|
uv run coverage run manage.py test ${{ matrix.job.glob }}
|
||||||
|
2
.github/workflows/ci-outpost.yml
vendored
2
.github/workflows/ci-outpost.yml
vendored
@ -29,7 +29,7 @@ jobs:
|
|||||||
- name: Generate API
|
- name: Generate API
|
||||||
run: make gen-client-go
|
run: make gen-client-go
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v7
|
uses: golangci/golangci-lint-action@v8
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
args: --timeout 5000s --verbose
|
args: --timeout 5000s --verbose
|
||||||
|
@ -37,6 +37,7 @@ jobs:
|
|||||||
signoff: true
|
signoff: true
|
||||||
# ID from https://api.github.com/users/authentik-automation[bot]
|
# ID from https://api.github.com/users/authentik-automation[bot]
|
||||||
author: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
|
author: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
|
||||||
|
labels: dependencies
|
||||||
- uses: peter-evans/enable-pull-request-automerge@v3
|
- uses: peter-evans/enable-pull-request-automerge@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ steps.generate_token.outputs.token }}
|
token: ${{ steps.generate_token.outputs.token }}
|
||||||
|
1
.github/workflows/image-compress.yml
vendored
1
.github/workflows/image-compress.yml
vendored
@ -53,6 +53,7 @@ jobs:
|
|||||||
body: ${{ steps.compress.outputs.markdown }}
|
body: ${{ steps.compress.outputs.markdown }}
|
||||||
delete-branch: true
|
delete-branch: true
|
||||||
signoff: true
|
signoff: true
|
||||||
|
labels: dependencies
|
||||||
- uses: peter-evans/enable-pull-request-automerge@v3
|
- uses: peter-evans/enable-pull-request-automerge@v3
|
||||||
if: "${{ github.event_name != 'pull_request' && steps.compress.outputs.markdown != '' }}"
|
if: "${{ github.event_name != 'pull_request' && steps.compress.outputs.markdown != '' }}"
|
||||||
with:
|
with:
|
||||||
|
8
.github/workflows/packages-npm-publish.yml
vendored
8
.github/workflows/packages-npm-publish.yml
vendored
@ -3,10 +3,10 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
paths:
|
paths:
|
||||||
- packages/docusaurus-config
|
- packages/docusaurus-config/**
|
||||||
- packages/eslint-config
|
- packages/eslint-config/**
|
||||||
- packages/prettier-config
|
- packages/prettier-config/**
|
||||||
- packages/tsconfig
|
- packages/tsconfig/**
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
jobs:
|
jobs:
|
||||||
publish:
|
publish:
|
||||||
|
@ -52,3 +52,6 @@ jobs:
|
|||||||
body: "core, web: update translations"
|
body: "core, web: update translations"
|
||||||
delete-branch: true
|
delete-branch: true
|
||||||
signoff: true
|
signoff: true
|
||||||
|
labels: dependencies
|
||||||
|
# ID from https://api.github.com/users/authentik-automation[bot]
|
||||||
|
author: authentik-automation[bot] <135050075+authentik-automation[bot]@users.noreply.github.com>
|
||||||
|
14
.github/workflows/translation-rename.yml
vendored
14
.github/workflows/translation-rename.yml
vendored
@ -25,23 +25,13 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ steps.generate_token.outputs.token }}
|
GH_TOKEN: ${{ steps.generate_token.outputs.token }}
|
||||||
run: |
|
run: |
|
||||||
title=$(curl -q -L \
|
title=$(gh pr view ${{ github.event.pull_request.number }} --json "title" -q ".title")
|
||||||
-H "Accept: application/vnd.github+json" \
|
|
||||||
-H "Authorization: Bearer ${GH_TOKEN}" \
|
|
||||||
-H "X-GitHub-Api-Version: 2022-11-28" \
|
|
||||||
https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${{ github.event.pull_request.number }} | jq -r .title)
|
|
||||||
echo "title=${title}" >> "$GITHUB_OUTPUT"
|
echo "title=${title}" >> "$GITHUB_OUTPUT"
|
||||||
- name: Rename
|
- name: Rename
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ steps.generate_token.outputs.token }}
|
GH_TOKEN: ${{ steps.generate_token.outputs.token }}
|
||||||
run: |
|
run: |
|
||||||
curl -L \
|
gh pr edit -t "translate: ${{ steps.title.outputs.title }}" --add-label dependencies
|
||||||
-X PATCH \
|
|
||||||
-H "Accept: application/vnd.github+json" \
|
|
||||||
-H "Authorization: Bearer ${GH_TOKEN}" \
|
|
||||||
-H "X-GitHub-Api-Version: 2022-11-28" \
|
|
||||||
https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${{ github.event.pull_request.number }} \
|
|
||||||
-d "{\"title\":\"translate: ${{ steps.title.outputs.title }}\"}"
|
|
||||||
- uses: peter-evans/enable-pull-request-automerge@v3
|
- uses: peter-evans/enable-pull-request-automerge@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ steps.generate_token.outputs.token }}
|
token: ${{ steps.generate_token.outputs.token }}
|
||||||
|
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@ -16,7 +16,7 @@
|
|||||||
],
|
],
|
||||||
"typescript.preferences.importModuleSpecifier": "non-relative",
|
"typescript.preferences.importModuleSpecifier": "non-relative",
|
||||||
"typescript.preferences.importModuleSpecifierEnding": "index",
|
"typescript.preferences.importModuleSpecifierEnding": "index",
|
||||||
"typescript.tsdk": "./web/node_modules/typescript/lib",
|
"typescript.tsdk": "./node_modules/typescript/lib",
|
||||||
"typescript.enablePromptUseWorkspaceTsdk": true,
|
"typescript.enablePromptUseWorkspaceTsdk": true,
|
||||||
"yaml.schemas": {
|
"yaml.schemas": {
|
||||||
"./blueprints/schema.json": "blueprints/**/*.yaml"
|
"./blueprints/schema.json": "blueprints/**/*.yaml"
|
||||||
@ -30,7 +30,5 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"go.testFlags": ["-count=1"],
|
"go.testFlags": ["-count=1"],
|
||||||
"github-actions.workflows.pinned.workflows": [
|
"github-actions.workflows.pinned.workflows": [".github/workflows/ci-main.yml"]
|
||||||
".github/workflows/ci-main.yml"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
10
Dockerfile
10
Dockerfile
@ -40,7 +40,8 @@ COPY ./web /work/web/
|
|||||||
COPY ./website /work/website/
|
COPY ./website /work/website/
|
||||||
COPY ./gen-ts-api /work/web/node_modules/@goauthentik/api
|
COPY ./gen-ts-api /work/web/node_modules/@goauthentik/api
|
||||||
|
|
||||||
RUN npm run build
|
RUN npm run build && \
|
||||||
|
npm run build:sfe
|
||||||
|
|
||||||
# Stage 3: Build go proxy
|
# Stage 3: Build go proxy
|
||||||
FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.24-bookworm AS go-builder
|
FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.24-bookworm AS go-builder
|
||||||
@ -85,18 +86,17 @@ FROM --platform=${BUILDPLATFORM} ghcr.io/maxmind/geoipupdate:v7.1.0 AS geoip
|
|||||||
ENV GEOIPUPDATE_EDITION_IDS="GeoLite2-City GeoLite2-ASN"
|
ENV GEOIPUPDATE_EDITION_IDS="GeoLite2-City GeoLite2-ASN"
|
||||||
ENV GEOIPUPDATE_VERBOSE="1"
|
ENV GEOIPUPDATE_VERBOSE="1"
|
||||||
ENV GEOIPUPDATE_ACCOUNT_ID_FILE="/run/secrets/GEOIPUPDATE_ACCOUNT_ID"
|
ENV GEOIPUPDATE_ACCOUNT_ID_FILE="/run/secrets/GEOIPUPDATE_ACCOUNT_ID"
|
||||||
ENV GEOIPUPDATE_LICENSE_KEY_FILE="/run/secrets/GEOIPUPDATE_LICENSE_KEY"
|
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
RUN --mount=type=secret,id=GEOIPUPDATE_ACCOUNT_ID \
|
RUN --mount=type=secret,id=GEOIPUPDATE_ACCOUNT_ID \
|
||||||
--mount=type=secret,id=GEOIPUPDATE_LICENSE_KEY \
|
--mount=type=secret,id=GEOIPUPDATE_LICENSE_KEY \
|
||||||
mkdir -p /usr/share/GeoIP && \
|
mkdir -p /usr/share/GeoIP && \
|
||||||
/bin/sh -c "/usr/bin/entry.sh || echo 'Failed to get GeoIP database, disabling'; exit 0"
|
/bin/sh -c "GEOIPUPDATE_LICENSE_KEY_FILE=/run/secrets/GEOIPUPDATE_LICENSE_KEY /usr/bin/entry.sh || echo 'Failed to get GeoIP database, disabling'; exit 0"
|
||||||
|
|
||||||
# Stage 5: Download uv
|
# Stage 5: Download uv
|
||||||
FROM ghcr.io/astral-sh/uv:0.6.16 AS uv
|
FROM ghcr.io/astral-sh/uv:0.7.5 AS uv
|
||||||
# Stage 6: Base python image
|
# Stage 6: Base python image
|
||||||
FROM ghcr.io/goauthentik/fips-python:3.12.10-slim-bookworm-fips AS python-base
|
FROM ghcr.io/goauthentik/fips-python:3.13.3-slim-bookworm-fips AS python-base
|
||||||
|
|
||||||
ENV VENV_PATH="/ak-root/.venv" \
|
ENV VENV_PATH="/ak-root/.venv" \
|
||||||
PATH="/lifecycle:/ak-root/.venv/bin:$PATH" \
|
PATH="/lifecycle:/ak-root/.venv/bin:$PATH" \
|
||||||
|
51
Makefile
51
Makefile
@ -1,6 +1,7 @@
|
|||||||
.PHONY: gen dev-reset all clean test web website
|
.PHONY: gen dev-reset all clean test web website
|
||||||
|
|
||||||
.SHELLFLAGS += ${SHELLFLAGS} -e
|
SHELL := /bin/bash
|
||||||
|
.SHELLFLAGS += ${SHELLFLAGS} -e -o pipefail
|
||||||
PWD = $(shell pwd)
|
PWD = $(shell pwd)
|
||||||
UID = $(shell id -u)
|
UID = $(shell id -u)
|
||||||
GID = $(shell id -g)
|
GID = $(shell id -g)
|
||||||
@ -8,9 +9,9 @@ NPM_VERSION = $(shell python -m scripts.generate_semver)
|
|||||||
PY_SOURCES = authentik tests scripts lifecycle .github
|
PY_SOURCES = authentik tests scripts lifecycle .github
|
||||||
DOCKER_IMAGE ?= "authentik:test"
|
DOCKER_IMAGE ?= "authentik:test"
|
||||||
|
|
||||||
GEN_API_TS = "gen-ts-api"
|
GEN_API_TS = gen-ts-api
|
||||||
GEN_API_PY = "gen-py-api"
|
GEN_API_PY = gen-py-api
|
||||||
GEN_API_GO = "gen-go-api"
|
GEN_API_GO = gen-go-api
|
||||||
|
|
||||||
pg_user := $(shell uv run python -m authentik.lib.config postgresql.user 2>/dev/null)
|
pg_user := $(shell uv run python -m authentik.lib.config postgresql.user 2>/dev/null)
|
||||||
pg_host := $(shell uv run python -m authentik.lib.config postgresql.host 2>/dev/null)
|
pg_host := $(shell uv run python -m authentik.lib.config postgresql.host 2>/dev/null)
|
||||||
@ -117,14 +118,19 @@ gen-diff: ## (Release) generate the changelog diff between the current schema a
|
|||||||
npx prettier --write diff.md
|
npx prettier --write diff.md
|
||||||
|
|
||||||
gen-clean-ts: ## Remove generated API client for Typescript
|
gen-clean-ts: ## Remove generated API client for Typescript
|
||||||
rm -rf ./${GEN_API_TS}/
|
rm -rf ${PWD}/${GEN_API_TS}/
|
||||||
rm -rf ./web/node_modules/@goauthentik/api/
|
rm -rf ${PWD}/web/node_modules/@goauthentik/api/
|
||||||
|
|
||||||
gen-clean-go: ## Remove generated API client for Go
|
gen-clean-go: ## Remove generated API client for Go
|
||||||
rm -rf ./${GEN_API_GO}/
|
mkdir -p ${PWD}/${GEN_API_GO}
|
||||||
|
ifneq ($(wildcard ${PWD}/${GEN_API_GO}/.*),)
|
||||||
|
make -C ${PWD}/${GEN_API_GO} clean
|
||||||
|
else
|
||||||
|
rm -rf ${PWD}/${GEN_API_GO}
|
||||||
|
endif
|
||||||
|
|
||||||
gen-clean-py: ## Remove generated API client for Python
|
gen-clean-py: ## Remove generated API client for Python
|
||||||
rm -rf ./${GEN_API_PY}/
|
rm -rf ${PWD}/${GEN_API_PY}/
|
||||||
|
|
||||||
gen-clean: gen-clean-ts gen-clean-go gen-clean-py ## Remove generated API clients
|
gen-clean: gen-clean-ts gen-clean-go gen-clean-py ## Remove generated API clients
|
||||||
|
|
||||||
@ -141,8 +147,8 @@ gen-client-ts: gen-clean-ts ## Build and install the authentik API for Typescri
|
|||||||
--git-repo-id authentik \
|
--git-repo-id authentik \
|
||||||
--git-user-id goauthentik
|
--git-user-id goauthentik
|
||||||
mkdir -p web/node_modules/@goauthentik/api
|
mkdir -p web/node_modules/@goauthentik/api
|
||||||
cd ./${GEN_API_TS} && npm i
|
cd ${PWD}/${GEN_API_TS} && npm i
|
||||||
\cp -rf ./${GEN_API_TS}/* web/node_modules/@goauthentik/api
|
\cp -rf ${PWD}/${GEN_API_TS}/* web/node_modules/@goauthentik/api
|
||||||
|
|
||||||
gen-client-py: gen-clean-py ## Build and install the authentik API for Python
|
gen-client-py: gen-clean-py ## Build and install the authentik API for Python
|
||||||
docker run \
|
docker run \
|
||||||
@ -156,24 +162,17 @@ gen-client-py: gen-clean-py ## Build and install the authentik API for Python
|
|||||||
--additional-properties=packageVersion=${NPM_VERSION} \
|
--additional-properties=packageVersion=${NPM_VERSION} \
|
||||||
--git-repo-id authentik \
|
--git-repo-id authentik \
|
||||||
--git-user-id goauthentik
|
--git-user-id goauthentik
|
||||||
pip install ./${GEN_API_PY}
|
|
||||||
|
|
||||||
gen-client-go: gen-clean-go ## Build and install the authentik API for Golang
|
gen-client-go: gen-clean-go ## Build and install the authentik API for Golang
|
||||||
mkdir -p ./${GEN_API_GO} ./${GEN_API_GO}/templates
|
mkdir -p ${PWD}/${GEN_API_GO}
|
||||||
wget https://raw.githubusercontent.com/goauthentik/client-go/main/config.yaml -O ./${GEN_API_GO}/config.yaml
|
ifeq ($(wildcard ${PWD}/${GEN_API_GO}/.*),)
|
||||||
wget https://raw.githubusercontent.com/goauthentik/client-go/main/templates/README.mustache -O ./${GEN_API_GO}/templates/README.mustache
|
git clone --depth 1 https://github.com/goauthentik/client-go.git ${PWD}/${GEN_API_GO}
|
||||||
wget https://raw.githubusercontent.com/goauthentik/client-go/main/templates/go.mod.mustache -O ./${GEN_API_GO}/templates/go.mod.mustache
|
else
|
||||||
cp schema.yml ./${GEN_API_GO}/
|
cd ${PWD}/${GEN_API_GO} && git pull
|
||||||
docker run \
|
endif
|
||||||
--rm -v ${PWD}/${GEN_API_GO}:/local \
|
cp ${PWD}/schema.yml ${PWD}/${GEN_API_GO}
|
||||||
--user ${UID}:${GID} \
|
make -C ${PWD}/${GEN_API_GO} build
|
||||||
docker.io/openapitools/openapi-generator-cli:v6.5.0 generate \
|
|
||||||
-i /local/schema.yml \
|
|
||||||
-g go \
|
|
||||||
-o /local/ \
|
|
||||||
-c /local/config.yaml
|
|
||||||
go mod edit -replace goauthentik.io/api/v3=./${GEN_API_GO}
|
go mod edit -replace goauthentik.io/api/v3=./${GEN_API_GO}
|
||||||
rm -rf ./${GEN_API_GO}/config.yaml ./${GEN_API_GO}/templates/
|
|
||||||
|
|
||||||
gen-dev-config: ## Generate a local development config file
|
gen-dev-config: ## Generate a local development config file
|
||||||
uv run scripts/generate_config.py
|
uv run scripts/generate_config.py
|
||||||
@ -244,7 +243,7 @@ docker: ## Build a docker image of the current source tree
|
|||||||
DOCKER_BUILDKIT=1 docker build . --progress plain --tag ${DOCKER_IMAGE}
|
DOCKER_BUILDKIT=1 docker build . --progress plain --tag ${DOCKER_IMAGE}
|
||||||
|
|
||||||
test-docker:
|
test-docker:
|
||||||
BUILD=true ./scripts/test_docker.sh
|
BUILD=true ${PWD}/scripts/test_docker.sh
|
||||||
|
|
||||||
#########################
|
#########################
|
||||||
## CI
|
## CI
|
||||||
|
@ -42,4 +42,4 @@ See [SECURITY.md](SECURITY.md)
|
|||||||
|
|
||||||
## Adoption and Contributions
|
## Adoption and Contributions
|
||||||
|
|
||||||
Your organization uses authentik? We'd love to add your logo to the readme and our website! Email us @ hello@goauthentik.io or open a GitHub Issue/PR! For more information on how to contribute to authentik, please refer to our [CONTRIBUTING.md file](./CONTRIBUTING.md).
|
Your organization uses authentik? We'd love to add your logo to the readme and our website! Email us @ hello@goauthentik.io or open a GitHub Issue/PR! For more information on how to contribute to authentik, please refer to our [contribution guide](https://docs.goauthentik.io/docs/developer-docs?utm_source=github).
|
||||||
|
@ -20,8 +20,8 @@ Even if the issue is not a CVE, we still greatly appreciate your help in hardeni
|
|||||||
|
|
||||||
| Version | Supported |
|
| Version | Supported |
|
||||||
| --------- | --------- |
|
| --------- | --------- |
|
||||||
| 2024.12.x | ✅ |
|
|
||||||
| 2025.2.x | ✅ |
|
| 2025.2.x | ✅ |
|
||||||
|
| 2025.4.x | ✅ |
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
from os import environ
|
from os import environ
|
||||||
|
|
||||||
__version__ = "2025.2.4"
|
__version__ = "2025.4.1"
|
||||||
ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
|
ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
"""API Authentication"""
|
"""API Authentication"""
|
||||||
|
|
||||||
from hmac import compare_digest
|
from hmac import compare_digest
|
||||||
|
from pathlib import Path
|
||||||
|
from tempfile import gettempdir
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.contrib.auth.models import AnonymousUser
|
||||||
from drf_spectacular.extensions import OpenApiAuthenticationExtension
|
from drf_spectacular.extensions import OpenApiAuthenticationExtension
|
||||||
from rest_framework.authentication import BaseAuthentication, get_authorization_header
|
from rest_framework.authentication import BaseAuthentication, get_authorization_header
|
||||||
from rest_framework.exceptions import AuthenticationFailed
|
from rest_framework.exceptions import AuthenticationFailed
|
||||||
@ -11,11 +14,17 @@ from rest_framework.request import Request
|
|||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
from authentik.core.middleware import CTX_AUTH_VIA
|
from authentik.core.middleware import CTX_AUTH_VIA
|
||||||
from authentik.core.models import Token, TokenIntents, User
|
from authentik.core.models import Token, TokenIntents, User, UserTypes
|
||||||
from authentik.outposts.models import Outpost
|
from authentik.outposts.models import Outpost
|
||||||
from authentik.providers.oauth2.constants import SCOPE_AUTHENTIK_API
|
from authentik.providers.oauth2.constants import SCOPE_AUTHENTIK_API
|
||||||
|
|
||||||
LOGGER = get_logger()
|
LOGGER = get_logger()
|
||||||
|
_tmp = Path(gettempdir())
|
||||||
|
try:
|
||||||
|
with open(_tmp / "authentik-core-ipc.key") as _f:
|
||||||
|
ipc_key = _f.read()
|
||||||
|
except OSError:
|
||||||
|
ipc_key = None
|
||||||
|
|
||||||
|
|
||||||
def validate_auth(header: bytes) -> str | None:
|
def validate_auth(header: bytes) -> str | None:
|
||||||
@ -73,6 +82,11 @@ def auth_user_lookup(raw_header: bytes) -> User | None:
|
|||||||
if user:
|
if user:
|
||||||
CTX_AUTH_VIA.set("secret_key")
|
CTX_AUTH_VIA.set("secret_key")
|
||||||
return user
|
return user
|
||||||
|
# then try to auth via secret key (for embedded outpost/etc)
|
||||||
|
user = token_ipc(auth_credentials)
|
||||||
|
if user:
|
||||||
|
CTX_AUTH_VIA.set("ipc")
|
||||||
|
return user
|
||||||
raise AuthenticationFailed("Token invalid/expired")
|
raise AuthenticationFailed("Token invalid/expired")
|
||||||
|
|
||||||
|
|
||||||
@ -90,6 +104,43 @@ def token_secret_key(value: str) -> User | None:
|
|||||||
return outpost.user
|
return outpost.user
|
||||||
|
|
||||||
|
|
||||||
|
class IPCUser(AnonymousUser):
|
||||||
|
"""'Virtual' user for IPC communication between authentik core and the authentik router"""
|
||||||
|
|
||||||
|
username = "authentik:system"
|
||||||
|
is_active = True
|
||||||
|
is_superuser = True
|
||||||
|
|
||||||
|
@property
|
||||||
|
def type(self):
|
||||||
|
return UserTypes.INTERNAL_SERVICE_ACCOUNT
|
||||||
|
|
||||||
|
def has_perm(self, perm, obj=None):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def has_perms(self, perm_list, obj=None):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def has_module_perms(self, module):
|
||||||
|
return True
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_anonymous(self):
|
||||||
|
return False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_authenticated(self):
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def token_ipc(value: str) -> User | None:
|
||||||
|
"""Check if the token is the secret key
|
||||||
|
and return the service account for the managed outpost"""
|
||||||
|
if not ipc_key or not compare_digest(value, ipc_key):
|
||||||
|
return None
|
||||||
|
return IPCUser()
|
||||||
|
|
||||||
|
|
||||||
class TokenAuthentication(BaseAuthentication):
|
class TokenAuthentication(BaseAuthentication):
|
||||||
"""Token-based authentication using HTTP Bearer authentication"""
|
"""Token-based authentication using HTTP Bearer authentication"""
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ def create_component(generator: SchemaGenerator, name, schema, type_=ResolvedCom
|
|||||||
return component
|
return component
|
||||||
|
|
||||||
|
|
||||||
def postprocess_schema_responses(result, generator: SchemaGenerator, **kwargs): # noqa: W0613
|
def postprocess_schema_responses(result, generator: SchemaGenerator, **kwargs):
|
||||||
"""Workaround to set a default response for endpoints.
|
"""Workaround to set a default response for endpoints.
|
||||||
Workaround suggested at
|
Workaround suggested at
|
||||||
<https://github.com/tfranzel/drf-spectacular/issues/119#issuecomment-656970357>
|
<https://github.com/tfranzel/drf-spectacular/issues/119#issuecomment-656970357>
|
||||||
|
@ -164,9 +164,7 @@ class BlueprintEntry:
|
|||||||
"""Get the blueprint model, with yaml tags resolved if present"""
|
"""Get the blueprint model, with yaml tags resolved if present"""
|
||||||
return str(self.tag_resolver(self.model, blueprint))
|
return str(self.tag_resolver(self.model, blueprint))
|
||||||
|
|
||||||
def get_permissions(
|
def get_permissions(self, blueprint: "Blueprint") -> Generator[BlueprintEntryPermission]:
|
||||||
self, blueprint: "Blueprint"
|
|
||||||
) -> Generator[BlueprintEntryPermission, None, None]:
|
|
||||||
"""Get permissions of this entry, with all yaml tags resolved"""
|
"""Get permissions of this entry, with all yaml tags resolved"""
|
||||||
for perm in self.permissions:
|
for perm in self.permissions:
|
||||||
yield BlueprintEntryPermission(
|
yield BlueprintEntryPermission(
|
||||||
|
@ -59,6 +59,7 @@ class BrandSerializer(ModelSerializer):
|
|||||||
"flow_device_code",
|
"flow_device_code",
|
||||||
"default_application",
|
"default_application",
|
||||||
"web_certificate",
|
"web_certificate",
|
||||||
|
"client_certificates",
|
||||||
"attributes",
|
"attributes",
|
||||||
]
|
]
|
||||||
extra_kwargs = {
|
extra_kwargs = {
|
||||||
@ -120,6 +121,7 @@ class BrandViewSet(UsedByMixin, ModelViewSet):
|
|||||||
"domain",
|
"domain",
|
||||||
"branding_title",
|
"branding_title",
|
||||||
"web_certificate__name",
|
"web_certificate__name",
|
||||||
|
"client_certificates__name",
|
||||||
]
|
]
|
||||||
filterset_fields = [
|
filterset_fields = [
|
||||||
"brand_uuid",
|
"brand_uuid",
|
||||||
@ -136,6 +138,7 @@ class BrandViewSet(UsedByMixin, ModelViewSet):
|
|||||||
"flow_user_settings",
|
"flow_user_settings",
|
||||||
"flow_device_code",
|
"flow_device_code",
|
||||||
"web_certificate",
|
"web_certificate",
|
||||||
|
"client_certificates",
|
||||||
]
|
]
|
||||||
ordering = ["domain"]
|
ordering = ["domain"]
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ def migrate_custom_css(apps: Apps, schema_editor: BaseDatabaseSchemaEditor):
|
|||||||
if not path.exists():
|
if not path.exists():
|
||||||
return
|
return
|
||||||
css = path.read_text()
|
css = path.read_text()
|
||||||
Brand.objects.using(db_alias).update(branding_custom_css=css)
|
Brand.objects.using(db_alias).all().update(branding_custom_css=css)
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
@ -0,0 +1,37 @@
|
|||||||
|
# Generated by Django 5.1.9 on 2025-05-19 15:09
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_brands", "0009_brand_branding_default_flow_background"),
|
||||||
|
("authentik_crypto", "0004_alter_certificatekeypair_name"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="brand",
|
||||||
|
name="client_certificates",
|
||||||
|
field=models.ManyToManyField(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
help_text="Certificates used for client authentication.",
|
||||||
|
to="authentik_crypto.certificatekeypair",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="brand",
|
||||||
|
name="web_certificate",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
default=None,
|
||||||
|
help_text="Web Certificate used by the authentik Core webserver.",
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.SET_DEFAULT,
|
||||||
|
related_name="+",
|
||||||
|
to="authentik_crypto.certificatekeypair",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
@ -73,6 +73,13 @@ class Brand(SerializerModel):
|
|||||||
default=None,
|
default=None,
|
||||||
on_delete=models.SET_DEFAULT,
|
on_delete=models.SET_DEFAULT,
|
||||||
help_text=_("Web Certificate used by the authentik Core webserver."),
|
help_text=_("Web Certificate used by the authentik Core webserver."),
|
||||||
|
related_name="+",
|
||||||
|
)
|
||||||
|
client_certificates = models.ManyToManyField(
|
||||||
|
CertificateKeyPair,
|
||||||
|
default=None,
|
||||||
|
blank=True,
|
||||||
|
help_text=_("Certificates used for client authentication."),
|
||||||
)
|
)
|
||||||
attributes = models.JSONField(default=dict, blank=True)
|
attributes = models.JSONField(default=dict, blank=True)
|
||||||
|
|
||||||
|
@ -5,10 +5,10 @@ from typing import Any
|
|||||||
from django.db.models import F, Q
|
from django.db.models import F, Q
|
||||||
from django.db.models import Value as V
|
from django.db.models import Value as V
|
||||||
from django.http.request import HttpRequest
|
from django.http.request import HttpRequest
|
||||||
from sentry_sdk import get_current_span
|
|
||||||
|
|
||||||
from authentik import get_full_version
|
from authentik import get_full_version
|
||||||
from authentik.brands.models import Brand
|
from authentik.brands.models import Brand
|
||||||
|
from authentik.lib.sentry import get_http_meta
|
||||||
from authentik.tenants.models import Tenant
|
from authentik.tenants.models import Tenant
|
||||||
|
|
||||||
_q_default = Q(default=True)
|
_q_default = Q(default=True)
|
||||||
@ -32,13 +32,9 @@ def context_processor(request: HttpRequest) -> dict[str, Any]:
|
|||||||
"""Context Processor that injects brand object into every template"""
|
"""Context Processor that injects brand object into every template"""
|
||||||
brand = getattr(request, "brand", DEFAULT_BRAND)
|
brand = getattr(request, "brand", DEFAULT_BRAND)
|
||||||
tenant = getattr(request, "tenant", Tenant())
|
tenant = getattr(request, "tenant", Tenant())
|
||||||
trace = ""
|
|
||||||
span = get_current_span()
|
|
||||||
if span:
|
|
||||||
trace = span.to_traceparent()
|
|
||||||
return {
|
return {
|
||||||
"brand": brand,
|
"brand": brand,
|
||||||
"footer_links": tenant.footer_links,
|
"footer_links": tenant.footer_links,
|
||||||
"sentry_trace": trace,
|
"html_meta": {**get_http_meta()},
|
||||||
"version": get_full_version(),
|
"version": get_full_version(),
|
||||||
}
|
}
|
||||||
|
@ -99,18 +99,17 @@ class GroupSerializer(ModelSerializer):
|
|||||||
if superuser
|
if superuser
|
||||||
else "authentik_core.disable_group_superuser"
|
else "authentik_core.disable_group_superuser"
|
||||||
)
|
)
|
||||||
has_perm = user.has_perm(perm)
|
if self.instance or superuser:
|
||||||
if self.instance and not has_perm:
|
has_perm = user.has_perm(perm) or user.has_perm(perm, self.instance)
|
||||||
has_perm = user.has_perm(perm, self.instance)
|
if not has_perm:
|
||||||
if not has_perm:
|
raise ValidationError(
|
||||||
raise ValidationError(
|
_(
|
||||||
_(
|
(
|
||||||
(
|
"User does not have permission to set "
|
||||||
"User does not have permission to set "
|
"superuser status to {superuser_status}."
|
||||||
"superuser status to {superuser_status}."
|
).format_map({"superuser_status": superuser})
|
||||||
).format_map({"superuser_status": superuser})
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
return superuser
|
return superuser
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
from django.contrib.auth.management import create_permissions
|
from django.contrib.auth.management import create_permissions
|
||||||
|
from django.core.management import call_command
|
||||||
from django.core.management.base import BaseCommand, no_translations
|
from django.core.management.base import BaseCommand, no_translations
|
||||||
from guardian.management import create_anonymous_user
|
from guardian.management import create_anonymous_user
|
||||||
|
|
||||||
@ -16,6 +17,10 @@ class Command(BaseCommand):
|
|||||||
"""Check permissions for all apps"""
|
"""Check permissions for all apps"""
|
||||||
for tenant in Tenant.objects.filter(ready=True):
|
for tenant in Tenant.objects.filter(ready=True):
|
||||||
with tenant:
|
with tenant:
|
||||||
|
# See https://code.djangoproject.com/ticket/28417
|
||||||
|
# Remove potential lingering old permissions
|
||||||
|
call_command("remove_stale_contenttypes", "--no-input")
|
||||||
|
|
||||||
for app in apps.get_app_configs():
|
for app in apps.get_app_configs():
|
||||||
self.stdout.write(f"Checking app {app.name} ({app.label})\n")
|
self.stdout.write(f"Checking app {app.name} ({app.label})\n")
|
||||||
create_permissions(app, verbosity=0)
|
create_permissions(app, verbosity=0)
|
||||||
|
@ -31,7 +31,10 @@ class PickleSerializer:
|
|||||||
|
|
||||||
def loads(self, data):
|
def loads(self, data):
|
||||||
"""Unpickle data to be loaded from redis"""
|
"""Unpickle data to be loaded from redis"""
|
||||||
return pickle.loads(data) # nosec
|
try:
|
||||||
|
return pickle.loads(data) # nosec
|
||||||
|
except Exception:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
|
||||||
def _migrate_session(
|
def _migrate_session(
|
||||||
|
@ -0,0 +1,27 @@
|
|||||||
|
# Generated by Django 5.1.9 on 2025-05-14 11:15
|
||||||
|
|
||||||
|
from django.apps.registry import Apps
|
||||||
|
from django.db import migrations
|
||||||
|
from django.db.backends.base.schema import BaseDatabaseSchemaEditor
|
||||||
|
|
||||||
|
|
||||||
|
def remove_old_authenticated_session_content_type(
|
||||||
|
apps: Apps, schema_editor: BaseDatabaseSchemaEditor
|
||||||
|
):
|
||||||
|
db_alias = schema_editor.connection.alias
|
||||||
|
ContentType = apps.get_model("contenttypes", "ContentType")
|
||||||
|
|
||||||
|
ContentType.objects.using(db_alias).filter(model="oldauthenticatedsession").delete()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_core", "0047_delete_oldauthenticatedsession"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(
|
||||||
|
code=remove_old_authenticated_session_content_type,
|
||||||
|
),
|
||||||
|
]
|
@ -21,7 +21,9 @@
|
|||||||
<script src="{% versioned_script 'dist/standalone/loading/index-%v.js' %}" type="module"></script>
|
<script src="{% versioned_script 'dist/standalone/loading/index-%v.js' %}" type="module"></script>
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<meta name="sentry-trace" content="{{ sentry_trace }}" />
|
{% for key, value in html_meta.items %}
|
||||||
|
<meta name="{{key}}" content="{{ value }}" />
|
||||||
|
{% endfor %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
@ -124,6 +124,16 @@ class TestGroupsAPI(APITestCase):
|
|||||||
{"is_superuser": ["User does not have permission to set superuser status to True."]},
|
{"is_superuser": ["User does not have permission to set superuser status to True."]},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_superuser_no_perm_no_superuser(self):
|
||||||
|
"""Test creating a group without permission and without superuser flag"""
|
||||||
|
assign_perm("authentik_core.add_group", self.login_user)
|
||||||
|
self.client.force_login(self.login_user)
|
||||||
|
res = self.client.post(
|
||||||
|
reverse("authentik_api:group-list"),
|
||||||
|
data={"name": generate_id(), "is_superuser": False},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 201)
|
||||||
|
|
||||||
def test_superuser_update_no_perm(self):
|
def test_superuser_update_no_perm(self):
|
||||||
"""Test updating a superuser group without permission"""
|
"""Test updating a superuser group without permission"""
|
||||||
group = Group.objects.create(name=generate_id(), is_superuser=True)
|
group = Group.objects.create(name=generate_id(), is_superuser=True)
|
||||||
|
@ -30,6 +30,7 @@ from structlog.stdlib import get_logger
|
|||||||
|
|
||||||
from authentik.core.api.used_by import UsedByMixin
|
from authentik.core.api.used_by import UsedByMixin
|
||||||
from authentik.core.api.utils import ModelSerializer, PassiveSerializer
|
from authentik.core.api.utils import ModelSerializer, PassiveSerializer
|
||||||
|
from authentik.core.models import UserTypes
|
||||||
from authentik.crypto.apps import MANAGED_KEY
|
from authentik.crypto.apps import MANAGED_KEY
|
||||||
from authentik.crypto.builder import CertificateBuilder, PrivateKeyAlg
|
from authentik.crypto.builder import CertificateBuilder, PrivateKeyAlg
|
||||||
from authentik.crypto.models import CertificateKeyPair
|
from authentik.crypto.models import CertificateKeyPair
|
||||||
@ -272,11 +273,12 @@ class CertificateKeyPairViewSet(UsedByMixin, ModelViewSet):
|
|||||||
def view_certificate(self, request: Request, pk: str) -> Response:
|
def view_certificate(self, request: Request, pk: str) -> Response:
|
||||||
"""Return certificate-key pairs certificate and log access"""
|
"""Return certificate-key pairs certificate and log access"""
|
||||||
certificate: CertificateKeyPair = self.get_object()
|
certificate: CertificateKeyPair = self.get_object()
|
||||||
Event.new( # noqa # nosec
|
if request.user.type != UserTypes.INTERNAL_SERVICE_ACCOUNT:
|
||||||
EventAction.SECRET_VIEW,
|
Event.new( # noqa # nosec
|
||||||
secret=certificate,
|
EventAction.SECRET_VIEW,
|
||||||
type="certificate",
|
secret=certificate,
|
||||||
).from_http(request)
|
type="certificate",
|
||||||
|
).from_http(request)
|
||||||
if "download" in request.query_params:
|
if "download" in request.query_params:
|
||||||
# Mime type from https://pki-tutorial.readthedocs.io/en/latest/mime.html
|
# Mime type from https://pki-tutorial.readthedocs.io/en/latest/mime.html
|
||||||
response = HttpResponse(
|
response = HttpResponse(
|
||||||
@ -302,11 +304,12 @@ class CertificateKeyPairViewSet(UsedByMixin, ModelViewSet):
|
|||||||
def view_private_key(self, request: Request, pk: str) -> Response:
|
def view_private_key(self, request: Request, pk: str) -> Response:
|
||||||
"""Return certificate-key pairs private key and log access"""
|
"""Return certificate-key pairs private key and log access"""
|
||||||
certificate: CertificateKeyPair = self.get_object()
|
certificate: CertificateKeyPair = self.get_object()
|
||||||
Event.new( # noqa # nosec
|
if request.user.type != UserTypes.INTERNAL_SERVICE_ACCOUNT:
|
||||||
EventAction.SECRET_VIEW,
|
Event.new( # noqa # nosec
|
||||||
secret=certificate,
|
EventAction.SECRET_VIEW,
|
||||||
type="private_key",
|
secret=certificate,
|
||||||
).from_http(request)
|
type="private_key",
|
||||||
|
).from_http(request)
|
||||||
if "download" in request.query_params:
|
if "download" in request.query_params:
|
||||||
# Mime type from https://pki-tutorial.readthedocs.io/en/latest/mime.html
|
# Mime type from https://pki-tutorial.readthedocs.io/en/latest/mime.html
|
||||||
response = HttpResponse(certificate.key_data, content_type="application/x-pem-file")
|
response = HttpResponse(certificate.key_data, content_type="application/x-pem-file")
|
||||||
|
@ -132,13 +132,14 @@ class LicenseKey:
|
|||||||
"""Get a summarized version of all (not expired) licenses"""
|
"""Get a summarized version of all (not expired) licenses"""
|
||||||
total = LicenseKey(get_license_aud(), 0, "Summarized license", 0, 0)
|
total = LicenseKey(get_license_aud(), 0, "Summarized license", 0, 0)
|
||||||
for lic in License.objects.all():
|
for lic in License.objects.all():
|
||||||
total.internal_users += lic.internal_users
|
if lic.is_valid:
|
||||||
total.external_users += lic.external_users
|
total.internal_users += lic.internal_users
|
||||||
|
total.external_users += lic.external_users
|
||||||
|
total.license_flags.extend(lic.status.license_flags)
|
||||||
exp_ts = int(mktime(lic.expiry.timetuple()))
|
exp_ts = int(mktime(lic.expiry.timetuple()))
|
||||||
if total.exp == 0:
|
if total.exp == 0:
|
||||||
total.exp = exp_ts
|
total.exp = exp_ts
|
||||||
total.exp = max(total.exp, exp_ts)
|
total.exp = max(total.exp, exp_ts)
|
||||||
total.license_flags.extend(lic.status.license_flags)
|
|
||||||
return total
|
return total
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@ -39,6 +39,10 @@ class License(SerializerModel):
|
|||||||
internal_users = models.BigIntegerField()
|
internal_users = models.BigIntegerField()
|
||||||
external_users = models.BigIntegerField()
|
external_users = models.BigIntegerField()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_valid(self) -> bool:
|
||||||
|
return self.expiry >= now()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def serializer(self) -> type[BaseSerializer]:
|
def serializer(self) -> type[BaseSerializer]:
|
||||||
from authentik.enterprise.api import LicenseSerializer
|
from authentik.enterprise.api import LicenseSerializer
|
||||||
|
@ -25,7 +25,7 @@ class GoogleWorkspaceGroupClient(
|
|||||||
"""Google client for groups"""
|
"""Google client for groups"""
|
||||||
|
|
||||||
connection_type = GoogleWorkspaceProviderGroup
|
connection_type = GoogleWorkspaceProviderGroup
|
||||||
connection_type_query = "group"
|
connection_attr = "googleworkspaceprovidergroup_set"
|
||||||
can_discover = True
|
can_discover = True
|
||||||
|
|
||||||
def __init__(self, provider: GoogleWorkspaceProvider) -> None:
|
def __init__(self, provider: GoogleWorkspaceProvider) -> None:
|
||||||
|
@ -20,7 +20,7 @@ class GoogleWorkspaceUserClient(GoogleWorkspaceSyncClient[User, GoogleWorkspaceP
|
|||||||
"""Sync authentik users into google workspace"""
|
"""Sync authentik users into google workspace"""
|
||||||
|
|
||||||
connection_type = GoogleWorkspaceProviderUser
|
connection_type = GoogleWorkspaceProviderUser
|
||||||
connection_type_query = "user"
|
connection_attr = "googleworkspaceprovideruser_set"
|
||||||
can_discover = True
|
can_discover = True
|
||||||
|
|
||||||
def __init__(self, provider: GoogleWorkspaceProvider) -> None:
|
def __init__(self, provider: GoogleWorkspaceProvider) -> None:
|
||||||
|
@ -132,7 +132,11 @@ class GoogleWorkspaceProvider(OutgoingSyncProvider, BackchannelProvider):
|
|||||||
if type == User:
|
if type == User:
|
||||||
# Get queryset of all users with consistent ordering
|
# Get queryset of all users with consistent ordering
|
||||||
# according to the provider's settings
|
# according to the provider's settings
|
||||||
base = User.objects.all().exclude_anonymous()
|
base = (
|
||||||
|
User.objects.prefetch_related("googleworkspaceprovideruser_set")
|
||||||
|
.all()
|
||||||
|
.exclude_anonymous()
|
||||||
|
)
|
||||||
if self.exclude_users_service_account:
|
if self.exclude_users_service_account:
|
||||||
base = base.exclude(type=UserTypes.SERVICE_ACCOUNT).exclude(
|
base = base.exclude(type=UserTypes.SERVICE_ACCOUNT).exclude(
|
||||||
type=UserTypes.INTERNAL_SERVICE_ACCOUNT
|
type=UserTypes.INTERNAL_SERVICE_ACCOUNT
|
||||||
@ -142,7 +146,11 @@ class GoogleWorkspaceProvider(OutgoingSyncProvider, BackchannelProvider):
|
|||||||
return base.order_by("pk")
|
return base.order_by("pk")
|
||||||
if type == Group:
|
if type == Group:
|
||||||
# Get queryset of all groups with consistent ordering
|
# Get queryset of all groups with consistent ordering
|
||||||
return Group.objects.all().order_by("pk")
|
return (
|
||||||
|
Group.objects.prefetch_related("googleworkspaceprovidergroup_set")
|
||||||
|
.all()
|
||||||
|
.order_by("pk")
|
||||||
|
)
|
||||||
raise ValueError(f"Invalid type {type}")
|
raise ValueError(f"Invalid type {type}")
|
||||||
|
|
||||||
def google_credentials(self):
|
def google_credentials(self):
|
||||||
|
@ -29,7 +29,7 @@ class MicrosoftEntraGroupClient(
|
|||||||
"""Microsoft client for groups"""
|
"""Microsoft client for groups"""
|
||||||
|
|
||||||
connection_type = MicrosoftEntraProviderGroup
|
connection_type = MicrosoftEntraProviderGroup
|
||||||
connection_type_query = "group"
|
connection_attr = "microsoftentraprovidergroup_set"
|
||||||
can_discover = True
|
can_discover = True
|
||||||
|
|
||||||
def __init__(self, provider: MicrosoftEntraProvider) -> None:
|
def __init__(self, provider: MicrosoftEntraProvider) -> None:
|
||||||
|
@ -24,7 +24,7 @@ class MicrosoftEntraUserClient(MicrosoftEntraSyncClient[User, MicrosoftEntraProv
|
|||||||
"""Sync authentik users into microsoft entra"""
|
"""Sync authentik users into microsoft entra"""
|
||||||
|
|
||||||
connection_type = MicrosoftEntraProviderUser
|
connection_type = MicrosoftEntraProviderUser
|
||||||
connection_type_query = "user"
|
connection_attr = "microsoftentraprovideruser_set"
|
||||||
can_discover = True
|
can_discover = True
|
||||||
|
|
||||||
def __init__(self, provider: MicrosoftEntraProvider) -> None:
|
def __init__(self, provider: MicrosoftEntraProvider) -> None:
|
||||||
|
@ -121,7 +121,11 @@ class MicrosoftEntraProvider(OutgoingSyncProvider, BackchannelProvider):
|
|||||||
if type == User:
|
if type == User:
|
||||||
# Get queryset of all users with consistent ordering
|
# Get queryset of all users with consistent ordering
|
||||||
# according to the provider's settings
|
# according to the provider's settings
|
||||||
base = User.objects.all().exclude_anonymous()
|
base = (
|
||||||
|
User.objects.prefetch_related("microsoftentraprovideruser_set")
|
||||||
|
.all()
|
||||||
|
.exclude_anonymous()
|
||||||
|
)
|
||||||
if self.exclude_users_service_account:
|
if self.exclude_users_service_account:
|
||||||
base = base.exclude(type=UserTypes.SERVICE_ACCOUNT).exclude(
|
base = base.exclude(type=UserTypes.SERVICE_ACCOUNT).exclude(
|
||||||
type=UserTypes.INTERNAL_SERVICE_ACCOUNT
|
type=UserTypes.INTERNAL_SERVICE_ACCOUNT
|
||||||
@ -131,7 +135,11 @@ class MicrosoftEntraProvider(OutgoingSyncProvider, BackchannelProvider):
|
|||||||
return base.order_by("pk")
|
return base.order_by("pk")
|
||||||
if type == Group:
|
if type == Group:
|
||||||
# Get queryset of all groups with consistent ordering
|
# Get queryset of all groups with consistent ordering
|
||||||
return Group.objects.all().order_by("pk")
|
return (
|
||||||
|
Group.objects.prefetch_related("microsoftentraprovidergroup_set")
|
||||||
|
.all()
|
||||||
|
.order_by("pk")
|
||||||
|
)
|
||||||
raise ValueError(f"Invalid type {type}")
|
raise ValueError(f"Invalid type {type}")
|
||||||
|
|
||||||
def microsoft_credentials(self):
|
def microsoft_credentials(self):
|
||||||
|
@ -19,6 +19,7 @@ TENANT_APPS = [
|
|||||||
"authentik.enterprise.providers.microsoft_entra",
|
"authentik.enterprise.providers.microsoft_entra",
|
||||||
"authentik.enterprise.providers.ssf",
|
"authentik.enterprise.providers.ssf",
|
||||||
"authentik.enterprise.stages.authenticator_endpoint_gdtc",
|
"authentik.enterprise.stages.authenticator_endpoint_gdtc",
|
||||||
|
"authentik.enterprise.stages.mtls",
|
||||||
"authentik.enterprise.stages.source",
|
"authentik.enterprise.stages.source",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
31
authentik/enterprise/stages/mtls/api.py
Normal file
31
authentik/enterprise/stages/mtls/api.py
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
"""Mutual TLS Stage API Views"""
|
||||||
|
|
||||||
|
from rest_framework.viewsets import ModelViewSet
|
||||||
|
|
||||||
|
from authentik.core.api.used_by import UsedByMixin
|
||||||
|
from authentik.enterprise.api import EnterpriseRequiredMixin
|
||||||
|
from authentik.enterprise.stages.mtls.models import MutualTLSStage
|
||||||
|
from authentik.flows.api.stages import StageSerializer
|
||||||
|
|
||||||
|
|
||||||
|
class MutualTLSStageSerializer(EnterpriseRequiredMixin, StageSerializer):
|
||||||
|
"""MutualTLSStage Serializer"""
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = MutualTLSStage
|
||||||
|
fields = StageSerializer.Meta.fields + [
|
||||||
|
"mode",
|
||||||
|
"certificate_authorities",
|
||||||
|
"cert_attribute",
|
||||||
|
"user_attribute",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class MutualTLSStageViewSet(UsedByMixin, ModelViewSet):
|
||||||
|
"""MutualTLSStage Viewset"""
|
||||||
|
|
||||||
|
queryset = MutualTLSStage.objects.all()
|
||||||
|
serializer_class = MutualTLSStageSerializer
|
||||||
|
filterset_fields = "__all__"
|
||||||
|
ordering = ["name"]
|
||||||
|
search_fields = ["name"]
|
12
authentik/enterprise/stages/mtls/apps.py
Normal file
12
authentik/enterprise/stages/mtls/apps.py
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
"""authentik stage app config"""
|
||||||
|
|
||||||
|
from authentik.enterprise.apps import EnterpriseConfig
|
||||||
|
|
||||||
|
|
||||||
|
class AuthentikEnterpriseStageMTLSConfig(EnterpriseConfig):
|
||||||
|
"""authentik MTLS stage config"""
|
||||||
|
|
||||||
|
name = "authentik.enterprise.stages.mtls"
|
||||||
|
label = "authentik_stages_mtls"
|
||||||
|
verbose_name = "authentik Enterprise.Stages.MTLS"
|
||||||
|
default = True
|
68
authentik/enterprise/stages/mtls/migrations/0001_initial.py
Normal file
68
authentik/enterprise/stages/mtls/migrations/0001_initial.py
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
# Generated by Django 5.1.9 on 2025-05-19 18:29
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_crypto", "0004_alter_certificatekeypair_name"),
|
||||||
|
("authentik_flows", "0027_auto_20231028_1424"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="MutualTLSStage",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"stage_ptr",
|
||||||
|
models.OneToOneField(
|
||||||
|
auto_created=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
parent_link=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
to="authentik_flows.stage",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"mode",
|
||||||
|
models.TextField(choices=[("optional", "Optional"), ("required", "Required")]),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"cert_attribute",
|
||||||
|
models.TextField(
|
||||||
|
choices=[
|
||||||
|
("subject", "Subject"),
|
||||||
|
("common_name", "Common Name"),
|
||||||
|
("email", "Email"),
|
||||||
|
]
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"user_attribute",
|
||||||
|
models.TextField(choices=[("username", "Username"), ("email", "Email")]),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"certificate_authorities",
|
||||||
|
models.ManyToManyField(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
help_text="Configure certificate authorities to validate the certificate against. This option has a higher priority than the `client_certificate` option on `Brand`.",
|
||||||
|
to="authentik_crypto.certificatekeypair",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"verbose_name": "Mutual TLS Stage",
|
||||||
|
"verbose_name_plural": "Mutual TLS Stages",
|
||||||
|
"permissions": [
|
||||||
|
("pass_outpost_certificate", "Permissions to pass Certificates for outposts.")
|
||||||
|
],
|
||||||
|
},
|
||||||
|
bases=("authentik_flows.stage",),
|
||||||
|
),
|
||||||
|
]
|
71
authentik/enterprise/stages/mtls/models.py
Normal file
71
authentik/enterprise/stages/mtls/models.py
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
from django.db import models
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
from rest_framework.serializers import Serializer
|
||||||
|
|
||||||
|
from authentik.crypto.models import CertificateKeyPair
|
||||||
|
from authentik.flows.models import Stage
|
||||||
|
from authentik.flows.stage import StageView
|
||||||
|
|
||||||
|
|
||||||
|
class TLSMode(models.TextChoices):
|
||||||
|
"""Modes the TLS Stage can operate in"""
|
||||||
|
|
||||||
|
OPTIONAL = "optional"
|
||||||
|
REQUIRED = "required"
|
||||||
|
|
||||||
|
|
||||||
|
class CertAttributes(models.TextChoices):
|
||||||
|
"""Certificate attribute used for user matching"""
|
||||||
|
|
||||||
|
SUBJECT = "subject"
|
||||||
|
COMMON_NAME = "common_name"
|
||||||
|
EMAIL = "email"
|
||||||
|
|
||||||
|
|
||||||
|
class UserAttributes(models.TextChoices):
|
||||||
|
"""User attribute for user matching"""
|
||||||
|
|
||||||
|
USERNAME = "username"
|
||||||
|
EMAIL = "email"
|
||||||
|
|
||||||
|
|
||||||
|
class MutualTLSStage(Stage):
|
||||||
|
"""Authenticate/enroll users using a client-certificate."""
|
||||||
|
|
||||||
|
mode = models.TextField(choices=TLSMode.choices)
|
||||||
|
|
||||||
|
certificate_authorities = models.ManyToManyField(
|
||||||
|
CertificateKeyPair,
|
||||||
|
default=None,
|
||||||
|
blank=True,
|
||||||
|
help_text=_(
|
||||||
|
"Configure certificate authorities to validate the certificate against. "
|
||||||
|
"This option has a higher priority than the `client_certificate` option on `Brand`."
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
cert_attribute = models.TextField(choices=CertAttributes.choices)
|
||||||
|
user_attribute = models.TextField(choices=UserAttributes.choices)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def view(self) -> type[StageView]:
|
||||||
|
from authentik.enterprise.stages.mtls.stage import MTLSStageView
|
||||||
|
|
||||||
|
return MTLSStageView
|
||||||
|
|
||||||
|
@property
|
||||||
|
def serializer(self) -> type[Serializer]:
|
||||||
|
from authentik.enterprise.stages.mtls.api import MutualTLSStageSerializer
|
||||||
|
|
||||||
|
return MutualTLSStageSerializer
|
||||||
|
|
||||||
|
@property
|
||||||
|
def component(self) -> str:
|
||||||
|
return "ak-stage-mtls-form"
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _("Mutual TLS Stage")
|
||||||
|
verbose_name_plural = _("Mutual TLS Stages")
|
||||||
|
permissions = [
|
||||||
|
("pass_outpost_certificate", _("Permissions to pass Certificates for outposts.")),
|
||||||
|
]
|
215
authentik/enterprise/stages/mtls/stage.py
Normal file
215
authentik/enterprise/stages/mtls/stage.py
Normal file
@ -0,0 +1,215 @@
|
|||||||
|
from binascii import hexlify
|
||||||
|
from urllib.parse import unquote_plus
|
||||||
|
|
||||||
|
from cryptography.exceptions import InvalidSignature
|
||||||
|
from cryptography.hazmat.primitives import hashes
|
||||||
|
from cryptography.x509 import Certificate, NameOID, ObjectIdentifier, load_pem_x509_certificate
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
|
from authentik.brands.models import Brand
|
||||||
|
from authentik.core.models import User
|
||||||
|
from authentik.crypto.models import CertificateKeyPair
|
||||||
|
from authentik.enterprise.stages.mtls.models import (
|
||||||
|
CertAttributes,
|
||||||
|
MutualTLSStage,
|
||||||
|
TLSMode,
|
||||||
|
UserAttributes,
|
||||||
|
)
|
||||||
|
from authentik.flows.challenge import AccessDeniedChallenge
|
||||||
|
from authentik.flows.models import FlowDesignation
|
||||||
|
from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER
|
||||||
|
from authentik.flows.stage import ChallengeStageView
|
||||||
|
from authentik.root.middleware import ClientIPMiddleware
|
||||||
|
from authentik.stages.password.stage import PLAN_CONTEXT_METHOD, PLAN_CONTEXT_METHOD_ARGS
|
||||||
|
from authentik.stages.prompt.stage import PLAN_CONTEXT_PROMPT
|
||||||
|
|
||||||
|
# All of these headers must only be accepted from "trusted" reverse proxies
|
||||||
|
# See internal/web/proxy.go:39
|
||||||
|
HEADER_PROXY_FORWARDED = "X-Forwarded-Client-Cert"
|
||||||
|
HEADER_NGINX_FORWARDED = "SSL-Client-Cert"
|
||||||
|
HEADER_TRAEFIK_FORWARDED = "X-Forwarded-TLS-Client-Cert"
|
||||||
|
HEADER_OUTPOST_FORWARDED = "X-Authentik-Outpost-Certificate"
|
||||||
|
|
||||||
|
|
||||||
|
PLAN_CONTEXT_CERTIFICATE = "certificate"
|
||||||
|
|
||||||
|
|
||||||
|
class MTLSStageView(ChallengeStageView):
|
||||||
|
|
||||||
|
def __parse_single_cert(self, raw: str | None) -> list[Certificate]:
|
||||||
|
"""Helper to parse a single certificate"""
|
||||||
|
if not raw:
|
||||||
|
return []
|
||||||
|
try:
|
||||||
|
cert = load_pem_x509_certificate(unquote_plus(raw).encode())
|
||||||
|
return [cert]
|
||||||
|
except ValueError as exc:
|
||||||
|
self.logger.info("Failed to parse certificate", exc=exc)
|
||||||
|
return []
|
||||||
|
|
||||||
|
def _parse_cert_xfcc(self) -> list[Certificate]:
|
||||||
|
"""Parse certificates in the format given to us in
|
||||||
|
the format of the authentik router/envoy"""
|
||||||
|
xfcc_raw = self.request.headers.get(HEADER_PROXY_FORWARDED)
|
||||||
|
if not xfcc_raw:
|
||||||
|
return []
|
||||||
|
certs = []
|
||||||
|
for r_cert in xfcc_raw.split(","):
|
||||||
|
el = r_cert.split(";")
|
||||||
|
raw_cert = {k.split("=")[0]: k.split("=")[1] for k in el}
|
||||||
|
if "Cert" not in raw_cert:
|
||||||
|
continue
|
||||||
|
certs.extend(self.__parse_single_cert(raw_cert["Cert"]))
|
||||||
|
return certs
|
||||||
|
|
||||||
|
def _parse_cert_nginx(self) -> list[Certificate]:
|
||||||
|
"""Parse certificates in the format nginx-ingress gives to us"""
|
||||||
|
sslcc_raw = self.request.headers.get(HEADER_NGINX_FORWARDED)
|
||||||
|
return self.__parse_single_cert(sslcc_raw)
|
||||||
|
|
||||||
|
def _parse_cert_traefik(self) -> list[Certificate]:
|
||||||
|
"""Parse certificates in the format traefik gives to us"""
|
||||||
|
ftcc_raw = self.request.headers.get(HEADER_TRAEFIK_FORWARDED)
|
||||||
|
return self.__parse_single_cert(ftcc_raw)
|
||||||
|
|
||||||
|
def _parse_cert_outpost(self) -> list[Certificate]:
|
||||||
|
"""Parse certificates in the format outposts give to us. Also authenticates
|
||||||
|
the outpost to ensure it has the permission to do so"""
|
||||||
|
user = ClientIPMiddleware.get_outpost_user(self.request)
|
||||||
|
if not user:
|
||||||
|
return []
|
||||||
|
if not user.has_perm(
|
||||||
|
"pass_outpost_certificate", self.executor.current_stage
|
||||||
|
) and not user.has_perm("authentik_stages_mtls.pass_outpost_certificate"):
|
||||||
|
return []
|
||||||
|
outpost_raw = self.request.headers.get(HEADER_OUTPOST_FORWARDED)
|
||||||
|
return self.__parse_single_cert(outpost_raw)
|
||||||
|
|
||||||
|
def get_authorities(self) -> list[CertificateKeyPair] | None:
|
||||||
|
# We can't access `certificate_authorities` on `self.executor.current_stage`, as that would
|
||||||
|
# load the certificate into the directly referenced foreign key, which we have to pickle
|
||||||
|
# as part of the flow plan, and cryptography certs can't be pickled
|
||||||
|
stage: MutualTLSStage = (
|
||||||
|
MutualTLSStage.objects.filter(pk=self.executor.current_stage.pk)
|
||||||
|
.prefetch_related("certificate_authorities")
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if stage.certificate_authorities.exists():
|
||||||
|
return stage.certificate_authorities.order_by("name")
|
||||||
|
brand: Brand = self.request.brand
|
||||||
|
if brand.client_certificates.exists():
|
||||||
|
return brand.client_certificates.order_by("name")
|
||||||
|
return None
|
||||||
|
|
||||||
|
def validate_cert(self, authorities: list[CertificateKeyPair], certs: list[Certificate]):
|
||||||
|
for _cert in certs:
|
||||||
|
for ca in authorities:
|
||||||
|
try:
|
||||||
|
_cert.verify_directly_issued_by(ca.certificate)
|
||||||
|
return _cert
|
||||||
|
except (InvalidSignature, TypeError, ValueError) as exc:
|
||||||
|
self.logger.warning(
|
||||||
|
"Discarding cert not issued by authority", cert=_cert, authority=ca, exc=exc
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
return None
|
||||||
|
|
||||||
|
def check_if_user(self, cert: Certificate):
|
||||||
|
stage: MutualTLSStage = self.executor.current_stage
|
||||||
|
cert_attr = None
|
||||||
|
user_attr = None
|
||||||
|
match stage.cert_attribute:
|
||||||
|
case CertAttributes.SUBJECT:
|
||||||
|
cert_attr = cert.subject.rfc4514_string()
|
||||||
|
case CertAttributes.COMMON_NAME:
|
||||||
|
cert_attr = self.get_cert_attribute(cert, NameOID.COMMON_NAME)
|
||||||
|
case CertAttributes.EMAIL:
|
||||||
|
cert_attr = self.get_cert_attribute(cert, NameOID.EMAIL_ADDRESS)
|
||||||
|
match stage.user_attribute:
|
||||||
|
case UserAttributes.USERNAME:
|
||||||
|
user_attr = "username"
|
||||||
|
case UserAttributes.EMAIL:
|
||||||
|
user_attr = "email"
|
||||||
|
if not user_attr or not cert_attr:
|
||||||
|
return None
|
||||||
|
return User.objects.filter(**{user_attr: cert_attr}).first()
|
||||||
|
|
||||||
|
def _cert_to_dict(self, cert: Certificate) -> dict:
|
||||||
|
"""Represent a certificate in a dictionary, as certificate objects cannot be pickled"""
|
||||||
|
return {
|
||||||
|
"serial_number": str(cert.serial_number),
|
||||||
|
"subject": cert.subject.rfc4514_string(),
|
||||||
|
"issuer": cert.issuer.rfc4514_string(),
|
||||||
|
"fingerprint_sha256": hexlify(cert.fingerprint(hashes.SHA256()), ":").decode("utf-8"),
|
||||||
|
"fingerprint_sha1": hexlify(cert.fingerprint(hashes.SHA256()), ":").decode("utf-8"),
|
||||||
|
}
|
||||||
|
|
||||||
|
def auth_user(self, user: User, cert: Certificate):
|
||||||
|
self.executor.plan.context[PLAN_CONTEXT_PENDING_USER] = user
|
||||||
|
self.executor.plan.context.setdefault(PLAN_CONTEXT_METHOD, "mtls")
|
||||||
|
self.executor.plan.context.setdefault(PLAN_CONTEXT_METHOD_ARGS, {})
|
||||||
|
self.executor.plan.context[PLAN_CONTEXT_METHOD_ARGS].update(
|
||||||
|
{"certificate": self._cert_to_dict(cert)}
|
||||||
|
)
|
||||||
|
|
||||||
|
def enroll_prepare_user(self, cert: Certificate):
|
||||||
|
self.executor.plan.context.setdefault(PLAN_CONTEXT_PROMPT, {})
|
||||||
|
self.executor.plan.context[PLAN_CONTEXT_PROMPT].update(
|
||||||
|
{
|
||||||
|
"email": self.get_cert_attribute(cert, NameOID.EMAIL_ADDRESS),
|
||||||
|
"name": self.get_cert_attribute(cert, NameOID.COMMON_NAME),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
self.executor.plan.context[PLAN_CONTEXT_CERTIFICATE] = self._cert_to_dict(cert)
|
||||||
|
|
||||||
|
def get_cert_attribute(self, cert: Certificate, oid: ObjectIdentifier) -> str | None:
|
||||||
|
attr = cert.subject.get_attributes_for_oid(oid)
|
||||||
|
if len(attr) < 1:
|
||||||
|
return None
|
||||||
|
return str(attr[0].value)
|
||||||
|
|
||||||
|
def dispatch(self, request, *args, **kwargs):
|
||||||
|
stage: MutualTLSStage = self.executor.current_stage
|
||||||
|
certs = [
|
||||||
|
*self._parse_cert_xfcc(),
|
||||||
|
*self._parse_cert_nginx(),
|
||||||
|
*self._parse_cert_traefik(),
|
||||||
|
*self._parse_cert_outpost(),
|
||||||
|
]
|
||||||
|
authorities = self.get_authorities()
|
||||||
|
if not authorities:
|
||||||
|
self.logger.warning("No Certificate authority found")
|
||||||
|
if stage.mode == TLSMode.OPTIONAL:
|
||||||
|
return self.executor.stage_ok()
|
||||||
|
if stage.mode == TLSMode.REQUIRED:
|
||||||
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
cert = self.validate_cert(authorities, certs)
|
||||||
|
if not cert and stage.mode == TLSMode.REQUIRED:
|
||||||
|
self.logger.warning("Client certificate required but no certificates given")
|
||||||
|
return super().dispatch(
|
||||||
|
request,
|
||||||
|
*args,
|
||||||
|
error_message=_("Certificate required but no certificate was given."),
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
|
if not cert and stage.mode == TLSMode.OPTIONAL:
|
||||||
|
self.logger.info("No certificate given, continuing")
|
||||||
|
return self.executor.stage_ok()
|
||||||
|
existing_user = self.check_if_user(cert)
|
||||||
|
if self.executor.flow.designation == FlowDesignation.ENROLLMENT:
|
||||||
|
self.enroll_prepare_user(cert)
|
||||||
|
elif existing_user:
|
||||||
|
self.auth_user(existing_user, cert)
|
||||||
|
else:
|
||||||
|
return super().dispatch(
|
||||||
|
request, *args, error_message=_("No user found for certificate."), **kwargs
|
||||||
|
)
|
||||||
|
return self.executor.stage_ok()
|
||||||
|
|
||||||
|
def get_challenge(self, *args, error_message: str | None = None, **kwargs):
|
||||||
|
return AccessDeniedChallenge(
|
||||||
|
data={
|
||||||
|
"component": "ak-stage-access-denied",
|
||||||
|
"error_message": str(error_message or "Unknown error"),
|
||||||
|
}
|
||||||
|
)
|
0
authentik/enterprise/stages/mtls/tests/__init__.py
Normal file
0
authentik/enterprise/stages/mtls/tests/__init__.py
Normal file
31
authentik/enterprise/stages/mtls/tests/fixtures/ca.pem
vendored
Normal file
31
authentik/enterprise/stages/mtls/tests/fixtures/ca.pem
vendored
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFXDCCA0SgAwIBAgIUBmV7zREyC1SPr72/75/L9zpwV18wDQYJKoZIhvcNAQEL
|
||||||
|
BQAwRjEaMBgGA1UEAwwRYXV0aGVudGlrIFRlc3QgQ0ExEjAQBgNVBAoMCWF1dGhl
|
||||||
|
bnRpazEUMBIGA1UECwwLU2VsZi1zaWduZWQwHhcNMjUwNDI3MTgzMDUwWhcNMzUw
|
||||||
|
MzA3MTgzMDUwWjBGMRowGAYDVQQDDBFhdXRoZW50aWsgVGVzdCBDQTESMBAGA1UE
|
||||||
|
CgwJYXV0aGVudGlrMRQwEgYDVQQLDAtTZWxmLXNpZ25lZDCCAiIwDQYJKoZIhvcN
|
||||||
|
AQEBBQADggIPADCCAgoCggIBAMc0NxZj7j1mPu0aRToo8oMPdC3T99xgxnqdr18x
|
||||||
|
LV4pWyi/YLghgZHqNQY2xNP6JIlSeUZD6KFUYT2sPL4Av/zSg5zO8bl+/lf7ckje
|
||||||
|
O1/Bt5A8xtL0CpmpMDGiI6ibdDElaywM6AohisbxrV29pygSKGq2wugF/urqGtE+
|
||||||
|
5z4y5Kt6qMdKkd0iXT+WagbQTIUlykFKgB0+qqTLzDl01lVDa/DoLl8Hqp45mVx2
|
||||||
|
pqrGsSa3TCErLIv9hUlZklF7A8UV4ZB4JL20UKcP8dKzQClviNie17tpsUpOuy3A
|
||||||
|
SQ6+guWTHTLJNCSdLn1xIqc5q+f5wd2dIDf8zXCTHj+Xp0bJE3Vgaq5R31K9+b+1
|
||||||
|
2dDWz1KcNJaLEnw2+b0O8M64wTMLxhqOv7QfLUr6Pmg1ZymghjLcZ6bnU9e31Vza
|
||||||
|
hlPKhxjqYQUC4Kq+oaYF6qdUeJy+dsYf0iDv5tTC+eReZDWIjxTPrNpwA773ZwT7
|
||||||
|
WVmL7ULGpuP2g9rNvFBcZiN+i6d7CUoN+jd/iRdo79lrI0dfXiyy4bYgW/2HeZfF
|
||||||
|
HaOsc1xsoqnJdWbWkX/ooyaCjAfm07kS3HiOzz4q3QW4wgGrwV8lEraLPxYYeOQu
|
||||||
|
YcGMOM8NfnVkjc8gmyXUxedCje5Vz/Tu5fKrQEInnCmXxVsWbwr/LzEjMKAM/ivY
|
||||||
|
0TXxAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0G
|
||||||
|
A1UdDgQWBBTa+Ns6QzqlNvnTGszkouQQtZnVJDANBgkqhkiG9w0BAQsFAAOCAgEA
|
||||||
|
NpJEDMXjuEIzSzafkxSshvjnt5sMYmzmvjNoRlkxgN2YcWvPoxbalGAYzcpyggT2
|
||||||
|
6xZY8R4tvB1oNTCArqwf860kkofUoJCr88D/pU3Cv4JhjCWs4pmXTsvSqlBSlJbo
|
||||||
|
+jPBZwbn6it/6jcit6Be3rW2PtHe8tASd9Lf8/2r1ZvupXwPzcR84R4Z10ve2lqV
|
||||||
|
xxcWlMmBh51CaYI0b1/WTe9Ua+wgkCVkxbf9zNcDQXjxw2ICWK+nR/4ld4nmqVm2
|
||||||
|
C7nhvXwU8FAHl7ZgR2Z3PLrwPuhd+kd6NXQqNkS9A+n+1vSRLbRjmV8pwIPpdPEq
|
||||||
|
nslUAGJJBHDUBArxC3gOJSB+WtmaCfzDu2gepMf9Ng1H2ZhwSF/FH3v3fsJqZkzz
|
||||||
|
NBstT9KuNGQRYiCmAPJaoVAc9BoLa+BFML1govtWtpdmbFk8PZEcuUsP7iAZqFF1
|
||||||
|
uuldPyZ8huGpQSR6Oq2bILRHowfGY0npTZAyxg0Vs8UMy1HTwNOp9OuRtArMZmsJ
|
||||||
|
jFIx1QzRf9S1i6bYpOzOudoXj4ARkS1KmVExGjJFcIT0xlFSSERie2fEKSeEYOyG
|
||||||
|
G+PA2qRt/F51FGOMm1ZscjPXqk2kt3C4BFbz6Vvxsq7D3lmhvFLn4jVA8+OidsM0
|
||||||
|
YUrVMtWET/RkjEIbADbgRXxNUNo+jtQZDU9C1IiAdfk=
|
||||||
|
-----END CERTIFICATE-----
|
30
authentik/enterprise/stages/mtls/tests/fixtures/cert_client.pem
vendored
Normal file
30
authentik/enterprise/stages/mtls/tests/fixtures/cert_client.pem
vendored
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFOzCCAyOgAwIBAgIUbnIMy+Ewi5RvK7OBDxWMCk7wi08wDQYJKoZIhvcNAQEL
|
||||||
|
BQAwRjEaMBgGA1UEAwwRYXV0aGVudGlrIFRlc3QgQ0ExEjAQBgNVBAoMCWF1dGhl
|
||||||
|
bnRpazEUMBIGA1UECwwLU2VsZi1zaWduZWQwHhcNMjUwNDI3MTgzMTE3WhcNMjYw
|
||||||
|
NDIzMTgzMTE3WjARMQ8wDQYDVQQDDAZjbGllbnQwggIiMA0GCSqGSIb3DQEBAQUA
|
||||||
|
A4ICDwAwggIKAoICAQCdV+GEa7+7ito1i/z637OZW+0azv1kuF2aDwSzv+FJd+4L
|
||||||
|
6hCroRbVYTUFS3I3YwanOOZfau64xH0+pFM5Js8aREG68eqKBayx8vT27hyAOFhd
|
||||||
|
giEVmSQJfla4ogvPie1rJ0HVOL7CiR72HDPQvz+9k1iDX3xQ/4sdAb3XurN13e+M
|
||||||
|
Gtavhjiyqxmoo/H4WRd8BhD/BZQFWtaxWODDY8aKk5R7omw6Xf7aRv1BlHdE4Ucy
|
||||||
|
Wozvpsj2Kz0l61rRUhiMlE0D9dpijgaRYFB+M7R2casH3CdhGQbBHTRiqBkZa6iq
|
||||||
|
SDkTiTwNJQQJov8yPTsR+9P8OOuV6QN+DGm/FXJJFaPnsHw/HDy7EAbA1PcdbSyK
|
||||||
|
XvJ8nVjdNhCEGbLGVSwAQLO+78hChVIN5YH+QSrP84YBSxKZYArnf4z2e9drqAN3
|
||||||
|
KmC26TkaUzkXnndnxOXBEIOSmyCdD4Dutg1XPE/bs8rA6rVGIR3pKXbCr29Z8hZn
|
||||||
|
Cn9jbxwDwTX865ljR1Oc3dnIeCWa9AS/uHaSMdGlbGbDrt4Bj/nyyfu8xc034K/0
|
||||||
|
uPh3hF3FLWNAomRVZCvtuh/v7IEIQEgUbvQMWBhZJ8hu3HdtV8V9TIAryVKzEzGy
|
||||||
|
Q72UHuQyK0njRDTmA/T+jn7P8GWOuf9eNdzd0gH0gcEuhCZFxPPRvUAeDuC7DQID
|
||||||
|
AQABo1YwVDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwFAYDVR0RAQH/
|
||||||
|
BAowCIIGY2xpZW50MB0GA1UdDgQWBBQ5KZwTD8+4CqLnbM/cBSXg8XeLXTANBgkq
|
||||||
|
hkiG9w0BAQsFAAOCAgEABDkb3iyEOl1xKq1wxyRzf2L8qfPXAQw71FxMbgHArM+a
|
||||||
|
e44wJGO3mZgPH0trOaJ+tuN6erB5YbZfsoX+xFacwskj9pKyb4QJLr/ENmJZRgyL
|
||||||
|
wp5P6PB6IUJhvryvy/GxrG938YGmFtYQ+ikeJw5PWhB6218C1aZ9hsi94wZ1Zzrc
|
||||||
|
Ry0q0D4QvIEZ0X2HL1Harc7gerE3VqhgQ7EWyImM+lCRtNDduwDQnZauwhr2r6cW
|
||||||
|
XG4VTe1RCNsDA0xinXQE2Xf9voCd0Zf6wOOXJseQtrXpf+tG4N13cy5heF5ihed1
|
||||||
|
hDxSeki0KjTM+18kVVfVm4fzxf1Zg0gm54UlzWceIWh9EtnWMUV08H0D1M9YNmW8
|
||||||
|
hWTupk7M+jAw8Y+suHOe6/RLi0+fb9NSJpIpq4GqJ5UF2kerXHX0SvuAavoXyB0j
|
||||||
|
CQrUXkRScEKOO2KAbVExSG56Ff7Ee8cRUAQ6rLC5pQRACq/R0sa6RcUsFPXul3Yv
|
||||||
|
vbO2rTuArAUPkNVFknwkndheN4lOslRd1If02HunZETmsnal6p+nmuMWt2pQ2fDA
|
||||||
|
vIguG54FyQ1T1IbF/QhfTEY62CQAebcgutnqqJHt9qe7Jr6ev57hMrJDEjotSzkY
|
||||||
|
OhOVrcYqgLldr1nBqNVlIK/4VrDaWH8H5dNJ72gA9aMNVH4/bSTJhuO7cJkLnHw=
|
||||||
|
-----END CERTIFICATE-----
|
213
authentik/enterprise/stages/mtls/tests/test_stage.py
Normal file
213
authentik/enterprise/stages/mtls/tests/test_stage.py
Normal file
@ -0,0 +1,213 @@
|
|||||||
|
from unittest.mock import MagicMock, patch
|
||||||
|
from urllib.parse import quote_plus
|
||||||
|
|
||||||
|
from django.urls import reverse
|
||||||
|
from guardian.shortcuts import assign_perm
|
||||||
|
|
||||||
|
from authentik.core.models import User
|
||||||
|
from authentik.core.tests.utils import create_test_brand, create_test_flow, create_test_user
|
||||||
|
from authentik.crypto.models import CertificateKeyPair
|
||||||
|
from authentik.enterprise.stages.mtls.models import (
|
||||||
|
CertAttributes,
|
||||||
|
MutualTLSStage,
|
||||||
|
TLSMode,
|
||||||
|
UserAttributes,
|
||||||
|
)
|
||||||
|
from authentik.enterprise.stages.mtls.stage import PLAN_CONTEXT_CERTIFICATE
|
||||||
|
from authentik.flows.models import FlowDesignation, FlowStageBinding
|
||||||
|
from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER
|
||||||
|
from authentik.flows.tests import FlowTestCase
|
||||||
|
from authentik.lib.generators import generate_id
|
||||||
|
from authentik.lib.tests.utils import load_fixture
|
||||||
|
from authentik.outposts.models import Outpost, OutpostType
|
||||||
|
from authentik.stages.prompt.stage import PLAN_CONTEXT_PROMPT
|
||||||
|
|
||||||
|
|
||||||
|
class MTLSStageTests(FlowTestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super().setUp()
|
||||||
|
self.flow = create_test_flow(FlowDesignation.AUTHENTICATION)
|
||||||
|
self.ca = CertificateKeyPair.objects.create(
|
||||||
|
name=generate_id(),
|
||||||
|
certificate_data=load_fixture("fixtures/ca.pem"),
|
||||||
|
)
|
||||||
|
self.stage = MutualTLSStage.objects.create(
|
||||||
|
name=generate_id(),
|
||||||
|
mode=TLSMode.REQUIRED,
|
||||||
|
cert_attribute=CertAttributes.COMMON_NAME,
|
||||||
|
user_attribute=UserAttributes.USERNAME,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.stage.certificate_authorities.add(self.ca)
|
||||||
|
self.binding = FlowStageBinding.objects.create(target=self.flow, stage=self.stage, order=0)
|
||||||
|
self.client_cert = load_fixture("fixtures/cert_client.pem")
|
||||||
|
# User matching the certificate
|
||||||
|
User.objects.filter(username="client").delete()
|
||||||
|
self.cert_user = create_test_user(username="client")
|
||||||
|
|
||||||
|
def test_parse_xfcc(self):
|
||||||
|
"""Test authentik Proxy/Envoy's XFCC format"""
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-Client-Cert": f"Cert={quote_plus(self.client_cert)}"},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PENDING_USER], self.cert_user)
|
||||||
|
|
||||||
|
def test_parse_nginx(self):
|
||||||
|
"""Test nginx's format"""
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"SSL-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PENDING_USER], self.cert_user)
|
||||||
|
|
||||||
|
def test_parse_traefik(self):
|
||||||
|
"""Test traefik's format"""
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-TLS-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PENDING_USER], self.cert_user)
|
||||||
|
|
||||||
|
def test_parse_outpost_object(self):
|
||||||
|
"""Test outposts's format"""
|
||||||
|
outpost = Outpost.objects.create(name=generate_id(), type=OutpostType.PROXY)
|
||||||
|
assign_perm("pass_outpost_certificate", outpost.user, self.stage)
|
||||||
|
with patch(
|
||||||
|
"authentik.root.middleware.ClientIPMiddleware.get_outpost_user",
|
||||||
|
MagicMock(return_value=outpost.user),
|
||||||
|
):
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Authentik-Outpost-Certificate": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PENDING_USER], self.cert_user)
|
||||||
|
|
||||||
|
def test_parse_outpost_global(self):
|
||||||
|
"""Test outposts's format"""
|
||||||
|
outpost = Outpost.objects.create(name=generate_id(), type=OutpostType.PROXY)
|
||||||
|
assign_perm("authentik_stages_mtls.pass_outpost_certificate", outpost.user)
|
||||||
|
with patch(
|
||||||
|
"authentik.root.middleware.ClientIPMiddleware.get_outpost_user",
|
||||||
|
MagicMock(return_value=outpost.user),
|
||||||
|
):
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Authentik-Outpost-Certificate": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PENDING_USER], self.cert_user)
|
||||||
|
|
||||||
|
def test_parse_outpost_no_perm(self):
|
||||||
|
"""Test outposts's format"""
|
||||||
|
outpost = Outpost.objects.create(name=generate_id(), type=OutpostType.PROXY)
|
||||||
|
with patch(
|
||||||
|
"authentik.root.middleware.ClientIPMiddleware.get_outpost_user",
|
||||||
|
MagicMock(return_value=outpost.user),
|
||||||
|
):
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Authentik-Outpost-Certificate": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageResponse(res, self.flow, component="ak-stage-access-denied")
|
||||||
|
|
||||||
|
def test_auth_no_user(self):
|
||||||
|
"""Test auth with no user"""
|
||||||
|
User.objects.filter(username="client").delete()
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-TLS-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageResponse(res, self.flow, component="ak-stage-access-denied")
|
||||||
|
|
||||||
|
def test_brand_ca(self):
|
||||||
|
"""Test using a CA from the brand"""
|
||||||
|
self.stage.certificate_authorities.clear()
|
||||||
|
|
||||||
|
brand = create_test_brand()
|
||||||
|
brand.client_certificates.add(self.ca)
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-TLS-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PENDING_USER], self.cert_user)
|
||||||
|
|
||||||
|
def test_no_ca_optional(self):
|
||||||
|
"""Test using no CA Set"""
|
||||||
|
self.stage.mode = TLSMode.OPTIONAL
|
||||||
|
self.stage.certificate_authorities.clear()
|
||||||
|
self.stage.save()
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-TLS-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
|
||||||
|
def test_no_ca_required(self):
|
||||||
|
"""Test using no CA Set"""
|
||||||
|
self.stage.certificate_authorities.clear()
|
||||||
|
self.stage.save()
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-TLS-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageResponse(res, self.flow, component="ak-stage-access-denied")
|
||||||
|
|
||||||
|
def test_no_cert_optional(self):
|
||||||
|
"""Test using no cert Set"""
|
||||||
|
self.stage.mode = TLSMode.OPTIONAL
|
||||||
|
self.stage.save()
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
|
||||||
|
def test_enroll(self):
|
||||||
|
"""Test Enrollment flow"""
|
||||||
|
self.flow.designation = FlowDesignation.ENROLLMENT
|
||||||
|
self.flow.save()
|
||||||
|
with self.assertFlowFinishes() as plan:
|
||||||
|
res = self.client.get(
|
||||||
|
reverse("authentik_api:flow-executor", kwargs={"flow_slug": self.flow.slug}),
|
||||||
|
headers={"X-Forwarded-TLS-Client-Cert": quote_plus(self.client_cert)},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertStageRedirects(res, reverse("authentik_core:root-redirect"))
|
||||||
|
self.assertEqual(plan().context[PLAN_CONTEXT_PROMPT], {"email": None, "name": "client"})
|
||||||
|
self.assertEqual(
|
||||||
|
plan().context[PLAN_CONTEXT_CERTIFICATE],
|
||||||
|
{
|
||||||
|
"fingerprint_sha1": (
|
||||||
|
"08:d4:a4:79:25:ca:c3:51:28:88:bb:30:c2:96:c3:44:5a:eb:18:07:84:ca:b4:75:27:74:61:19:8a:6a:af:fc"
|
||||||
|
),
|
||||||
|
"fingerprint_sha256": (
|
||||||
|
"08:d4:a4:79:25:ca:c3:51:28:88:bb:30:c2:96:c3:44:5a:eb:18:07:84:ca:b4:75:27:74:61:19:8a:6a:af:fc"
|
||||||
|
),
|
||||||
|
"issuer": "OU=Self-signed,O=authentik,CN=authentik Test CA",
|
||||||
|
"serial_number": "630532384467334865093173111400266136879266564943",
|
||||||
|
"subject": "CN=client",
|
||||||
|
},
|
||||||
|
)
|
5
authentik/enterprise/stages/mtls/urls.py
Normal file
5
authentik/enterprise/stages/mtls/urls.py
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
"""API URLs"""
|
||||||
|
|
||||||
|
from authentik.enterprise.stages.mtls.api import MutualTLSStageViewSet
|
||||||
|
|
||||||
|
api_urlpatterns = [("stages/mtls", MutualTLSStageViewSet)]
|
@ -8,6 +8,7 @@ from django.test import TestCase
|
|||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
from rest_framework.exceptions import ValidationError
|
from rest_framework.exceptions import ValidationError
|
||||||
|
|
||||||
|
from authentik.core.models import User
|
||||||
from authentik.enterprise.license import LicenseKey
|
from authentik.enterprise.license import LicenseKey
|
||||||
from authentik.enterprise.models import (
|
from authentik.enterprise.models import (
|
||||||
THRESHOLD_READ_ONLY_WEEKS,
|
THRESHOLD_READ_ONLY_WEEKS,
|
||||||
@ -71,9 +72,9 @@ class TestEnterpriseLicense(TestCase):
|
|||||||
)
|
)
|
||||||
def test_valid_multiple(self):
|
def test_valid_multiple(self):
|
||||||
"""Check license verification"""
|
"""Check license verification"""
|
||||||
lic = License.objects.create(key=generate_id())
|
lic = License.objects.create(key=generate_id(), expiry=expiry_valid)
|
||||||
self.assertTrue(lic.status.status().is_valid)
|
self.assertTrue(lic.status.status().is_valid)
|
||||||
lic2 = License.objects.create(key=generate_id())
|
lic2 = License.objects.create(key=generate_id(), expiry=expiry_valid)
|
||||||
self.assertTrue(lic2.status.status().is_valid)
|
self.assertTrue(lic2.status.status().is_valid)
|
||||||
total = LicenseKey.get_total()
|
total = LicenseKey.get_total()
|
||||||
self.assertEqual(total.internal_users, 200)
|
self.assertEqual(total.internal_users, 200)
|
||||||
@ -232,7 +233,9 @@ class TestEnterpriseLicense(TestCase):
|
|||||||
)
|
)
|
||||||
def test_expiry_expired(self):
|
def test_expiry_expired(self):
|
||||||
"""Check license verification"""
|
"""Check license verification"""
|
||||||
License.objects.create(key=generate_id())
|
User.objects.all().delete()
|
||||||
|
License.objects.all().delete()
|
||||||
|
License.objects.create(key=generate_id(), expiry=expiry_expired)
|
||||||
self.assertEqual(LicenseKey.get_total().summary().status, LicenseUsageStatus.EXPIRED)
|
self.assertEqual(LicenseKey.get_total().summary().status, LicenseUsageStatus.EXPIRED)
|
||||||
|
|
||||||
@patch(
|
@patch(
|
||||||
|
@ -57,7 +57,7 @@ class LogEventSerializer(PassiveSerializer):
|
|||||||
|
|
||||||
|
|
||||||
@contextmanager
|
@contextmanager
|
||||||
def capture_logs(log_default_output=True) -> Generator[list[LogEvent], None, None]:
|
def capture_logs(log_default_output=True) -> Generator[list[LogEvent]]:
|
||||||
"""Capture log entries created"""
|
"""Capture log entries created"""
|
||||||
logs = []
|
logs = []
|
||||||
cap = LogCapture()
|
cap = LogCapture()
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'dist/sfe/bootstrap.min.css' %}">
|
<link rel="stylesheet" type="text/css" href="{% static 'dist/sfe/bootstrap.min.css' %}">
|
||||||
<meta name="sentry-trace" content="{{ sentry_trace }}" />
|
<meta name="sentry-trace" content="{{ sentry_trace }}" />
|
||||||
|
<link rel="prefetch" href="{{ flow_background_url }}" />
|
||||||
{% include "base/header_js.html" %}
|
{% include "base/header_js.html" %}
|
||||||
<style>
|
<style>
|
||||||
html,
|
html,
|
||||||
@ -22,7 +23,7 @@
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
background-image: url("{{ flow.background_url }}");
|
background-image: url("{{ flow_background_url }}");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,9 @@
|
|||||||
|
|
||||||
{% block head_before %}
|
{% block head_before %}
|
||||||
{{ block.super }}
|
{{ block.super }}
|
||||||
<link rel="prefetch" href="{{ flow.background_url }}" />
|
<link rel="prefetch" href="{{ flow_background_url }}" />
|
||||||
{% if flow.compatibility_mode and not inspector %}
|
{% if flow.compatibility_mode and not inspector %}
|
||||||
<script>ShadyDOM = { force: !navigator.webdriver };</script>
|
<script>ShadyDOM = { force: true };</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include "base/header_js.html" %}
|
{% include "base/header_js.html" %}
|
||||||
<script>
|
<script>
|
||||||
@ -21,7 +21,7 @@ window.authentik.flow = {
|
|||||||
<script src="{% versioned_script 'dist/flow/FlowInterface-%v.js' %}" type="module"></script>
|
<script src="{% versioned_script 'dist/flow/FlowInterface-%v.js' %}" type="module"></script>
|
||||||
<style>
|
<style>
|
||||||
:root {
|
:root {
|
||||||
--ak-flow-background: url("{{ flow.background_url }}");
|
--ak-flow-background: url("{{ flow_background_url }}");
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
"""Test helpers"""
|
"""Test helpers"""
|
||||||
|
|
||||||
|
from collections.abc import Callable, Generator
|
||||||
|
from contextlib import contextmanager
|
||||||
from json import loads
|
from json import loads
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
from django.http.response import HttpResponse
|
from django.http.response import HttpResponse
|
||||||
from django.urls.base import reverse
|
from django.urls.base import reverse
|
||||||
@ -9,6 +12,8 @@ from rest_framework.test import APITestCase
|
|||||||
|
|
||||||
from authentik.core.models import User
|
from authentik.core.models import User
|
||||||
from authentik.flows.models import Flow
|
from authentik.flows.models import Flow
|
||||||
|
from authentik.flows.planner import FlowPlan
|
||||||
|
from authentik.flows.views.executor import SESSION_KEY_PLAN
|
||||||
|
|
||||||
|
|
||||||
class FlowTestCase(APITestCase):
|
class FlowTestCase(APITestCase):
|
||||||
@ -44,3 +49,12 @@ class FlowTestCase(APITestCase):
|
|||||||
def assertStageRedirects(self, response: HttpResponse, to: str) -> dict[str, Any]:
|
def assertStageRedirects(self, response: HttpResponse, to: str) -> dict[str, Any]:
|
||||||
"""Wrapper around assertStageResponse that checks for a redirect"""
|
"""Wrapper around assertStageResponse that checks for a redirect"""
|
||||||
return self.assertStageResponse(response, component="xak-flow-redirect", to=to)
|
return self.assertStageResponse(response, component="xak-flow-redirect", to=to)
|
||||||
|
|
||||||
|
@contextmanager
|
||||||
|
def assertFlowFinishes(self) -> Generator[Callable[[], FlowPlan]]:
|
||||||
|
"""Capture the flow plan before the flow finishes and return it"""
|
||||||
|
try:
|
||||||
|
with patch("authentik.flows.views.executor.FlowExecutorView.cancel", MagicMock()):
|
||||||
|
yield lambda: self.client.session.get(SESSION_KEY_PLAN)
|
||||||
|
finally:
|
||||||
|
pass
|
||||||
|
@ -13,7 +13,9 @@ class FlowInterfaceView(InterfaceView):
|
|||||||
"""Flow interface"""
|
"""Flow interface"""
|
||||||
|
|
||||||
def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
|
def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
|
||||||
kwargs["flow"] = get_object_or_404(Flow, slug=self.kwargs.get("flow_slug"))
|
flow = get_object_or_404(Flow, slug=self.kwargs.get("flow_slug"))
|
||||||
|
kwargs["flow"] = flow
|
||||||
|
kwargs["flow_background_url"] = flow.background_url(self.request)
|
||||||
kwargs["inspector"] = "inspector" in self.request.GET
|
kwargs["inspector"] = "inspector" in self.request.GET
|
||||||
return super().get_context_data(**kwargs)
|
return super().get_context_data(**kwargs)
|
||||||
|
|
||||||
|
@ -363,6 +363,9 @@ def django_db_config(config: ConfigLoader | None = None) -> dict:
|
|||||||
pool_options = config.get_dict_from_b64_json("postgresql.pool_options", True)
|
pool_options = config.get_dict_from_b64_json("postgresql.pool_options", True)
|
||||||
if not pool_options:
|
if not pool_options:
|
||||||
pool_options = True
|
pool_options = True
|
||||||
|
# FIXME: Temporarily force pool to be deactivated.
|
||||||
|
# See https://github.com/goauthentik/authentik/issues/14320
|
||||||
|
pool_options = False
|
||||||
|
|
||||||
db = {
|
db = {
|
||||||
"default": {
|
"default": {
|
||||||
|
@ -17,7 +17,7 @@ from ldap3.core.exceptions import LDAPException
|
|||||||
from redis.exceptions import ConnectionError as RedisConnectionError
|
from redis.exceptions import ConnectionError as RedisConnectionError
|
||||||
from redis.exceptions import RedisError, ResponseError
|
from redis.exceptions import RedisError, ResponseError
|
||||||
from rest_framework.exceptions import APIException
|
from rest_framework.exceptions import APIException
|
||||||
from sentry_sdk import HttpTransport
|
from sentry_sdk import HttpTransport, get_current_scope
|
||||||
from sentry_sdk import init as sentry_sdk_init
|
from sentry_sdk import init as sentry_sdk_init
|
||||||
from sentry_sdk.api import set_tag
|
from sentry_sdk.api import set_tag
|
||||||
from sentry_sdk.integrations.argv import ArgvIntegration
|
from sentry_sdk.integrations.argv import ArgvIntegration
|
||||||
@ -27,6 +27,7 @@ from sentry_sdk.integrations.redis import RedisIntegration
|
|||||||
from sentry_sdk.integrations.socket import SocketIntegration
|
from sentry_sdk.integrations.socket import SocketIntegration
|
||||||
from sentry_sdk.integrations.stdlib import StdlibIntegration
|
from sentry_sdk.integrations.stdlib import StdlibIntegration
|
||||||
from sentry_sdk.integrations.threading import ThreadingIntegration
|
from sentry_sdk.integrations.threading import ThreadingIntegration
|
||||||
|
from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, SENTRY_TRACE_HEADER_NAME
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
from websockets.exceptions import WebSocketException
|
from websockets.exceptions import WebSocketException
|
||||||
|
|
||||||
@ -95,6 +96,8 @@ def traces_sampler(sampling_context: dict) -> float:
|
|||||||
return 0
|
return 0
|
||||||
if _type == "websocket":
|
if _type == "websocket":
|
||||||
return 0
|
return 0
|
||||||
|
if CONFIG.get_bool("debug"):
|
||||||
|
return 1
|
||||||
return float(CONFIG.get("error_reporting.sample_rate", 0.1))
|
return float(CONFIG.get("error_reporting.sample_rate", 0.1))
|
||||||
|
|
||||||
|
|
||||||
@ -167,3 +170,14 @@ def before_send(event: dict, hint: dict) -> dict | None:
|
|||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
return None
|
return None
|
||||||
return event
|
return event
|
||||||
|
|
||||||
|
|
||||||
|
def get_http_meta():
|
||||||
|
"""Get sentry-related meta key-values"""
|
||||||
|
scope = get_current_scope()
|
||||||
|
meta = {
|
||||||
|
SENTRY_TRACE_HEADER_NAME: scope.get_traceparent() or "",
|
||||||
|
}
|
||||||
|
if bag := scope.get_baggage():
|
||||||
|
meta[BAGGAGE_HEADER_NAME] = bag.serialize()
|
||||||
|
return meta
|
||||||
|
@ -59,7 +59,7 @@ class PropertyMappingManager:
|
|||||||
request: HttpRequest | None,
|
request: HttpRequest | None,
|
||||||
return_mapping: bool = False,
|
return_mapping: bool = False,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
) -> Generator[tuple[dict, PropertyMapping], None]:
|
) -> Generator[tuple[dict, PropertyMapping]]:
|
||||||
"""Iterate over all mappings that were pre-compiled and
|
"""Iterate over all mappings that were pre-compiled and
|
||||||
execute all of them with the given context"""
|
execute all of them with the given context"""
|
||||||
if not self.__has_compiled:
|
if not self.__has_compiled:
|
||||||
|
@ -23,7 +23,6 @@ if TYPE_CHECKING:
|
|||||||
|
|
||||||
|
|
||||||
class Direction(StrEnum):
|
class Direction(StrEnum):
|
||||||
|
|
||||||
add = "add"
|
add = "add"
|
||||||
remove = "remove"
|
remove = "remove"
|
||||||
|
|
||||||
@ -37,13 +36,16 @@ SAFE_METHODS = [
|
|||||||
|
|
||||||
|
|
||||||
class BaseOutgoingSyncClient[
|
class BaseOutgoingSyncClient[
|
||||||
TModel: "Model", TConnection: "Model", TSchema: dict, TProvider: "OutgoingSyncProvider"
|
TModel: "Model",
|
||||||
|
TConnection: "Model",
|
||||||
|
TSchema: dict,
|
||||||
|
TProvider: "OutgoingSyncProvider",
|
||||||
]:
|
]:
|
||||||
"""Basic Outgoing sync client Client"""
|
"""Basic Outgoing sync client Client"""
|
||||||
|
|
||||||
provider: TProvider
|
provider: TProvider
|
||||||
connection_type: type[TConnection]
|
connection_type: type[TConnection]
|
||||||
connection_type_query: str
|
connection_attr: str
|
||||||
mapper: PropertyMappingManager
|
mapper: PropertyMappingManager
|
||||||
|
|
||||||
can_discover = False
|
can_discover = False
|
||||||
@ -63,9 +65,7 @@ class BaseOutgoingSyncClient[
|
|||||||
def write(self, obj: TModel) -> tuple[TConnection, bool]:
|
def write(self, obj: TModel) -> tuple[TConnection, bool]:
|
||||||
"""Write object to destination. Uses self.create and self.update, but
|
"""Write object to destination. Uses self.create and self.update, but
|
||||||
can be overwritten for further logic"""
|
can be overwritten for further logic"""
|
||||||
connection = self.connection_type.objects.filter(
|
connection = getattr(obj, self.connection_attr).filter(provider=self.provider).first()
|
||||||
provider=self.provider, **{self.connection_type_query: obj}
|
|
||||||
).first()
|
|
||||||
try:
|
try:
|
||||||
if not connection:
|
if not connection:
|
||||||
connection = self.create(obj)
|
connection = self.create(obj)
|
||||||
|
@ -494,86 +494,88 @@ class TestConfig(TestCase):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_db_pool(self):
|
# FIXME: Temporarily force pool to be deactivated.
|
||||||
"""Test DB Config with pool"""
|
# See https://github.com/goauthentik/authentik/issues/14320
|
||||||
config = ConfigLoader()
|
# def test_db_pool(self):
|
||||||
config.set("postgresql.host", "foo")
|
# """Test DB Config with pool"""
|
||||||
config.set("postgresql.name", "foo")
|
# config = ConfigLoader()
|
||||||
config.set("postgresql.user", "foo")
|
# config.set("postgresql.host", "foo")
|
||||||
config.set("postgresql.password", "foo")
|
# config.set("postgresql.name", "foo")
|
||||||
config.set("postgresql.port", "foo")
|
# config.set("postgresql.user", "foo")
|
||||||
config.set("postgresql.test.name", "foo")
|
# config.set("postgresql.password", "foo")
|
||||||
config.set("postgresql.use_pool", True)
|
# config.set("postgresql.port", "foo")
|
||||||
conf = django_db_config(config)
|
# config.set("postgresql.test.name", "foo")
|
||||||
self.assertEqual(
|
# config.set("postgresql.use_pool", True)
|
||||||
conf,
|
# conf = django_db_config(config)
|
||||||
{
|
# self.assertEqual(
|
||||||
"default": {
|
# conf,
|
||||||
"ENGINE": "authentik.root.db",
|
# {
|
||||||
"HOST": "foo",
|
# "default": {
|
||||||
"NAME": "foo",
|
# "ENGINE": "authentik.root.db",
|
||||||
"OPTIONS": {
|
# "HOST": "foo",
|
||||||
"pool": True,
|
# "NAME": "foo",
|
||||||
"sslcert": None,
|
# "OPTIONS": {
|
||||||
"sslkey": None,
|
# "pool": True,
|
||||||
"sslmode": None,
|
# "sslcert": None,
|
||||||
"sslrootcert": None,
|
# "sslkey": None,
|
||||||
},
|
# "sslmode": None,
|
||||||
"PASSWORD": "foo",
|
# "sslrootcert": None,
|
||||||
"PORT": "foo",
|
# },
|
||||||
"TEST": {"NAME": "foo"},
|
# "PASSWORD": "foo",
|
||||||
"USER": "foo",
|
# "PORT": "foo",
|
||||||
"CONN_MAX_AGE": 0,
|
# "TEST": {"NAME": "foo"},
|
||||||
"CONN_HEALTH_CHECKS": False,
|
# "USER": "foo",
|
||||||
"DISABLE_SERVER_SIDE_CURSORS": False,
|
# "CONN_MAX_AGE": 0,
|
||||||
}
|
# "CONN_HEALTH_CHECKS": False,
|
||||||
},
|
# "DISABLE_SERVER_SIDE_CURSORS": False,
|
||||||
)
|
# }
|
||||||
|
# },
|
||||||
|
# )
|
||||||
|
|
||||||
def test_db_pool_options(self):
|
# def test_db_pool_options(self):
|
||||||
"""Test DB Config with pool"""
|
# """Test DB Config with pool"""
|
||||||
config = ConfigLoader()
|
# config = ConfigLoader()
|
||||||
config.set("postgresql.host", "foo")
|
# config.set("postgresql.host", "foo")
|
||||||
config.set("postgresql.name", "foo")
|
# config.set("postgresql.name", "foo")
|
||||||
config.set("postgresql.user", "foo")
|
# config.set("postgresql.user", "foo")
|
||||||
config.set("postgresql.password", "foo")
|
# config.set("postgresql.password", "foo")
|
||||||
config.set("postgresql.port", "foo")
|
# config.set("postgresql.port", "foo")
|
||||||
config.set("postgresql.test.name", "foo")
|
# config.set("postgresql.test.name", "foo")
|
||||||
config.set("postgresql.use_pool", True)
|
# config.set("postgresql.use_pool", True)
|
||||||
config.set(
|
# config.set(
|
||||||
"postgresql.pool_options",
|
# "postgresql.pool_options",
|
||||||
base64.b64encode(
|
# base64.b64encode(
|
||||||
dumps(
|
# dumps(
|
||||||
{
|
# {
|
||||||
"max_size": 15,
|
# "max_size": 15,
|
||||||
}
|
# }
|
||||||
).encode()
|
# ).encode()
|
||||||
).decode(),
|
# ).decode(),
|
||||||
)
|
# )
|
||||||
conf = django_db_config(config)
|
# conf = django_db_config(config)
|
||||||
self.assertEqual(
|
# self.assertEqual(
|
||||||
conf,
|
# conf,
|
||||||
{
|
# {
|
||||||
"default": {
|
# "default": {
|
||||||
"ENGINE": "authentik.root.db",
|
# "ENGINE": "authentik.root.db",
|
||||||
"HOST": "foo",
|
# "HOST": "foo",
|
||||||
"NAME": "foo",
|
# "NAME": "foo",
|
||||||
"OPTIONS": {
|
# "OPTIONS": {
|
||||||
"pool": {
|
# "pool": {
|
||||||
"max_size": 15,
|
# "max_size": 15,
|
||||||
},
|
# },
|
||||||
"sslcert": None,
|
# "sslcert": None,
|
||||||
"sslkey": None,
|
# "sslkey": None,
|
||||||
"sslmode": None,
|
# "sslmode": None,
|
||||||
"sslrootcert": None,
|
# "sslrootcert": None,
|
||||||
},
|
# },
|
||||||
"PASSWORD": "foo",
|
# "PASSWORD": "foo",
|
||||||
"PORT": "foo",
|
# "PORT": "foo",
|
||||||
"TEST": {"NAME": "foo"},
|
# "TEST": {"NAME": "foo"},
|
||||||
"USER": "foo",
|
# "USER": "foo",
|
||||||
"CONN_MAX_AGE": 0,
|
# "CONN_MAX_AGE": 0,
|
||||||
"CONN_HEALTH_CHECKS": False,
|
# "CONN_HEALTH_CHECKS": False,
|
||||||
"DISABLE_SERVER_SIDE_CURSORS": False,
|
# "DISABLE_SERVER_SIDE_CURSORS": False,
|
||||||
}
|
# }
|
||||||
},
|
# },
|
||||||
)
|
# )
|
||||||
|
@ -34,7 +34,7 @@ class SCIMGroupClient(SCIMClient[Group, SCIMProviderGroup, SCIMGroupSchema]):
|
|||||||
"""SCIM client for groups"""
|
"""SCIM client for groups"""
|
||||||
|
|
||||||
connection_type = SCIMProviderGroup
|
connection_type = SCIMProviderGroup
|
||||||
connection_type_query = "group"
|
connection_attr = "scimprovidergroup_set"
|
||||||
mapper: PropertyMappingManager
|
mapper: PropertyMappingManager
|
||||||
|
|
||||||
def __init__(self, provider: SCIMProvider):
|
def __init__(self, provider: SCIMProvider):
|
||||||
@ -199,7 +199,7 @@ class SCIMGroupClient(SCIMClient[Group, SCIMProviderGroup, SCIMGroupSchema]):
|
|||||||
chunk_size = len(ops)
|
chunk_size = len(ops)
|
||||||
if len(ops) < 1:
|
if len(ops) < 1:
|
||||||
return
|
return
|
||||||
for chunk in batched(ops, chunk_size):
|
for chunk in batched(ops, chunk_size, strict=False):
|
||||||
req = PatchRequest(Operations=list(chunk))
|
req = PatchRequest(Operations=list(chunk))
|
||||||
self._request(
|
self._request(
|
||||||
"PATCH",
|
"PATCH",
|
||||||
|
@ -18,7 +18,7 @@ class SCIMUserClient(SCIMClient[User, SCIMProviderUser, SCIMUserSchema]):
|
|||||||
"""SCIM client for users"""
|
"""SCIM client for users"""
|
||||||
|
|
||||||
connection_type = SCIMProviderUser
|
connection_type = SCIMProviderUser
|
||||||
connection_type_query = "user"
|
connection_attr = "scimprovideruser_set"
|
||||||
mapper: PropertyMappingManager
|
mapper: PropertyMappingManager
|
||||||
|
|
||||||
def __init__(self, provider: SCIMProvider):
|
def __init__(self, provider: SCIMProvider):
|
||||||
|
@ -116,7 +116,7 @@ class SCIMProvider(OutgoingSyncProvider, BackchannelProvider):
|
|||||||
if type == User:
|
if type == User:
|
||||||
# Get queryset of all users with consistent ordering
|
# Get queryset of all users with consistent ordering
|
||||||
# according to the provider's settings
|
# according to the provider's settings
|
||||||
base = User.objects.all().exclude_anonymous()
|
base = User.objects.prefetch_related("scimprovideruser_set").all().exclude_anonymous()
|
||||||
if self.exclude_users_service_account:
|
if self.exclude_users_service_account:
|
||||||
base = base.exclude(type=UserTypes.SERVICE_ACCOUNT).exclude(
|
base = base.exclude(type=UserTypes.SERVICE_ACCOUNT).exclude(
|
||||||
type=UserTypes.INTERNAL_SERVICE_ACCOUNT
|
type=UserTypes.INTERNAL_SERVICE_ACCOUNT
|
||||||
@ -126,7 +126,7 @@ class SCIMProvider(OutgoingSyncProvider, BackchannelProvider):
|
|||||||
return base.order_by("pk")
|
return base.order_by("pk")
|
||||||
if type == Group:
|
if type == Group:
|
||||||
# Get queryset of all groups with consistent ordering
|
# Get queryset of all groups with consistent ordering
|
||||||
return Group.objects.all().order_by("pk")
|
return Group.objects.prefetch_related("scimprovidergroup_set").all().order_by("pk")
|
||||||
raise ValueError(f"Invalid type {type}")
|
raise ValueError(f"Invalid type {type}")
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -99,6 +99,7 @@ class RBACPermissionViewSet(ReadOnlyModelViewSet):
|
|||||||
filterset_class = PermissionFilter
|
filterset_class = PermissionFilter
|
||||||
permission_classes = [IsAuthenticated]
|
permission_classes = [IsAuthenticated]
|
||||||
search_fields = [
|
search_fields = [
|
||||||
|
"name",
|
||||||
"codename",
|
"codename",
|
||||||
"content_type__model",
|
"content_type__model",
|
||||||
"content_type__app_label",
|
"content_type__app_label",
|
||||||
|
@ -317,7 +317,7 @@ class KerberosSource(Source):
|
|||||||
usage="accept", name=name, store=self.get_gssapi_store()
|
usage="accept", name=name, store=self.get_gssapi_store()
|
||||||
)
|
)
|
||||||
except gssapi.exceptions.GSSError as exc:
|
except gssapi.exceptions.GSSError as exc:
|
||||||
LOGGER.warn("GSSAPI credentials failure", exc=exc)
|
LOGGER.warning("GSSAPI credentials failure", exc=exc)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -2,7 +2,7 @@
|
|||||||
"$schema": "http://json-schema.org/draft-07/schema",
|
"$schema": "http://json-schema.org/draft-07/schema",
|
||||||
"$id": "https://goauthentik.io/blueprints/schema.json",
|
"$id": "https://goauthentik.io/blueprints/schema.json",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"title": "authentik 2025.2.4 Blueprint schema",
|
"title": "authentik 2025.4.1 Blueprint schema",
|
||||||
"required": [
|
"required": [
|
||||||
"version",
|
"version",
|
||||||
"entries"
|
"entries"
|
||||||
@ -3921,6 +3921,46 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"model",
|
||||||
|
"identifiers"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"model": {
|
||||||
|
"const": "authentik_stages_mtls.mutualtlsstage"
|
||||||
|
},
|
||||||
|
"id": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"state": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"absent",
|
||||||
|
"present",
|
||||||
|
"created",
|
||||||
|
"must_created"
|
||||||
|
],
|
||||||
|
"default": "present"
|
||||||
|
},
|
||||||
|
"conditions": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "boolean"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"permissions": {
|
||||||
|
"$ref": "#/$defs/model_authentik_stages_mtls.mutualtlsstage_permissions"
|
||||||
|
},
|
||||||
|
"attrs": {
|
||||||
|
"$ref": "#/$defs/model_authentik_stages_mtls.mutualtlsstage"
|
||||||
|
},
|
||||||
|
"identifiers": {
|
||||||
|
"$ref": "#/$defs/model_authentik_stages_mtls.mutualtlsstage"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"required": [
|
"required": [
|
||||||
@ -4867,6 +4907,7 @@
|
|||||||
"authentik.enterprise.providers.microsoft_entra",
|
"authentik.enterprise.providers.microsoft_entra",
|
||||||
"authentik.enterprise.providers.ssf",
|
"authentik.enterprise.providers.ssf",
|
||||||
"authentik.enterprise.stages.authenticator_endpoint_gdtc",
|
"authentik.enterprise.stages.authenticator_endpoint_gdtc",
|
||||||
|
"authentik.enterprise.stages.mtls",
|
||||||
"authentik.enterprise.stages.source",
|
"authentik.enterprise.stages.source",
|
||||||
"authentik.events"
|
"authentik.events"
|
||||||
],
|
],
|
||||||
@ -4977,6 +5018,7 @@
|
|||||||
"authentik_providers_microsoft_entra.microsoftentraprovidermapping",
|
"authentik_providers_microsoft_entra.microsoftentraprovidermapping",
|
||||||
"authentik_providers_ssf.ssfprovider",
|
"authentik_providers_ssf.ssfprovider",
|
||||||
"authentik_stages_authenticator_endpoint_gdtc.authenticatorendpointgdtcstage",
|
"authentik_stages_authenticator_endpoint_gdtc.authenticatorendpointgdtcstage",
|
||||||
|
"authentik_stages_mtls.mutualtlsstage",
|
||||||
"authentik_stages_source.sourcestage",
|
"authentik_stages_source.sourcestage",
|
||||||
"authentik_events.event",
|
"authentik_events.event",
|
||||||
"authentik_events.notificationtransport",
|
"authentik_events.notificationtransport",
|
||||||
@ -7477,6 +7519,11 @@
|
|||||||
"authentik_stages_invitation.delete_invitationstage",
|
"authentik_stages_invitation.delete_invitationstage",
|
||||||
"authentik_stages_invitation.view_invitation",
|
"authentik_stages_invitation.view_invitation",
|
||||||
"authentik_stages_invitation.view_invitationstage",
|
"authentik_stages_invitation.view_invitationstage",
|
||||||
|
"authentik_stages_mtls.add_mutualtlsstage",
|
||||||
|
"authentik_stages_mtls.change_mutualtlsstage",
|
||||||
|
"authentik_stages_mtls.delete_mutualtlsstage",
|
||||||
|
"authentik_stages_mtls.pass_outpost_certificate",
|
||||||
|
"authentik_stages_mtls.view_mutualtlsstage",
|
||||||
"authentik_stages_password.add_passwordstage",
|
"authentik_stages_password.add_passwordstage",
|
||||||
"authentik_stages_password.change_passwordstage",
|
"authentik_stages_password.change_passwordstage",
|
||||||
"authentik_stages_password.delete_passwordstage",
|
"authentik_stages_password.delete_passwordstage",
|
||||||
@ -13422,6 +13469,16 @@
|
|||||||
"title": "Web certificate",
|
"title": "Web certificate",
|
||||||
"description": "Web Certificate used by the authentik Core webserver."
|
"description": "Web Certificate used by the authentik Core webserver."
|
||||||
},
|
},
|
||||||
|
"client_certificates": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string",
|
||||||
|
"format": "uuid",
|
||||||
|
"description": "Certificates used for client authentication."
|
||||||
|
},
|
||||||
|
"title": "Client certificates",
|
||||||
|
"description": "Certificates used for client authentication."
|
||||||
|
},
|
||||||
"attributes": {
|
"attributes": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": true,
|
"additionalProperties": true,
|
||||||
@ -14185,6 +14242,11 @@
|
|||||||
"authentik_stages_invitation.delete_invitationstage",
|
"authentik_stages_invitation.delete_invitationstage",
|
||||||
"authentik_stages_invitation.view_invitation",
|
"authentik_stages_invitation.view_invitation",
|
||||||
"authentik_stages_invitation.view_invitationstage",
|
"authentik_stages_invitation.view_invitationstage",
|
||||||
|
"authentik_stages_mtls.add_mutualtlsstage",
|
||||||
|
"authentik_stages_mtls.change_mutualtlsstage",
|
||||||
|
"authentik_stages_mtls.delete_mutualtlsstage",
|
||||||
|
"authentik_stages_mtls.pass_outpost_certificate",
|
||||||
|
"authentik_stages_mtls.view_mutualtlsstage",
|
||||||
"authentik_stages_password.add_passwordstage",
|
"authentik_stages_password.add_passwordstage",
|
||||||
"authentik_stages_password.change_passwordstage",
|
"authentik_stages_password.change_passwordstage",
|
||||||
"authentik_stages_password.delete_passwordstage",
|
"authentik_stages_password.delete_passwordstage",
|
||||||
@ -15088,6 +15150,161 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"model_authentik_stages_mtls.mutualtlsstage": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"name": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1,
|
||||||
|
"title": "Name"
|
||||||
|
},
|
||||||
|
"flow_set": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"name": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1,
|
||||||
|
"title": "Name"
|
||||||
|
},
|
||||||
|
"slug": {
|
||||||
|
"type": "string",
|
||||||
|
"maxLength": 50,
|
||||||
|
"minLength": 1,
|
||||||
|
"pattern": "^[-a-zA-Z0-9_]+$",
|
||||||
|
"title": "Slug",
|
||||||
|
"description": "Visible in the URL."
|
||||||
|
},
|
||||||
|
"title": {
|
||||||
|
"type": "string",
|
||||||
|
"minLength": 1,
|
||||||
|
"title": "Title",
|
||||||
|
"description": "Shown as the Title in Flow pages."
|
||||||
|
},
|
||||||
|
"designation": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"authentication",
|
||||||
|
"authorization",
|
||||||
|
"invalidation",
|
||||||
|
"enrollment",
|
||||||
|
"unenrollment",
|
||||||
|
"recovery",
|
||||||
|
"stage_configuration"
|
||||||
|
],
|
||||||
|
"title": "Designation",
|
||||||
|
"description": "Decides what this Flow is used for. For example, the Authentication flow is redirect to when an un-authenticated user visits authentik."
|
||||||
|
},
|
||||||
|
"policy_engine_mode": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"all",
|
||||||
|
"any"
|
||||||
|
],
|
||||||
|
"title": "Policy engine mode"
|
||||||
|
},
|
||||||
|
"compatibility_mode": {
|
||||||
|
"type": "boolean",
|
||||||
|
"title": "Compatibility mode",
|
||||||
|
"description": "Enable compatibility mode, increases compatibility with password managers on mobile devices."
|
||||||
|
},
|
||||||
|
"layout": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"stacked",
|
||||||
|
"content_left",
|
||||||
|
"content_right",
|
||||||
|
"sidebar_left",
|
||||||
|
"sidebar_right"
|
||||||
|
],
|
||||||
|
"title": "Layout"
|
||||||
|
},
|
||||||
|
"denied_action": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"message_continue",
|
||||||
|
"message",
|
||||||
|
"continue"
|
||||||
|
],
|
||||||
|
"title": "Denied action",
|
||||||
|
"description": "Configure what should happen when a flow denies access to a user."
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": [
|
||||||
|
"name",
|
||||||
|
"slug",
|
||||||
|
"title",
|
||||||
|
"designation"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"title": "Flow set"
|
||||||
|
},
|
||||||
|
"mode": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"optional",
|
||||||
|
"required"
|
||||||
|
],
|
||||||
|
"title": "Mode"
|
||||||
|
},
|
||||||
|
"certificate_authorities": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string",
|
||||||
|
"format": "uuid",
|
||||||
|
"description": "Configure certificate authorities to validate the certificate against. This option has a higher priority than the `client_certificate` option on `Brand`."
|
||||||
|
},
|
||||||
|
"title": "Certificate authorities",
|
||||||
|
"description": "Configure certificate authorities to validate the certificate against. This option has a higher priority than the `client_certificate` option on `Brand`."
|
||||||
|
},
|
||||||
|
"cert_attribute": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"subject",
|
||||||
|
"common_name",
|
||||||
|
"email"
|
||||||
|
],
|
||||||
|
"title": "Cert attribute"
|
||||||
|
},
|
||||||
|
"user_attribute": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"username",
|
||||||
|
"email"
|
||||||
|
],
|
||||||
|
"title": "User attribute"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": []
|
||||||
|
},
|
||||||
|
"model_authentik_stages_mtls.mutualtlsstage_permissions": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "object",
|
||||||
|
"required": [
|
||||||
|
"permission"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"permission": {
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"pass_outpost_certificate",
|
||||||
|
"add_mutualtlsstage",
|
||||||
|
"change_mutualtlsstage",
|
||||||
|
"delete_mutualtlsstage",
|
||||||
|
"view_mutualtlsstage"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"role": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"model_authentik_stages_source.sourcestage": {
|
"model_authentik_stages_source.sourcestage": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
@ -19,7 +19,6 @@ import (
|
|||||||
sentryutils "goauthentik.io/internal/utils/sentry"
|
sentryutils "goauthentik.io/internal/utils/sentry"
|
||||||
webutils "goauthentik.io/internal/utils/web"
|
webutils "goauthentik.io/internal/utils/web"
|
||||||
"goauthentik.io/internal/web"
|
"goauthentik.io/internal/web"
|
||||||
"goauthentik.io/internal/web/brand_tls"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var rootCmd = &cobra.Command{
|
var rootCmd = &cobra.Command{
|
||||||
@ -67,12 +66,12 @@ var rootCmd = &cobra.Command{
|
|||||||
}
|
}
|
||||||
|
|
||||||
ws := web.NewWebServer()
|
ws := web.NewWebServer()
|
||||||
ws.Core().HealthyCallback = func() {
|
ws.Core().AddHealthyCallback(func() {
|
||||||
if config.Get().Outposts.DisableEmbeddedOutpost {
|
if config.Get().Outposts.DisableEmbeddedOutpost {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
go attemptProxyStart(ws, u)
|
go attemptProxyStart(ws, u)
|
||||||
}
|
})
|
||||||
ws.Start()
|
ws.Start()
|
||||||
<-ex
|
<-ex
|
||||||
l.Info("shutting down webserver")
|
l.Info("shutting down webserver")
|
||||||
@ -95,13 +94,8 @@ func attemptProxyStart(ws *web.WebServer, u *url.URL) {
|
|||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// Init brand_tls here too since it requires an API Client,
|
|
||||||
// so we just reuse the same one as the outpost uses
|
|
||||||
tw := brand_tls.NewWatcher(ac.Client)
|
|
||||||
go tw.Start()
|
|
||||||
ws.BrandTLS = tw
|
|
||||||
ac.AddRefreshHandler(func() {
|
ac.AddRefreshHandler(func() {
|
||||||
tw.Check()
|
ws.BrandTLS.Check()
|
||||||
})
|
})
|
||||||
|
|
||||||
srv := proxyv2.NewProxyServer(ac)
|
srv := proxyv2.NewProxyServer(ac)
|
||||||
|
@ -31,7 +31,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
server:
|
server:
|
||||||
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.2.4}
|
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.4.1}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: server
|
command: server
|
||||||
environment:
|
environment:
|
||||||
@ -55,7 +55,7 @@ services:
|
|||||||
redis:
|
redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
worker:
|
worker:
|
||||||
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.2.4}
|
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.4.1}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: worker
|
command: worker
|
||||||
environment:
|
environment:
|
||||||
|
16
go.mod
16
go.mod
@ -5,7 +5,7 @@ go 1.24.0
|
|||||||
require (
|
require (
|
||||||
beryju.io/ldap v0.1.0
|
beryju.io/ldap v0.1.0
|
||||||
github.com/coreos/go-oidc/v3 v3.14.1
|
github.com/coreos/go-oidc/v3 v3.14.1
|
||||||
github.com/getsentry/sentry-go v0.32.0
|
github.com/getsentry/sentry-go v0.33.0
|
||||||
github.com/go-http-utils/etag v0.0.0-20161124023236-513ea8f21eb1
|
github.com/go-http-utils/etag v0.0.0-20161124023236-513ea8f21eb1
|
||||||
github.com/go-ldap/ldap/v3 v3.4.11
|
github.com/go-ldap/ldap/v3 v3.4.11
|
||||||
github.com/go-openapi/runtime v0.28.0
|
github.com/go-openapi/runtime v0.28.0
|
||||||
@ -19,18 +19,18 @@ require (
|
|||||||
github.com/jellydator/ttlcache/v3 v3.3.0
|
github.com/jellydator/ttlcache/v3 v3.3.0
|
||||||
github.com/mitchellh/mapstructure v1.5.0
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484
|
github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484
|
||||||
github.com/pires/go-proxyproto v0.8.0
|
github.com/pires/go-proxyproto v0.8.1
|
||||||
github.com/prometheus/client_golang v1.22.0
|
github.com/prometheus/client_golang v1.22.0
|
||||||
github.com/redis/go-redis/v9 v9.7.3
|
github.com/redis/go-redis/v9 v9.8.0
|
||||||
github.com/sethvargo/go-envconfig v1.2.0
|
github.com/sethvargo/go-envconfig v1.3.0
|
||||||
github.com/sirupsen/logrus v1.9.3
|
github.com/sirupsen/logrus v1.9.3
|
||||||
github.com/spf13/cobra v1.9.1
|
github.com/spf13/cobra v1.9.1
|
||||||
github.com/stretchr/testify v1.10.0
|
github.com/stretchr/testify v1.10.0
|
||||||
github.com/wwt/guac v1.3.2
|
github.com/wwt/guac v1.3.2
|
||||||
goauthentik.io/api/v3 v3.2025024.9
|
goauthentik.io/api/v3 v3.2025041.2
|
||||||
golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab
|
golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab
|
||||||
golang.org/x/oauth2 v0.29.0
|
golang.org/x/oauth2 v0.30.0
|
||||||
golang.org/x/sync v0.13.0
|
golang.org/x/sync v0.14.0
|
||||||
gopkg.in/yaml.v2 v2.4.0
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
layeh.com/radius v0.0.0-20210819152912-ad72663a72ab
|
layeh.com/radius v0.0.0-20210819152912-ad72663a72ab
|
||||||
)
|
)
|
||||||
@ -75,7 +75,7 @@ require (
|
|||||||
go.opentelemetry.io/otel/trace v1.24.0 // indirect
|
go.opentelemetry.io/otel/trace v1.24.0 // indirect
|
||||||
golang.org/x/crypto v0.36.0 // indirect
|
golang.org/x/crypto v0.36.0 // indirect
|
||||||
golang.org/x/sys v0.31.0 // indirect
|
golang.org/x/sys v0.31.0 // indirect
|
||||||
golang.org/x/text v0.23.0 // indirect
|
golang.org/x/text v0.24.0 // indirect
|
||||||
google.golang.org/protobuf v1.36.5 // indirect
|
google.golang.org/protobuf v1.36.5 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
36
go.sum
36
go.sum
@ -69,8 +69,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
|
|||||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||||
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
|
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
|
||||||
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
||||||
github.com/getsentry/sentry-go v0.32.0 h1:YKs+//QmwE3DcYtfKRH8/KyOOF/I6Qnx7qYGNHCGmCY=
|
github.com/getsentry/sentry-go v0.33.0 h1:YWyDii0KGVov3xOaamOnF0mjOrqSjBqwv48UEzn7QFg=
|
||||||
github.com/getsentry/sentry-go v0.32.0/go.mod h1:CYNcMMz73YigoHljQRG+qPF+eMq8gG72XcGN/p71BAY=
|
github.com/getsentry/sentry-go v0.33.0/go.mod h1:C55omcY9ChRQIUcVcGcs+Zdy4ZpQGvNJ7JYHIoSWOtE=
|
||||||
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
|
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
|
||||||
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
|
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
|
||||||
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
||||||
@ -230,8 +230,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+
|
|||||||
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
|
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
|
||||||
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
|
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
|
||||||
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
|
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
|
||||||
github.com/pires/go-proxyproto v0.8.0 h1:5unRmEAPbHXHuLjDg01CxJWf91cw3lKHc/0xzKpXEe0=
|
github.com/pires/go-proxyproto v0.8.1 h1:9KEixbdJfhrbtjpz/ZwCdWDD2Xem0NZ38qMYaASJgp0=
|
||||||
github.com/pires/go-proxyproto v0.8.0/go.mod h1:iknsfgnH8EkjrMeMyvfKByp9TiBZCKZM0jx2xmKqnVY=
|
github.com/pires/go-proxyproto v0.8.1/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU=
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
@ -245,14 +245,14 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ
|
|||||||
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
|
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
|
||||||
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
||||||
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
||||||
github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
|
github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI=
|
||||||
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
|
github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
|
||||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||||
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
||||||
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/sethvargo/go-envconfig v1.2.0 h1:q3XkOZWkC+G1sMLCrw9oPGTjYexygLOXDmGUit1ti8Q=
|
github.com/sethvargo/go-envconfig v1.3.0 h1:gJs+Fuv8+f05omTpwWIu6KmuseFAXKrIaOZSh8RMt0U=
|
||||||
github.com/sethvargo/go-envconfig v1.2.0/go.mod h1:JLd0KFWQYzyENqnEPWWZ49i4vzZo/6nRidxI8YvGiHw=
|
github.com/sethvargo/go-envconfig v1.3.0/go.mod h1:JLd0KFWQYzyENqnEPWWZ49i4vzZo/6nRidxI8YvGiHw=
|
||||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||||
@ -290,8 +290,8 @@ go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y
|
|||||||
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
|
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||||
goauthentik.io/api/v3 v3.2025024.9 h1:i3tbkyotE32ZpJ729BsPWTuLQUdtZ54Li4aP1amZzsM=
|
goauthentik.io/api/v3 v3.2025041.2 h1:vFYYnhcDcxL95RczZwhzt3i4LptFXMvIRN+vgf8sQYg=
|
||||||
goauthentik.io/api/v3 v3.2025024.9/go.mod h1:zz+mEZg8rY/7eEjkMGWJ2DnGqk+zqxuybGCGrR2O4Kw=
|
goauthentik.io/api/v3 v3.2025041.2/go.mod h1:zz+mEZg8rY/7eEjkMGWJ2DnGqk+zqxuybGCGrR2O4Kw=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
@ -358,16 +358,16 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
|
|||||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
|
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
|
||||||
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
|
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||||
golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
|
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
|
||||||
golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
|
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
@ -376,8 +376,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
|
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
|
||||||
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
@ -412,8 +412,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
|
||||||
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
|
@ -21,12 +21,16 @@ func FullVersion() string {
|
|||||||
return ver
|
return ver
|
||||||
}
|
}
|
||||||
|
|
||||||
func OutpostUserAgent() string {
|
func UserAgentOutpost() string {
|
||||||
return fmt.Sprintf("goauthentik.io/outpost/%s", FullVersion())
|
return fmt.Sprintf("goauthentik.io/outpost/%s", FullVersion())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func UserAgentIPC() string {
|
||||||
|
return fmt.Sprintf("goauthentik.io/ipc/%s", FullVersion())
|
||||||
|
}
|
||||||
|
|
||||||
func UserAgent() string {
|
func UserAgent() string {
|
||||||
return fmt.Sprintf("authentik@%s", FullVersion())
|
return fmt.Sprintf("authentik@%s", FullVersion())
|
||||||
}
|
}
|
||||||
|
|
||||||
const VERSION = "2025.2.4"
|
const VERSION = "2025.4.1"
|
||||||
|
@ -18,8 +18,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type GoUnicorn struct {
|
type GoUnicorn struct {
|
||||||
Healthcheck func() bool
|
Healthcheck func() bool
|
||||||
HealthyCallback func()
|
healthyCallbacks []func()
|
||||||
|
|
||||||
log *log.Entry
|
log *log.Entry
|
||||||
p *exec.Cmd
|
p *exec.Cmd
|
||||||
@ -32,12 +32,12 @@ type GoUnicorn struct {
|
|||||||
func New(healthcheck func() bool) *GoUnicorn {
|
func New(healthcheck func() bool) *GoUnicorn {
|
||||||
logger := log.WithField("logger", "authentik.router.unicorn")
|
logger := log.WithField("logger", "authentik.router.unicorn")
|
||||||
g := &GoUnicorn{
|
g := &GoUnicorn{
|
||||||
Healthcheck: healthcheck,
|
Healthcheck: healthcheck,
|
||||||
log: logger,
|
log: logger,
|
||||||
started: false,
|
started: false,
|
||||||
killed: false,
|
killed: false,
|
||||||
alive: false,
|
alive: false,
|
||||||
HealthyCallback: func() {},
|
healthyCallbacks: []func(){},
|
||||||
}
|
}
|
||||||
g.initCmd()
|
g.initCmd()
|
||||||
c := make(chan os.Signal, 1)
|
c := make(chan os.Signal, 1)
|
||||||
@ -79,6 +79,10 @@ func (g *GoUnicorn) initCmd() {
|
|||||||
g.p.Stderr = os.Stderr
|
g.p.Stderr = os.Stderr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (g *GoUnicorn) AddHealthyCallback(cb func()) {
|
||||||
|
g.healthyCallbacks = append(g.healthyCallbacks, cb)
|
||||||
|
}
|
||||||
|
|
||||||
func (g *GoUnicorn) IsRunning() bool {
|
func (g *GoUnicorn) IsRunning() bool {
|
||||||
return g.alive
|
return g.alive
|
||||||
}
|
}
|
||||||
@ -101,7 +105,9 @@ func (g *GoUnicorn) healthcheck() {
|
|||||||
if g.Healthcheck() {
|
if g.Healthcheck() {
|
||||||
g.alive = true
|
g.alive = true
|
||||||
g.log.Debug("backend is alive, backing off with healthchecks")
|
g.log.Debug("backend is alive, backing off with healthchecks")
|
||||||
g.HealthyCallback()
|
for _, cb := range g.healthyCallbacks {
|
||||||
|
cb()
|
||||||
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
g.log.Debug("backend not alive yet")
|
g.log.Debug("backend not alive yet")
|
||||||
|
@ -62,7 +62,7 @@ func NewAPIController(akURL url.URL, token string) *APIController {
|
|||||||
apiConfig.Scheme = akURL.Scheme
|
apiConfig.Scheme = akURL.Scheme
|
||||||
apiConfig.HTTPClient = &http.Client{
|
apiConfig.HTTPClient = &http.Client{
|
||||||
Transport: web.NewUserAgentTransport(
|
Transport: web.NewUserAgentTransport(
|
||||||
constants.OutpostUserAgent(),
|
constants.UserAgentOutpost(),
|
||||||
web.NewTracingTransport(
|
web.NewTracingTransport(
|
||||||
rsp.Context(),
|
rsp.Context(),
|
||||||
GetTLSTransport(),
|
GetTLSTransport(),
|
||||||
|
@ -38,7 +38,7 @@ func (ac *APIController) initWS(akURL url.URL, outpostUUID string) error {
|
|||||||
|
|
||||||
header := http.Header{
|
header := http.Header{
|
||||||
"Authorization": []string{authHeader},
|
"Authorization": []string{authHeader},
|
||||||
"User-Agent": []string{constants.OutpostUserAgent()},
|
"User-Agent": []string{constants.UserAgentOutpost()},
|
||||||
}
|
}
|
||||||
|
|
||||||
dialer := websocket.Dialer{
|
dialer := websocket.Dialer{
|
||||||
|
@ -3,6 +3,8 @@ package ak
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"crypto/x509"
|
||||||
|
"encoding/pem"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"goauthentik.io/api/v3"
|
"goauthentik.io/api/v3"
|
||||||
@ -67,16 +69,34 @@ func (cs *CryptoStore) Fetch(uuid string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
x509cert, err := tls.X509KeyPair([]byte(cert.Data), []byte(key.Data))
|
var tcert tls.Certificate
|
||||||
if err != nil {
|
if key.Data != "" {
|
||||||
return err
|
x509cert, err := tls.X509KeyPair([]byte(cert.Data), []byte(key.Data))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tcert = x509cert
|
||||||
|
} else {
|
||||||
|
p, _ := pem.Decode([]byte(cert.Data))
|
||||||
|
x509cert, err := x509.ParseCertificate(p.Bytes)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tcert = tls.Certificate{
|
||||||
|
Certificate: [][]byte{x509cert.Raw},
|
||||||
|
Leaf: x509cert,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cs.certificates[uuid] = &x509cert
|
cs.certificates[uuid] = &tcert
|
||||||
cs.fingerprints[uuid] = cfp
|
cs.fingerprints[uuid] = cfp
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cs *CryptoStore) Get(uuid string) *tls.Certificate {
|
func (cs *CryptoStore) Get(uuid string) *tls.Certificate {
|
||||||
|
c, ok := cs.certificates[uuid]
|
||||||
|
if ok {
|
||||||
|
return c
|
||||||
|
}
|
||||||
err := cs.Fetch(uuid)
|
err := cs.Fetch(uuid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cs.log.WithError(err).Warning("failed to fetch certificate")
|
cs.log.WithError(err).Warning("failed to fetch certificate")
|
||||||
|
@ -55,7 +55,7 @@ func doGlobalSetup(outpost api.Outpost, globalConfig *api.Config) {
|
|||||||
EnableTracing: true,
|
EnableTracing: true,
|
||||||
TracesSampler: sentryutils.SamplerFunc(float64(globalConfig.ErrorReporting.TracesSampleRate)),
|
TracesSampler: sentryutils.SamplerFunc(float64(globalConfig.ErrorReporting.TracesSampleRate)),
|
||||||
Release: fmt.Sprintf("authentik@%s", constants.VERSION),
|
Release: fmt.Sprintf("authentik@%s", constants.VERSION),
|
||||||
HTTPTransport: webutils.NewUserAgentTransport(constants.OutpostUserAgent(), http.DefaultTransport),
|
HTTPTransport: webutils.NewUserAgentTransport(constants.UserAgentOutpost(), http.DefaultTransport),
|
||||||
IgnoreErrors: []string{
|
IgnoreErrors: []string{
|
||||||
http.ErrAbortHandler.Error(),
|
http.ErrAbortHandler.Error(),
|
||||||
},
|
},
|
||||||
|
@ -61,7 +61,7 @@ func NewFlowExecutor(ctx context.Context, flowSlug string, refConfig *api.Config
|
|||||||
l.WithError(err).Warning("Failed to create cookiejar")
|
l.WithError(err).Warning("Failed to create cookiejar")
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
transport := web.NewUserAgentTransport(constants.OutpostUserAgent(), web.NewTracingTransport(rsp.Context(), ak.GetTLSTransport()))
|
transport := web.NewUserAgentTransport(constants.UserAgentOutpost(), web.NewTracingTransport(rsp.Context(), ak.GetTLSTransport()))
|
||||||
fe := &FlowExecutor{
|
fe := &FlowExecutor{
|
||||||
Params: url.Values{},
|
Params: url.Values{},
|
||||||
Answers: make(map[StageComponent]string),
|
Answers: make(map[StageComponent]string),
|
||||||
|
@ -52,7 +52,7 @@ func (a *Application) addHeaders(headers http.Header, c *Claims) {
|
|||||||
headers.Set("X-authentik-meta-outpost", a.outpostName)
|
headers.Set("X-authentik-meta-outpost", a.outpostName)
|
||||||
headers.Set("X-authentik-meta-provider", a.proxyConfig.Name)
|
headers.Set("X-authentik-meta-provider", a.proxyConfig.Name)
|
||||||
headers.Set("X-authentik-meta-app", a.proxyConfig.AssignedApplicationSlug)
|
headers.Set("X-authentik-meta-app", a.proxyConfig.AssignedApplicationSlug)
|
||||||
headers.Set("X-authentik-meta-version", constants.OutpostUserAgent())
|
headers.Set("X-authentik-meta-version", constants.UserAgentOutpost())
|
||||||
|
|
||||||
if c.Proxy == nil {
|
if c.Proxy == nil {
|
||||||
return
|
return
|
||||||
|
@ -31,7 +31,7 @@ func (ps *ProxyServer) Refresh() error {
|
|||||||
ua := fmt.Sprintf(" (provider=%s)", provider.Name)
|
ua := fmt.Sprintf(" (provider=%s)", provider.Name)
|
||||||
hc := &http.Client{
|
hc := &http.Client{
|
||||||
Transport: web.NewUserAgentTransport(
|
Transport: web.NewUserAgentTransport(
|
||||||
constants.OutpostUserAgent()+ua,
|
constants.UserAgentOutpost()+ua,
|
||||||
web.NewTracingTransport(
|
web.NewTracingTransport(
|
||||||
rsp.Context(),
|
rsp.Context(),
|
||||||
ak.GetTLSTransport(),
|
ak.GetTLSTransport(),
|
||||||
|
@ -61,7 +61,7 @@ func (c *Connection) initSocket(forChannel string) error {
|
|||||||
|
|
||||||
header := http.Header{
|
header := http.Header{
|
||||||
"Authorization": []string{authHeader},
|
"Authorization": []string{authHeader},
|
||||||
"User-Agent": []string{constants.OutpostUserAgent()},
|
"User-Agent": []string{constants.UserAgentOutpost()},
|
||||||
}
|
}
|
||||||
|
|
||||||
dialer := websocket.Dialer{
|
dialer := websocket.Dialer{
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package web
|
package web
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
@ -9,6 +10,14 @@ import (
|
|||||||
"goauthentik.io/internal/config"
|
"goauthentik.io/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type allowedProxyRequestContext string
|
||||||
|
|
||||||
|
const allowedProxyRequest allowedProxyRequestContext = ""
|
||||||
|
|
||||||
|
func IsRequestFromTrustedProxy(r *http.Request) bool {
|
||||||
|
return r.Context().Value(allowedProxyRequest) != nil
|
||||||
|
}
|
||||||
|
|
||||||
// ProxyHeaders Set proxy headers like X-Forwarded-For and such, but only if the direct connection
|
// ProxyHeaders Set proxy headers like X-Forwarded-For and such, but only if the direct connection
|
||||||
// comes from a client that's in a list of trusted CIDRs
|
// comes from a client that's in a list of trusted CIDRs
|
||||||
func ProxyHeaders() func(http.Handler) http.Handler {
|
func ProxyHeaders() func(http.Handler) http.Handler {
|
||||||
@ -20,7 +29,6 @@ func ProxyHeaders() func(http.Handler) http.Handler {
|
|||||||
}
|
}
|
||||||
nets = append(nets, cidr)
|
nets = append(nets, cidr)
|
||||||
}
|
}
|
||||||
ph := handlers.ProxyHeaders
|
|
||||||
return func(h http.Handler) http.Handler {
|
return func(h http.Handler) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
host, _, err := net.SplitHostPort(r.RemoteAddr)
|
host, _, err := net.SplitHostPort(r.RemoteAddr)
|
||||||
@ -30,7 +38,8 @@ func ProxyHeaders() func(http.Handler) http.Handler {
|
|||||||
for _, allowedCidr := range nets {
|
for _, allowedCidr := range nets {
|
||||||
if remoteAddr != nil && allowedCidr.Contains(remoteAddr) {
|
if remoteAddr != nil && allowedCidr.Contains(remoteAddr) {
|
||||||
log.WithField("remoteAddr", remoteAddr).WithField("cidr", allowedCidr.String()).Trace("Setting proxy headers")
|
log.WithField("remoteAddr", remoteAddr).WithField("cidr", allowedCidr.String()).Trace("Setting proxy headers")
|
||||||
ph(h).ServeHTTP(w, r)
|
rr := r.WithContext(context.WithValue(r.Context(), allowedProxyRequest, true))
|
||||||
|
handlers.ProxyHeaders(h).ServeHTTP(w, rr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ package brand_tls
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"crypto/x509"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -56,22 +57,37 @@ func (w *Watcher) Check() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
for _, b := range brands {
|
for _, b := range brands {
|
||||||
kp := b.WebCertificate.Get()
|
kp := b.GetWebCertificate()
|
||||||
if kp == nil {
|
if kp != "" {
|
||||||
continue
|
err := w.cs.AddKeypair(kp)
|
||||||
|
if err != nil {
|
||||||
|
w.log.WithError(err).WithField("kp", kp).Warning("failed to add web certificate")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
err := w.cs.AddKeypair(*kp)
|
for _, crt := range b.GetClientCertificates() {
|
||||||
if err != nil {
|
if crt != "" {
|
||||||
w.log.WithError(err).Warning("failed to add certificate")
|
err := w.cs.AddKeypair(crt)
|
||||||
|
if err != nil {
|
||||||
|
w.log.WithError(err).WithField("kp", kp).Warning("failed to add client certificate")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
w.brands = brands
|
w.brands = brands
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Watcher) GetCertificate(ch *tls.ClientHelloInfo) (*tls.Certificate, error) {
|
type CertificateConfig struct {
|
||||||
|
Web *tls.Certificate
|
||||||
|
Client *x509.CertPool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *Watcher) GetCertificate(ch *tls.ClientHelloInfo) *CertificateConfig {
|
||||||
var bestSelection *api.Brand
|
var bestSelection *api.Brand
|
||||||
|
config := CertificateConfig{
|
||||||
|
Web: w.fallback,
|
||||||
|
}
|
||||||
for _, t := range w.brands {
|
for _, t := range w.brands {
|
||||||
if t.WebCertificate.Get() == nil {
|
if !t.WebCertificate.IsSet() && len(t.GetClientCertificates()) < 1 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if *t.Default {
|
if *t.Default {
|
||||||
@ -82,11 +98,20 @@ func (w *Watcher) GetCertificate(ch *tls.ClientHelloInfo) (*tls.Certificate, err
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if bestSelection == nil {
|
if bestSelection == nil {
|
||||||
return w.fallback, nil
|
return &config
|
||||||
}
|
}
|
||||||
cert := w.cs.Get(bestSelection.GetWebCertificate())
|
if bestSelection.GetWebCertificate() != "" {
|
||||||
if cert == nil {
|
if cert := w.cs.Get(bestSelection.GetWebCertificate()); cert != nil {
|
||||||
return w.fallback, nil
|
config.Web = cert
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return cert, nil
|
if len(bestSelection.GetClientCertificates()) > 0 {
|
||||||
|
config.Client = x509.NewCertPool()
|
||||||
|
for _, kp := range bestSelection.GetClientCertificates() {
|
||||||
|
if cert := w.cs.Get(kp); cert != nil {
|
||||||
|
config.Client.AddCert(cert.Leaf)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &config
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,11 @@
|
|||||||
package web
|
package web
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/base64"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/securecookie"
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
"github.com/prometheus/client_golang/prometheus/promauto"
|
"github.com/prometheus/client_golang/prometheus/promauto"
|
||||||
"github.com/prometheus/client_golang/prometheus/promhttp"
|
"github.com/prometheus/client_golang/prometheus/promhttp"
|
||||||
@ -18,8 +14,6 @@ import (
|
|||||||
"goauthentik.io/internal/utils/sentry"
|
"goauthentik.io/internal/utils/sentry"
|
||||||
)
|
)
|
||||||
|
|
||||||
const MetricsKeyFile = "authentik-core-metrics.key"
|
|
||||||
|
|
||||||
var Requests = promauto.NewHistogramVec(prometheus.HistogramOpts{
|
var Requests = promauto.NewHistogramVec(prometheus.HistogramOpts{
|
||||||
Name: "authentik_main_request_duration_seconds",
|
Name: "authentik_main_request_duration_seconds",
|
||||||
Help: "API request latencies in seconds",
|
Help: "API request latencies in seconds",
|
||||||
@ -27,14 +21,6 @@ var Requests = promauto.NewHistogramVec(prometheus.HistogramOpts{
|
|||||||
|
|
||||||
func (ws *WebServer) runMetricsServer() {
|
func (ws *WebServer) runMetricsServer() {
|
||||||
l := log.WithField("logger", "authentik.router.metrics")
|
l := log.WithField("logger", "authentik.router.metrics")
|
||||||
tmp := os.TempDir()
|
|
||||||
key := base64.StdEncoding.EncodeToString(securecookie.GenerateRandomKey(64))
|
|
||||||
keyPath := path.Join(tmp, MetricsKeyFile)
|
|
||||||
err := os.WriteFile(keyPath, []byte(key), 0o600)
|
|
||||||
if err != nil {
|
|
||||||
l.WithError(err).Warning("failed to save metrics key")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
m := mux.NewRouter()
|
m := mux.NewRouter()
|
||||||
m.Use(sentry.SentryNoSampleMiddleware)
|
m.Use(sentry.SentryNoSampleMiddleware)
|
||||||
@ -51,7 +37,7 @@ func (ws *WebServer) runMetricsServer() {
|
|||||||
l.WithError(err).Warning("failed to get upstream metrics")
|
l.WithError(err).Warning("failed to get upstream metrics")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
re.Header.Set("Authorization", fmt.Sprintf("Bearer %s", key))
|
re.Header.Set("Authorization", fmt.Sprintf("Bearer %s", ws.metricsKey))
|
||||||
res, err := ws.upstreamHttpClient().Do(re)
|
res, err := ws.upstreamHttpClient().Do(re)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
l.WithError(err).Warning("failed to get upstream metrics")
|
l.WithError(err).Warning("failed to get upstream metrics")
|
||||||
@ -64,13 +50,9 @@ func (ws *WebServer) runMetricsServer() {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
l.WithField("listen", config.Get().Listen.Metrics).Info("Starting Metrics server")
|
l.WithField("listen", config.Get().Listen.Metrics).Info("Starting Metrics server")
|
||||||
err = http.ListenAndServe(config.Get().Listen.Metrics, m)
|
err := http.ListenAndServe(config.Get().Listen.Metrics, m)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
l.WithError(err).Warning("Failed to start metrics server")
|
l.WithError(err).Warning("Failed to start metrics server")
|
||||||
}
|
}
|
||||||
l.WithField("listen", config.Get().Listen.Metrics).Info("Stopping Metrics server")
|
l.WithField("listen", config.Get().Listen.Metrics).Info("Stopping Metrics server")
|
||||||
err = os.Remove(keyPath)
|
|
||||||
if err != nil {
|
|
||||||
l.WithError(err).Warning("failed to remove metrics key file")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -2,21 +2,29 @@ package web
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"encoding/pem"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httputil"
|
"net/http/httputil"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
"goauthentik.io/internal/config"
|
"goauthentik.io/internal/config"
|
||||||
"goauthentik.io/internal/utils/sentry"
|
"goauthentik.io/internal/utils/sentry"
|
||||||
|
"goauthentik.io/internal/utils/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrAuthentikStarting = errors.New("authentik starting")
|
ErrAuthentikStarting = errors.New("authentik starting")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
maxBodyBytes = 32 * 1024 * 1024
|
||||||
|
)
|
||||||
|
|
||||||
func (ws *WebServer) configureProxy() {
|
func (ws *WebServer) configureProxy() {
|
||||||
// Reverse proxy to the application server
|
// Reverse proxy to the application server
|
||||||
director := func(req *http.Request) {
|
director := func(req *http.Request) {
|
||||||
@ -26,8 +34,25 @@ func (ws *WebServer) configureProxy() {
|
|||||||
// explicitly disable User-Agent so it's not set to default value
|
// explicitly disable User-Agent so it's not set to default value
|
||||||
req.Header.Set("User-Agent", "")
|
req.Header.Set("User-Agent", "")
|
||||||
}
|
}
|
||||||
|
if !web.IsRequestFromTrustedProxy(req) {
|
||||||
|
// If the request isn't coming from a trusted proxy, delete MTLS headers
|
||||||
|
req.Header.Del("SSL-Client-Cert") // nginx-ingress
|
||||||
|
req.Header.Del("X-Forwarded-TLS-Client-Cert") // traefik
|
||||||
|
req.Header.Del("X-Forwarded-Client-Cert") // envoy
|
||||||
|
}
|
||||||
if req.TLS != nil {
|
if req.TLS != nil {
|
||||||
req.Header.Set("X-Forwarded-Proto", "https")
|
req.Header.Set("X-Forwarded-Proto", "https")
|
||||||
|
if len(req.TLS.PeerCertificates) > 0 {
|
||||||
|
pems := make([]string, len(req.TLS.PeerCertificates))
|
||||||
|
for i, crt := range req.TLS.PeerCertificates {
|
||||||
|
pem := pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "CERTIFICATE",
|
||||||
|
Bytes: crt.Raw,
|
||||||
|
})
|
||||||
|
pems[i] = "Cert=" + url.QueryEscape(string(pem))
|
||||||
|
}
|
||||||
|
req.Header.Set("X-Forwarded-Client-Cert", strings.Join(pems, ","))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ws.log.WithField("url", req.URL.String()).WithField("headers", req.Header).Trace("tracing request to backend")
|
ws.log.WithField("url", req.URL.String()).WithField("headers", req.Header).Trace("tracing request to backend")
|
||||||
}
|
}
|
||||||
@ -57,7 +82,7 @@ func (ws *WebServer) configureProxy() {
|
|||||||
Requests.With(prometheus.Labels{
|
Requests.With(prometheus.Labels{
|
||||||
"dest": "core",
|
"dest": "core",
|
||||||
}).Observe(float64(elapsed) / float64(time.Second))
|
}).Observe(float64(elapsed) / float64(time.Second))
|
||||||
r.Body = http.MaxBytesReader(rw, r.Body, 32*1024*1024)
|
r.Body = http.MaxBytesReader(rw, r.Body, maxBodyBytes)
|
||||||
rp.ServeHTTP(rw, r)
|
rp.ServeHTTP(rw, r)
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package web
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/base64"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
@ -13,17 +14,27 @@ import (
|
|||||||
|
|
||||||
"github.com/gorilla/handlers"
|
"github.com/gorilla/handlers"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
|
"github.com/gorilla/securecookie"
|
||||||
"github.com/pires/go-proxyproto"
|
"github.com/pires/go-proxyproto"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
|
"goauthentik.io/api/v3"
|
||||||
"goauthentik.io/internal/config"
|
"goauthentik.io/internal/config"
|
||||||
|
"goauthentik.io/internal/constants"
|
||||||
"goauthentik.io/internal/gounicorn"
|
"goauthentik.io/internal/gounicorn"
|
||||||
|
"goauthentik.io/internal/outpost/ak"
|
||||||
"goauthentik.io/internal/outpost/proxyv2"
|
"goauthentik.io/internal/outpost/proxyv2"
|
||||||
"goauthentik.io/internal/utils"
|
"goauthentik.io/internal/utils"
|
||||||
"goauthentik.io/internal/utils/web"
|
"goauthentik.io/internal/utils/web"
|
||||||
"goauthentik.io/internal/web/brand_tls"
|
"goauthentik.io/internal/web/brand_tls"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
IPCKeyFile = "authentik-core-ipc.key"
|
||||||
|
MetricsKeyFile = "authentik-core-metrics.key"
|
||||||
|
UnixSocketName = "authentik-core.sock"
|
||||||
|
)
|
||||||
|
|
||||||
type WebServer struct {
|
type WebServer struct {
|
||||||
Bind string
|
Bind string
|
||||||
BindTLS bool
|
BindTLS bool
|
||||||
@ -40,9 +51,10 @@ type WebServer struct {
|
|||||||
log *log.Entry
|
log *log.Entry
|
||||||
upstreamClient *http.Client
|
upstreamClient *http.Client
|
||||||
upstreamURL *url.URL
|
upstreamURL *url.URL
|
||||||
}
|
|
||||||
|
|
||||||
const UnixSocketName = "authentik-core.sock"
|
metricsKey string
|
||||||
|
ipcKey string
|
||||||
|
}
|
||||||
|
|
||||||
func NewWebServer() *WebServer {
|
func NewWebServer() *WebServer {
|
||||||
l := log.WithField("logger", "authentik.router")
|
l := log.WithField("logger", "authentik.router")
|
||||||
@ -76,7 +88,7 @@ func NewWebServer() *WebServer {
|
|||||||
mainRouter: mainHandler,
|
mainRouter: mainHandler,
|
||||||
loggingRouter: loggingHandler,
|
loggingRouter: loggingHandler,
|
||||||
log: l,
|
log: l,
|
||||||
gunicornReady: true,
|
gunicornReady: false,
|
||||||
upstreamClient: upstreamClient,
|
upstreamClient: upstreamClient,
|
||||||
upstreamURL: u,
|
upstreamURL: u,
|
||||||
}
|
}
|
||||||
@ -103,7 +115,59 @@ func NewWebServer() *WebServer {
|
|||||||
return ws
|
return ws
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ws *WebServer) prepareKeys() {
|
||||||
|
tmp := os.TempDir()
|
||||||
|
key := base64.StdEncoding.EncodeToString(securecookie.GenerateRandomKey(64))
|
||||||
|
err := os.WriteFile(path.Join(tmp, MetricsKeyFile), []byte(key), 0o600)
|
||||||
|
if err != nil {
|
||||||
|
ws.log.WithError(err).Warning("failed to save metrics key")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ws.metricsKey = key
|
||||||
|
|
||||||
|
key = base64.StdEncoding.EncodeToString(securecookie.GenerateRandomKey(64))
|
||||||
|
err = os.WriteFile(path.Join(tmp, IPCKeyFile), []byte(key), 0o600)
|
||||||
|
if err != nil {
|
||||||
|
ws.log.WithError(err).Warning("failed to save ipc key")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ws.ipcKey = key
|
||||||
|
}
|
||||||
|
|
||||||
func (ws *WebServer) Start() {
|
func (ws *WebServer) Start() {
|
||||||
|
ws.prepareKeys()
|
||||||
|
|
||||||
|
u, err := url.Parse(fmt.Sprintf("http://%s%s", config.Get().Listen.HTTP, config.Get().Web.Path))
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
apiConfig := api.NewConfiguration()
|
||||||
|
apiConfig.Host = u.Host
|
||||||
|
apiConfig.Scheme = u.Scheme
|
||||||
|
apiConfig.HTTPClient = &http.Client{
|
||||||
|
Transport: web.NewUserAgentTransport(
|
||||||
|
constants.UserAgentIPC(),
|
||||||
|
ak.GetTLSTransport(),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
apiConfig.Servers = api.ServerConfigurations{
|
||||||
|
{
|
||||||
|
URL: fmt.Sprintf("%sapi/v3", u.Path),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
apiConfig.AddDefaultHeader("Authorization", fmt.Sprintf("Bearer %s", ws.ipcKey))
|
||||||
|
|
||||||
|
// create the API client, with the transport
|
||||||
|
apiClient := api.NewAPIClient(apiConfig)
|
||||||
|
|
||||||
|
// Init brand_tls here too since it requires an API Client,
|
||||||
|
// so we just reuse the same one as the outpost uses
|
||||||
|
tw := brand_tls.NewWatcher(apiClient)
|
||||||
|
ws.BrandTLS = tw
|
||||||
|
ws.g.AddHealthyCallback(func() {
|
||||||
|
go tw.Start()
|
||||||
|
})
|
||||||
|
|
||||||
go ws.runMetricsServer()
|
go ws.runMetricsServer()
|
||||||
go ws.attemptStartBackend()
|
go ws.attemptStartBackend()
|
||||||
go ws.listenPlain()
|
go ws.listenPlain()
|
||||||
@ -112,23 +176,23 @@ func (ws *WebServer) Start() {
|
|||||||
|
|
||||||
func (ws *WebServer) attemptStartBackend() {
|
func (ws *WebServer) attemptStartBackend() {
|
||||||
for {
|
for {
|
||||||
if !ws.gunicornReady {
|
if ws.gunicornReady {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err := ws.g.Start()
|
err := ws.g.Start()
|
||||||
log.WithField("logger", "authentik.router").WithError(err).Warning("gunicorn process died, restarting")
|
ws.log.WithError(err).Warning("gunicorn process died, restarting")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithField("logger", "authentik.router").WithError(err).Error("gunicorn failed to start, restarting")
|
ws.log.WithError(err).Error("gunicorn failed to start, restarting")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
failedChecks := 0
|
failedChecks := 0
|
||||||
for range time.NewTicker(30 * time.Second).C {
|
for range time.NewTicker(30 * time.Second).C {
|
||||||
if !ws.g.IsRunning() {
|
if !ws.g.IsRunning() {
|
||||||
log.WithField("logger", "authentik.router").Warningf("gunicorn process failed healthcheck %d times", failedChecks)
|
ws.log.Warningf("gunicorn process failed healthcheck %d times", failedChecks)
|
||||||
failedChecks += 1
|
failedChecks += 1
|
||||||
}
|
}
|
||||||
if failedChecks >= 3 {
|
if failedChecks >= 3 {
|
||||||
log.WithField("logger", "authentik.router").WithError(err).Error("gunicorn process failed healthcheck three times, restarting")
|
ws.log.WithError(err).Error("gunicorn process failed healthcheck three times, restarting")
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -146,6 +210,15 @@ func (ws *WebServer) upstreamHttpClient() *http.Client {
|
|||||||
func (ws *WebServer) Shutdown() {
|
func (ws *WebServer) Shutdown() {
|
||||||
ws.log.Info("shutting down gunicorn")
|
ws.log.Info("shutting down gunicorn")
|
||||||
ws.g.Kill()
|
ws.g.Kill()
|
||||||
|
tmp := os.TempDir()
|
||||||
|
err := os.Remove(path.Join(tmp, MetricsKeyFile))
|
||||||
|
if err != nil {
|
||||||
|
ws.log.WithError(err).Warning("failed to remove metrics key file")
|
||||||
|
}
|
||||||
|
err = os.Remove(path.Join(tmp, IPCKeyFile))
|
||||||
|
if err != nil {
|
||||||
|
ws.log.WithError(err).Warning("failed to remove ipc key file")
|
||||||
|
}
|
||||||
ws.stop <- struct{}{}
|
ws.stop <- struct{}{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,40 +12,57 @@ import (
|
|||||||
"goauthentik.io/internal/utils/web"
|
"goauthentik.io/internal/utils/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (ws *WebServer) GetCertificate() func(ch *tls.ClientHelloInfo) (*tls.Certificate, error) {
|
func (ws *WebServer) GetCertificate() func(ch *tls.ClientHelloInfo) (*tls.Config, error) {
|
||||||
cert, err := crypto.GenerateSelfSignedCert()
|
fallback, err := crypto.GenerateSelfSignedCert()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ws.log.WithError(err).Error("failed to generate default cert")
|
ws.log.WithError(err).Error("failed to generate default cert")
|
||||||
}
|
}
|
||||||
return func(ch *tls.ClientHelloInfo) (*tls.Certificate, error) {
|
return func(ch *tls.ClientHelloInfo) (*tls.Config, error) {
|
||||||
|
cfg := utils.GetTLSConfig()
|
||||||
if ch.ServerName == "" {
|
if ch.ServerName == "" {
|
||||||
return &cert, nil
|
cfg.Certificates = []tls.Certificate{fallback}
|
||||||
|
return cfg, nil
|
||||||
}
|
}
|
||||||
if ws.ProxyServer != nil {
|
if ws.ProxyServer != nil {
|
||||||
appCert := ws.ProxyServer.GetCertificate(ch.ServerName)
|
appCert := ws.ProxyServer.GetCertificate(ch.ServerName)
|
||||||
if appCert != nil {
|
if appCert != nil {
|
||||||
return appCert, nil
|
cfg.Certificates = []tls.Certificate{*appCert}
|
||||||
|
return cfg, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ws.BrandTLS != nil {
|
if ws.BrandTLS != nil {
|
||||||
return ws.BrandTLS.GetCertificate(ch)
|
bcert := ws.BrandTLS.GetCertificate(ch)
|
||||||
|
cfg.Certificates = []tls.Certificate{*bcert.Web}
|
||||||
|
ws.log.Trace("using brand web Certificate")
|
||||||
|
if bcert.Client != nil {
|
||||||
|
cfg.ClientCAs = bcert.Client
|
||||||
|
cfg.ClientAuth = tls.RequestClientCert
|
||||||
|
ws.log.Trace("using brand client Certificate")
|
||||||
|
}
|
||||||
|
return cfg, nil
|
||||||
}
|
}
|
||||||
ws.log.Trace("using default, self-signed certificate")
|
ws.log.Trace("using default, self-signed certificate")
|
||||||
return &cert, nil
|
cfg.Certificates = []tls.Certificate{fallback}
|
||||||
|
return cfg, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServeHTTPS constructs a net.Listener and starts handling HTTPS requests
|
// ServeHTTPS constructs a net.Listener and starts handling HTTPS requests
|
||||||
func (ws *WebServer) listenTLS() {
|
func (ws *WebServer) listenTLS() {
|
||||||
tlsConfig := utils.GetTLSConfig()
|
tlsConfig := utils.GetTLSConfig()
|
||||||
tlsConfig.GetCertificate = ws.GetCertificate()
|
tlsConfig.GetConfigForClient = ws.GetCertificate()
|
||||||
|
|
||||||
ln, err := net.Listen("tcp", config.Get().Listen.HTTPS)
|
ln, err := net.Listen("tcp", config.Get().Listen.HTTPS)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ws.log.WithError(err).Warning("failed to listen (TLS)")
|
ws.log.WithError(err).Warning("failed to listen (TLS)")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
proxyListener := &proxyproto.Listener{
|
||||||
|
Listener: web.TCPKeepAliveListener{
|
||||||
|
TCPListener: ln.(*net.TCPListener),
|
||||||
|
},
|
||||||
|
ConnPolicy: utils.GetProxyConnectionPolicy(),
|
||||||
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
err := proxyListener.Close()
|
err := proxyListener.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -56,6 +56,7 @@ EXPOSE 3389 6636 9300
|
|||||||
|
|
||||||
USER 1000
|
USER 1000
|
||||||
|
|
||||||
ENV GOFIPS=1
|
ENV TMPDIR=/dev/shm/ \
|
||||||
|
GOFIPS=1
|
||||||
|
|
||||||
ENTRYPOINT ["/ldap"]
|
ENTRYPOINT ["/ldap"]
|
||||||
|
@ -62,7 +62,8 @@ function prepare_debug {
|
|||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y --no-install-recommends krb5-kdc krb5-user krb5-admin-server libkrb5-dev gcc
|
apt-get install -y --no-install-recommends krb5-kdc krb5-user krb5-admin-server libkrb5-dev gcc
|
||||||
VIRTUAL_ENV=/ak-root/.venv uv sync --frozen
|
source "${VENV_PATH}/bin/activate"
|
||||||
|
uv sync --active --frozen
|
||||||
touch /unittest.xml
|
touch /unittest.xml
|
||||||
chown authentik:authentik /unittest.xml
|
chown authentik:authentik /unittest.xml
|
||||||
}
|
}
|
||||||
@ -96,6 +97,7 @@ elif [[ "$1" == "test-all" ]]; then
|
|||||||
elif [[ "$1" == "healthcheck" ]]; then
|
elif [[ "$1" == "healthcheck" ]]; then
|
||||||
run_authentik healthcheck $(cat $MODE_FILE)
|
run_authentik healthcheck $(cat $MODE_FILE)
|
||||||
elif [[ "$1" == "dump_config" ]]; then
|
elif [[ "$1" == "dump_config" ]]; then
|
||||||
|
shift
|
||||||
exec python -m authentik.lib.config $@
|
exec python -m authentik.lib.config $@
|
||||||
elif [[ "$1" == "debug" ]]; then
|
elif [[ "$1" == "debug" ]]; then
|
||||||
exec sleep infinity
|
exec sleep infinity
|
||||||
|
8
lifecycle/aws/package-lock.json
generated
8
lifecycle/aws/package-lock.json
generated
@ -9,7 +9,7 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"aws-cdk": "^2.1012.0",
|
"aws-cdk": "^2.1016.0",
|
||||||
"cross-env": "^7.0.3"
|
"cross-env": "^7.0.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
@ -17,9 +17,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk": {
|
"node_modules/aws-cdk": {
|
||||||
"version": "2.1012.0",
|
"version": "2.1016.0",
|
||||||
"resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1012.0.tgz",
|
"resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.1016.0.tgz",
|
||||||
"integrity": "sha512-C6jSWkqP0hkY2Cs300VJHjspmTXDTMfB813kwZvRbd/OsKBfTBJBbYU16VoLAp1LVEOnQMf8otSlaSgzVF0X9A==",
|
"integrity": "sha512-zdJ/tQp0iE/s8l8zLQPgdUJUHpS6KblkzdP5nOYC/NbD5OCdhS8QS7vLBkT8M7mNyZh3Ep3C+/m6NsxrurRe0A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
"node": ">=20"
|
"node": ">=20"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"aws-cdk": "^2.1012.0",
|
"aws-cdk": "^2.1016.0",
|
||||||
"cross-env": "^7.0.3"
|
"cross-env": "^7.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ Parameters:
|
|||||||
Description: authentik Docker image
|
Description: authentik Docker image
|
||||||
AuthentikVersion:
|
AuthentikVersion:
|
||||||
Type: String
|
Type: String
|
||||||
Default: 2025.2.4
|
Default: 2025.4.1
|
||||||
Description: authentik Docker image tag
|
Description: authentik Docker image tag
|
||||||
AuthentikServerCPU:
|
AuthentikServerCPU:
|
||||||
Type: Number
|
Type: Number
|
||||||
|
Binary file not shown.
@ -8,7 +8,6 @@
|
|||||||
# Jens L. <jens@goauthentik.io>, 2022
|
# Jens L. <jens@goauthentik.io>, 2022
|
||||||
# Lars Lehmann <lars@lars-lehmann.net>, 2023
|
# Lars Lehmann <lars@lars-lehmann.net>, 2023
|
||||||
# Johannes —/—, 2023
|
# Johannes —/—, 2023
|
||||||
# Dominic Wagner <mail@dominic-wagner.de>, 2023
|
|
||||||
# fde4f289d99ed356ff5cfdb762dc44aa_a8a971d, 2023
|
# fde4f289d99ed356ff5cfdb762dc44aa_a8a971d, 2023
|
||||||
# Christian Foellmann <foellmann@foe-services.de>, 2023
|
# Christian Foellmann <foellmann@foe-services.de>, 2023
|
||||||
# kidhab, 2023
|
# kidhab, 2023
|
||||||
@ -30,17 +29,18 @@
|
|||||||
# Alexander Möbius, 2025
|
# Alexander Möbius, 2025
|
||||||
# Jonas, 2025
|
# Jonas, 2025
|
||||||
# Niklas Kroese, 2025
|
# Niklas Kroese, 2025
|
||||||
# 97cce0ae0cad2a2cc552d3165d04643e_de3d740, 2025
|
|
||||||
# datenschmutz, 2025
|
# datenschmutz, 2025
|
||||||
|
# 97cce0ae0cad2a2cc552d3165d04643e_de3d740, 2025
|
||||||
|
# Dominic Wagner <mail@dominic-wagner.de>, 2025
|
||||||
#
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-04-11 00:10+0000\n"
|
"POT-Creation-Date: 2025-04-23 09:00+0000\n"
|
||||||
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
||||||
"Last-Translator: datenschmutz, 2025\n"
|
"Last-Translator: Dominic Wagner <mail@dominic-wagner.de>, 2025\n"
|
||||||
"Language-Team: German (https://app.transifex.com/authentik/teams/119923/de/)\n"
|
"Language-Team: German (https://app.transifex.com/authentik/teams/119923/de/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -214,6 +214,7 @@ msgid "User's display name."
|
|||||||
msgstr "Anzeigename"
|
msgstr "Anzeigename"
|
||||||
|
|
||||||
#: authentik/core/models.py authentik/providers/oauth2/models.py
|
#: authentik/core/models.py authentik/providers/oauth2/models.py
|
||||||
|
#: authentik/rbac/models.py
|
||||||
msgid "User"
|
msgid "User"
|
||||||
msgstr "Benutzer"
|
msgstr "Benutzer"
|
||||||
|
|
||||||
@ -402,6 +403,18 @@ msgstr "Eigenschaft"
|
|||||||
msgid "Property Mappings"
|
msgid "Property Mappings"
|
||||||
msgstr "Eigenschaften"
|
msgstr "Eigenschaften"
|
||||||
|
|
||||||
|
#: authentik/core/models.py
|
||||||
|
msgid "session data"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/core/models.py
|
||||||
|
msgid "Session"
|
||||||
|
msgstr "Sitzung"
|
||||||
|
|
||||||
|
#: authentik/core/models.py
|
||||||
|
msgid "Sessions"
|
||||||
|
msgstr "Sitzungen"
|
||||||
|
|
||||||
#: authentik/core/models.py
|
#: authentik/core/models.py
|
||||||
msgid "Authenticated Session"
|
msgid "Authenticated Session"
|
||||||
msgstr "Authentifizierte Sitzung"
|
msgstr "Authentifizierte Sitzung"
|
||||||
@ -511,6 +524,38 @@ msgstr "Lizenzverwendung"
|
|||||||
msgid "License Usage Records"
|
msgid "License Usage Records"
|
||||||
msgstr "Lizenzverwendung Aufzeichnungen"
|
msgstr "Lizenzverwendung Aufzeichnungen"
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
#: authentik/policies/password/models.py
|
||||||
|
msgid "Field key to check, field keys defined in Prompt stages are available."
|
||||||
|
msgstr ""
|
||||||
|
"Zu prüfender Feldschlüssel, die in den Aufforderungsstufen definierten "
|
||||||
|
"Feldschlüssel sind verfügbar."
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "Number of passwords to check against."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
#: authentik/policies/password/models.py
|
||||||
|
msgid "Password not set in context"
|
||||||
|
msgstr "Passwort nicht im Kontext festgelegt"
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "This password has been used previously. Please choose a different one."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "Password Uniqueness Policy"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "Password Uniqueness Policies"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "User Password History"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/enterprise/policy.py
|
#: authentik/enterprise/policy.py
|
||||||
msgid "Enterprise required to access this feature."
|
msgid "Enterprise required to access this feature."
|
||||||
msgstr "Enterprise ist erforderlich, um auf diese Funktion zuzugreifen."
|
msgstr "Enterprise ist erforderlich, um auf diese Funktion zuzugreifen."
|
||||||
@ -1303,12 +1348,6 @@ msgstr "Richtlinien Cache Metriken anzeigen"
|
|||||||
msgid "Clear Policy's cache metrics"
|
msgid "Clear Policy's cache metrics"
|
||||||
msgstr "Richtlinien Cache Metriken löschen"
|
msgstr "Richtlinien Cache Metriken löschen"
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
|
||||||
msgid "Field key to check, field keys defined in Prompt stages are available."
|
|
||||||
msgstr ""
|
|
||||||
"Zu prüfender Feldschlüssel, die in den Aufforderungsstufen definierten "
|
|
||||||
"Feldschlüssel sind verfügbar."
|
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
#: authentik/policies/password/models.py
|
||||||
msgid "How many times the password hash is allowed to be on haveibeenpwned"
|
msgid "How many times the password hash is allowed to be on haveibeenpwned"
|
||||||
msgstr "Wie häufig der Passwort-Hash auf haveibeenpwned vertreten sein darf"
|
msgstr "Wie häufig der Passwort-Hash auf haveibeenpwned vertreten sein darf"
|
||||||
@ -1320,10 +1359,6 @@ msgstr ""
|
|||||||
"Die Richtlinie wird verweigert, wenn die zxcvbn-Bewertung gleich oder "
|
"Die Richtlinie wird verweigert, wenn die zxcvbn-Bewertung gleich oder "
|
||||||
"kleiner diesem Wert ist."
|
"kleiner diesem Wert ist."
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
|
||||||
msgid "Password not set in context"
|
|
||||||
msgstr "Passwort nicht im Kontext festgelegt"
|
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
#: authentik/policies/password/models.py
|
||||||
msgid "Invalid password."
|
msgid "Invalid password."
|
||||||
msgstr "Ungültiges Passwort."
|
msgstr "Ungültiges Passwort."
|
||||||
@ -1365,20 +1400,6 @@ msgstr "Reputationswert"
|
|||||||
msgid "Reputation Scores"
|
msgid "Reputation Scores"
|
||||||
msgstr "Reputationswert"
|
msgstr "Reputationswert"
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/buffer.html
|
|
||||||
msgid "Waiting for authentication..."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/buffer.html
|
|
||||||
msgid ""
|
|
||||||
"You're already authenticating in another tab. This page will refresh once "
|
|
||||||
"authentication is completed."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/buffer.html
|
|
||||||
msgid "Authenticate in this tab"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/denied.html
|
#: authentik/policies/templates/policies/denied.html
|
||||||
msgid "Permission denied"
|
msgid "Permission denied"
|
||||||
msgstr "Erlaubnis verweigert"
|
msgstr "Erlaubnis verweigert"
|
||||||
@ -2208,6 +2229,10 @@ msgstr "Rolle"
|
|||||||
msgid "Roles"
|
msgid "Roles"
|
||||||
msgstr "Rollen"
|
msgstr "Rollen"
|
||||||
|
|
||||||
|
#: authentik/rbac/models.py
|
||||||
|
msgid "Initial Permissions"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/rbac/models.py
|
#: authentik/rbac/models.py
|
||||||
msgid "System permission"
|
msgid "System permission"
|
||||||
msgstr "Systemberechtigung"
|
msgstr "Systemberechtigung"
|
||||||
@ -2478,6 +2503,22 @@ msgstr "LDAP Quelle Eigenschafts-Zuordnung"
|
|||||||
msgid "LDAP Source Property Mappings"
|
msgid "LDAP Source Property Mappings"
|
||||||
msgstr "LDAP Quelle Eigenschafts-Zuordnungen"
|
msgstr "LDAP Quelle Eigenschafts-Zuordnungen"
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "User LDAP Source Connection"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "User LDAP Source Connections"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "Group LDAP Source Connection"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "Group LDAP Source Connections"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/sources/ldap/signals.py
|
#: authentik/sources/ldap/signals.py
|
||||||
msgid "Password does not match Active Directory Complexity."
|
msgid "Password does not match Active Directory Complexity."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -2487,6 +2528,14 @@ msgstr ""
|
|||||||
msgid "No token received."
|
msgid "No token received."
|
||||||
msgstr "Kein Token empfangen."
|
msgstr "Kein Token empfangen."
|
||||||
|
|
||||||
|
#: authentik/sources/oauth/models.py
|
||||||
|
msgid "HTTP Basic Authentication"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/oauth/models.py
|
||||||
|
msgid "Include the client ID and secret as request parameters"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/sources/oauth/models.py
|
#: authentik/sources/oauth/models.py
|
||||||
msgid "Request Token URL"
|
msgid "Request Token URL"
|
||||||
msgstr "Token-URL anfordern"
|
msgstr "Token-URL anfordern"
|
||||||
@ -2528,6 +2577,12 @@ msgstr ""
|
|||||||
msgid "Additional Scopes"
|
msgid "Additional Scopes"
|
||||||
msgstr "zusätzliche Scopes"
|
msgstr "zusätzliche Scopes"
|
||||||
|
|
||||||
|
#: authentik/sources/oauth/models.py
|
||||||
|
msgid ""
|
||||||
|
"How to perform authentication during an authorization_code token request "
|
||||||
|
"flow"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/sources/oauth/models.py
|
#: authentik/sources/oauth/models.py
|
||||||
msgid "OAuth Source"
|
msgid "OAuth Source"
|
||||||
msgstr "Outh Quelle"
|
msgstr "Outh Quelle"
|
||||||
@ -3434,6 +3489,12 @@ msgstr ""
|
|||||||
"Wenn aktiviert, wird die Phase auch dann erfolgreich abgeschlossen und "
|
"Wenn aktiviert, wird die Phase auch dann erfolgreich abgeschlossen und "
|
||||||
"fortgesetzt, wenn falsche Benutzerdaten eingegeben wurden."
|
"fortgesetzt, wenn falsche Benutzerdaten eingegeben wurden."
|
||||||
|
|
||||||
|
#: authentik/stages/identification/models.py
|
||||||
|
msgid ""
|
||||||
|
"Show the user the 'Remember me on this device' toggle, allowing repeat users"
|
||||||
|
" to skip straight to entering their password."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/stages/identification/models.py
|
#: authentik/stages/identification/models.py
|
||||||
msgid "Optional enrollment flow, which is linked at the bottom of the page."
|
msgid "Optional enrollment flow, which is linked at the bottom of the page."
|
||||||
msgstr "Optionaler Registrierungs-Flow, der unten auf der Seite verlinkt ist."
|
msgstr "Optionaler Registrierungs-Flow, der unten auf der Seite verlinkt ist."
|
||||||
@ -3826,6 +3887,14 @@ msgstr ""
|
|||||||
"Die Ereignisse werden nach dieser Dauer gelöscht (Format: "
|
"Die Ereignisse werden nach dieser Dauer gelöscht (Format: "
|
||||||
"Wochen=3;Tage=2;Stunden=3,Sekunden=2)."
|
"Wochen=3;Tage=2;Stunden=3,Sekunden=2)."
|
||||||
|
|
||||||
|
#: authentik/tenants/models.py
|
||||||
|
msgid "Reputation cannot decrease lower than this value. Zero or negative."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/tenants/models.py
|
||||||
|
msgid "Reputation cannot increase higher than this value. Zero or positive."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/tenants/models.py
|
#: authentik/tenants/models.py
|
||||||
msgid "The option configures the footer links on the flow executor pages."
|
msgid "The option configures the footer links on the flow executor pages."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
Binary file not shown.
@ -15,7 +15,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-04-11 00:10+0000\n"
|
"POT-Creation-Date: 2025-04-23 09:00+0000\n"
|
||||||
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
||||||
"Last-Translator: Jens L. <jens@goauthentik.io>, 2025\n"
|
"Last-Translator: Jens L. <jens@goauthentik.io>, 2025\n"
|
||||||
"Language-Team: Spanish (https://app.transifex.com/authentik/teams/119923/es/)\n"
|
"Language-Team: Spanish (https://app.transifex.com/authentik/teams/119923/es/)\n"
|
||||||
@ -190,6 +190,7 @@ msgid "User's display name."
|
|||||||
msgstr "Nombre para mostrar del usuario."
|
msgstr "Nombre para mostrar del usuario."
|
||||||
|
|
||||||
#: authentik/core/models.py authentik/providers/oauth2/models.py
|
#: authentik/core/models.py authentik/providers/oauth2/models.py
|
||||||
|
#: authentik/rbac/models.py
|
||||||
msgid "User"
|
msgid "User"
|
||||||
msgstr "Usuario"
|
msgstr "Usuario"
|
||||||
|
|
||||||
@ -378,6 +379,18 @@ msgstr "Asignación de Propiedades"
|
|||||||
msgid "Property Mappings"
|
msgid "Property Mappings"
|
||||||
msgstr "Asignaciones de Propiedades"
|
msgstr "Asignaciones de Propiedades"
|
||||||
|
|
||||||
|
#: authentik/core/models.py
|
||||||
|
msgid "session data"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/core/models.py
|
||||||
|
msgid "Session"
|
||||||
|
msgstr "Sesión"
|
||||||
|
|
||||||
|
#: authentik/core/models.py
|
||||||
|
msgid "Sessions"
|
||||||
|
msgstr "Sesiones"
|
||||||
|
|
||||||
#: authentik/core/models.py
|
#: authentik/core/models.py
|
||||||
msgid "Authenticated Session"
|
msgid "Authenticated Session"
|
||||||
msgstr "Sesión autenticada"
|
msgstr "Sesión autenticada"
|
||||||
@ -485,6 +498,38 @@ msgstr "Uso de Licencias"
|
|||||||
msgid "License Usage Records"
|
msgid "License Usage Records"
|
||||||
msgstr "Registro de Uso de Licencias"
|
msgstr "Registro de Uso de Licencias"
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
#: authentik/policies/password/models.py
|
||||||
|
msgid "Field key to check, field keys defined in Prompt stages are available."
|
||||||
|
msgstr ""
|
||||||
|
"Clave de campo a verificar, las claves de campo definidas en las etapas de "
|
||||||
|
"Solicitud están disponibles."
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "Number of passwords to check against."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
#: authentik/policies/password/models.py
|
||||||
|
msgid "Password not set in context"
|
||||||
|
msgstr "La contraseña no se ha establecido en contexto"
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "This password has been used previously. Please choose a different one."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "Password Uniqueness Policy"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "Password Uniqueness Policies"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/enterprise/policies/unique_password/models.py
|
||||||
|
msgid "User Password History"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/enterprise/policy.py
|
#: authentik/enterprise/policy.py
|
||||||
msgid "Enterprise required to access this feature."
|
msgid "Enterprise required to access this feature."
|
||||||
msgstr "Se requiere de Enterprise para acceder esta característica."
|
msgstr "Se requiere de Enterprise para acceder esta característica."
|
||||||
@ -1268,12 +1313,6 @@ msgstr "Ver las métricas de caché de la Política"
|
|||||||
msgid "Clear Policy's cache metrics"
|
msgid "Clear Policy's cache metrics"
|
||||||
msgstr "Borrar las métricas de caché de la Política"
|
msgstr "Borrar las métricas de caché de la Política"
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
|
||||||
msgid "Field key to check, field keys defined in Prompt stages are available."
|
|
||||||
msgstr ""
|
|
||||||
"Clave de campo a verificar, las claves de campo definidas en las etapas de "
|
|
||||||
"Solicitud están disponibles."
|
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
#: authentik/policies/password/models.py
|
||||||
msgid "How many times the password hash is allowed to be on haveibeenpwned"
|
msgid "How many times the password hash is allowed to be on haveibeenpwned"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -1287,10 +1326,6 @@ msgstr ""
|
|||||||
"Si la puntuación zxcvbn es igual o menor que este valor, la política "
|
"Si la puntuación zxcvbn es igual o menor que este valor, la política "
|
||||||
"fallará."
|
"fallará."
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
|
||||||
msgid "Password not set in context"
|
|
||||||
msgstr "La contraseña no se ha establecido en contexto"
|
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
#: authentik/policies/password/models.py
|
||||||
msgid "Invalid password."
|
msgid "Invalid password."
|
||||||
msgstr "Contraseña inválida."
|
msgstr "Contraseña inválida."
|
||||||
@ -1332,20 +1367,6 @@ msgstr "Puntuación de Reputacion"
|
|||||||
msgid "Reputation Scores"
|
msgid "Reputation Scores"
|
||||||
msgstr "Puntuaciones de Reputacion"
|
msgstr "Puntuaciones de Reputacion"
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/buffer.html
|
|
||||||
msgid "Waiting for authentication..."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/buffer.html
|
|
||||||
msgid ""
|
|
||||||
"You're already authenticating in another tab. This page will refresh once "
|
|
||||||
"authentication is completed."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/buffer.html
|
|
||||||
msgid "Authenticate in this tab"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/policies/templates/policies/denied.html
|
#: authentik/policies/templates/policies/denied.html
|
||||||
msgid "Permission denied"
|
msgid "Permission denied"
|
||||||
msgstr "Permiso denegado"
|
msgstr "Permiso denegado"
|
||||||
@ -2175,6 +2196,10 @@ msgstr "Rol"
|
|||||||
msgid "Roles"
|
msgid "Roles"
|
||||||
msgstr "Roles"
|
msgstr "Roles"
|
||||||
|
|
||||||
|
#: authentik/rbac/models.py
|
||||||
|
msgid "Initial Permissions"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/rbac/models.py
|
#: authentik/rbac/models.py
|
||||||
msgid "System permission"
|
msgid "System permission"
|
||||||
msgstr "Permiso de sistema"
|
msgstr "Permiso de sistema"
|
||||||
@ -2443,6 +2468,22 @@ msgstr "Asignación de Propiedades de Fuente de LDAP"
|
|||||||
msgid "LDAP Source Property Mappings"
|
msgid "LDAP Source Property Mappings"
|
||||||
msgstr "Asignaciones de Propiedades de Fuente de LDAP"
|
msgstr "Asignaciones de Propiedades de Fuente de LDAP"
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "User LDAP Source Connection"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "User LDAP Source Connections"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "Group LDAP Source Connection"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/ldap/models.py
|
||||||
|
msgid "Group LDAP Source Connections"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/sources/ldap/signals.py
|
#: authentik/sources/ldap/signals.py
|
||||||
msgid "Password does not match Active Directory Complexity."
|
msgid "Password does not match Active Directory Complexity."
|
||||||
msgstr "La contraseña no coincide con la complejidad de Active Directory."
|
msgstr "La contraseña no coincide con la complejidad de Active Directory."
|
||||||
@ -2451,6 +2492,14 @@ msgstr "La contraseña no coincide con la complejidad de Active Directory."
|
|||||||
msgid "No token received."
|
msgid "No token received."
|
||||||
msgstr "No se recibió ningún token."
|
msgstr "No se recibió ningún token."
|
||||||
|
|
||||||
|
#: authentik/sources/oauth/models.py
|
||||||
|
msgid "HTTP Basic Authentication"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/sources/oauth/models.py
|
||||||
|
msgid "Include the client ID and secret as request parameters"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/sources/oauth/models.py
|
#: authentik/sources/oauth/models.py
|
||||||
msgid "Request Token URL"
|
msgid "Request Token URL"
|
||||||
msgstr "Solicitar URL de token"
|
msgstr "Solicitar URL de token"
|
||||||
@ -2491,6 +2540,12 @@ msgstr "URL utilizada por authentik para obtener información del usuario."
|
|||||||
msgid "Additional Scopes"
|
msgid "Additional Scopes"
|
||||||
msgstr "Alcances Adicionales"
|
msgstr "Alcances Adicionales"
|
||||||
|
|
||||||
|
#: authentik/sources/oauth/models.py
|
||||||
|
msgid ""
|
||||||
|
"How to perform authentication during an authorization_code token request "
|
||||||
|
"flow"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/sources/oauth/models.py
|
#: authentik/sources/oauth/models.py
|
||||||
msgid "OAuth Source"
|
msgid "OAuth Source"
|
||||||
msgstr "Fuente de OAuth"
|
msgstr "Fuente de OAuth"
|
||||||
@ -3407,6 +3462,12 @@ msgstr ""
|
|||||||
"Cuando está habilitado, la etapa tendrá éxito y continuará incluso cuando se"
|
"Cuando está habilitado, la etapa tendrá éxito y continuará incluso cuando se"
|
||||||
" ingrese información de usuario incorrecta."
|
" ingrese información de usuario incorrecta."
|
||||||
|
|
||||||
|
#: authentik/stages/identification/models.py
|
||||||
|
msgid ""
|
||||||
|
"Show the user the 'Remember me on this device' toggle, allowing repeat users"
|
||||||
|
" to skip straight to entering their password."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/stages/identification/models.py
|
#: authentik/stages/identification/models.py
|
||||||
msgid "Optional enrollment flow, which is linked at the bottom of the page."
|
msgid "Optional enrollment flow, which is linked at the bottom of the page."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -3794,6 +3855,14 @@ msgstr ""
|
|||||||
"Los Eventos serán eliminados después de este periodo. (Formato: "
|
"Los Eventos serán eliminados después de este periodo. (Formato: "
|
||||||
"weeks=3;days=2;hours=3,seconds=2)."
|
"weeks=3;days=2;hours=3,seconds=2)."
|
||||||
|
|
||||||
|
#: authentik/tenants/models.py
|
||||||
|
msgid "Reputation cannot decrease lower than this value. Zero or negative."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/tenants/models.py
|
||||||
|
msgid "Reputation cannot increase higher than this value. Zero or positive."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/tenants/models.py
|
#: authentik/tenants/models.py
|
||||||
msgid "The option configures the footer links on the flow executor pages."
|
msgid "The option configures the footer links on the flow executor pages."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user