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

Jump to bottom

Add feature flags to CLI args #3359

Merged
merged 5 commits into from
Oct 15, 2024
Merged

Add feature flags to CLI args #3359

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f5acdb
Update main.go
ktranSC Oct 2, 2024
9d48902
Update main.go
ktranSC Oct 2, 2024
b8f2077
Merge branch 'main' into patch-1
ktranSC Oct 3, 2024
c85d562
Merge branch 'main' into patch-1
ktranSC Oct 14, 2024
0bc4061
Merge branch 'main' into patch-1
ktranSC Oct 15, 2024
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
24 changes: 24 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/trufflesecurity/trufflehog/v3/pkg/handlers"
"github.com/trufflesecurity/trufflehog/v3/pkg/log"
"github.com/trufflesecurity/trufflehog/v3/pkg/output"
"github.com/trufflesecurity/trufflehog/v3/pkg/feature"
"github.com/trufflesecurity/trufflehog/v3/pkg/sources"
"github.com/trufflesecurity/trufflehog/v3/pkg/tui"
"github.com/trufflesecurity/trufflehog/v3/pkg/updater"
Expand Down Expand Up @@ -70,6 +71,12 @@ var (
excludeDetectors = cli.Flag("exclude-detectors", "Comma separated list of detector types to exclude. Protobuf name or IDs may be used, as well as ranges. IDs defined here take precedence over the include list.").String()
jobReportFile = cli.Flag("output-report", "Write a scan report to the provided path.").Hidden().OpenFile(os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)

// Add feature flags
forceSkipBinaries = cli.Flag("force-skip-binaries", "Force skipping binaries.").Bool()
forceSkipArchives = cli.Flag("force-skip-archives", "Force skipping archives.").Bool()
skipAdditionalRefs = cli.Flag("skip-additional-refs", "Skip additional references.").Bool()
userAgentSuffix = cli.Flag("user-agent-suffix", "Suffix to add to User-Agent.").String()

gitScan = cli.Command("git", "Find credentials in git repositories.")
gitScanURI = gitScan.Arg("uri", "Git repository URL. https://, file://, or ssh:// schema expected.").Required().String()
gitScanIncludePaths = gitScan.Flag("include-paths", "Path to file with newline separated regexes for files to include in scan.").Short('i').String()
Expand Down Expand Up @@ -368,6 +375,23 @@ func run(state overseer.State) {
}()
}

// Set feature configurations from CLI flags
if *forceSkipBinaries {
feature.ForceSkipBinaries.Store(true)
}

if *forceSkipArchives {
feature.ForceSkipArchives.Store(true)
}

if *skipAdditionalRefs {
feature.SkipAdditionalRefs.Store(true)
}

if *userAgentSuffix != "" {
feature.UserAgentSuffix.Store(*userAgentSuffix)
}

conf := &config.Config{}
if *configFilename != "" {
var err error
Expand Down
Loading