feat: add scan with validation func to Scanner interface (#298)

<!--
Thanks for contributing to 2ms by offering a pull request.
-->

Closes #

**Proposed Changes**

<!--
Please describe the big picture of your changes here. If it fixes a bug
or resolves a feature request, be sure to link to that issue.
-->

**Checklist**

- [x] I covered my changes with tests.
- [ ] I Updated the documentation that is affected by my changes:
  - [ ] Change in the CLI arguments
  - [ ] Change in the configuration file

I submit this contribution under the Apache-2.0 license.

Author: cx-ben-alvo

.2ms.yml

@@ -94,3 +94,15 @@ ignore-result:
   - 44912790c892213daa0df821a006e1e1659e6e24 # value used for testing
   - ac3704513c4ab9bde3fa3539b14152c95ba5698f # value used for testing
   - ac2d6adbeca8901c1655bcf3e0eac027ca681825 # value used for testing
+  - cfb06617a386e8c6a6fd25cf2dee18d88dfecbdd # value used for testing
+  - 33269ddd7e8734ef20906f888fcd4c971d1483bc # value used for testing
+  - 48b64922d5f628b4d57839f044c63f7000d0f840 # value used for testing
+  - 38f3e9d8932aa9fc51a6a20295f8f1a95efc7799 # value used for testing
+  - 1b14f7b1653e85b0c4e4b08b8ba5b508a896d102 # value used for testing
+  - 8180b128c17dac4e375c712c9f265612ac528824 # value used for testing
+  - 5b1a634de50b1ecbe1df038e02dbce5487083d54 # value used for testing
+  - fc9d1484bb5c0c8cdd34b9790ebf90609674bb3d # value used for testing
+  - af16d5223104c029475f82cd780fd57115ed1e2f # value used for testing
+  - 91bc1fc92b04c56c5f746d50df5759e39b956146 # value used for testing
+  - 4d4af54fd6e3e1209094e5838f339b6c95636f79 # value used for testing
+  - fabcbd067a3bbf3cd5951d03ed4f17918241316a # value used for testing

cmd/config.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/checkmarx/2ms/lib/utils"
+	"github.com/checkmarx/2ms/v3/lib/utils"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

cmd/main.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/checkmarx/2ms/engine"
-	"github.com/checkmarx/2ms/lib/config"
-	"github.com/checkmarx/2ms/lib/reporting"
-	"github.com/checkmarx/2ms/lib/secrets"
-	"github.com/checkmarx/2ms/plugins"
+	"github.com/checkmarx/2ms/v3/engine"
+	"github.com/checkmarx/2ms/v3/lib/config"
+	"github.com/checkmarx/2ms/v3/lib/reporting"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
+	"github.com/checkmarx/2ms/v3/plugins"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

cmd/main_test.go

@@ -2,9 +2,9 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/checkmarx/2ms/engine"
-	"github.com/checkmarx/2ms/lib/secrets"
-	"github.com/checkmarx/2ms/plugins"
+	"github.com/checkmarx/2ms/v3/engine"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
+	"github.com/checkmarx/2ms/v3/plugins"
 	"github.com/stretchr/testify/assert"
 	"sync"
 	"testing"

cmd/workers.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"context"
-	"github.com/checkmarx/2ms/engine"
-	"github.com/checkmarx/2ms/engine/extra"
-	"github.com/checkmarx/2ms/lib/secrets"
-	"golang.org/x/sync/errgroup"
 	"sync"
+
+	"github.com/checkmarx/2ms/v3/engine"
+	"github.com/checkmarx/2ms/v3/engine/extra"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
+	"golang.org/x/sync/errgroup"
 )
 
 func ProcessItems(engineInstance engine.IEngine, pluginName string) {
@@ -53,6 +54,20 @@ func ProcessSecrets() {
 	close(CvssScoreWithoutValidationChan)
 }
 
+func ProcessSecretsWithValidation() {
+	defer Channels.WaitGroup.Done()
+
+	for secret := range SecretsChan {
+		Report.TotalSecretsFound++
+		SecretsExtrasChan <- secret
+		ValidationChan <- secret
+		Report.Results[secret.ID] = append(Report.Results[secret.ID], secret)
+	}
+	close(SecretsExtrasChan)
+	close(ValidationChan)
+	close(CvssScoreWithoutValidationChan)
+}
+
 func ProcessSecretsExtras() {
 	defer Channels.WaitGroup.Done()
 

cmd/workers_test.go

@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/checkmarx/2ms/engine"
-	"github.com/checkmarx/2ms/lib/reporting"
-	"github.com/checkmarx/2ms/lib/secrets"
-	"github.com/checkmarx/2ms/plugins"
+	"github.com/checkmarx/2ms/v3/engine"
+	"github.com/checkmarx/2ms/v3/lib/reporting"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
+	"github.com/checkmarx/2ms/v3/plugins"
 	"github.com/stretchr/testify/assert"
 	"sort"
 	"strconv"

engine/engine.go

@@ -14,14 +14,14 @@ import (
 	"sync"
 	"text/tabwriter"
 
-	"github.com/checkmarx/2ms/engine/chunk"
-	"github.com/checkmarx/2ms/engine/linecontent"
-	"github.com/checkmarx/2ms/engine/rules"
-	"github.com/checkmarx/2ms/engine/score"
-	"github.com/checkmarx/2ms/engine/semaphore"
-	"github.com/checkmarx/2ms/engine/validation"
-	"github.com/checkmarx/2ms/lib/secrets"
-	"github.com/checkmarx/2ms/plugins"
+	"github.com/checkmarx/2ms/v3/engine/chunk"
+	"github.com/checkmarx/2ms/v3/engine/linecontent"
+	"github.com/checkmarx/2ms/v3/engine/rules"
+	"github.com/checkmarx/2ms/v3/engine/score"
+	"github.com/checkmarx/2ms/v3/engine/semaphore"
+	"github.com/checkmarx/2ms/v3/engine/validation"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
+	"github.com/checkmarx/2ms/v3/plugins"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/zricethezav/gitleaks/v8/config"

engine/engine_mock.go

@@ -10,11 +10,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/checkmarx/2ms/engine/chunk"
-	"github.com/checkmarx/2ms/engine/rules"
-	"github.com/checkmarx/2ms/engine/semaphore"
-	"github.com/checkmarx/2ms/lib/secrets"
-	"github.com/checkmarx/2ms/plugins"
+	"github.com/checkmarx/2ms/v3/engine/chunk"
+	"github.com/checkmarx/2ms/v3/engine/rules"
+	"github.com/checkmarx/2ms/v3/engine/semaphore"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
+	"github.com/checkmarx/2ms/v3/plugins"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"

engine/engine_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/checkmarx/2ms/lib/secrets"
+	"github.com/checkmarx/2ms/v3/lib/secrets"
 )
 
 type addExtraFunc = func(*secrets.Secret) interface{}