peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Remove receiver from auth methods

Browse Source
This commit is contained in:
Peter Stuifzand 2019-03-24 10:25:40 +01:00
parent c894e4da13
commit 2d39edac8e
Signed by: peter
GPG Key ID: 374322D56E5209E8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/eksterd/auth.go
View File

@ -15,7 +15,7 @@ import (
var authHeaderRegex = regexp.MustCompile("^Bearer (.+)$") var authHeaderRegex = regexp.MustCompile("^Bearer (.+)$")
func (b *memoryBackend) cachedCheckAuthToken(conn redis.Conn, header string, r *auth.TokenResponse) (bool, error) { func cachedCheckAuthToken(conn redis.Conn, header string, tokenEndpoint string, r *auth.TokenResponse) (bool, error) {
tokens := authHeaderRegex.FindStringSubmatch(header) tokens := authHeaderRegex.FindStringSubmatch(header)
if len(tokens) != 2 { if len(tokens) != 2 {
@ -33,7 +33,7 @@ func (b *memoryBackend) cachedCheckAuthToken(conn redis.Conn, header string, r *
return true, nil return true, nil
} }
authorized, err = b.checkAuthToken(header, r) authorized, err = checkAuthToken(header, tokenEndpoint, r)
if err != nil { if err != nil {
return false, errors.Wrap(err, "could not check auth token") return false, errors.Wrap(err, "could not check auth token")
} }
@ -50,8 +50,7 @@ func (b *memoryBackend) cachedCheckAuthToken(conn redis.Conn, header string, r *
return authorized, nil return authorized, nil
} }
func (b *memoryBackend) checkAuthToken(header string, token *auth.TokenResponse) (bool, error) { func checkAuthToken(header string, tokenEndpoint string, token *auth.TokenResponse) (bool, error) {
tokenEndpoint := b.TokenEndpoint
req, err := buildValidateAuthTokenRequest(tokenEndpoint, header) req, err := buildValidateAuthTokenRequest(tokenEndpoint, header)
if err != nil { if err != nil {

2
cmd/eksterd/memory.go
View File

@ -75,7 +75,7 @@ func (b *memoryBackend) AuthTokenAccepted(header string, r *auth.TokenResponse)
log.Printf("could not close redis connection: %v", err) log.Printf("could not close redis connection: %v", err)
} }
}() }()
return b.cachedCheckAuthToken(conn, header, r) return cachedCheckAuthToken(conn, header, b.TokenEndpoint, r)
} }
func (b *memoryBackend) Debug() { func (b *memoryBackend) Debug() {