From 8d99527e455d06acb38acbc7ab77fbaec5ef2ef3 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sat, 15 Sep 2018 16:13:38 +0200 Subject: [PATCH] Move function down --- cmd/eksterd/auth.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cmd/eksterd/auth.go b/cmd/eksterd/auth.go index afea084..af5e128 100644 --- a/cmd/eksterd/auth.go +++ b/cmd/eksterd/auth.go @@ -62,26 +62,6 @@ func (b *memoryBackend) cachedCheckAuthToken(conn redis.Conn, header string, r * return authorized } -// setCachedTokenResponseValue remembers the value of the auth token response in redis -func setCachedTokenResponseValue(conn redis.Conn, key string, r *auth.TokenResponse) error { - _, err := conn.Do("HMSET", redis.Args{}.Add(key).AddFlat(r)...) - if err != nil { - return fmt.Errorf("error while setting token: %v", err) - } - conn.Do("EXPIRE", key, uint64(10*time.Minute/time.Second)) -} - -// getCachedValue gets the cached value from Redis -func getCachedValue(conn redis.Conn, key string, r *auth.TokenResponse) (bool, error) { - values, err := redis.Values(conn.Do("HGETALL", key)) - if err == nil && len(values) > 0 { - if err = redis.ScanStruct(values, r); err == nil { - return true, nil - } - } - return false, fmt.Errorf("error while getting value from backend: %v", err) -} - func (b *memoryBackend) checkAuthToken(header string, token *auth.TokenResponse) bool { log.Println("Checking auth token") @@ -119,3 +99,23 @@ func (b *memoryBackend) checkAuthToken(header string, token *auth.TokenResponse) log.Println("Auth Token: Success") return true } + +// setCachedTokenResponseValue remembers the value of the auth token response in redis +func setCachedTokenResponseValue(conn redis.Conn, key string, r *auth.TokenResponse) error { + _, err := conn.Do("HMSET", redis.Args{}.Add(key).AddFlat(r)...) + if err != nil { + return fmt.Errorf("error while setting token: %v", err) + } + conn.Do("EXPIRE", key, uint64(10*time.Minute/time.Second)) +} + +// getCachedValue gets the cached value from Redis +func getCachedValue(conn redis.Conn, key string, r *auth.TokenResponse) (bool, error) { + values, err := redis.Values(conn.Do("HGETALL", key)) + if err == nil && len(values) > 0 { + if err = redis.ScanStruct(values, r); err == nil { + return true, nil + } + } + return false, fmt.Errorf("error while getting value from backend: %v", err) +}