lint: gocritic/captLocal (don't capitalize local variables) (crowdsec…

…urity#3402)

* lint: gocritic/captLocal (don't capitalize local variables)

* lint (whitespace)

.golangci.yml

@@ -192,7 +192,6 @@ linters-settings:
       - unnamedResult
       - sloppyReassign
       - appendCombine
-      - captLocal
       - typeUnparen
       - commentFormatting
       - deferInLoop             #

cmd/crowdsec-cli/clidecision/decisions.go

@@ -170,7 +170,7 @@ func (cli *cliDecisions) NewCommand() *cobra.Command {
 	return cmd
 }
 
-func (cli *cliDecisions) list(ctx context.Context, filter apiclient.AlertsListOpts, NoSimu *bool, contained *bool, printMachine bool) error {
+func (cli *cliDecisions) list(ctx context.Context, filter apiclient.AlertsListOpts, noSimu *bool, contained *bool, printMachine bool) error {
 	var err error
 
 	*filter.ScopeEquals, err = clialert.SanitizeScope(*filter.ScopeEquals, *filter.IPEquals, *filter.RangeEquals)
@@ -181,7 +181,7 @@ func (cli *cliDecisions) list(ctx context.Context, filter apiclient.AlertsListOp
 	filter.ActiveDecisionEquals = new(bool)
 	*filter.ActiveDecisionEquals = true
 
-	if NoSimu != nil && *NoSimu {
+	if noSimu != nil && *noSimu {
 		filter.IncludeSimulated = new(bool)
 	}
 	/* nullify the empty entries to avoid bad filter */

pkg/acquisition/acquisition.go

@@ -365,13 +365,13 @@ func copyEvent(evt types.Event, line string) types.Event {
 	return evtCopy
 }
 
-func transform(transformChan chan types.Event, output chan types.Event, AcquisTomb *tomb.Tomb, transformRuntime *vm.Program, logger *log.Entry) {
+func transform(transformChan chan types.Event, output chan types.Event, acquisTomb *tomb.Tomb, transformRuntime *vm.Program, logger *log.Entry) {
 	defer trace.CatchPanic("crowdsec/acquis")
 	logger.Infof("transformer started")
 
 	for {
 		select {
-		case <-AcquisTomb.Dying():
+		case <-acquisTomb.Dying():
 			logger.Debugf("transformer is dying")
 			return
 		case evt := <-transformChan:
@@ -420,7 +420,7 @@ func transform(transformChan chan types.Event, output chan types.Event, AcquisTo
 	}
 }
 
-func StartAcquisition(ctx context.Context, sources []DataSource, output chan types.Event, AcquisTomb *tomb.Tomb) error {
+func StartAcquisition(ctx context.Context, sources []DataSource, output chan types.Event, acquisTomb *tomb.Tomb) error {
 	// Don't wait if we have no sources, as it will hang forever
 	if len(sources) == 0 {
 		return nil
@@ -430,7 +430,7 @@ func StartAcquisition(ctx context.Context, sources []DataSource, output chan typ
 		subsrc := sources[i] // ensure its a copy
 		log.Debugf("starting one source %d/%d ->> %T", i, len(sources), subsrc)
 
-		AcquisTomb.Go(func() error {
+		acquisTomb.Go(func() error {
 			defer trace.CatchPanic("crowdsec/acquis")
 
 			var err error
@@ -449,29 +449,29 @@ func StartAcquisition(ctx context.Context, sources []DataSource, output chan typ
 					"datasource": subsrc.GetName(),
 				})
 
-				AcquisTomb.Go(func() error {
-					transform(outChan, output, AcquisTomb, transformRuntime, transformLogger)
+				acquisTomb.Go(func() error {
+					transform(outChan, output, acquisTomb, transformRuntime, transformLogger)
 					return nil
 				})
 			}
 
 			if subsrc.GetMode() == configuration.TAIL_MODE {
-				err = subsrc.StreamingAcquisition(ctx, outChan, AcquisTomb)
+				err = subsrc.StreamingAcquisition(ctx, outChan, acquisTomb)
 			} else {
-				err = subsrc.OneShotAcquisition(ctx, outChan, AcquisTomb)
+				err = subsrc.OneShotAcquisition(ctx, outChan, acquisTomb)
 			}
 
 			if err != nil {
 				// if one of the acqusition returns an error, we kill the others to properly shutdown
-				AcquisTomb.Kill(err)
+				acquisTomb.Kill(err)
 			}
 
 			return nil
 		})
 	}
 
 	/*return only when acquisition is over (cat) or never (tail)*/
-	err := AcquisTomb.Wait()
+	err := acquisTomb.Wait()
 
 	return err
 }

pkg/acquisition/modules/appsec/appsec.go

@@ -155,14 +155,14 @@ func (w *AppsecSource) GetAggregMetrics() []prometheus.Collector {
 	return []prometheus.Collector{AppsecReqCounter, AppsecBlockCounter, AppsecRuleHits, AppsecOutbandParsingHistogram, AppsecInbandParsingHistogram, AppsecGlobalParsingHistogram}
 }
 
-func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry, MetricsLevel int) error {
+func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry, metricsLevel int) error {
 	err := w.UnmarshalConfig(yamlConfig)
 	if err != nil {
 		return fmt.Errorf("unable to parse appsec configuration: %w", err)
 	}
 
 	w.logger = logger
-	w.metricsLevel = MetricsLevel
+	w.metricsLevel = metricsLevel
 	w.logger.Tracef("Appsec configuration: %+v", w.config)
 
 	if w.config.AuthCacheDuration == nil {
@@ -180,7 +180,7 @@ func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry, MetricsLe
 	w.InChan = make(chan appsec.ParsedRequest)
 	appsecCfg := appsec.AppsecConfig{Logger: w.logger.WithField("component", "appsec_config")}
 
-	//we keep the datasource name
+	// we keep the datasource name
 	appsecCfg.Name = w.config.Name
 
 	// let's load the associated appsec_config:
@@ -275,6 +275,7 @@ func (w *AppsecSource) StreamingAcquisition(ctx context.Context, out chan types.
 
 		for _, runner := range w.AppsecRunners {
 			runner.outChan = out
+
 			t.Go(func() error {
 				defer trace.CatchPanic("crowdsec/acquis/appsec/live/runner")
 				return runner.Run(t)
@@ -285,16 +286,20 @@ func (w *AppsecSource) StreamingAcquisition(ctx context.Context, out chan types.
 			if w.config.ListenSocket != "" {
 				w.logger.Infof("creating unix socket %s", w.config.ListenSocket)
 				_ = os.RemoveAll(w.config.ListenSocket)
+
 				listener, err := net.Listen("unix", w.config.ListenSocket)
 				if err != nil {
 					return fmt.Errorf("appsec server failed: %w", err)
 				}
+
 				defer listener.Close()
+
 				if w.config.CertFilePath != "" && w.config.KeyFilePath != "" {
 					err = w.server.ServeTLS(listener, w.config.CertFilePath, w.config.KeyFilePath)
 				} else {
 					err = w.server.Serve(listener)
 				}
+
 				if err != nil && !errors.Is(err, http.ErrServerClosed) {
 					return fmt.Errorf("appsec server failed: %w", err)
 				}
@@ -304,8 +309,10 @@ func (w *AppsecSource) StreamingAcquisition(ctx context.Context, out chan types.
 		})
 		t.Go(func() error {
 			var err error
+
 			if w.config.ListenAddr != "" {
 				w.logger.Infof("creating TCP server on %s", w.config.ListenAddr)
+
 				if w.config.CertFilePath != "" && w.config.KeyFilePath != "" {
 					err = w.server.ListenAndServeTLS(w.config.CertFilePath, w.config.KeyFilePath)
 				} else {
@@ -324,6 +331,7 @@ func (w *AppsecSource) StreamingAcquisition(ctx context.Context, out chan types.
 		// xx let's clean up the appsec runners :)
 		appsec.AppsecRulesDetails = make(map[int]appsec.RulesDetails)
 		w.server.Shutdown(ctx)
+
 		return nil
 	})
 
@@ -354,11 +362,13 @@ func (w *AppsecSource) IsAuth(apiKey string) bool {
 	}
 
 	req.Header.Add("X-Api-Key", apiKey)
+
 	resp, err := client.Do(req)
 	if err != nil {
 		log.Errorf("Error performing request: %s", err)
 		return false
 	}
+
 	defer resp.Body.Close()
 
 	return resp.StatusCode == http.StatusOK
@@ -371,17 +381,21 @@ func (w *AppsecSource) appsecHandler(rw http.ResponseWriter, r *http.Request) {
 	apiKey := r.Header.Get(appsec.APIKeyHeaderName)
 	clientIP := r.Header.Get(appsec.IPHeaderName)
 	remoteIP := r.RemoteAddr
+
 	if apiKey == "" {
 		w.logger.Errorf("Unauthorized request from '%s' (real IP = %s)", remoteIP, clientIP)
 		rw.WriteHeader(http.StatusUnauthorized)
+
 		return
 	}
+
 	expiration, exists := w.AuthCache.Get(apiKey)
 	// if the apiKey is not in cache or has expired, just recheck the auth
 	if !exists || time.Now().After(expiration) {
 		if !w.IsAuth(apiKey) {
 			rw.WriteHeader(http.StatusUnauthorized)
 			w.logger.Errorf("Unauthorized request from '%s' (real IP = %s)", remoteIP, clientIP)
+
 			return
 		}
 
@@ -394,8 +408,10 @@ func (w *AppsecSource) appsecHandler(rw http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.logger.Errorf("%s", err)
 		rw.WriteHeader(http.StatusInternalServerError)
+
 		return
 	}
+
 	parsedRequest.AppsecEngine = w.config.Name
 
 	logger := w.logger.WithFields(log.Fields{