Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sources/oauth: fix URLs being overwritten by OIDC urls #8147

Merged
merged 2 commits into from
Jan 13, 2024

Conversation

BeryJu
Copy link
Member

@BeryJu BeryJu commented Jan 12, 2024

Details

#8131 closes #7972


Checklist

  • Local tests pass (ak test authentik/)
  • The code has been formatted (make lint-fix)

If an API change has been made

  • The API schema has been updated (make gen-build)

If changes to the frontend have been made

  • The code has been formatted (make web)
  • The translation files have been updated (make i18n-extract)

If applicable

  • The documentation has been updated
  • The documentation has been formatted (make website)

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu requested a review from a team as a code owner January 12, 2024 18:24
Copy link

netlify bot commented Jan 12, 2024

Deploy Preview for authentik-storybook canceled.

Name Link
🔨 Latest commit 11c4859
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/65a2a2e4ae406a00089f6cde

@BeryJu
Copy link
Member Author

BeryJu commented Jan 12, 2024

/cherry-pick version-2023.10

Copy link

codecov bot commented Jan 12, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (7f70a86) 92.32% compared to head (11c4859) 92.29%.
Report is 3 commits behind head on main.

Files Patch % Lines
authentik/sources/oauth/api/source.py 80.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8147      +/-   ##
==========================================
- Coverage   92.32%   92.29%   -0.03%     
==========================================
  Files         608      608              
  Lines       30246    30252       +6     
==========================================
- Hits        27924    27922       -2     
- Misses       2322     2330       +8     
Flag Coverage Δ
e2e 50.56% <0.00%> (-0.05%) ⬇️
integration 26.40% <0.00%> (-0.01%) ⬇️
unit 89.46% <80.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@CyB0rgg
Copy link

CyB0rgg commented Jan 13, 2024

Failed to auto merge - failed checks. Could you please give it a prod ?

Copy link

netlify bot commented Jan 13, 2024

Deploy Preview for authentik ready!

Name Link
🔨 Latest commit 4b43e4b
🔍 Latest deploy log https://app.netlify.com/sites/authentik/deploys/65a2a25fb13b7500087be785
😎 Deploy Preview https://deploy-preview-8147--authentik.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu force-pushed the sources/oauth/fix-url-overwrite branch from 4b43e4b to 11c4859 Compare January 13, 2024 14:49
Copy link
Contributor

authentik PR Installation instructions

Instructions for docker-compose

Add the following block to your .env file:

AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-sources-oauth-fix-url-overwrite-1705158548-11c4859
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s

For arm64, use these values:

AUTHENTIK_IMAGE=ghcr.io/goauthentik/dev-server
AUTHENTIK_TAG=gh-sources-oauth-fix-url-overwrite-1705158548-11c4859-arm64
AUTHENTIK_OUTPOSTS__CONTAINER_IMAGE_BASE=ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s

Afterwards, run the upgrade commands from the latest release notes.

Instructions for Kubernetes

Add the following block to your values.yml file:

authentik:
    outposts:
        container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
image:
    repository: ghcr.io/goauthentik/dev-server
    tag: gh-sources-oauth-fix-url-overwrite-1705158548-11c4859

For arm64, use these values:

authentik:
    outposts:
        container_image_base: ghcr.io/goauthentik/dev-%(type)s:gh-%(build_hash)s
image:
    repository: ghcr.io/goauthentik/dev-server
    tag: gh-sources-oauth-fix-url-overwrite-1705158548-11c4859-arm64

Afterwards, run the upgrade commands from the latest release notes.

@BeryJu BeryJu merged commit 7c116ac into main Jan 13, 2024
68 of 69 checks passed
@BeryJu BeryJu deleted the sources/oauth/fix-url-overwrite branch January 13, 2024 15:27
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jan 13, 2024
* sources/oauth: fix URLs being overwritten by OIDC urls

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* fix tests

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
BeryJu added a commit that referenced this pull request Jan 13, 2024
…8147) (#8156)

sources/oauth: fix URLs being overwritten by OIDC urls (#8147)

* sources/oauth: fix URLs being overwritten by OIDC urls



* fix tests



---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: Jens L <jens@goauthentik.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Federation & Social Logins // OAuth - Azure AD // Unable to save settings
2 participants