add agent info in upstream requests

Signed-off-by: Ivan Milchev <[email protected]>

apps/cnquery/cmd/login.go

@@ -19,6 +19,7 @@ import (
 	cnquery_providers "go.mondoo.com/cnquery/v10/providers"
 	"go.mondoo.com/cnquery/v10/providers-sdk/v1/sysinfo"
 	"go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream"
+	rangerUtils "go.mondoo.com/cnquery/v10/utils/ranger"
 	"go.mondoo.com/ranger-rpc"
 	"go.mondoo.com/ranger-rpc/codes"
 	"go.mondoo.com/ranger-rpc/plugins/authentication/statictoken"
@@ -72,7 +73,7 @@ func register(token string, annotations map[string]string, timer int, splay int)
 	if err != nil {
 		return cli_errors.NewCommandError(errors.Wrap(err, "could not gather client information"), 1)
 	}
-	defaultPlugins := defaultRangerPlugins(sysInfo, cnquery.DefaultFeatures)
+	defaultPlugins := rangerUtils.DefaultRangerPlugins(cnquery.DefaultFeatures)
 
 	apiEndpoint := viper.GetString("api_endpoint")
 	token = strings.TrimSpace(token)

apps/cnquery/cmd/logout.go

@@ -14,8 +14,8 @@ import (
 	"go.mondoo.com/cnquery/v10/cli/config"
 	cli_errors "go.mondoo.com/cnquery/v10/cli/errors"
 	cnquery_providers "go.mondoo.com/cnquery/v10/providers"
-	"go.mondoo.com/cnquery/v10/providers-sdk/v1/sysinfo"
 	"go.mondoo.com/cnquery/v10/providers-sdk/v1/upstream"
+	rangerUtils "go.mondoo.com/cnquery/v10/utils/ranger"
 	"sigs.k8s.io/yaml"
 )
 
@@ -48,19 +48,13 @@ ensure the credentials cannot be used in the future.
 		// print the used config to the user
 		config.DisplayUsedConfig()
 
-		// determine information about the client
-		sysInfo, err := sysinfo.Get()
-		if err != nil {
-			return errors.Wrap(err, "could not gather client information")
-		}
-
 		// check valid client authentication
 		serviceAccount := opts.GetServiceCredential()
 		if serviceAccount == nil {
 			return cli_errors.NewCommandError(errors.Wrap(err, "could not initialize client authentication"), ConfigurationErrorCode)
 		}
 
-		plugins := defaultRangerPlugins(sysInfo, opts.GetFeatures())
+		plugins := rangerUtils.DefaultRangerPlugins(opts.GetFeatures())
 		certAuth, err := upstream.NewServiceAccountRangerPlugin(serviceAccount)
 		if err != nil {
 			log.Error().Err(err).Msg("could not initialize client authentication")

apps/cnquery/cmd/root.go

@@ -4,7 +4,6 @@
 package cmd
 
 import (
-	"net/http"
 	"os"
 	"regexp"
 	"strings"
@@ -14,15 +13,11 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 	"github.com/spf13/viper"
-	"go.mondoo.com/cnquery/v10"
 	"go.mondoo.com/cnquery/v10/cli/config"
 	cli_errors "go.mondoo.com/cnquery/v10/cli/errors"
 	"go.mondoo.com/cnquery/v10/cli/providers"
 	"go.mondoo.com/cnquery/v10/cli/theme"
 	"go.mondoo.com/cnquery/v10/logger"
-	"go.mondoo.com/cnquery/v10/providers-sdk/v1/sysinfo"
-	"go.mondoo.com/ranger-rpc"
-	"go.mondoo.com/ranger-rpc/plugins/scope"
 )
 
 const (
@@ -138,38 +133,6 @@ func initLogger() {
 	logger.Set(level)
 }
 
-func defaultRangerPlugins(sysInfo *sysinfo.SystemInfo, features cnquery.Features) []ranger.ClientPlugin {
-	plugins := []ranger.ClientPlugin{}
-	plugins = append(plugins, scope.NewRequestIDRangerPlugin())
-	plugins = append(plugins, sysInfoHeader(sysInfo, features))
-	return plugins
-}
-
-func sysInfoHeader(sysInfo *sysinfo.SystemInfo, features cnquery.Features) ranger.ClientPlugin {
-	const (
-		HttpHeaderUserAgent      = "User-Agent"
-		HttpHeaderClientFeatures = "Mondoo-Features"
-		HttpHeaderPlatformID     = "Mondoo-PlatformID"
-	)
-
-	h := http.Header{}
-	info := map[string]string{
-		"cnquery": cnquery.Version,
-		"build":   cnquery.Build,
-	}
-	if sysInfo != nil {
-		info["PN"] = sysInfo.Platform.Name
-		info["PR"] = sysInfo.Platform.Version
-		info["PA"] = sysInfo.Platform.Arch
-		info["IP"] = sysInfo.IP
-		info["HN"] = sysInfo.Hostname
-		h.Set(HttpHeaderPlatformID, sysInfo.PlatformId)
-	}
-	h.Set(HttpHeaderUserAgent, scope.XInfoHeader(info))
-	h.Set(HttpHeaderClientFeatures, features.Encode())
-	return scope.NewCustomHeaderRangerPlugin(h)
-}
-
 var reMdName = regexp.MustCompile(`/([^/]+)\.md$`)
 
 func GenerateMarkdown(dir string) error {

explorer/scan/local_scanner.go

@@ -227,7 +227,7 @@ func (s *LocalScanner) distributeJob(job *Job, ctx context.Context, upstream *up
 	// plan scan jobs
 	reporter := NewAggregateReporter()
 	if job.Bundle == nil && upstream != nil && upstream.Creds != nil {
-		client, err := upstream.InitClient()
+		client, err := upstream.InitClient(ctx)
 		if err != nil {
 			return nil, err
 		}
@@ -271,7 +271,7 @@ func (s *LocalScanner) distributeJob(job *Job, ctx context.Context, upstream *up
 	spaceMrn := ""
 	var services *explorer.Services
 	if upstream != nil && upstream.ApiEndpoint != "" && !upstream.Incognito {
-		client, err := upstream.InitClient()
+		client, err := upstream.InitClient(ctx)
 		if err != nil {
 			return nil, err
 		}
@@ -447,7 +447,7 @@ func (s *LocalScanner) runMotorizedAsset(job *AssetJob) (*AssetReport, error) {
 	runtimeErr := inmemory.WithDb(job.runtime, func(db *inmemory.Db, services *explorer.LocalServices) error {
 		if job.UpstreamConfig != nil && job.UpstreamConfig.ApiEndpoint != "" && !job.UpstreamConfig.Incognito {
 			log.Debug().Msg("using API endpoint " + job.UpstreamConfig.ApiEndpoint)
-			client, err := job.UpstreamConfig.InitClient()
+			client, err := job.UpstreamConfig.InitClient(job.Ctx)
 			if err != nil {
 				return err
 			}

providers-sdk/v1/upstream/upstream.go

@@ -4,12 +4,15 @@
 package upstream
 
 import (
+	"context"
 	"errors"
 	"net/http"
 	"net/url"
 
 	"github.com/rs/zerolog/log"
+	"go.mondoo.com/cnquery/v10"
 	"go.mondoo.com/cnquery/v10/utils/multierr"
+	rangerUtils "go.mondoo.com/cnquery/v10/utils/ranger"
 	"go.mondoo.com/ranger-rpc"
 	guard_cert_auth "go.mondoo.com/ranger-rpc/plugins/authentication/cert"
 	"go.mondoo.com/ranger-rpc/plugins/rangerguard/crypto"
@@ -52,15 +55,17 @@ type UpstreamClient struct {
 	HttpClient *http.Client
 }
 
-func (c *UpstreamConfig) InitClient() (*UpstreamClient, error) {
+func (c *UpstreamConfig) InitClient(ctx context.Context) (*UpstreamClient, error) {
 	certAuth, err := NewServiceAccountRangerPlugin(c.Creds)
 	if err != nil {
 		return nil, multierr.Wrap(err, "could not initialize client authentication")
 	}
+	plugins := []ranger.ClientPlugin{certAuth}
+	plugins = append(plugins, rangerUtils.DefaultRangerPlugins(cnquery.GetFeatures(ctx))...)
 
 	res := UpstreamClient{
 		UpstreamConfig: *c,
-		Plugins:        []ranger.ClientPlugin{certAuth},
+		Plugins:        plugins,
 		HttpClient:     c.httpClient(),
 	}
 

providers/arista/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"net/url"
 	"strconv"
@@ -132,7 +133,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/atlassian/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 
 	"go.mondoo.com/cnquery/v10/llx"
@@ -145,7 +146,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/aws/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"strings"
 
@@ -214,7 +215,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/azure/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -211,7 +212,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/core/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 
 	"go.mondoo.com/cnquery/v10/llx"
@@ -40,7 +41,7 @@ func (s *Service) Connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 		var upstream *upstream.UpstreamClient
 		var err error
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/equinix/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"os"
 
@@ -116,7 +117,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/gcp/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"os"
 
@@ -229,7 +230,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/github/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"os"
 	"strings"
@@ -135,7 +136,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/gitlab/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"os"
 	"strconv"
@@ -149,7 +150,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/google-workspace/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"os"
 
@@ -167,7 +168,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/ipmi/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"net/url"
 	"strconv"
@@ -126,7 +127,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/k8s/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 
 	"go.mondoo.com/cnquery/v10"
@@ -164,7 +165,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}

providers/ms365/provider/provider.go

@@ -4,6 +4,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 
 	"go.mondoo.com/cnquery/v10/providers-sdk/v1/inventory"
@@ -123,7 +124,7 @@ func (s *Service) connect(req *plugin.ConnectReq, callback plugin.ProviderCallba
 
 		var upstream *upstream.UpstreamClient
 		if req.Upstream != nil && !req.Upstream.Incognito {
-			upstream, err = req.Upstream.InitClient()
+			upstream, err = req.Upstream.InitClient(context.Background())
 			if err != nil {
 				return nil, err
 			}