AuthN: Fix signout redirect url #87631
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kalleep
added
type/bug
backport v11.0.x
kalleep
commented
May 10, 2024
| @@ -875,7 +875,6 @@ auto_sign_up = false | |||
| url_login = false | |||
| allow_assign_grafana_admin = false | |||
| skip_org_role_sync = false | |||
| signout_redirect_url = | |||
There was a problem hiding this comment.
this value is never read into jwt config
|
This PR must be merged before a backport PR will be created. |
1 similar comment
|
This PR must be merged before a backport PR will be created. |
kalleep
commented
May 10, 2024
| @@ -254,6 +254,7 @@ func (hs *HTTPServer) Logout(c *contextmodel.ReqContext) { | |||
| if err != nil { | |||
| hs.log.Error("Failed perform proper logout", "error", err) | |||
| c.Redirect(hs.Cfg.AppSubURL + "/login") | |||
| return | |||
There was a problem hiding this comment.
Panic logs displayed in issues was from here. When something wen't wrong we did not return here and on line 262 we tried to use redirect.URL i.e. de-referencing a nil pointer
IevaVasiljeva
approved these changes
May 10, 2024
|
I think this also fixes this issue: #79839 |
mgyongyosi
approved these changes
May 10, 2024
grafana-delivery-bot bot
pushed a commit
that referenced
this pull request
May 12, 2024
* Add missing return * Use sign out redirect url from auth config if configured * remove option from auth.jwt that is not used (cherry picked from commit 0f3080e)
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
After #79635 we did not respect
signout_redirect_urlconfigured under[auth]. It only worked with saml and oauth.To fix this we instead default to use
signout_redirect_urlif configured. A client that implementLogoutClientwill still take precedence. We also need to ignore the case when users don't have a session token so that the configured redirect url is used.Which issue(s) does this PR fix?:
Fixes #85128
Fixes #84108
Special notes for your reviewer:
Please check that: