llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 20:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong usement in getUsername

Browse Source 
Signed-off-by: Kininaru <shiftregister233@outlook.com>
This commit is contained in:
Kininaru
2021-06-06 18:56:00 +08:00
parent 741d1feec8
commit b65ae4eec1
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
routers/authz_filter.go
View File

@ -32,10 +32,25 @@ type Object struct {
Name string `json:"name"`
}
func getUsernameByClientIdSecret(ctx *context.Context) string {
requestUri := ctx.Request.RequestURI
clientId := parseQuery(requestUri, "clientId")
clientSecret := parseQuery(requestUri, "clientSecret")
if len(clientId) == 0 || len(clientSecret) == 0 {
return ""
}
app := object.GetApplicationByClientId(clientId)
if app == nil || app.ClientSecret != clientSecret {
return ""
}
return "built-in/service"
}
func getUsername(ctx *context.Context) (username string) {
defer func() {
if r := recover(); r != nil {
username = ""
username = getUsernameByClientIdSecret(ctx)
}
}()
@ -44,18 +59,7 @@ func getUsername(ctx *context.Context) (username string) {
username = ctx.Input.Session("username").(string)
if len(username) == 0 {
query := ctx.Request.URL.RawQuery
clientId := parseQuery(query, "clientId")
clientSecret := parseQuery(query, "clientSecret")
if len(clientId) == 0 || len(clientSecret) == 0 {
return
}
app := object.GetApplicationByClientId(clientId)
if app == nil || app.ClientSecret != clientSecret {
return
}
return "built-in/service"
username = getUsernameByClientIdSecret(ctx)
}
return