IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Write the redirect cookie if denied - do not write a blank redirect (#57381)

Browse Source 
* Write the redirect cookie if denied - do not write a blank redirect

* Remove redundant code, reverse polarity
This commit is contained in:
Kristina 2022-10-21 09:53:17 -05:00 committed by GitHub
parent 98053cfde8
commit 5d7d54d076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/middleware/auth.go
View File

@ -64,9 +64,12 @@ func writeRedirectCookie(c *models.ReqContext) {
redirectTo = setting.AppSubUrl + c.Req.RequestURI redirectTo = setting.AppSubUrl + c.Req.RequestURI
} }
if redirectTo == "/" {
return
}
// remove any forceLogin=true params // remove any forceLogin=true params
redirectTo = removeForceLoginParams(redirectTo) redirectTo = removeForceLoginParams(redirectTo)
cookies.WriteCookie(c.Resp, "redirect_to", url.QueryEscape(redirectTo), 0, nil) cookies.WriteCookie(c.Resp, "redirect_to", url.QueryEscape(redirectTo), 0, nil)
} }

1
pkg/services/accesscontrol/middleware.go
View File

@ -84,6 +84,7 @@ func deny(c *models.ReqContext, evaluator Evaluator, err error) {
if !c.IsApiRequest() { if !c.IsApiRequest() {
// TODO(emil): I'd like to show a message after this redirect, not sure how that can be done? // TODO(emil): I'd like to show a message after this redirect, not sure how that can be done?
writeRedirectCookie(c)
c.Redirect(setting.AppSubUrl + "/") c.Redirect(setting.AppSubUrl + "/")
return return
} }