Prevent duplicate decisions to call script

Signed-off-by: Shivam Sandbhor <[email protected]>

Author: sbs2001

README.md

@@ -43,15 +43,13 @@ sudo ./install.sh
 
 ### Start
 
-If your bouncer run on the same machine as your crowdsec local API, you can start the service directly since the `install.sh` took care of the configuration.
+If your bouncer runs on the same machine as your crowdsec local API, you can start the service directly since the `install.sh` took care of the configuration.
 ```sh
 sudo systemctl start cs-custom-bouncer
 ```
 
 ## Upgrade
 
-## Upgrade
-
 If you already have `cs-custom-bouncer` installed, please download the [latest release](https://github.com/crowdsecurity/cs-custom-bouncer/releases) and run the following commands to upgrade it:
 
 ```bash

custom.go

@@ -12,8 +12,15 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/models"
 )
 
+type DecisionKey struct {
+	Value string
+	Type  string
+}
+
 type customBouncer struct {
-	path string
+	path                    string
+	newDecisionValueSet     map[DecisionKey]struct{}
+	expiredDecisionValueSet map[DecisionKey]struct{}
 }
 
 func newCustomBouncer(path string) (*customBouncer, error) {
@@ -22,17 +29,25 @@ func newCustomBouncer(path string) (*customBouncer, error) {
 	}, nil
 }
 
+func (c *customBouncer) ResetCache() {
+	c.newDecisionValueSet = make(map[DecisionKey]struct{})
+	c.expiredDecisionValueSet = make(map[DecisionKey]struct{})
+}
+
 func (c *customBouncer) Init() error {
+	c.ResetCache()
 	return nil
 }
 
 func (c *customBouncer) Add(decision *models.Decision) error {
+	if _, exists := c.newDecisionValueSet[decisionToDecisionKey(decision)]; exists {
+		return nil
+	}
 	banDuration, err := time.ParseDuration(*decision.Duration)
 	if err != nil {
 		return err
 	}
 	log.Printf("custom [%s] : add ban on %s for %s sec (%s)", c.path, *decision.Value, strconv.Itoa(int(banDuration.Seconds())), *decision.Scenario)
-
 	str, err := serializeDecision(decision)
 	if err != nil {
 		log.Warningf("serialize: %s", err)
@@ -41,15 +56,18 @@ func (c *customBouncer) Add(decision *models.Decision) error {
 	if out, err := cmd.CombinedOutput(); err != nil {
 		log.Infof("Error in 'add' command (%s): %v --> %s", cmd.String(), err, string(out))
 	}
+	c.newDecisionValueSet[decisionToDecisionKey(decision)] = struct{}{}
 	return nil
 }
 
 func (c *customBouncer) Delete(decision *models.Decision) error {
+	if _, exists := c.expiredDecisionValueSet[decisionToDecisionKey(decision)]; exists {
+		return nil
+	}
 	banDuration, err := time.ParseDuration(*decision.Duration)
 	if err != nil {
 		return err
 	}
-
 	str, err := serializeDecision(decision)
 	if err != nil {
 		log.Warningf("serialize: %s", err)
@@ -59,6 +77,7 @@ func (c *customBouncer) Delete(decision *models.Decision) error {
 	if out, err := cmd.CombinedOutput(); err != nil {
 		log.Infof("Error in 'del' command (%s): %v --> %s", cmd.String(), err, string(out))
 	}
+	c.expiredDecisionValueSet[decisionToDecisionKey(decision)] = struct{}{}
 	return nil
 }
 
@@ -73,3 +92,10 @@ func serializeDecision(decision *models.Decision) (string, error) {
 	}
 	return string(serbyte), nil
 }
+
+func decisionToDecisionKey(decision *models.Decision) DecisionKey {
+	return DecisionKey{
+		Value: *decision.Value,
+		Type:  *decision.Type,
+	}
+}

go.mod

@@ -3,17 +3,13 @@ module github.com/crowdsecurity/cs-custom-bouncer
 go 1.14
 
 require (
-	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/antonmedv/expr v1.8.9 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/crowdsecurity/crowdsec v1.0.2
 	github.com/crowdsecurity/go-cs-bouncer v0.0.0-20210113162030-7eec88c1afa8
 	github.com/go-openapi/validate v0.20.0 // indirect
-	github.com/hashicorp/go-version v1.2.1 // indirect
-	github.com/jinzhu/gorm v1.9.16 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
-	github.com/rogpeppe/godef v1.1.2 // indirect
 	github.com/sirupsen/logrus v1.7.0
+	github.com/vjeantet/grok v1.0.1 // indirect
 	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
 	golang.org/x/sys v0.0.0-20210113131315-ba0562f347e0 // indirect
 	golang.org/x/text v0.3.5 // indirect