lint

Author: mmetc

pkg/acquisition/modules/appsec/appsec.go

@@ -194,19 +194,16 @@ func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry, metricsLe
 
 	// let's load the associated appsec_config:
 	if w.config.AppsecConfigPath != "" {
-		err := appsecCfg.LoadByPath(w.config.AppsecConfigPath)
-		if err != nil {
+		if err = appsecCfg.LoadByPath(w.config.AppsecConfigPath); err != nil {
 			return fmt.Errorf("unable to load appsec_config: %w", err)
 		}
 	} else if w.config.AppsecConfig != "" {
-		err := appsecCfg.Load(w.config.AppsecConfig)
-		if err != nil {
+		if err = appsecCfg.Load(w.config.AppsecConfig); err != nil {
 			return fmt.Errorf("unable to load appsec_config: %w", err)
 		}
 	} else if len(w.config.AppsecConfigs) > 0 {
 		for _, appsecConfig := range w.config.AppsecConfigs {
-			err := appsecCfg.Load(appsecConfig)
-			if err != nil {
+			if err = appsecCfg.Load(appsecConfig); err != nil {
 				return fmt.Errorf("unable to load appsec_config: %w", err)
 			}
 		}
@@ -233,6 +230,7 @@ func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry, metricsLe
 	if err != nil {
 		return fmt.Errorf("unable to get authenticated LAPI client: %w", err)
 	}
+
 	w.appsecAllowlistClient = allowlists.NewAppsecAllowlist(w.apiClient, w.logger)
 
 	for nbRoutine := range w.config.Routines {

pkg/acquisition/modules/http/http_test.go

@@ -392,6 +392,7 @@ headers:
   key: test`), 2)
 
 	time.Sleep(1 * time.Second)
+
 	rawEvt := `{"test": "test"}`
 
 	errChan := make(chan error)
@@ -435,6 +436,7 @@ custom_headers:
 
 	rawEvt := `{"test": "test"}`
 	errChan := make(chan error)
+
 	go assertEvents(out, []string{rawEvt}, errChan)
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, fmt.Sprintf("%s/test", testHTTPServerAddr), strings.NewReader(rawEvt))
@@ -468,9 +470,11 @@ func (sr *slowReader) Read(p []byte) (int, error) {
 	if sr.index >= len(sr.body) {
 		return 0, io.EOF
 	}
+
 	time.Sleep(sr.delay) // Simulate a delay in reading
 	n := copy(p, sr.body[sr.index:])
 	sr.index += n
+
 	return n, nil
 }
 
@@ -497,10 +501,12 @@ func assertEvents(out chan types.Event, expected []string, errChan chan error) {
 			errChan <- fmt.Errorf(`expected %s, got '%+v'`, expected, evt.Line.Raw)
 			return
 		}
+
 		if evt.Line.Src != "127.0.0.1" {
 			errChan <- fmt.Errorf("expected '127.0.0.1', got '%s'", evt.Line.Src)
 			return
 		}
+
 		if evt.Line.Module != "http" {
 			errChan <- fmt.Errorf("expected 'http', got '%s'", evt.Line.Module)
 			return
@@ -606,6 +612,7 @@ tls:
 
 	rawEvt := `{"test": "test"}`
 	errChan := make(chan error)
+
 	go assertEvents(out, []string{rawEvt}, errChan)
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, fmt.Sprintf("%s/test", testHTTPServerAddrTLS), strings.NewReader(rawEvt))
@@ -666,6 +673,7 @@ tls:
 
 	rawEvt := `{"test": "test"}`
 	errChan := make(chan error)
+
 	go assertEvents(out, []string{rawEvt}, errChan)
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, fmt.Sprintf("%s/test", testHTTPServerAddrTLS), strings.NewReader(rawEvt))
@@ -702,6 +710,7 @@ headers:
 
 	rawEvt := `{"test": "test"}`
 	errChan := make(chan error)
+
 	go assertEvents(out, []string{rawEvt, rawEvt}, errChan)
 
 	var b strings.Builder
@@ -753,9 +762,10 @@ headers:
   key: test`), 2)
 
 	time.Sleep(1 * time.Second)
-	rawEvt := `{"test": "test"}`
 
+	rawEvt := `{"test": "test"}`
 	errChan := make(chan error)
+
 	go assertEvents(out, []string{rawEvt, rawEvt}, errChan)
 
 	client := &http.Client{}
@@ -786,10 +796,13 @@ func assertMetrics(t *testing.T, reg *prometheus.Registry, metrics []prometheus.
 	require.NoError(t, err)
 
 	isExist := false
+
 	for _, metricFamily := range promMetrics {
 		if metricFamily.GetName() == "cs_httpsource_hits_total" {
 			isExist = true
+
 			assert.Len(t, metricFamily.GetMetric(), 1)
+
 			for _, metric := range metricFamily.GetMetric() {
 				assert.InDelta(t, float64(expected), metric.GetCounter().GetValue(), 0.000001)
 				labels := metric.GetLabel()
@@ -801,6 +814,7 @@ func assertMetrics(t *testing.T, reg *prometheus.Registry, metrics []prometheus.
 			}
 		}
 	}
+
 	if !isExist && expected > 0 {
 		t.Fatalf("expected metric cs_httpsource_hits_total not found")
 	}

pkg/apiclient/auth_jwt.go

@@ -170,6 +170,7 @@ func (t *JWTTransport) prepareRequest(req *http.Request) (*http.Request, error)
 // RoundTrip implements the RoundTripper interface.
 func (t *JWTTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	var resp *http.Response
+
 	attemptsCount := make(map[int]int)
 
 	for {
@@ -213,6 +214,7 @@ func (t *JWTTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 		}
 
 		log.Debugf("retrying request to %s", req.URL.String())
+
 		attemptsCount[resp.StatusCode]++
 		log.Infof("attempt %d out of %d", attemptsCount[resp.StatusCode], config.MaxAttempts)
 
@@ -222,6 +224,7 @@ func (t *JWTTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 			time.Sleep(time.Duration(backoff) * time.Second)
 		}
 	}
+
 	return resp, nil
 }
 
@@ -242,5 +245,6 @@ func (t *JWTTransport) transport() http.RoundTripper {
 	if t.Transport != nil {
 		return t.Transport
 	}
+
 	return http.DefaultTransport
 }

pkg/apiclient/decisions_service.go

@@ -45,8 +45,8 @@ func (o *DecisionsStreamOpts) addQueryParamsToURL(url string) (string, error) {
 		return "", err
 	}
 
-	//Those 2 are a bit different
-	//They default to true, and we only want to include them if they are false
+	// Those 2 are a bit different
+	// They default to true, and we only want to include them if they are false
 
 	if params.Get("community_pull") == "true" {
 		params.Del("community_pull")

pkg/apiclient/heartbeat.go

@@ -33,7 +33,9 @@ func (h *HeartBeatService) Ping(ctx context.Context) (bool, *Response, error) {
 func (h *HeartBeatService) StartHeartBeat(ctx context.Context, t *tomb.Tomb) {
 	t.Go(func() error {
 		defer trace.CatchPanic("crowdsec/apiClient/heartbeat")
+
 		hbTimer := time.NewTicker(1 * time.Minute)
+
 		for {
 			select {
 			case <-hbTimer.C:
@@ -46,6 +48,7 @@ func (h *HeartBeatService) StartHeartBeat(ctx context.Context, t *tomb.Tomb) {
 				}
 
 				resp.Response.Body.Close()
+
 				if resp.Response.StatusCode != http.StatusOK {
 					log.Errorf("heartbeat unexpected return code: %d", resp.Response.StatusCode)
 					continue
@@ -58,6 +61,7 @@ func (h *HeartBeatService) StartHeartBeat(ctx context.Context, t *tomb.Tomb) {
 			case <-t.Dying():
 				log.Debugf("heartbeat: stopping")
 				hbTimer.Stop()
+
 				return nil
 			}
 		}

pkg/apiserver/middlewares/v1/tls_auth.go

@@ -131,9 +131,10 @@ func (ta *TLSAuth) ValidateCert(c *gin.Context) (string, error) {
 
 	okToCache := true
 
-	var validErr error
-
-	var couldCheck bool
+	var (
+		validErr   error
+		couldCheck bool
+	)
 
 	for _, chain := range c.Request.TLS.VerifiedChains {
 		validErr, couldCheck = ta.checkRevocationPath(c.Request.Context(), chain)

pkg/cticlient/client.go

@@ -42,6 +42,7 @@ func (c *CrowdsecCTIClient) doRequest(ctx context.Context, method string, endpoi
 			url += fmt.Sprintf("%s=%s&", k, v)
 		}
 	}
+
 	req, err := http.NewRequestWithContext(ctx, method, url, nil)
 	if err != nil {
 		return nil, err
@@ -54,68 +55,87 @@ func (c *CrowdsecCTIClient) doRequest(ctx context.Context, method string, endpoi
 	if err != nil {
 		return nil, err
 	}
+
 	defer resp.Body.Close()
+
 	if resp.StatusCode != http.StatusOK {
 		if resp.StatusCode == http.StatusForbidden {
 			return nil, ErrUnauthorized
 		}
+
 		if resp.StatusCode == http.StatusTooManyRequests {
 			return nil, ErrLimit
 		}
+
 		if resp.StatusCode == http.StatusNotFound {
 			return nil, ErrNotFound
 		}
+
 		return nil, fmt.Errorf("unexpected http code : %s", resp.Status)
 	}
+
 	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
+
 	return respBody, nil
 }
 
 func (c *CrowdsecCTIClient) GetIPInfo(ip string) (*SmokeItem, error) {
 	ctx := context.TODO()
+
 	body, err := c.doRequest(ctx, http.MethodGet, smokeEndpoint+"/"+ip, nil)
 	if err != nil {
 		if errors.Is(err, ErrNotFound) {
 			return &SmokeItem{}, nil
 		}
+
 		return nil, err
 	}
+
 	item := SmokeItem{}
+
 	err = json.Unmarshal(body, &item)
 	if err != nil {
 		return nil, err
 	}
+
 	return &item, nil
 }
 
 func (c *CrowdsecCTIClient) SearchIPs(ips []string) (*SearchIPResponse, error) {
 	ctx := context.TODO()
 	params := make(map[string]string)
 	params["ips"] = strings.Join(ips, ",")
+
 	body, err := c.doRequest(ctx, http.MethodGet, smokeEndpoint, params)
 	if err != nil {
 		return nil, err
 	}
+
 	searchIPResponse := SearchIPResponse{}
+
 	err = json.Unmarshal(body, &searchIPResponse)
 	if err != nil {
 		return nil, err
 	}
+
 	return &searchIPResponse, nil
 }
 
 func (c *CrowdsecCTIClient) Fire(params FireParams) (*FireResponse, error) {
 	ctx := context.TODO()
 	paramsMap := make(map[string]string)
+
 	if params.Page != nil {
 		paramsMap["page"] = fmt.Sprintf("%d", *params.Page)
 	}
+
 	if params.Since != nil {
 		paramsMap["since"] = *params.Since
 	}
+
 	if params.Limit != nil {
 		paramsMap["limit"] = fmt.Sprintf("%d", *params.Limit)
 	}
@@ -124,11 +144,14 @@ func (c *CrowdsecCTIClient) Fire(params FireParams) (*FireResponse, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	fireResponse := FireResponse{}
+
 	err = json.Unmarshal(body, &fireResponse)
 	if err != nil {
 		return nil, err
 	}
+
 	return &fireResponse, nil
 }
 
@@ -137,13 +160,16 @@ func NewCrowdsecCTIClient(options ...func(*CrowdsecCTIClient)) *CrowdsecCTIClien
 	for _, option := range options {
 		option(client)
 	}
+
 	if client.httpClient == nil {
 		client.httpClient = &http.Client{}
 	}
-	// we cannot return with a ni logger, so we set a default one
+
+	// we cannot return with a nil logger, so we set a default one
 	if client.Logger == nil {
 		client.Logger = log.NewEntry(log.New())
 	}
+
 	return client
 }