Add garbage collector for expired api tokens

Author: NicoBiernat

config/config.go

@@ -41,13 +41,14 @@ var (
 	DisableRateLimiter bool = getBool("DISABLE_RATE_LIMITER", false)
 
 	// Domain specific config
-	AdminRoleName          string        = getString("ADMIN_ROLENAME", "admin")
-	DeployRoleName         string        = getString("DEPLOY_ROLENAME", "deploy")
-	RegistrationKeyLength  int           = getInt("REGISTRATION_KEY_LENGTH", 20)
-	ApiTokenExpirationTime time.Duration = getDuration("API_TOKEN_EXPIRATION_TIME", 3*24*time.Hour)
-	MinPasswordLength      int           = getInt("MIN_PASSWORD_LENGTH", 12)
-	InternalIPs            []net.IP      = parseIPs(getString("INTERNAL_IPS", ""))
-	RestrictLoginToAdmins  bool          = getBool("RESTRICT_LOGIN_TO_ADMINS", false)
+	AdminRoleName                    string        = getString("ADMIN_ROLENAME", "admin")
+	DeployRoleName                   string        = getString("DEPLOY_ROLENAME", "deploy")
+	RegistrationKeyLength            int           = getInt("REGISTRATION_KEY_LENGTH", 20)
+	ApiTokenExpirationTime           time.Duration = getDuration("API_TOKEN_EXPIRATION_TIME", 3*24*time.Hour)
+	ApiTokenGarbageCollectorInterval time.Duration = getDuration("API_TOKEN_GARBAGE_COLLECTOR_INTERVAL", 1*time.Hour)
+	MinPasswordLength                int           = getInt("MIN_PASSWORD_LENGTH", 12)
+	InternalIPs                      []net.IP      = parseIPs(getString("INTERNAL_IPS", ""))
+	RestrictLoginToAdmins            bool          = getBool("RESTRICT_LOGIN_TO_ADMINS", false)
 
 	UseTestDatabase bool = getBool("USE_TEST_DATABASE", false) // TODO: remove in prod - this function deletes the whole database
 )

repository/token.go

@@ -54,6 +54,11 @@ func (r *TokenRepository) DeleteByID(id uint) error {
 	return wrapError(r.DB.Unscoped().Select(clause.Associations).Delete(&model.Token{UserID: id}).Error)
 }
 
+func (r *TokenRepository) DeleteAllExpiredNonPermanent() (int, error) {
+	res := r.DB.Unscoped().Where("not permanent AND expires_at < NOW()").Delete(model.Token{})
+	return (int)(res.RowsAffected), res.Error
+}
+
 func (r *TokenRepository) Migrate() error {
 	err := r.DB.AutoMigrate(&model.Token{})
 	if err != nil {

service/token.go

@@ -25,6 +25,7 @@ type TokenService struct {
 }
 
 func NewTokenService(tokenRepository repository.TokenRepository, userRepository repository.UserRepository) TokenService {
+	go tokenGarbageCollector(tokenRepository)
 	return TokenService{tokenRepository,
 		userRepository,
 		make(map[string][]chan *model.AuthUpdateMessage),
@@ -34,6 +35,17 @@ func NewTokenService(tokenRepository repository.TokenRepository, userRepository
 	}
 }
 
+func tokenGarbageCollector(tokenRepository repository.TokenRepository) {
+	for range time.NewTicker(config.ApiTokenGarbageCollectorInterval).C {
+		rowsAffected, err := tokenRepository.DeleteAllExpiredNonPermanent()
+		if err != nil {
+			log.Println(err)
+			continue
+		}
+		log.Printf("Successfully deleted %d expired tokens\n", rowsAffected)
+	}
+}
+
 func newRandomToken() (string, error) {
 	s, err := crypto.NewRandomAlphaNumString(20)
 	if err != nil {