prevent nil deref when loading cti config (#3176)

* correct variable names * prevent nil deref when loading cti config
crowdsecurity · Aug 12, 2024 · 52995b8 · 52995b8
1 parent 3532e87
commit 52995b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pkg/apiserver/apic.go b/pkg/apiserver/apic.go
@@ -42,7 +42,7 @@ const (
 	metricsIntervalDefault    = time.Minute * 30
 	metricsIntervalDelta      = time.Minute * 15
 	usageMetricsInterval      = time.Minute * 30
-	usageMetricsIntervalFirst = time.Minute * 15
+	usageMetricsIntervalDelta = time.Minute * 15
 )
 
 type apic struct {
@@ -196,7 +196,7 @@ func NewAPIC(config *csconfig.OnlineApiClientCfg, dbClient *database.Client, con
 		metricsInterval:           metricsIntervalDefault,
 		metricsIntervalFirst:      randomDuration(metricsIntervalDefault, metricsIntervalDelta),
 		usageMetricsInterval:      usageMetricsInterval,
-		usageMetricsIntervalFirst: randomDuration(usageMetricsInterval, usageMetricsIntervalFirst),
+		usageMetricsIntervalFirst: randomDuration(usageMetricsInterval, usageMetricsIntervalDelta),
 		isPulling:                 make(chan bool, 1),
 		whitelists:                apicWhitelist,
 	}

diff --git a/pkg/csconfig/api.go b/pkg/csconfig/api.go
@@ -61,16 +61,15 @@ type CTICfg struct {
 
 func (a *CTICfg) Load() error {
 	if a.Key == nil {
-		*a.Enabled = false
+		a.Enabled = ptr.Of(false)
 	}
 
 	if a.Key != nil && *a.Key == "" {
 		return errors.New("empty cti key")
 	}
 
 	if a.Enabled == nil {
-		a.Enabled = new(bool)
-		*a.Enabled = true
+		a.Enabled = ptr.Of(true)
 	}
 
 	if a.CacheTimeout == nil {