Remove unused hasher

Authored-by: Owen Nelson <[email protected]>

Author: tw-owen-nelson

detector/chain.go

@@ -15,21 +15,21 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-//Chain represents a chain of Detectors.
-//It is itself a detector.
+// Chain represents a chain of Detectors.
+// It is itself a detector.
 type Chain struct {
 	detectors []detector.Detector
 	mode      string
 }
 
-//NewChain returns an empty DetectorChain
-//It is itself a detector, but it tests nothing.
+// NewChain returns an empty DetectorChain
+// It is itself a detector, but it tests nothing.
 func NewChain(hooktype string) *Chain {
 	result := Chain{[]detector.Detector{}, hooktype}
 	return &result
 }
 
-//DefaultChain returns a DetectorChain with pre-configured detectors
+// DefaultChain returns a DetectorChain with pre-configured detectors
 func DefaultChain(tRC *talismanrc.TalismanRC, runMode string) *Chain {
 	chain := NewChain(runMode)
 	chain.AddDetector(filename.DefaultFileNameDetector(tRC.Threshold))
@@ -38,21 +38,21 @@ func DefaultChain(tRC *talismanrc.TalismanRC, runMode string) *Chain {
 	return chain
 }
 
-//AddDetector adds the detector that is passed in to the chain
+// AddDetector adds the detector that is passed in to the chain
 func (dc *Chain) AddDetector(d detector.Detector) *Chain {
 	dc.detectors = append(dc.detectors, d)
 	return dc
 }
 
-//Test validates the additions against each detector in the chain.
-//The results are passed in from detector to detector and thus collect all errors from all detectors
+// Test validates the additions against each detector in the chain.
+// The results are passed in from detector to detector and thus collect all errors from all detectors
 func (dc *Chain) Test(currentAdditions []gitrepo.Addition, talismanRC *talismanrc.TalismanRC, result *helpers.DetectionResults) {
 	wd, _ := os.Getwd()
 	repo := gitrepo.RepoLocatedAt(wd)
 	allAdditions := repo.TrackedFilesAsAdditions()
 	hasher := utility.MakeHasher(dc.mode, wd)
 	calculator := checksumcalculator.NewChecksumCalculator(hasher, append(allAdditions, currentAdditions...))
-	cc := helpers.NewChecksumCompare(calculator, hasher, talismanRC)
+	cc := helpers.NewChecksumCompare(calculator, talismanRC)
 	log.Printf("Number of files to scan: %d\n", len(currentAdditions))
 	log.Printf("Number of detectors: %d\n", len(dc.detectors))
 	total := len(currentAdditions) * len(dc.detectors)

detector/filecontent/base64_aggressive_detector_test.go

@@ -2,7 +2,6 @@ package filecontent
 
 import (
 	"talisman/detector/helpers"
-	"talisman/utility"
 	"testing"
 
 	"talisman/gitrepo"
@@ -23,7 +22,7 @@ func TestShouldFlagPotentialAWSAccessKeysInAggressiveMode(t *testing.T) {
 
 	aggressiveModeFileContentDetector.
 		Test(
-			helpers.NewChecksumCompare(nil, utility.MakeHasher("default", "."), _blankTalismanRC),
+			helpers.NewChecksumCompare(nil, _blankTalismanRC),
 			additions,
 			_blankTalismanRC,
 			results,
@@ -40,7 +39,7 @@ func TestShouldFlagPotentialAWSAccessKeysAtPropertyDefinitionInAggressiveMode(t
 
 	aggressiveModeFileContentDetector.
 		Test(
-			helpers.NewChecksumCompare(nil, utility.MakeHasher("default", "."), _blankTalismanRC),
+			helpers.NewChecksumCompare(nil, _blankTalismanRC),
 			additions,
 			_blankTalismanRC,
 			results,
@@ -62,7 +61,7 @@ func TestShouldNotFlagPotentialSecretsWithinSafeJavaCodeEvenInAggressiveMode(t *
 
 	aggressiveModeFileContentDetector.
 		Test(
-			helpers.NewChecksumCompare(nil, utility.MakeHasher("default", "."), _blankTalismanRC),
+			helpers.NewChecksumCompare(nil, _blankTalismanRC),
 			additions,
 			_blankTalismanRC,
 			results,

detector/filecontent/filecontent_detector_test.go

@@ -9,7 +9,6 @@ import (
 	"talisman/gitrepo"
 	mock "talisman/internal/mock/checksumcalculator"
 	"talisman/talismanrc"
-	"talisman/utility"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -18,8 +17,7 @@ import (
 )
 
 var emptyTalismanRC = &talismanrc.TalismanRC{IgnoreConfigs: []talismanrc.IgnoreConfig{}}
-var defaultChecksumCompareUtility = helpers.
-	NewChecksumCompare(nil, utility.MakeHasher("default", "."), emptyTalismanRC)
+var defaultChecksumCompareUtility = helpers.NewChecksumCompare(nil, emptyTalismanRC)
 var dummyCallback = func() {}
 var filename = "filename"
 
@@ -44,8 +42,7 @@ func TestShouldIgnoreFileIfNeeded(t *testing.T) {
 	mockChecksumCalculator.EXPECT().
 		CalculateCollectiveChecksumForPattern("filename").
 		Return("mock-checksum-for-filename")
-	checksumCompare := helpers.
-		NewChecksumCompare(mockChecksumCalculator, utility.MakeHasher("default", "."), talismanRCIWithFilenameIgnore)
+	checksumCompare := helpers.NewChecksumCompare(mockChecksumCalculator, talismanRCIWithFilenameIgnore)
 
 	NewFileContentDetector(talismanRCIWithFilenameIgnore).
 		Test(checksumCompare, additions, talismanRCIWithFilenameIgnore, results, dummyCallback)
@@ -191,8 +188,7 @@ func TestShouldNotFlagPotentialCreditCardNumberIfAboveThreshold(t *testing.T) {
 	results := helpers.NewDetectionResults(talismanrc.HookMode)
 	additions := []gitrepo.Addition{gitrepo.NewAddition(filename, []byte(creditCardNumber))}
 	talismanRCWithThreshold := &talismanrc.TalismanRC{Threshold: severity.High}
-	checksumCompareWithThreshold := helpers.
-		NewChecksumCompare(nil, utility.MakeHasher("default", "."), talismanRCWithThreshold)
+	checksumCompareWithThreshold := helpers.NewChecksumCompare(nil, talismanRCWithThreshold)
 
 	NewFileContentDetector(emptyTalismanRC).
 		Test(checksumCompareWithThreshold, additions, talismanRCWithThreshold, results, dummyCallback)
@@ -221,18 +217,17 @@ func TestResultsShouldNotFlagCreditCardNumberIfSpecifiedInFileIgnores(t *testing
 		AllowedPatterns: []string{creditCardNumber},
 	}
 	talismanRCWithFileIgnore := &talismanrc.TalismanRC{
-		IgnoreConfigs:   []talismanrc.IgnoreConfig{fileIgnoreConfig},
+		IgnoreConfigs: []talismanrc.IgnoreConfig{fileIgnoreConfig},
 	}
 	additions := []gitrepo.Addition{gitrepo.NewAddition(filename, []byte(creditCardNumber))}
 
 	NewFileContentDetector(emptyTalismanRC).
 		Test(defaultChecksumCompareUtility, additions, talismanRCWithFileIgnore, results, dummyCallback)
-	
+
 	assert.False(t, results.HasFailures(), "Expected the creditcard number to be ignored based on talisman RC")
 
 }
 
-
 func TestResultsShouldContainHexTextsIfHexAndBase64ExistInFile(t *testing.T) {
 	const hex string = "68656C6C6F20776F726C6421"
 	const base64 string = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"

detector/filename/filename_detector_test.go

@@ -7,7 +7,6 @@ import (
 	"regexp"
 	"talisman/detector/helpers"
 	"talisman/detector/severity"
-	"talisman/utility"
 	"testing"
 
 	"talisman/gitrepo"
@@ -17,7 +16,7 @@ import (
 )
 
 var talismanRC = &talismanrc.TalismanRC{}
-var defaultChecksumCompareUtility = helpers.NewChecksumCompare(nil, utility.MakeHasher("default", "."), talismanRC)
+var defaultChecksumCompareUtility = helpers.NewChecksumCompare(nil, talismanRC)
 
 func TestShouldFlagPotentialSSHPrivateKeys(t *testing.T) {
 	shouldFail("id_rsa", "^.+_rsa$", severity.Low, t)

detector/filesize/filesize_detector_test.go

@@ -3,7 +3,6 @@ package filesize
 import (
 	"talisman/detector/helpers"
 	"talisman/detector/severity"
-	"talisman/utility"
 	"testing"
 
 	"talisman/gitrepo"
@@ -13,13 +12,12 @@ import (
 )
 
 var talismanRC = &talismanrc.TalismanRC{}
-var defaultHasher = utility.MakeHasher("default", ".")
 
 func TestShouldFlagLargeFiles(t *testing.T) {
 	results := helpers.NewDetectionResults(talismanrc.HookMode)
 	content := []byte("more than one byte")
 	additions := []gitrepo.Addition{gitrepo.NewAddition("filename", content)}
-	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, defaultHasher, talismanRC), additions, talismanRC, results, func() {})
+	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, talismanRC), additions, talismanRC, results, func() {})
 	assert.True(t, results.HasFailures(), "Expected file to fail the check against file size detector.")
 }
 
@@ -28,7 +26,7 @@ func TestShouldNotFlagLargeFilesIfThresholdIsBelowSeverity(t *testing.T) {
 	content := []byte("more than one byte")
 	talismanRCWithThreshold := &talismanrc.TalismanRC{Threshold: severity.High}
 	additions := []gitrepo.Addition{gitrepo.NewAddition("filename", content)}
-	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, defaultHasher, talismanRCWithThreshold), additions, talismanRCWithThreshold, results, func() {})
+	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, talismanRCWithThreshold), additions, talismanRCWithThreshold, results, func() {})
 	assert.False(t, results.HasFailures(), "Expected file to not fail the check against file size detector.")
 	assert.True(t, results.HasWarnings(), "Expected file to have warnings against file size detector.")
 }
@@ -37,7 +35,7 @@ func TestShouldNotFlagSmallFiles(t *testing.T) {
 	results := helpers.NewDetectionResults(talismanrc.HookMode)
 	content := []byte("m")
 	additions := []gitrepo.Addition{gitrepo.NewAddition("filename", content)}
-	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, defaultHasher, talismanRC), additions, talismanRC, results, func() {})
+	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, talismanRC), additions, talismanRC, results, func() {})
 	assert.False(t, results.HasFailures(), "Expected file to not fail the check against file size detector.")
 }
 
@@ -55,6 +53,6 @@ func TestShouldNotFlagIgnoredLargeFiles(t *testing.T) {
 	talismanRC.IgnoreConfigs[0] = fileIgnoreConfig
 
 	additions := []gitrepo.Addition{gitrepo.NewAddition(filename, content)}
-	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, defaultHasher, talismanRC), additions, talismanRC, results, func() {})
+	NewFileSizeDetector(2).Test(helpers.NewChecksumCompare(nil, talismanRC), additions, talismanRC, results, func() {})
 	assert.True(t, results.Successful(), "expected file %s to be ignored by file size detector", filename)
 }

detector/helpers/checksum_compare.go

@@ -4,18 +4,16 @@ import (
 	"talisman/checksumcalculator"
 	"talisman/gitrepo"
 	"talisman/talismanrc"
-	"talisman/utility"
 )
 
 type ChecksumCompare struct {
 	calculator checksumcalculator.ChecksumCalculator
-	hasher     utility.SHA256Hasher
 	talismanRC *talismanrc.TalismanRC
 }
 
 // NewChecksumCompare returns new instance of the ChecksumCompare
-func NewChecksumCompare(calculator checksumcalculator.ChecksumCalculator, hasher utility.SHA256Hasher, talismanRCConfig *talismanrc.TalismanRC) ChecksumCompare {
-	return ChecksumCompare{calculator: calculator, hasher: hasher, talismanRC: talismanRCConfig}
+func NewChecksumCompare(calculator checksumcalculator.ChecksumCalculator, talismanRCConfig *talismanrc.TalismanRC) ChecksumCompare {
+	return ChecksumCompare{calculator: calculator, talismanRC: talismanRCConfig}
 }
 
 func (cc *ChecksumCompare) IsScanNotRequired(addition gitrepo.Addition) bool {

detector/helpers/checksum_compare_test.go

@@ -5,7 +5,6 @@ import (
 	"talisman/gitrepo"
 	mockchecksumcalculator "talisman/internal/mock/checksumcalculator"
 	"talisman/talismanrc"
-	"talisman/utility"
 
 	"github.com/golang/mock/gomock"
 	logr "github.com/sirupsen/logrus"
@@ -23,7 +22,7 @@ func TestChecksumCompare_IsScanNotRequired(t *testing.T) {
 		ignoreConfig := &talismanrc.TalismanRC{
 			IgnoreConfigs: []talismanrc.IgnoreConfig{},
 		}
-		cc := NewChecksumCompare(nil, utility.MakeHasher("default", "."), ignoreConfig)
+		cc := NewChecksumCompare(nil, ignoreConfig)
 		addition := gitrepo.Addition{Path: "some.txt"}
 
 		required := cc.IsScanNotRequired(addition)
@@ -43,7 +42,7 @@ func TestChecksumCompare_IsScanNotRequired(t *testing.T) {
 				},
 			},
 		}
-		cc := NewChecksumCompare(checksumCalculator, utility.MakeHasher("default", "."), &ignoreConfig)
+		cc := NewChecksumCompare(checksumCalculator, &ignoreConfig)
 		addition := gitrepo.Addition{Name: "some.txt"}
 		checksumCalculator.EXPECT().CalculateCollectiveChecksumForPattern("some.txt").Return("sha1")
 

detector/pattern/pattern_detector_test.go

@@ -7,14 +7,13 @@ import (
 	"talisman/detector/severity"
 	"talisman/gitrepo"
 	"talisman/talismanrc"
-	"talisman/utility"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 var talismanRC = &talismanrc.TalismanRC{}
-var defaultChecksumCompare = helpers.NewChecksumCompare(nil, utility.MakeHasher("default", "."), talismanRC)
+var defaultChecksumCompare = helpers.NewChecksumCompare(nil, talismanRC)
 var dummyCallback = func() {}
 
 var (
@@ -30,8 +29,8 @@ func TestShouldDetectPasswordPatterns(t *testing.T) {
 		shouldPassDetectionOfSecretPattern(filename, []byte("."+values[i]+"=randomStringGoesHere}"), t)
 		shouldPassDetectionOfSecretPattern(filename, []byte(":"+values[i]+" randomStringGoesHere"), t)
 		shouldPassDetectionOfSecretPattern(filename, []byte(values[i]+" ,\"randomStringGoesHere\""), t)
-		shouldPassDetectionOfSecretPattern(filename, []byte("'" + values[i]+"' ,\"randomStringGoesHere\""), t)
-		shouldPassDetectionOfSecretPattern(filename, []byte("\"" + values[i]+"\" ,\"randomStringGoesHere\""), t)
+		shouldPassDetectionOfSecretPattern(filename, []byte("'"+values[i]+"' ,\"randomStringGoesHere\""), t)
+		shouldPassDetectionOfSecretPattern(filename, []byte("\""+values[i]+"\" ,\"randomStringGoesHere\""), t)
 		shouldPassDetectionOfSecretPattern(filename,
 			[]byte("\"SERVER_"+strings.ToUpper(values[i])+"\" : UnsafeString"),
 			t)
@@ -104,7 +103,7 @@ func TestShouldOnlyWarnSecretPatternIfBelowThreshold(t *testing.T) {
 	filename := "secret.txt"
 	additions := []gitrepo.Addition{gitrepo.NewAddition(filename, content)}
 	talismanRCWithThreshold := &talismanrc.TalismanRC{Threshold: severity.High}
-	checksumCompare := helpers.NewChecksumCompare(nil, utility.MakeHasher("default", "."), talismanRCWithThreshold)
+	checksumCompare := helpers.NewChecksumCompare(nil, talismanRCWithThreshold)
 
 	NewPatternDetector(customPatterns).Test(checksumCompare, additions, talismanRCWithThreshold, results, dummyCallback)