Replace memory storage from karlseguin/ccache to hashicorp/golang-lru

Author: pr0head

go.mod

@@ -3,7 +3,7 @@ module github.com/ProtocolONE/authone-jwt-verifier-golang
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-redis/redis v6.15.1+incompatible
-	github.com/karlseguin/ccache v2.0.2+incompatible
+	github.com/hashicorp/golang-lru v0.5.1
 	github.com/labstack/echo v3.3.5+incompatible
 	github.com/labstack/gommon v0.2.8
 	github.com/lestrrat-go/jwx v0.0.0-20180928232350-0d477e6a1f0e

go.sum

@@ -1,20 +1,36 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/karlseguin/ccache v2.0.2+incompatible h1:MpSlLlHgG3vPWTAIJsSYlyAQsHwfQ2HzgUlbJFh9Ufk=
 github.com/karlseguin/ccache v2.0.2+incompatible/go.mod h1:CM9tNPzT6EdRh14+jiW8mEF9mkNZuuE51qmgGYUB93w=
+github.com/labstack/echo v3.3.5+incompatible h1:9PfxPUmasKzeJor9uQTaXLT6WUG/r+vSTmvXxvv3JO4=
 github.com/labstack/echo v3.3.5+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/lestrrat-go/jwx v0.0.0-20180928232350-0d477e6a1f0e h1:BsBWIgqA7BFb5sdQeFVQqXYL0P9ZwiNYvL3nywtEmnY=
 github.com/lestrrat-go/jwx v0.0.0-20180928232350-0d477e6a1f0e/go.mod h1:iEoxlYfZjvoGpuWwxUz+eR5e6KTJGsaRcy/YNA/UnBk=
+github.com/lestrrat-go/pdebug v0.0.0-20180220043849-39f9a71bcabe h1:S7XSBlgc/eI2v47LkPPVa+infH3FuTS4tPJbqCtJovo=
 github.com/lestrrat-go/pdebug v0.0.0-20180220043849-39f9a71bcabe/go.mod h1:zvUY6gZZVL2nu7NM+/3b51Z/hxyFZCZxV0hvfZ3NJlg=
+github.com/mattn/go-colorable v0.1.0 h1:v2XXALHHh6zHfYTJ+cSkwtyffnaOyR1MXaA91mTrb8o=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2 h1:NwxKRvbkH5MsNkvOtPZi3/3kmI8CAzs3mtv+GLQMkNo=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80=
 golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 h1:uESlIz09WIHT2I+pasSXcpLYqYK8wHcdCetU3VuMBJE=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=

jwtverifier.go

@@ -131,7 +131,7 @@ func NewJwtVerifier(config Config, options ...interface{}) *JwtVerifier {
 	}
 
 	if j.storage == nil {
-		j.storage = memory.NewStorage(memory.MaxSize, memory.PruneLimit, memory.PromoteLimit)
+		j.storage = memory.NewStorage(memory.MaxSize)
 	}
 
 	return j

storage/memory/memory_storage.go

@@ -2,58 +2,59 @@ package memory
 
 import (
 	"errors"
-	"fmt"
 	"github.com/ProtocolONE/authone-jwt-verifier-golang/storage"
-	"github.com/karlseguin/ccache"
+	lru "github.com/hashicorp/golang-lru"
 	"time"
 )
 
 const (
+	ErrorTokenAdd       = "unbale to add token"
 	ErrorTokenNotExists = "token not exists"
 	ErrorTokenIsExpired = "token is expired"
 	MaxSize             = 5000
-	PruneLimit          = 500
-	PromoteLimit        = 3
 )
 
-type tokenStorageMemory struct {
-	cache *ccache.Cache
+type entry struct {
+	value    []byte
+	duration time.Duration
 }
 
-func NewStorage(maxSize int64, pruneLimit uint32, promoteLimit int32) storage.Adapter {
-	conf := ccache.Configure()
-	conf.MaxSize(maxSize)
-	conf.ItemsToPrune(pruneLimit)
-	conf.GetsPerPromote(promoteLimit)
+type tokenStorageMemory struct {
+	cache *lru.Cache
+}
 
+func NewStorage(maxSize int) storage.Adapter {
+	l, _ := lru.New(maxSize)
 	return tokenStorageMemory{
-		cache: ccache.New(conf),
+		cache: l,
 	}
 }
 
 func (tsm tokenStorageMemory) Set(token string, expire int64, introspect []byte) error {
-	duration := time.Unix(expire, 0).Sub(time.Now())
-	tsm.cache.Set(token, introspect, duration)
+	e := &entry{
+		value:    introspect,
+		duration: time.Unix(expire, 0).Sub(time.Now()),
+	}
+	if false == tsm.cache.Add(token, e) {
+		return errors.New(ErrorTokenAdd)
+	}
 	return nil
 }
 
 func (tsm tokenStorageMemory) Get(token string) ([]byte, error) {
-	item := tsm.cache.Get(token)
-	if item == nil {
-		return nil, errors.New(ErrorTokenNotExists)
-	}
-	if item.Expired() {
-		_ = tsm.Delete(token)
-		return nil, errors.New(ErrorTokenIsExpired)
+	if e, ok := tsm.cache.Get(token); ok {
+		entry := e.(*entry)
+		exp := time.Now().Add(entry.duration)
+		if exp.Before(time.Now()) {
+			_ = tsm.Delete(token)
+			return nil, errors.New(ErrorTokenIsExpired)
+		}
+		return entry.value, nil
 	}
-	v := fmt.Sprintf("%s", item.Value())
-	return []byte(v), nil
+	return nil, errors.New(ErrorTokenNotExists)
 }
 
 func (tsm tokenStorageMemory) Delete(token string) error {
-	if tsm.cache.Delete(token) == false {
-		return fmt.Errorf("unable to delete token [%s] from cache", token)
-	}
-
+	tsm.cache.Remove(token)
 	return nil
 }

storage/memory/memory_storage_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestSetAndGetToken(t *testing.T) {
-	st := createStorage(1, 1)
+	st := createStorage(1)
 	tName := fmt.Sprintf("%d", time.Now().UnixNano())
 	exp := time.Now().Add(5 * time.Second).Unix()
 	token := []byte(tName)
@@ -26,7 +26,7 @@ func TestSetAndGetToken(t *testing.T) {
 }
 
 func TestExpireToken(t *testing.T) {
-	st := createStorage(1, 1)
+	st := createStorage(1)
 	tName := fmt.Sprintf("%d", time.Now().UnixNano())
 	exp := time.Now().Add(time.Second).Unix() - 1
 	token := []byte(tName)
@@ -46,7 +46,7 @@ func TestExpireToken(t *testing.T) {
 }
 
 func TestGetUnExistsToken(t *testing.T) {
-	st := createStorage(1, 1)
+	st := createStorage(1)
 	tName := "unexiststoken"
 	_, err := st.Get(tName)
 	if err == nil {
@@ -60,7 +60,7 @@ func TestGetUnExistsToken(t *testing.T) {
 }
 
 func TestDeleteToken(t *testing.T) {
-	st := createStorage(1, 1)
+	st := createStorage(1)
 	tName := fmt.Sprintf("%d", time.Now().UnixNano())
 	exp := time.Now().Add(5 * time.Second).Unix()
 	token := []byte(tName)
@@ -76,6 +76,6 @@ func TestDeleteToken(t *testing.T) {
 	}
 }
 
-func createStorage(maxSize int, itemsToPrune int) storage.Adapter {
-	return NewStorage(int64(maxSize), uint32(itemsToPrune), PromoteLimit)
+func createStorage(maxSize int) storage.Adapter {
+	return NewStorage(maxSize)
 }