Skip to content

Commit 2b3feee

Browse files
dominic-rdominic-r
committed
Merge remote-tracking branch 'origin/main' into mayswind/main
2 parents f6f680a + 1115e6f commit 2b3feee

254 files changed

Lines changed: 22050 additions & 6615 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/setup/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
sudo apt-get install --no-install-recommends -y libpq-dev openssl libxmlsec1-dev pkg-config gettext libkrb5-dev krb5-kdc krb5-user krb5-admin-server
2222
- name: Install uv
2323
if: ${{ contains(inputs.dependencies, 'python') }}
24-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v5
24+
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v5
2525
with:
2626
enable-cache: true
2727
- name: Setup python

‎.github/workflows/_reusable-docker-build-single.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
contents: read
4444
steps:
4545
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
46-
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
46+
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
4747
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
4848
- name: prepare variables
4949
uses: ./.github/actions/docker-push-variables

‎.github/workflows/ci-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
with:
7474
ref: ${{ github.event.pull_request.head.sha }}
7575
- name: Set up QEMU
76-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
76+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
7777
- name: Set up Docker Buildx
7878
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
7979
- name: prepare variables

‎.github/workflows/ci-main.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,15 @@ jobs:
7676
fetch-depth: 0
7777
- name: checkout stable
7878
run: |
79+
set -e -o pipefail
7980
# Copy current, latest config to local
8081
cp authentik/lib/default.yml local.env.yml
8182
cp -R .github ..
8283
cp -R scripts ..
8384
# Previous stable tag
8485
prev_stable=$(git tag --sort=version:refname | grep '^version/' | grep -vE -- '-rc[0-9]+$' | tail -n1)
8586
# Current version family based on
86-
current_version_family=$(python -c "from authentik import VERSION; print(VERSION)" | grep -vE -- 'rc[0-9]+$')
87+
current_version_family=$(cat internal/constants/VERSION | grep -vE -- 'rc[0-9]+$' || true)
8788
if [[ -n $current_version_family ]]; then
8889
prev_stable=$current_version_family
8990
fi

‎.github/workflows/ci-outpost.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Generate API
3535
run: make gen-client-go
3636
- name: golangci-lint
37-
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
37+
uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v8
3838
with:
3939
version: latest
4040
args: --timeout 5000s --verbose
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
ref: ${{ github.event.pull_request.head.sha }}
9292
- name: Set up QEMU
93-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
93+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
9494
- name: Set up Docker Buildx
9595
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
9696
- name: prepare variables

‎.github/workflows/gen-image-compress.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
token: ${{ steps.generate_token.outputs.token }}
3939
- name: Compress images
4040
id: compress
41-
uses: calibreapp/image-actions@05b1cf44e88c3b041b841452482df9497f046ef7 # main
41+
uses: calibreapp/image-actions@420075c115b26f8785e293c5bd5bef0911c506e5 # main
4242
with:
4343
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
4444
compressOnly: ${{ github.event_name != 'pull_request' }}

‎.github/workflows/release-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3535
- name: Set up QEMU
36-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
36+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
3737
- name: Set up Docker Buildx
3838
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
3939
- name: prepare variables
@@ -88,7 +88,7 @@ jobs:
8888
with:
8989
go-version-file: "go.mod"
9090
- name: Set up QEMU
91-
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
91+
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
9292
- name: Set up Docker Buildx
9393
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
9494
- name: prepare variables

‎.github/workflows/release-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
git tag "version/${{ inputs.version }}" HEAD -m "version/${{ inputs.version }}"
9090
git push --follow-tags
9191
- name: Create Release
92-
uses: goauthentik/action-gh-release@84da137b91a625a58fe8a34f3bd6bdb034a49138
92+
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
9393
with:
9494
token: "${{ steps.app-token.outputs.token }}"
9595
tag_name: "version/${{ inputs.version }}"

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN npm run build && \
2626
npm run build:sfe
2727

2828
# Stage 2: Build go proxy
29-
FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.25.4-trixie@sha256:a13297bfdd45d9702badd83b45c6db1f8fee638bba6ece0c359ce51260577bbe AS go-builder
29+
FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.25.4-trixie@sha256:27e1c927a07ed2c7295d39941d6d881424739dbde9ae3055d0d3013699ed35e8 AS go-builder
3030

3131
ARG TARGETOS
3232
ARG TARGETARCH
@@ -76,7 +76,7 @@ RUN --mount=type=secret,id=GEOIPUPDATE_ACCOUNT_ID \
7676
/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"
7777

7878
# Stage 4: Download uv
79-
FROM ghcr.io/astral-sh/uv:0.9.7@sha256:ba4857bf2a068e9bc0e64eed8563b065908a4cd6bfb66b531a9c424c8e25e142 AS uv
79+
FROM ghcr.io/astral-sh/uv:0.9.8@sha256:08f409e1d53e77dfb5b65c788491f8ca70fe1d2d459f41c89afa2fcbef998abe AS uv
8080
# Stage 5: Base python image
8181
FROM ghcr.io/goauthentik/fips-python:3.13.9-slim-trixie-fips@sha256:700fc8c1e290bd14e5eaca50b1d8e8c748c820010559cbfb4c4f8dfbe2c4c9ff AS python-base
8282

‎authentik/core/models.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from django.db.models import Q, QuerySet, options
1616
from django.db.models.constants import LOOKUP_SEP
1717
from django.http import HttpRequest
18-
from django.utils.functional import SimpleLazyObject, cached_property
18+
from django.utils.functional import cached_property
1919
from django.utils.timezone import now
2020
from django.utils.translation import gettext_lazy as _
2121
from django_cte import CTE, with_cte
@@ -585,18 +585,16 @@ def get_meta_icon(self) -> str | None:
585585

586586
def get_launch_url(self, user: Optional["User"] = None) -> str | None:
587587
"""Get launch URL if set, otherwise attempt to get launch URL based on provider."""
588+
from authentik.core.api.users import UserSerializer
589+
588590
url = None
589591
if self.meta_launch_url:
590592
url = self.meta_launch_url
591593
elif provider := self.get_provider():
592594
url = provider.launch_url
593595
if user and url:
594-
if isinstance(user, SimpleLazyObject):
595-
user._setup()
596-
user = user._wrapped
597596
try:
598-
return url % user.__dict__
599-
597+
return url % UserSerializer(instance=user).data
600598
except Exception as exc: # noqa
601599
LOGGER.warning("Failed to format launch url", exc=exc)
602600
return url

0 commit comments

Comments
 (0)