github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 17:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update unauthorized callback calling order (#1469)

Browse Source 
* chore: update unauthorized callback calling order

* chore: add comments
This commit is contained in:
Kevin Wan 2022-01-20 21:09:45 +08:00 committed by GitHub
parent df0f8ed59e
commit fdc7f64d6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/limit/tokenlimit.go
View File

@ -112,7 +112,8 @@ func (lim *TokenLimiter) reserveN(now time.Time, n int) bool {
// Lua boolean false -> r Nil bulk reply // Lua boolean false -> r Nil bulk reply
if err == redis.Nil { if err == redis.Nil {
return false return false
} else if err != nil { }
if err != nil {
logx.Errorf("fail to use rate limiter: %s, use in-process limiter for rescue", err) logx.Errorf("fail to use rate limiter: %s, use in-process limiter for rescue", err)
lim.startMonitor() lim.startMonitor()
return lim.rescueLimiter.AllowN(now, n) return lim.rescueLimiter.AllowN(now, n)

4
core/mapping/unmarshaler.go
View File

@ -742,7 +742,9 @@ func getValueWithChainedKeys(m Valuer, keys []string) (interface{}, bool) {
if len(keys) == 1 { if len(keys) == 1 {
v, ok := m.Value(keys[0]) v, ok := m.Value(keys[0])
return v, ok return v, ok
} else if len(keys) > 1 { }
if len(keys) > 1 {
if v, ok := m.Value(keys[0]); ok { if v, ok := m.Value(keys[0]); ok {
if nextm, ok := v.(map[string]interface{}); ok { if nextm, ok := v.(map[string]interface{}); ok {
return getValueWithChainedKeys(MapValuer(nextm), keys[1:]) return getValueWithChainedKeys(MapValuer(nextm), keys[1:])

6
rest/handler/authhandler.go
View File

@ -113,11 +113,13 @@ func unauthorized(w http.ResponseWriter, r *http.Request, err error, callback Un
detailAuthLog(r, noDetailReason) detailAuthLog(r, noDetailReason)
} }
writer.WriteHeader(http.StatusUnauthorized) // let callback go first, to make sure we respond with user-defined HTTP header
if callback != nil { if callback != nil {
callback(writer, r, err) callback(writer, r, err)
} }
// if user not setting HTTP header, we set header with 401
writer.WriteHeader(http.StatusUnauthorized)
} }
type guardedResponseWriter struct { type guardedResponseWriter struct {