Add collector to get pci and lsmod data

Author: brett060102

build/packaging/suseconnect-ng.spec

@@ -56,6 +56,7 @@ Requires:       ca-certificates
 %endif
 
 Requires:       coreutils
+Requires:       pciutils
 Requires:       zypper
 Requires:       util-linux
 Recommends:     systemd

cmd/suseconnect/suseconnect.go

@@ -118,6 +118,11 @@ func main() {
 	flag.BoolVar(&info, "i", false, "")
 
 	flag.Parse()
+	// when info set nothing sent to SCC,
+	// in that case we don't want to update
+	// contents of the data checksum files
+	util.UpdateLargeDataIDs = !info
+
 	if version {
 		fmt.Println(connect.GetShortenedVersion())
 		os.Exit(0)

internal/collectors/lsmod.go

@@ -0,0 +1,80 @@
+package collectors
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/sha256"
+	"encoding/hex"
+	"sort"
+	"strings"
+
+	"github.com/SUSE/connect-ng/internal/util"
+)
+
+type LSMOD struct{}
+
+const KernModChecksumFile = "/etc/zypp/chksum-kernmoddata.txt"
+const lsmodTag = "lsmod_data"
+
+func (lsmod LSMOD) run(arch string) (Result, error) {
+	modInfo, err := util.Execute([]string{"lsmod"}, nil)
+	// Should not happen, but if command fails
+	// send nil to SCC to indicate that module data was unavailable.
+	if err != nil {
+		return Result{lsmodTag: nil}, err
+	}
+	scanner := bufio.NewScanner(bytes.NewReader(modInfo))
+
+	// Iterate through each line get module name
+	modList := make(map[string]bool)
+	for scanner.Scan() {
+		module := strings.Fields(scanner.Text())[0]
+		// skip "Mudule" from the hearder line
+		if module != "Module" {
+			modList[module] = true // update module list
+		}
+	}
+	// Check for any errors during scanning
+	if err := scanner.Err(); err != nil {
+		return Result{lsmodTag: nil}, err
+	}
+
+	// run through mudual list removing duplicates
+	var sortedMods []string
+	for module := range modList {
+		sortedMods = append(sortedMods, module)
+	}
+
+	// sort the module list, , since the order does not matter
+	// and may change over system reboots.
+	sort.Strings(sortedMods)
+
+	// create new line seperated list of sorted modules
+	output := strings.Join(sortedMods, "\n")
+
+	byteOutput := []byte(output)
+	// get sha256 has a pci data
+	mkSha256 := sha256.New()
+	mkSha256.Write([]byte(byteOutput))
+	sha256 := mkSha256.Sum(nil)
+	modProfileId := hex.EncodeToString(sha256)
+
+	oldmodProfileId := util.GetChecksum(KernModChecksumFile)
+	if oldmodProfileId != modProfileId {
+		if util.UpdateLargeDataIDs {
+			util.Debug.Print("updating: ", KernModChecksumFile)
+			err = util.PutChecksum(KernModChecksumFile, modProfileId)
+			if err != nil {
+				return Result{lsmodTag: nil}, err
+			}
+		}
+		var dataBlob util.Profile
+		dataBlob.ProfileID = modProfileId
+		dataBlob.ProfileData = sortedMods
+		return Result{lsmodTag: dataBlob}, nil
+	} else {
+		var dataBlob util.Profile
+		dataBlob.ProfileID = modProfileId
+		return Result{lsmodTag: dataBlob}, nil
+	}
+}

internal/collectors/lsmod_test.go

@@ -0,0 +1,74 @@
+package collectors
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/SUSE/connect-ng/internal/util"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLSMODRunSuccess(t *testing.T) {
+	assert := assert.New(t)
+
+	var dataBlob util.Profile
+	dataBlob.ProfileID = "a27b6fd9514de9b56319922c0af28783ceec4d36230e16a32d35b060fa733c33"
+	dataBlob.ProfileData = []string{"acpi_tad", "autofs4", "ccp", "dmi_sysfs", "efi_pstore", "hid_generic", "i2c_algo_bit", "i2c_piix4", "i2c_smbus", "input_leds", "ip_tables", "joydev", "k10temp", "lp", "mac_hid", "mc", "msr", "nfnetlink", "nvme", "nvme_core", "parport", "parport_pc", "ppdev", "psmouse", "r8169", "rc_core", "realtek", "sch_fq_codel", "snd_pci_acp3x", "snd_soc_acpi", "soundcore", "usbhid", "x_tables"}
+
+	kernModTestData := `rc_core                73728  1 cec
+snd_soc_acpi           16384  3 snd_sof_amd_acp,snd_acp_config,snd_pci_ps
+i2c_piix4              32768  0
+mc                     81920  5 videodev,snd_usb_audio,videobuf2_v4l2,uvcvideo,videobuf2_common
+k10temp                16384  0
+i2c_algo_bit           16384  1 amdgpu
+i2c_smbus              20480  1 i2c_piix4
+soundcore              16384  1 snd
+ccp                   155648  1 kvm_amd
+snd_pci_acp3x          16384  0
+input_leds             12288  0
+joydev                 32768  0
+acpi_tad               20480  0
+mac_hid                12288  0
+sch_fq_codel           24576  4
+msr                    12288  0
+parport_pc             53248  0
+ppdev                  24576  0
+lp                     28672  0
+parport                73728  3 parport_pc,lp,ppdev
+efi_pstore             12288  0
+nfnetlink              20480  5 nft_compat,nf_tables,ip_set
+dmi_sysfs              24576  0
+ip_tables              32768  0
+x_tables               65536  9 xt_conntrack,nft_compat,xt_tcpudp,xt_addrtype,xt_CHECKSUM,xt_set,ipt_REJECT,ip_tables,xt_MASQUERADE
+autofs4                57344  2
+hid_generic            12288  0
+usbhid                 77824  0
+nvme                   61440  2
+psmouse               217088  0
+r8169                 126976  0
+nvme_core             225280  3 nvme
+realtek                49152  2
+`
+
+	mockUtilExecute(kernModTestData, nil)
+	expected := Result{"lsmod_data": dataBlob}
+
+	collector := LSMOD{}
+	result, err := collector.run(ARCHITECTURE_X86_64)
+
+	assert.Equal(expected, result)
+	assert.Nil(err)
+}
+
+func TestLSMODRunFail(t *testing.T) {
+	assert := assert.New(t)
+
+	mockUtilExecute("", fmt.Errorf("forced error"))
+	expected := Result{"lsmod_data": nil}
+
+	collector := LSMOD{}
+	result, err := collector.run(ARCHITECTURE_X86_64)
+
+	assert.Equal(expected, result)
+	assert.ErrorContains(err, "forced error")
+}

internal/collectors/pci.go

@@ -0,0 +1,49 @@
+package collectors
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+
+	"github.com/SUSE/connect-ng/internal/util"
+)
+
+// var InfoOnly bool // indicated that -i/--info was used
+const PCIChecksumFile = "/etc/zypp/chksum-pcidata.txt"
+const pciTag = "pci_data"
+
+type PCI struct{}
+
+func (pci PCI) run(arch string) (Result, error) {
+	output, err := util.Execute([]string{"lspci", "-s", ".0"}, nil)
+	// Some systems may not have lspci command, so
+	// if the execute fails,
+	// send nil to SCC to indicate that PCI data was unavailable.
+	if err != nil {
+		return Result{pciTag: nil}, err
+	}
+	stringOutput := string(output)
+	// get sha256 has a pci data
+	mkSha256 := sha256.New()
+	mkSha256.Write([]byte(output))
+	sha256 := mkSha256.Sum(nil)
+	hwIndex := hex.EncodeToString(sha256)
+
+	oldHwIndex := util.GetChecksum(PCIChecksumFile)
+	if oldHwIndex != hwIndex {
+		if util.UpdateLargeDataIDs {
+			util.Debug.Print("updating: ", PCIChecksumFile)
+			err = util.PutChecksum(PCIChecksumFile, hwIndex)
+			if err != nil {
+				return Result{pciTag: nil}, err
+			}
+		}
+		var dataBlob util.Profile
+		dataBlob.ProfileID = hwIndex
+		dataBlob.ProfileData = stringOutput
+		return Result{pciTag: dataBlob}, nil
+	} else {
+		var dataBlob util.Profile
+		dataBlob.ProfileID = hwIndex
+		return Result{pciTag: dataBlob}, nil
+	}
+}

internal/collectors/pci_test.go

@@ -0,0 +1,66 @@
+package collectors
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/SUSE/connect-ng/internal/util"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPCIRunSuccess(t *testing.T) {
+	assert := assert.New(t)
+
+	var dataBlob util.Profile
+	dataBlob.ProfileID = "de5b2af84042cbe8298be6864362a99bae3e087fea4efcdad9e33f58fa323185"
+	dataBlob.ProfileData = "00:00.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h-19h PCIe Root Complex (rev 01)\n00:01.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h-19h PCIe Dummy Host Bridge (rev 01)\n00:02.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h-19h PCIe Dummy Host Bridge (rev 01)\n00:03.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h-19h PCIe Dummy Host Bridge (rev 01)\n00:04.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h-19h PCIe Dummy Host Bridge (rev 01)\n00:08.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h-19h PCIe Dummy Host Bridge (rev 01)\n00:14.0 SMBus: Advanced Micro Devices, Inc. [AMD] FCH SMBus Controller (rev 71)\n00:18.0 Host bridge: Advanced Micro Devices, Inc. [AMD] Rembrandt Data Fabric: Device 18h; Function 0\n01:00.0 Non-Volatile memory controller: Micron/Crucial Technology Device 5426 (rev 01)\n02:00.0 Network controller: Intel Corporation Wi-Fi 6 AX200 (rev 1a)\n03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller (rev 15)\n04:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller (rev 15)\n05:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Rembrandt [Radeon 680M] (rev c7)\n06:00.0 USB controller: Advanced Micro Devices, Inc. [AMD] Rembrandt USB4 XHCI controller #8"
+
+	mockUtilExecute(dataBlob.ProfileData.(string), nil)
+	expected := Result{"pci_data": dataBlob}
+
+	collector := PCI{}
+	result, err := collector.run(ARCHITECTURE_X86_64)
+
+	assert.Equal(expected, result)
+	assert.Nil(err)
+}
+
+func TestPCIRunFail(t *testing.T) {
+	assert := assert.New(t)
+
+	mockUtilExecute("", fmt.Errorf("forced error"))
+	expected := Result{"pci_data": nil}
+
+	collector := PCI{}
+	result, err := collector.run(ARCHITECTURE_X86_64)
+
+	assert.Equal(expected, result)
+	assert.ErrorContains(err, "forced error")
+}
+
+func TestPutChkSum(t *testing.T) {
+	assert := assert.New(t)
+
+	err := util.PutChecksum("/tmp/testPutCheckSum", "testthis")
+	assert.Nil(err)
+	content, err1 := os.ReadFile("/tmp/testPutCheckSum")
+	assert.Nil(err1)
+	assert.Equal("testthis", string(content))
+
+}
+
+func TestGetChkSum(t *testing.T) {
+	assert := assert.New(t)
+	mockUtilFileExists(true)
+	tstChkSum := util.GetChecksum("/tmp/testPutCheckSum")
+	assert.Equal("testthis", tstChkSum)
+}
+
+func TestGetChkSumNoFile(t *testing.T) {
+	assert := assert.New(t)
+	mockUtilFileExists(false)
+
+	tstChkSum := util.GetChecksum("/etc/zypp/chksum-pcidata.txt")
+	assert.Equal("", tstChkSum)
+}

internal/connect/collectors.go

@@ -14,6 +14,8 @@ var usedCollectors = []collectors.Collector{
 	collectors.CloudProvider{},
 	collectors.Architecture{},
 	collectors.ContainerRuntime{},
+	collectors.PCI{},
+	collectors.LSMOD{},
 
 	// Optional collectors
 	collectors.Uname{},

internal/util/profiles.go

@@ -0,0 +1,40 @@
+package util
+
+import (
+	"os"
+)
+
+// Profile struct is for handling lage data blobs
+// ProfileID: an index to reference ProfileData, at the moment
+//
+//	this will be a sha256 caluculated from ProfileData
+//	since, ProfileData can be any type (string, array
+//	of strings, etc) it may need processing before the
+//	sha256 can be calcuated
+//
+// ProfileData: can be any data such array of strings, a single large string
+type Profile struct {
+	ProfileID   string // sha256 of ProfileData
+	ProfileData any    // data associated with ProfileI
+}
+
+func GetChecksum(chkSumFilePath string) string {
+	// before system registration chkSumFilePath won't exist
+	// in that case just return emtpy string
+	if !FileExists(chkSumFilePath) {
+		return ""
+	}
+	// read value in from checksum file
+	content, err := os.ReadFile(chkSumFilePath)
+	// if read fails return empty string, should not happed
+	if err != nil {
+		return ""
+	}
+	return string(content)
+}
+
+func PutChecksum(chkSumFilePath string, value string) error {
+	perms := os.FileMode(0644)
+	err := os.WriteFile(chkSumFilePath, []byte(value), perms)
+	return err
+}

internal/util/system.go

@@ -31,6 +31,7 @@ const (
 )
 
 var systemEcho bool
+var UpdateLargeDataIDs bool // set if -i/--info was used
 
 // SetSystemEcho toggles piping of executed command's outputs to stdout/stderr
 // returns true if it was enabled before, false otherwise