fix up regex

This commit is contained in:
Zachary Rice 2023-09-25 13:34:05 -05:00
parent c01402761c
commit 291718f4d9
2 changed files with 15 additions and 11 deletions

View file

@ -25,7 +25,7 @@ var (
defaultClient = common.SaneHttpClientTimeOut(5 * time.Second)
// Make sure that your group is surrounded in boundary characters such as below to reduce false positives
keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"dynadot"}) + `\b([a-z0-9A-Z]{30})\b`)
keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"dynadot"}) + `\b([a-z0-9A-Z]{45})\b`)
)
func (s Scanner) Keywords() []string {
@ -53,7 +53,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
if client == nil {
client = defaultClient
}
req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.dynadot.com/api3.xml?key=%s&command=create_contact&name=Webb&email=myemail@email.com&phonenum=8662623399&phonecc=1&address1=POBox345&city=SanMateo&zip=94401&country=US", resMatch), nil)
req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.dynadot.com/api3.json?key=%s&command=search&domain0=mydomain.com&show_price=1&currency=USD", resMatch), nil)
if err != nil {
s1.VerificationError = err
} else {

View file

@ -6,10 +6,11 @@ import (
"testing"
"time"
"github.com/kylelemons/godebug/pretty"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/trufflesecurity/trufflehog/v3/pkg/common"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors"
"github.com/trufflesecurity/trufflehog/v3/pkg/common"
"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"
)
@ -29,11 +30,12 @@ func TestDynadot_FromChunk(t *testing.T) {
verify bool
}
tests := []struct {
name string
s Scanner
args args
want []detectors.Result
wantErr bool
name string
s Scanner
args args
want []detectors.Result
wantErr bool
wantVerificationErr bool
}{
{
name: "found, verified",
@ -65,7 +67,8 @@ func TestDynadot_FromChunk(t *testing.T) {
Verified: false,
},
},
wantErr: false,
wantErr: false,
wantVerificationErr: true,
},
{
name: "not found",
@ -93,7 +96,8 @@ func TestDynadot_FromChunk(t *testing.T) {
}
got[i].Raw = nil
}
if diff := pretty.Compare(got, tt.want); diff != "" {
ignoreOpts := cmpopts.IgnoreFields(detectors.Result{}, "Raw", "VerificationError")
if diff := cmp.Diff(got, tt.want, ignoreOpts); diff != "" {
t.Errorf("Dynadot.FromData() %s diff: (-got +want)\n%s", tt.name, diff)
}
})