mirrors/crowdsec
1
0
Fork 0
mirror of https://github.com/crowdsecurity/crowdsec.git synced 2025-05-10 20:05:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact pkg/database: dry decision count (#3586)

Browse source
This commit is contained in:
mmetc 2025-04-24 10:25:48 +02:00 • committed by GitHub
parent d46cef1bcb
commit 34e306505c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

74
pkg/database/decisions.go
View file

@ -533,44 +533,10 @@ func (c *Client) ExpireDecisionByID(ctx context.Context, decisionID int) (int, [
return count, toUpdate, err
}
func (c *Client) CountDecisionsByValue(ctx context.Context, decisionValue string) (int, error) {
var (
err error
start_ip, start_sfx, end_ip, end_sfx int64
ip_sz, count int
)
ip_sz, start_ip, start_sfx, end_ip, end_sfx, err = types.Addr2Ints(decisionValue)
func (c *Client) CountDecisionsByValue(ctx context.Context, value string, since *time.Time, onlyActive bool) (int, error) {
ip_sz, start_ip, start_sfx, end_ip, end_sfx, err := types.Addr2Ints(value)
if err != nil {
return 0, errors.Wrapf(InvalidIPOrRange, "unable to convert '%s' to int: %s", decisionValue, err)
}
contains := true
decisions := c.Ent.Decision.Query()
decisions, err = decisionIPFilter(decisions, contains, ip_sz, start_ip, start_sfx, end_ip, end_sfx)
if err != nil {
return 0, errors.Wrapf(err, "fail to apply StartIpEndIpFilter")
}
count, err = decisions.Count(ctx)
if err != nil {
return 0, errors.Wrapf(err, "fail to count decisions")
}
return count, nil
}
func (c *Client) CountActiveDecisionsByValue(ctx context.Context, decisionValue string) (int, error) {
var (
err error
start_ip, start_sfx, end_ip, end_sfx int64
ip_sz, count int
)
ip_sz, start_ip, start_sfx, end_ip, end_sfx, err = types.Addr2Ints(decisionValue)
if err != nil {
return 0, fmt.Errorf("unable to convert '%s' to int: %w", decisionValue, err)
return 0, fmt.Errorf("unable to convert '%s' to int: %w", value, err)
}
contains := true
@ -581,9 +547,15 @@ func (c *Client) CountActiveDecisionsByValue(ctx context.Context, decisionValue
return 0, fmt.Errorf("fail to apply StartIpEndIpFilter: %w", err)
}
decisions = decisions.Where(decision.UntilGT(time.Now().UTC()))
if since != nil {
decisions = decisions.Where(decision.CreatedAtGT(*since))
}
count, err = decisions.Count(ctx)
if onlyActive {
decisions = decisions.Where(decision.UntilGT(time.Now().UTC()))
}
count, err := decisions.Count(ctx)
if err != nil {
return 0, fmt.Errorf("fail to count decisions: %w", err)
}
@ -627,30 +599,6 @@ func (c *Client) GetActiveDecisionsTimeLeftByValue(ctx context.Context, decision
return decision.Until.Sub(time.Now().UTC()), nil
}
func (c *Client) CountDecisionsSinceByValue(ctx context.Context, decisionValue string, since time.Time) (int, error) {
ip_sz, start_ip, start_sfx, end_ip, end_sfx, err := types.Addr2Ints(decisionValue)
if err != nil {
return 0, errors.Wrapf(InvalidIPOrRange, "unable to convert '%s' to int: %s", decisionValue, err)
}
contains := true
decisions := c.Ent.Decision.Query().Where(
decision.CreatedAtGT(since),
)
decisions, err = decisionIPFilter(decisions, contains, ip_sz, start_ip, start_sfx, end_ip, end_sfx)
if err != nil {
return 0, errors.Wrapf(err, "fail to apply StartIpEndIpFilter")
}
count, err := decisions.Count(ctx)
if err != nil {
return 0, errors.Wrapf(err, "fail to count decisions")
}
return count, nil
}
func decisionIPv4Filter(decisions *ent.DecisionQuery, contains bool, ip_sz int, start_ip int64, start_sfx int64, end_ip int64, end_sfx int64) (*ent.DecisionQuery, error) {
if contains {
/*Decision contains {start_ip,end_ip}*/

6
pkg/exprhelpers/helpers.go
View file

@ -642,7 +642,7 @@ func GetDecisionsCount(params ...any) (any, error) {
ctx := context.TODO()
count, err := dbClient.CountDecisionsByValue(ctx, value)
count, err := dbClient.CountDecisionsByValue(ctx, value, nil, false)
if err != nil {
log.Errorf("Failed to get decisions count from value '%s'", value)
return 0, nil //nolint:nilerr // This helper did not return an error before the move to expr.Function, we keep this behavior for backward compatibility
@ -670,7 +670,7 @@ func GetDecisionsSinceCount(params ...any) (any, error) {
ctx := context.TODO()
sinceTime := time.Now().UTC().Add(-sinceDuration)
count, err := dbClient.CountDecisionsSinceByValue(ctx, value, sinceTime)
count, err := dbClient.CountDecisionsByValue(ctx, value, &sinceTime, false)
if err != nil {
log.Errorf("Failed to get decisions count from value '%s'", value)
return 0, nil //nolint:nilerr // This helper did not return an error before the move to expr.Function, we keep this behavior for backward compatibility
@ -689,7 +689,7 @@ func GetActiveDecisionsCount(params ...any) (any, error) {
ctx := context.TODO()
count, err := dbClient.CountActiveDecisionsByValue(ctx, value)
count, err := dbClient.CountDecisionsByValue(ctx, value, nil, true)
if err != nil {
log.Errorf("Failed to get active decisions count from value '%s'", value)
return 0, err