trufflesecurity/trufflehog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[chore] Address more linter errors (#1134)

Browse Source 
* Address lint errors in detectors

* Update deprecated ioutil call
This commit is contained in:
Miccah
2023-02-28 10:00:41 -06:00
committed by GitHub
parent 4efe5313f4
commit 6209a80ce1
34 changed files with 30 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/detectors/abbysale/abbysale.go
+1 -2
View File
@@ -2,7 +2,6 @@ package abbysale
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("x-api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/bitfinex/bitfinex.go
+1 -1
View File
@@ -86,7 +86,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
s1.Verified = isValid
// If there is a valid one, we need to stop iterating now and return the valid result
if isValid == true {
if isValid {
break
}
}
pkg/detectors/brandfetch/brandfetch.go
+1 -2
View File
@@ -2,7 +2,6 @@ package brandfetch
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -56,7 +55,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Content-Type", "application/json")
req.Header.Add("x-api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/clockify/clockify.go
+1 -2
View File
@@ -2,7 +2,6 @@ package clockify
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("content-type", "application/json")
req.Header.Add("X-Api-Key", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Api-Key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/cloudflarecakey/cloudflarecakey.go
-1
View File
@@ -66,7 +66,6 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if res.StatusCode >= 200 && res.StatusCode < 300 {
s1.Verified = true
}
} else {
}
}
pkg/detectors/everhour/everhour.go
+1 -2
View File
@@ -2,7 +2,6 @@ package everhour
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Content-Type", "application/json")
req.Header.Add("X-Api-Key", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Api-Key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/fastlypersonaltoken/fastlypersonaltoken.go
+1 -1
View File
@@ -61,7 +61,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("Fastly-Key", fmt.Sprintf("%s", resMatch))
req.Header.Add("Fastly-Key", resMatch)
res, err := client.Do(req)
if err == nil {
bodyBytes, err := io.ReadAll(res.Body)
pkg/detectors/figmapersonalaccesstoken/figmapersonalaccesstoken.go
+1 -2
View File
@@ -2,7 +2,6 @@ package figmapersonalaccesstoken
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -51,7 +50,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("X-Figma-Token", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Figma-Token", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/fulcrum/fulcrum.go
+1 -2
View File
@@ -2,7 +2,6 @@ package fulcrum
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Accept", "application/json")
req.Header.Add("X-ApiToken", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-ApiToken", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/generic/generic.go
+1 -2
View File
@@ -44,8 +44,7 @@ func New() Scanner {
}
type Scanner struct {
programmingBookWords []string
excludeMatchers []*regexp.Regexp
excludeMatchers []*regexp.Regexp
}
// Ensure the Scanner satisfies the interface at compile time.
pkg/detectors/impala/impala.go
+1 -2
View File
@@ -2,7 +2,6 @@ package impala
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("x-api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/interseller/interseller.go
-5
View File
@@ -56,11 +56,6 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
defer res.Body.Close()
if res.StatusCode >= 200 && res.StatusCode < 300 {
s1.Verified = true
} else {
// This function will check false positives for common test words, but also it will make sure the key appears 'random' enough to be a real key
// if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) {
// continue
// }
}
}
}
pkg/detectors/keenio/keenio.go
+1 -2
View File
@@ -2,7 +2,6 @@ package keenio
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -61,7 +60,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Content-Type", "application/json")
req.Header.Add("Authorization", fmt.Sprintf("%s", resMatch))
req.Header.Add("Authorization", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/newrelicpersonalapikey/newrelicpersonalapikey.go
+1 -2
View File
@@ -2,7 +2,6 @@ package newrelicpersonalapikey
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("X-Api-Key", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Api-Key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/newscatcher/newscatcher.go
+1 -2
View File
@@ -2,7 +2,6 @@ package newscatcher
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("x-api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/nftport/nftport.go
+1 -2
View File
@@ -2,7 +2,6 @@ package nftport
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Content-Type", "application/json")
req.Header.Add("Authorization", fmt.Sprintf("%s", resMatch))
req.Header.Add("Authorization", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/omnisend/omnisend.go
+1 -2
View File
@@ -2,7 +2,6 @@ package omnisend
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("X-API-KEY", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-API-KEY", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/openuv/openuv.go
+1 -2
View File
@@ -2,7 +2,6 @@ package openuv
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("x-access-token", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-access-token", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/pepipost/pepipost.go
+1 -2
View File
@@ -2,7 +2,6 @@ package pepipost
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("api_key", fmt.Sprintf("%s", resMatch))
req.Header.Add("api_key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/postman/postman.go
+1 -2
View File
@@ -2,7 +2,6 @@ package postman
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("x-api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/postmark/postmark.go
+1 -2
View File
@@ -2,7 +2,6 @@ package postmark
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
}
req.Header.Add("Accept", "application/json")
req.Header.Add("Content-Type", "application/json")
req.Header.Add("X-Postmark-Server-Token", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Postmark-Server-Token", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/prospectio/prospectio.go
+1 -2
View File
@@ -2,7 +2,6 @@ package prospectio
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("Authorization", fmt.Sprintf("%s", resMatch))
req.Header.Add("Authorization", resMatch)
req.Header.Add("Content-Type", "application/vnd.api+json; charset=utf-8")
res, err := client.Do(req)
if err == nil {
pkg/detectors/pushbulletapikey/pushbulletapikey.go
+1 -2
View File
@@ -2,7 +2,6 @@ package pushbulletapikey
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("Access-Token", fmt.Sprintf("%s", resMatch))
req.Header.Add("Access-Token", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/qubole/qubole.go
+1 -2
View File
@@ -2,7 +2,6 @@ package qubole
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -54,7 +53,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
}
req.Header.Add("Content-Type", "application/json")
req.Header.Add("Accept", "application/json")
req.Header.Add("X-AUTH-TOKEN", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-AUTH-TOKEN", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/rapidapi/rapidapi.go
+1 -2
View File
@@ -2,7 +2,6 @@ package rapidapi
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -51,7 +50,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("x-rapidapi-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-rapidapi-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/rechargepayments/rechargepayments.go
-1
View File
@@ -16,7 +16,6 @@ type Scanner struct{}
var _ detectors.Detector = (*Scanner)(nil)
var (
client = common.SaneHttpClient()
verifyURL = "https://api.rechargeapps.com/token_information"
// Make sure that your group is surrounded in boundary characters such as below to reduce false positives.
pkg/detectors/scalewaykey/scalewaykey.go
+1 -2
View File
@@ -2,7 +2,6 @@ package scalewaykey
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -51,7 +50,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("X-Auth-Token", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Auth-Token", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/sendinbluev2/sendinbluev2.go
+1 -2
View File
@@ -2,7 +2,6 @@ package sendinbluev2
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -51,7 +50,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/shortcut/shortcut.go
-8
View File
@@ -65,19 +65,11 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if strings.Contains(body, "app_url") {
s1.Verified = true
} else {
// if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) {
// continue
// }
}
}
}
results = append(results, s1)
}
return results, nil
}
pkg/detectors/skrappio/skrappio.go
+1 -2
View File
@@ -2,7 +2,6 @@ package skrappio
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Content-Type", "application/json")
req.Header.Add("X-Access-Key", fmt.Sprintf("%s", resMatch))
req.Header.Add("X-Access-Key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/stormglass/stormglass.go
+1 -2
View File
@@ -2,7 +2,6 @@ package stormglass
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("Authorization", fmt.Sprintf("%s", resMatch))
req.Header.Add("Authorization", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/tatumio/tatumio.go
+1 -2
View File
@@ -2,7 +2,6 @@ package tatumio
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -53,7 +52,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}
req.Header.Add("Accept", "application/vnd.tatumio+json; version=3")
req.Header.Add("x-api-key", fmt.Sprintf("%s", resMatch))
req.Header.Add("x-api-key", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/detectors/zonkafeedback/zonkafeedback.go
+1 -2
View File
@@ -2,7 +2,6 @@ package zonkafeedback
import (
"context"
"fmt"
"net/http"
"regexp"
"strings"
@@ -52,7 +51,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if err != nil {
continue
}
req.Header.Add("Z-API-TOKEN", fmt.Sprintf("%s", resMatch))
req.Header.Add("Z-API-TOKEN", resMatch)
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
pkg/sources/git/git.go
+1 -2
View File
@@ -5,7 +5,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/url"
"os"
"os/exec"
@@ -257,7 +256,7 @@ func CloneRepo(ctx context.Context, userInfo *url.Userinfo, gitUrl string, args
if err := gitCmdCheck(); err != nil {
return "", nil, err
}
clonePath, err := ioutil.TempDir(os.TempDir(), "trufflehog")
clonePath, err := os.MkdirTemp(os.TempDir(), "trufflehog")
if err != nil {
return "", nil, err
}