internal/token: tokens are not renewable

netauth · Aug 17, 2019 · ad28706 · ad28706
1 parent a6b27dc
commit ad28706
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 9 deletions.
diff --git a/cmd/netauthd/main.go b/cmd/netauthd/main.go
@@ -53,7 +53,6 @@ func init() {
 
 	pflag.String("token.backend", "jwt-rsa", "Token implementation to use")
 	pflag.Duration("token.lifetime", time.Hour*10, "Token lifetime")
-	pflag.Int("token.renewals", 5, "Maximum number of times the token may be renewed")
 
 	pflag.Int("token.jwt.bits", 2048, "Bit length of generated keys")
 	pflag.Bool("token.jwt.generate", false, "Generate keys if not available")

diff --git a/internal/token/claims.go b/internal/token/claims.go
@@ -6,7 +6,6 @@ package token
 type Claims struct {
 	EntityID     string
 	Capabilities []string
-	RenewalsLeft int
 }
 
 // HasCapability is a convenience function to determine if the

diff --git a/internal/token/jwt/rsa.go b/internal/token/jwt/rsa.go
@@ -58,7 +58,6 @@ func (s *RSATokenService) Generate(claims token.Claims, config token.Config) (st
 		return "", token.ErrKeyUnavailable
 	}
 
-	claims.RenewalsLeft = config.Renewals
 	c := RSAToken{
 		claims,
 		jwt.StandardClaims{

diff --git a/internal/token/jwt/rsa_test.go b/internal/token/jwt/rsa_test.go
@@ -21,7 +21,6 @@ import (
 var (
 	config = token.Config{
 		Lifetime: time.Minute * 5,
-		Renewals: 0,
 		Issuer:   "NetAuth Test",
 	}
 )
@@ -169,7 +168,6 @@ func TestValidateToken(t *testing.T) {
 		Lifetime:  time.Minute * 5,
 		IssuedAt:  time.Now(),
 		NotBefore: time.Now(),
-		Renewals:  0,
 		Issuer:    "NetAuth Test",
 	}
 
@@ -285,7 +283,6 @@ func TestValidateExpiredToken(t *testing.T) {
 		Lifetime:  0,
 		IssuedAt:  time.Now().Add(-1 * time.Minute),
 		NotBefore: time.Now().Add(-1 * time.Minute),
-		Renewals:  0,
 		Issuer:    "NetAuth Test",
 	}
 

diff --git a/internal/token/token.go b/internal/token/token.go
@@ -22,7 +22,6 @@ type Service interface {
 // generating a token.
 type Config struct {
 	Lifetime  time.Duration
-	Renewals  int
 	Issuer    string
 	IssuedAt  time.Time
 	NotBefore time.Time
@@ -78,7 +77,6 @@ func GetBackendList() []string {
 func GetConfig() Config {
 	return Config{
 		Lifetime:  viper.GetDuration("token.lifetime"),
-		Renewals:  viper.GetInt("token.renewals"),
 		IssuedAt:  time.Now(),
 		NotBefore: time.Now(),
 	}

diff --git a/internal/token/token_test.go b/internal/token/token_test.go
@@ -70,7 +70,7 @@ func TestNewUnknown(t *testing.T) {
 
 func TestGetConfig(t *testing.T) {
 	c := GetConfig()
-	if c.Lifetime != viper.GetDuration("token.lifetime") || c.Renewals != viper.GetInt("token.renewals") {
+	if c.Lifetime != viper.GetDuration("token.lifetime") {
 		t.Error("Config contains incorrect values")
 	}
 }