From fcc4c5fe2f2835d12b32af15f3469bc49af2a642 Mon Sep 17 00:00:00 2001 From: Jon Hadfield Date: Mon, 29 Apr 2024 07:52:05 +0100 Subject: [PATCH] lint. --- cmd/root.go | 2 +- config/config.go | 2 +- providers/abuseipdb/abuseipdb.go | 2 +- providers/annotated/annotated.go | 2 +- providers/aws/aws.go | 6 +++--- providers/azure/azure.go | 2 +- providers/criminalip/criminalip.go | 4 ++-- providers/digitalocean/digitalocean.go | 2 +- providers/ipurl/ipurl.go | 6 +++--- providers/providers.go | 2 ++ providers/shodan/shodan.go | 2 +- 11 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index cbbd0df..4977456 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -168,7 +168,7 @@ func initConfig(cmd *cobra.Command) error { // initialise logging initLogging(cmd) - conf.HttpClient = getHTTPClient() + conf.HTTPClient = getHTTPClient() utd, err := cmd.Flags().GetBool("use-test-data") if err != nil { diff --git a/config/config.go b/config/config.go index 6a07348..3bbd468 100644 --- a/config/config.go +++ b/config/config.go @@ -84,7 +84,7 @@ type Config struct { MaxReports int `mapstructure:"max-reports"` DisableCache bool `mapstructure:"disable-cache"` } `mapstructure:"global"` - HttpClient *retryablehttp.Client + HTTPClient *retryablehttp.Client Host netip.Addr Providers Providers `mapstructure:"providers"` HideProgress bool `mapstructure:"hide-progress"` diff --git a/providers/abuseipdb/abuseipdb.go b/providers/abuseipdb/abuseipdb.go index 7c53db9..9493c18 100644 --- a/providers/abuseipdb/abuseipdb.go +++ b/providers/abuseipdb/abuseipdb.go @@ -206,7 +206,7 @@ func loadAPIResponse(ctx context.Context, c config.Config, apiKey string) (res * req.Header.Add("Key", apiKey) req.Header.Add("Accept", "application/json") - resp, err := c.HttpClient.Do(req) + resp, err := c.HTTPClient.Do(req) if err != nil { return nil, fmt.Errorf("failed to make request: %w", err) } diff --git a/providers/annotated/annotated.go b/providers/annotated/annotated.go index 903d541..3e04e7e 100644 --- a/providers/annotated/annotated.go +++ b/providers/annotated/annotated.go @@ -401,7 +401,7 @@ func getValidFilePathsFromDir(l *slog.Logger, dir string) (paths []os.DirEntry) func LoadFilePrefixesWithAnnotationsFromPath(path string, prefixesWithAnnotations map[netip.Prefix][]annotation) error { info, err := os.Stat(path) if os.IsNotExist(err) { - return err + return err // nolint: wrapcheck } path, err = filepath.Abs(path) diff --git a/providers/aws/aws.go b/providers/aws/aws.go index fe8efb4..2e8fa8d 100644 --- a/providers/aws/aws.go +++ b/providers/aws/aws.go @@ -63,7 +63,7 @@ func unmarshalProviderData(rBody []byte) (*aws.Doc, error) { func (c *ProviderClient) loadProviderData() error { awsClient := aws.New() - awsClient.Client = c.HttpClient + awsClient.Client = c.HTTPClient if c.Providers.AWS.URL != "" { awsClient.DownloadURL = c.Providers.AWS.URL @@ -128,7 +128,7 @@ func (c *ProviderClient) Initialise() error { return nil } -func loadTestData(c *ProviderClient) ([]byte, error) { +func loadTestData() ([]byte, error) { tdf, err := loadResultsFile("providers/aws/testdata/aws_18_164_52_75_report.json") if err != nil { return nil, err @@ -185,7 +185,7 @@ func (c *ProviderClient) FindHost() ([]byte, error) { if c.UseTestData { var loadErr error - out, loadErr = loadTestData(c) + out, loadErr = loadTestData() if loadErr != nil { return nil, loadErr } diff --git a/providers/azure/azure.go b/providers/azure/azure.go index e7faabd..b99c9f1 100644 --- a/providers/azure/azure.go +++ b/providers/azure/azure.go @@ -66,7 +66,7 @@ const ( func (c *ProviderClient) loadProviderDataFromSource() error { azureClient := azure.New() - azureClient.Client = c.HttpClient + azureClient.Client = c.HTTPClient if c.Providers.Azure.URL != "" { azureClient.DownloadURL = c.Providers.Azure.URL diff --git a/providers/criminalip/criminalip.go b/providers/criminalip/criminalip.go index c051c97..5582638 100644 --- a/providers/criminalip/criminalip.go +++ b/providers/criminalip/criminalip.go @@ -82,11 +82,11 @@ func loadAPIResponse(ctx context.Context, conf *config.Config, apiKey string) (r panic(err) } - conf.HttpClient.HTTPClient.Timeout = 30 * time.Second + conf.HTTPClient.HTTPClient.Timeout = 30 * time.Second req.Header.Add("x-api-key", apiKey) - resp, err := conf.HttpClient.Do(req) + resp, err := conf.HTTPClient.Do(req) if err != nil { panic(err) } diff --git a/providers/digitalocean/digitalocean.go b/providers/digitalocean/digitalocean.go index 2042c82..b56a65e 100644 --- a/providers/digitalocean/digitalocean.go +++ b/providers/digitalocean/digitalocean.go @@ -74,7 +74,7 @@ func unmarshalProviderData(data []byte) (*digitalocean.Doc, error) { func (c *ProviderClient) loadProviderData() error { digitaloceanClient := digitalocean.New() - digitaloceanClient.Client = c.HttpClient + digitaloceanClient.Client = c.HTTPClient if c.Providers.DigitalOcean.URL != "" { digitaloceanClient.DownloadURL = c.Providers.DigitalOcean.URL diff --git a/providers/ipurl/ipurl.go b/providers/ipurl/ipurl.go index 4345417..668dce2 100644 --- a/providers/ipurl/ipurl.go +++ b/providers/ipurl/ipurl.go @@ -216,8 +216,8 @@ type StoredURLPrefixes struct { } func (c *ProviderClient) loadProviderURLsFromSource(providerUrls []string) error { - ic := ipfetcherURL.New(ipfetcherURL.WithHttpClient(c.HttpClient)) - ic.HttpClient = c.HttpClient + ic := ipfetcherURL.New(ipfetcherURL.WithHttpClient(c.HTTPClient)) + ic.HttpClient = c.HTTPClient var wg sync.WaitGroup @@ -244,7 +244,7 @@ func (c *ProviderClient) loadProviderURLsFromSource(providerUrls []string) error // loadProviderDataFromSource fetches the data from the source and caches it for individual urls func (c *ProviderClient) loadProviderURLFromSource(pURL string) ([]netip.Prefix, error) { hf := ipfetcherURL.HttpFile{ - Client: c.HttpClient, + Client: c.HTTPClient, Url: pURL, } diff --git a/providers/providers.go b/providers/providers.go index 05b16ae..53fc9f2 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -169,6 +169,8 @@ func PortMatchFilter(in PortMatchFilterInput) (ageMatch, netMatch bool, err erro // TODO: Allow provider specific max value chars to override global func PreProcessValueOutput(conf *config.Config, provider string, in string) string { out := strings.TrimSpace(in) + + // abbreviate output value if it exceeds max value chars if conf.Global.MaxValueChars > 0 { if len(out) > int(conf.Global.MaxValueChars) { out = out[:conf.Global.MaxValueChars] + "..." diff --git a/providers/shodan/shodan.go b/providers/shodan/shodan.go index e9d51eb..0ac5681 100644 --- a/providers/shodan/shodan.go +++ b/providers/shodan/shodan.go @@ -74,7 +74,7 @@ func loadAPIResponse(ctx context.Context, c config.Config, apiKey string) (res * return nil, fmt.Errorf("failed to create request: %w", err) } - resp, err := c.HttpClient.Do(req) + resp, err := c.HTTPClient.Do(req) if err != nil { return nil, fmt.Errorf("failed to make request: %w", err) }