shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-08 04:55:55 +08:00
Code Issues Projects Releases Wiki Activity

clear check authorization.

Browse Source
This commit is contained in:
wdvxdr 2021-07-07 21:19:02 +08:00
parent e9b302ad74
commit d266242887
No known key found for this signature in database
GPG Key ID: 55FF1414A69CEBA6
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coolq/bot.go
View File

@ -551,9 +551,3 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
} }
return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin) return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
} }
// ToJSON 生成JSON字符串
func (m MSG) ToJSON() string {
b, _ := json.Marshal(m)
return string(b)
}

25
server/http.go
View File

@ -97,12 +97,9 @@ func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request
writer.WriteHeader(http.StatusNotFound) writer.WriteHeader(http.StatusNotFound)
return return
} }
if status := checkAuth(request, s.accessToken); status != http.StatusOK {
if s.accessToken != "" { writer.WriteHeader(status)
if status := checkAuth(request, s.accessToken); status != http.StatusOK { return
writer.WriteHeader(status)
return
}
} }
action := strings.TrimPrefix(request.URL.Path, "/") action := strings.TrimPrefix(request.URL.Path, "/")
@ -116,6 +113,10 @@ func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request
} }
func checkAuth(req *http.Request, token string) int { func checkAuth(req *http.Request, token string) int {
if token == "" { // quick path
return http.StatusOK
}
auth := req.Header.Get("Authorization") auth := req.Header.Get("Authorization")
if auth == "" { if auth == "" {
auth = req.URL.Query().Get("access_token") auth = req.URL.Query().Get("access_token")
@ -126,13 +127,13 @@ func checkAuth(req *http.Request, token string) int {
} }
} }
switch { switch auth {
case auth == "": case token:
return http.StatusUnauthorized
case auth != token:
return http.StatusForbidden
default:
return http.StatusOK return http.StatusOK
case "":
return http.StatusUnauthorized
default:
return http.StatusForbidden
} }
} }