llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 18:54:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove routers/util (#287)

Browse Source 
Signed-off-by: sh1luo <690898835@qq.com>
This commit is contained in:
sh1luo 2021-09-05 22:02:32 +08:00 committed by GitHub
parent 465d25a272
commit 9d9a1da07f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
routers/authz_filter.go
View File

@ -67,7 +67,8 @@ func getObject(ctx *context.Context) (string, string) {
if id == "" { if id == "" {
return "", "" return "", ""
} }
return parseSlash(id) tokens := strings.Split(id, "/")
return tokens[0], tokens[1]
} else { } else {
body := ctx.Input.RequestBody body := ctx.Input.RequestBody

32
routers/record.go
View File

@ -39,10 +39,9 @@ func getUser(ctx *context.Context) (username string) {
} }
func getUserByClientIdSecret(ctx *context.Context) string { func getUserByClientIdSecret(ctx *context.Context) string {
requestUri := ctx.Request.RequestURI clientId := ctx.Input.Query("clientId")
clientId := parseQuery(requestUri, "clientId") clientSecret := ctx.Input.Query("clientSecret")
clientSecret := parseQuery(requestUri, "clientSecret") if clientId == "" || clientSecret == "" {
if len(clientId) == 0 || len(clientSecret) == 0 {
return "" return ""
} }
@ -50,20 +49,23 @@ func getUserByClientIdSecret(ctx *context.Context) string {
if app == nil || app.ClientSecret != clientSecret { if app == nil || app.ClientSecret != clientSecret {
return "" return ""
} }
return app.Organization + "/" + app.Name return app.Organization + "/" + app.Name
} }
func RecordMessage(ctx *context.Context) { func RecordMessage(ctx *context.Context) {
if ctx.Request.URL.Path != "/api/login" { if ctx.Request.URL.Path == "/api/login" {
user := getUser(ctx) return
userinfo := strings.Split(user, "/")
if user == "" {
userinfo = append(userinfo, "")
}
record := util.Records(ctx)
record.Organization = userinfo[0]
record.Username = userinfo[1]
object.AddRecord(record)
} }
user := getUser(ctx)
userinfo := strings.Split(user, "/")
if user == "" {
userinfo = append(userinfo, "")
}
record := util.Records(ctx)
record.Organization = userinfo[0]
record.Username = userinfo[1]
object.AddRecord(record)
} }

34
routers/util.go
View File

@ -1,34 +0,0 @@
// Copyright 2021 The casbin Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package routers
import (
"net/url"
"strings"
)
func parseQuery(query string, key string) string {
queryMap, err := url.ParseQuery(query)
if err != nil {
panic(err)
}
return queryMap.Get(key)
}
func parseSlash(s string) (string, string) {
tokens := strings.Split(s, "/")
return tokens[0], tokens[1]
}