Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed uri regex issue #3815

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

fixed uri regex issue #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e2d64e1
fixed uri regex issue
kashifkhan0771 Dec 23, 2024
49df1b3
extended password special char set
kashifkhan0771 Dec 30, 2024
546eb5c
Merge branch 'main' into fix/github-3686
kashifkhan0771 Dec 30, 2024
2833c3d
improved the regex and logic
kashifkhan0771 Dec 31, 2024
6b23703
updated test case
kashifkhan0771 Dec 31, 2024
464860f
Merge branch 'main' into fix/github-3686
kashifkhan0771 Dec 31, 2024
5104701
Merge branch 'main' into fix/github-3686
kashifkhan0771 Dec 31, 2024
0d2d520
Merge branch 'main' into fix/github-3686
kashifkhan0771 Dec 31, 2024
58b092b
Merge branch 'main' into fix/github-3686
kashifkhan0771 Jan 7, 2025
27e78cf
Merge branch 'main' into fix/github-3686
kashifkhan0771 Jan 8, 2025
93ac5d1
Merge branch 'main' into fix/github-3686
kashifkhan0771 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/detectors/privacy/privacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package privacy
import (
"context"
"fmt"
regexp "github.com/wasilibs/go-re2"
"net/http"
"strings"

regexp "github.com/wasilibs/go-re2"

"github.com/trufflesecurity/trufflehog/v3/pkg/common"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors"
"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"
Expand Down
14 changes: 11 additions & 3 deletions pkg/detectors/uri/uri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var _ detectors.Detector = (*Scanner)(nil)
var _ detectors.CustomFalsePositiveChecker = (*Scanner)(nil)

var (
keyPat = regexp.MustCompile(`\b(?:https?:)?\/\/[\S]{3,50}:([\S]{3,50})@[-.%\w\/:]+\b`)
keyPat = regexp.MustCompile(`\b(?:https?:\/\/)?[\w-\.$~!]{3,50}:([\w-\.%$^&#]{3,50})@[-.\w]+\b`)

// TODO: make local addr opt-out
defaultClient = detectors.DetectorHttpClientWithNoLocalAddresses
Expand All @@ -39,10 +39,10 @@ func (s Scanner) Keywords() []string {
func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) {
dataStr := string(data)

matches := keyPat.FindAllStringSubmatch(dataStr, -1)
var isProcessed = make(map[string]struct{})

matches := keyPat.FindAllStringSubmatch(dataStr, -1)
for _, match := range matches {

if !s.allowKnownTestSites {
if strings.Contains(match[0], "httpbin.org") {
continue
Expand All @@ -61,6 +61,11 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
continue
}

// if "url+password" combination is already processed continue
if _, ok := isProcessed[urlMatch+password]; ok {
continue
}

parsedURL, err := url.Parse(urlMatch)
if err != nil {
continue
Expand Down Expand Up @@ -98,6 +103,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
}

results = append(results, s1)

// add url+password in isProcessed list
isProcessed[urlMatch+password] = struct{}{}
}

return results, nil
Expand Down
6 changes: 6 additions & 0 deletions pkg/detectors/uri/uri_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

var (
validPattern = "https://kaNydBSAodo87dsm9asuiSAFtsd7.com:1234@qYY3SylY7fHP"
validPattern2 = `<p><a href="http://username:[email protected]">http://username:[email protected]</a></p>`
invalidPattern = "https://kaNydBSAodo87dsm9asuiSAFtsd7.com.1234@qYY3SylY7fHP"
keyword = "uri"
)
Expand All @@ -30,6 +31,11 @@ func TestURI_Pattern(t *testing.T) {
input: fmt.Sprintf("%s token = '%s'", keyword, validPattern),
want: []string{validPattern},
},
{
name: "valid pattern - do not process duplicate",
input: fmt.Sprintf("%s token = '%s'", keyword, validPattern2),
want: []string{"http://username:[email protected]"},
},
{
name: "invalid pattern",
input: fmt.Sprintf("%s = '%s'", keyword, invalidPattern),
Expand Down
Loading