Initialise client with OSV UserAgent.

Signed-off-by: kash2104 <kparikh1104@gmail.com>

Author: kash2104

clients/osv.go

@@ -30,7 +30,22 @@ import (
 var _ VulnerabilitiesClient = osvClient{}
 
 type osvClient struct {
-	local bool
+	local            bool
+	requestUserAgent string
+}
+
+type OSVConfig struct {
+	ExperimentalLocal bool
+	UserAgent         string
+}
+
+func NewOSVClient(config *OSVConfig) VulnerabilitiesClient {
+	cfg := osvClient{}
+	if config != nil {
+		cfg.local = config.ExperimentalLocal
+		cfg.requestUserAgent = config.UserAgent
+	}
+	return cfg
 }
 
 // ListUnfixedVulnerabilities implements VulnerabilityClient.ListUnfixedVulnerabilities.
@@ -54,6 +69,12 @@ func (v osvClient) ListUnfixedVulnerabilities(
 	if commit != "" {
 		gitCommits = append(gitCommits, commit)
 	}
+
+	exp := osvscanner.ExperimentalScannerActions{
+		PluginsEnabled:   []string{"python/requirements"},
+		PluginsDisabled:  []string{"python/requirementsenhanceable"},
+		RequestUserAgent: v.requestUserAgent,
+	}
 	res, err := osvscanner.DoScan(osvscanner.ScannerActions{
 		DirectoryPaths:    directoryPaths,
 		IncludeGitRoot:    false,
@@ -62,10 +83,7 @@ func (v osvClient) ListUnfixedVulnerabilities(
 		CompareOffline:    v.local,
 		DownloadDatabases: v.local,
 		// swap out the transitive requirements scanning for offline extractor
-		ExperimentalScannerActions: osvscanner.ExperimentalScannerActions{
-			PluginsEnabled:  []string{"python/requirements"},
-			PluginsDisabled: []string{"python/requirementsenhanceable"},
-		},
+		ExperimentalScannerActions: exp,
 	}) // TODO: Do logging?
 
 	response := VulnerabilitiesResponse{}

clients/vulnerabilities.go

@@ -29,7 +29,7 @@ type VulnerabilitiesClient interface {
 
 // DefaultVulnerabilitiesClient returns a new OSV Vulnerabilities client.
 func DefaultVulnerabilitiesClient() VulnerabilitiesClient {
-	return osvClient{local: false}
+	return NewOSVClient(nil)
 }
 
 // ExperimentalLocalOSVClient returns an OSV Vulnerabilities client which

cron/internal/worker/main.go

@@ -330,6 +330,9 @@ func main() {
 	info := version.GetVersionInfo()
 	actions := osvscanner.ExperimentalScannerActions{}
 	actions.RequestUserAgent = fmt.Sprintf("scorecard-cron/%s", info.GitVersion)
+	osvConfig := clients.OSVConfig{}
+	osvConfig.UserAgent = actions.RequestUserAgent
+	clients.NewOSVClient(&osvConfig)
 	flag.Parse()
 	if err := config.ReadConfig(); err != nil {
 		panic(err)

main.go

@@ -22,14 +22,18 @@ import (
 	"github.com/google/osv-scanner/v2/pkg/osvscanner"
 	"sigs.k8s.io/release-utils/version"
 
+	"github.com/ossf/scorecard/v5/clients"
 	"github.com/ossf/scorecard/v5/cmd"
 	"github.com/ossf/scorecard/v5/options"
 )
 
 func main() {
 	info := version.GetVersionInfo()
 	actions := osvscanner.ExperimentalScannerActions{}
+	config := clients.OSVConfig{}
 	actions.RequestUserAgent = fmt.Sprintf("scorecard-cli/%s", info.GitVersion)
+	config.UserAgent = actions.RequestUserAgent
+	clients.NewOSVClient(&config)
 	opts := options.New()
 	if err := cmd.New(opts).Execute(); err != nil {
 		log.Fatalf("error during command execution: %v", err)