🟢 Add tests for sysInfoHeader and product overwrite fields

Add product name, version, and build fields to ClientSysInfo to allow
callers to overwrite the default mql identity in upstream headers.
Add comprehensive test coverage for sysInfoHeader including product
overwrites, partial fields, and fallback behavior.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: preslavgerchev

utils/ranger/plugins.go

@@ -21,6 +21,13 @@ type ClientSysInfo struct {
 	IP              string
 	Hostname        string
 	PlatformID      string
+	// the product using the header. e.g. 'mql' or 'cnspec'. if not set,
+	// defaults to 'mql'.
+	ProductName string
+	// the version of the product, e.g. '13.0.0'. if not set, defaults to the mql version.
+	ProductVersion string
+	// the build of the product, e.g. 'ab1f1'. if not set, defaults to the mql build.
+	ProductBuild string
 }
 
 func DefaultRangerPlugins(features mql.Features, si *ClientSysInfo) []ranger.ClientPlugin {
@@ -39,15 +46,23 @@ func sysInfoHeader(features mql.Features, si *ClientSysInfo) ranger.ClientPlugin
 
 	h := http.Header{}
 	info := map[string]string{
+		// these might get overwritten down below if details are provided
 		"mql":   mql.Version,
 		"build": mql.Build,
 	}
+
 	if si != nil {
 		info["PN"] = si.PlatformName
 		info["PR"] = si.PlatformVersion
 		info["PA"] = si.PlatformArch
 		info["IP"] = si.IP
 		info["HN"] = si.Hostname
+		if si.ProductName != "" && si.ProductVersion != "" {
+			info[si.ProductName] = si.ProductVersion
+		}
+		if si.ProductBuild != "" {
+			info["build"] = si.ProductBuild
+		}
 		h.Set(HttpHeaderPlatformID, si.PlatformID)
 	}
 

utils/ranger/plugins_test.go

@@ -0,0 +1,100 @@
+// Copyright (c) Mondoo, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package ranger
+
+import (
+	"runtime"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.mondoo.com/mql/v13"
+	"go.mondoo.com/ranger-rpc/plugins/scope"
+)
+
+func TestSysInfoHeader(t *testing.T) {
+	t.Run("nil sysinfo defaults PN to GOOS", func(t *testing.T) {
+		plugin := sysInfoHeader(mql.Features{}, nil)
+		h := plugin.GetHeader(nil)
+
+		parsed, err := scope.ParseXInfoHeader(h.Get("User-Agent"))
+		require.NoError(t, err)
+
+		assert.Equal(t, mql.Version, parsed["mql"])
+		assert.Equal(t, mql.Build, parsed["build"])
+		assert.Equal(t, runtime.GOOS, parsed["PN"])
+	})
+
+	t.Run("populates all sysinfo fields", func(t *testing.T) {
+		si := &ClientSysInfo{
+			PlatformName:    "ubuntu",
+			PlatformVersion: "22.04",
+			PlatformArch:    "amd64",
+			IP:              "10.0.0.1",
+			Hostname:        "myhost",
+			PlatformID:      "platform-123",
+			ProductName:     "cnspec",
+			ProductVersion:  "9.1.0",
+			ProductBuild:    "deadbeef",
+		}
+		plugin := sysInfoHeader(mql.Features{}, si)
+		h := plugin.GetHeader(nil)
+
+		parsed, err := scope.ParseXInfoHeader(h.Get("User-Agent"))
+		require.NoError(t, err)
+
+		assert.Equal(t, "ubuntu", parsed["PN"])
+		assert.Equal(t, "22.04", parsed["PR"])
+		assert.Equal(t, "amd64", parsed["PA"])
+		assert.Equal(t, "10.0.0.1", parsed["IP"])
+		assert.Equal(t, "myhost", parsed["HN"])
+		assert.Equal(t, mql.Version, parsed["mql"])
+		assert.Equal(t, "9.1.0", parsed["cnspec"])
+		assert.Equal(t, "deadbeef", parsed["build"])
+		assert.Equal(t, "platform-123", h.Get("Mondoo-PlatformID"))
+	})
+
+	t.Run("product name without version is ignored", func(t *testing.T) {
+		si := &ClientSysInfo{
+			PlatformName: "debian",
+			ProductName:  "cnspec",
+		}
+		plugin := sysInfoHeader(mql.Features{}, si)
+		h := plugin.GetHeader(nil)
+
+		parsed, err := scope.ParseXInfoHeader(h.Get("User-Agent"))
+		require.NoError(t, err)
+
+		_, hasProduct := parsed["cnspec"]
+		assert.False(t, hasProduct, "product should not be added when version is empty")
+		assert.Equal(t, mql.Version, parsed["mql"], "mql version should still be present")
+	})
+
+	t.Run("product version without name is ignored", func(t *testing.T) {
+		si := &ClientSysInfo{
+			PlatformName:   "debian",
+			ProductVersion: "9.1.0",
+		}
+		plugin := sysInfoHeader(mql.Features{}, si)
+		h := plugin.GetHeader(nil)
+
+		parsed, err := scope.ParseXInfoHeader(h.Get("User-Agent"))
+		require.NoError(t, err)
+
+		_, hasEmpty := parsed[""]
+		assert.False(t, hasEmpty, "empty product name should not be added as a key")
+		assert.Equal(t, mql.Version, parsed["mql"], "mql version should still be present")
+	})
+
+	t.Run("empty platform name defaults to GOOS", func(t *testing.T) {
+		si := &ClientSysInfo{PlatformName: ""}
+		plugin := sysInfoHeader(mql.Features{}, si)
+		h := plugin.GetHeader(nil)
+
+		parsed, err := scope.ParseXInfoHeader(h.Get("User-Agent"))
+		require.NoError(t, err)
+
+		assert.Equal(t, runtime.GOOS, parsed["PN"])
+	})
+}