refactor: trigger CRL update on timer and client update

This changes the CRL timer to run once per minute but only trigger the
CRL update if the specified interval has elapsed since the last
scheduled run or if the indexer has signaled that the CRL should be
updated on the next timer tick.

Fixes #167

Signed-off-by: Aurora Gaffney <aurora@blinklabs.io>

Author: agaffney

cmd/vpn-indexer/main.go

@@ -160,7 +160,7 @@ func main() {
 	}
 
 	// Configure CRL
-	_, err = crl.New(cfg, logger, db, ca)
+	crl, err := crl.New(cfg, logger, db, ca)
 	if err != nil {
 		slog.Error(
 			fmt.Sprintf("failed to configure CRL: %s", err),
@@ -169,7 +169,7 @@ func main() {
 	}
 
 	// Start indexer
-	if err := indexer.GetIndexer().Start(cfg, logger, db, ca); err != nil {
+	if err := indexer.GetIndexer().Start(cfg, logger, db, ca, crl); err != nil {
 		slog.Error(
 			fmt.Sprintf("failed to start indexer: %s", err),
 		)

internal/crl/crl.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"log/slog"
 	"math/big"
+	"sync"
 	"time"
 
 	"github.com/blinklabs-io/vpn-indexer/internal/ca"
@@ -34,11 +35,13 @@ import (
 )
 
 type Crl struct {
-	ca     *ca.Ca
-	config *config.Config
-	db     *database.Database
-	logger *slog.Logger
-	timer  *time.Timer
+	ca                  *ca.Ca
+	config              *config.Config
+	db                  *database.Database
+	logger              *slog.Logger
+	nextScheduledUpdate time.Time
+	needsUpdate         bool
+	needsUpdateMutex    sync.Mutex
 }
 
 func New(
@@ -61,6 +64,12 @@ func New(
 	return crl, nil
 }
 
+func (c *Crl) SetNeedsUpdate() {
+	c.needsUpdateMutex.Lock()
+	c.needsUpdate = true
+	c.needsUpdateMutex.Unlock()
+}
+
 func (c *Crl) k8sClient() (*kubernetes.Clientset, error) {
 	config, err := rest.InClusterConfig()
 	if err != nil {
@@ -74,20 +83,32 @@ func (c *Crl) k8sClient() (*kubernetes.Clientset, error) {
 }
 
 func (c *Crl) scheduleUpdateConfigMap() {
-	c.timer = time.AfterFunc(
-		c.config.Crl.UpdateInterval,
-		func() {
-			if err := c.updateConfigMap(); err != nil {
-				c.logger.Error(
-					fmt.Sprintf(
-						"failed to update CRL ConfigMap: %s",
-						err,
-					),
-				)
+	tickChan := time.Tick(1 * time.Minute)
+	c.nextScheduledUpdate = time.Now().Add(c.config.Crl.UpdateInterval)
+	go func() {
+		for {
+			_, ok := <-tickChan
+			if !ok {
+				return
 			}
-			c.scheduleUpdateConfigMap()
-		},
-	)
+			c.needsUpdateMutex.Lock()
+			if time.Now().After(c.nextScheduledUpdate) || c.needsUpdate {
+				if err := c.updateConfigMap(); err != nil {
+					c.logger.Error(
+						fmt.Sprintf(
+							"failed to update CRL ConfigMap: %s",
+							err,
+						),
+					)
+				}
+				if !c.needsUpdate {
+					c.nextScheduledUpdate = c.nextScheduledUpdate.Add(c.config.Crl.UpdateInterval)
+				}
+				c.needsUpdate = false
+			}
+			c.needsUpdateMutex.Unlock()
+		}
+	}()
 }
 
 func (c *Crl) updateConfigMap() error {

internal/indexer/indexer.go

@@ -34,6 +34,7 @@ import (
 	"github.com/blinklabs-io/vpn-indexer/internal/ca"
 	"github.com/blinklabs-io/vpn-indexer/internal/client"
 	"github.com/blinklabs-io/vpn-indexer/internal/config"
+	"github.com/blinklabs-io/vpn-indexer/internal/crl"
 	"github.com/blinklabs-io/vpn-indexer/internal/database"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
@@ -58,6 +59,7 @@ type Indexer struct {
 	cfg               *config.Config
 	db                *database.Database
 	ca                *ca.Ca
+	crl               *crl.Crl
 	logger            *slog.Logger
 	pipeline          *pipeline.Pipeline
 	refTokenPolicyId  lcommon.Blake2b224
@@ -76,10 +78,12 @@ func (i *Indexer) Start(
 	logger *slog.Logger,
 	db *database.Database,
 	ca *ca.Ca,
+	crl *crl.Crl,
 ) error {
 	i.cfg = cfg
 	i.db = db
 	i.ca = ca
+	i.crl = crl
 	i.logger = logger
 	// Parse script address to determine client asset policy ID
 	scriptAddr, err := lcommon.NewAddress(cfg.Indexer.ScriptAddress)
@@ -336,6 +340,8 @@ func (i *Indexer) handleEventClient(txOutput lcommon.Utxo) error {
 	if err != nil {
 		return err
 	}
+	// Trigger CRL update to unblock renewals
+	i.crl.SetNeedsUpdate()
 	i.logger.Info(
 		"generated client",
 		"client",

scripts/local-deploy.sh

@@ -120,7 +120,7 @@ crl:
   configMapNamespace: vpn-test
   configMapName: test-crl
   configMapKey: crl.pem
-  updateInterval: 1m
+  updateInterval: 2m
 EOF
 
 # Install helm chart