db: don't set bouncer last_pull until first connection

crowdsecurity · May 31, 2024 · e57b79b · e57b79b
1 parent c1e858c
commit e57b79b
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 29 deletions.
diff --git a/pkg/apiserver/controllers/v1/decisions.go b/pkg/apiserver/controllers/v1/decisions.go
@@ -72,7 +72,7 @@ func (c *Controller) GetDecision(gctx *gin.Context) {
 		return
 	}
 
-	if time.Now().UTC().Sub(bouncerInfo.LastPull) >= time.Minute {
+	if bouncerInfo.LastPull == nil || time.Now().UTC().Sub(*bouncerInfo.LastPull) >= time.Minute {
 		if err := c.DBClient.UpdateBouncerLastPull(time.Now().UTC(), bouncerInfo.ID); err != nil {
 			log.Errorf("failed to update bouncer last pull: %v", err)
 		}
@@ -186,7 +186,7 @@ func writeStartupDecisions(gctx *gin.Context, filters map[string][]string, dbFun
 	return nil
 }
 
-func writeDeltaDecisions(gctx *gin.Context, filters map[string][]string, lastPull time.Time, dbFunc func(time.Time, map[string][]string) ([]*ent.Decision, error)) error {
+func writeDeltaDecisions(gctx *gin.Context, filters map[string][]string, lastPull *time.Time, dbFunc func(*time.Time, map[string][]string) ([]*ent.Decision, error)) error {
 	//respBuffer := bytes.NewBuffer([]byte{})
 	limit := 30000 //FIXME : make it configurable
 	needComma := false
@@ -348,8 +348,13 @@ func (c *Controller) StreamDecisionNonChunked(gctx *gin.Context, bouncerInfo *en
 	//data = KeepLongestDecision(data)
 	ret["new"] = FormatDecisions(data)
 
+	since := time.Time{}
+	if bouncerInfo.LastPull != nil {
+		since = bouncerInfo.LastPull.Add(-2 * time.Second)
+	}
+
 	// getting expired decisions
-	data, err = c.DBClient.QueryExpiredDecisionsSinceWithFilters(bouncerInfo.LastPull.Add((-2 * time.Second)), filters) // do we want to give exactly lastPull time ?
+	data, err = c.DBClient.QueryExpiredDecisionsSinceWithFilters(&since, filters) // do we want to give exactly lastPull time ?
 	if err != nil {
 		log.Errorf("unable to query expired decision for '%s' : %v", bouncerInfo.Name, err)
 		gctx.JSON(http.StatusInternalServerError, gin.H{"message": err.Error()})

diff --git a/pkg/database/decisions.go b/pkg/database/decisions.go
@@ -248,11 +248,15 @@ func longestDecisionForScopeTypeValue(s *sql.Selector) {
 	)
 }
 
-func (c *Client) QueryExpiredDecisionsSinceWithFilters(since time.Time, filters map[string][]string) ([]*ent.Decision, error) {
+func (c *Client) QueryExpiredDecisionsSinceWithFilters(since *time.Time, filters map[string][]string) ([]*ent.Decision, error) {
 	query := c.Ent.Decision.Query().Where(
 		decision.UntilLT(time.Now().UTC()),
-		decision.UntilGT(since),
 	)
+
+	if since != nil {
+		query = query.Where(decision.UntilGT(*since))
+	}
+
 	//Allow a bouncer to ask for non-deduplicated results
 	if v, ok := filters["dedup"]; !ok || v[0] != "false" {
 		query = query.Where(longestDecisionForScopeTypeValue)
@@ -274,12 +278,15 @@ func (c *Client) QueryExpiredDecisionsSinceWithFilters(since time.Time, filters
 	return data, nil
 }
 
-func (c *Client) QueryNewDecisionsSinceWithFilters(since time.Time, filters map[string][]string) ([]*ent.Decision, error) {
+func (c *Client) QueryNewDecisionsSinceWithFilters(since *time.Time, filters map[string][]string) ([]*ent.Decision, error) {
 	query := c.Ent.Decision.Query().Where(
-		decision.CreatedAtGT(since),
 		decision.UntilGT(time.Now().UTC()),
 	)
 
+	if since != nil {
+		query = query.Where(decision.CreatedAtGT(*since))
+	}
+
 	// Allow a bouncer to ask for non-deduplicated results
 	if v, ok := filters["dedup"]; !ok || v[0] != "false" {
 		query = query.Where(longestDecisionForScopeTypeValue)

diff --git a/pkg/database/ent/bouncer.go b/pkg/database/ent/bouncer.go
diff --git a/pkg/database/ent/bouncer/bouncer.go b/pkg/database/ent/bouncer/bouncer.go
diff --git a/pkg/database/ent/bouncer/where.go b/pkg/database/ent/bouncer/where.go
diff --git a/pkg/database/ent/bouncer_create.go b/pkg/database/ent/bouncer_create.go
diff --git a/pkg/database/ent/bouncer_update.go b/pkg/database/ent/bouncer_update.go
diff --git a/pkg/database/ent/migrate/schema.go b/pkg/database/ent/migrate/schema.go
diff --git a/pkg/database/ent/mutation.go b/pkg/database/ent/mutation.go
diff --git a/pkg/database/ent/runtime.go b/pkg/database/ent/runtime.go
diff --git a/pkg/database/ent/schema/bouncer.go b/pkg/database/ent/schema/bouncer.go
@@ -28,8 +28,7 @@ func (Bouncer) Fields() []ent.Field {
 		field.String("ip_address").Default("").Optional().StructTag(`json:"ip_address"`),
 		field.String("type").Optional().StructTag(`json:"type"`),
 		field.String("version").Optional().StructTag(`json:"version"`),
-		field.Time("last_pull").
-			Default(types.UtcNow).StructTag(`json:"last_pull"`),
+		field.Time("last_pull").Nillable().Optional().StructTag(`json:"last_pull"`),
 		field.String("auth_type").StructTag(`json:"auth_type"`).Default(types.ApiKeyAuthType),
 	}
 }