🐛 fixes for suse linux (#1800)

Migrate #1469 and other follow-on PRs. I ran a diff for `sysv.go` and migrated a few more things from latest v8. Fixes #1475 Signed-off-by: Dominik Richter <[email protected]>
mondoohq · Sep 20, 2023 · a3e8dfa · a3e8dfa
1 parent 6497412
commit a3e8dfa
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/providers/os/resources/packages/rpm_packages.go b/providers/os/resources/packages/rpm_packages.go
@@ -258,7 +258,7 @@ func (spm *SusePkgManager) Available() (map[string]PackageUpdate, error) {
 	if spm.isStaticAnalysis() {
 		return spm.staticAvailable()
 	}
-	cmd, err := spm.conn.RunCommand("zypper --xmlout list-updates")
+	cmd, err := spm.conn.RunCommand("zypper -n --xmlout list-updates")
 	if err != nil {
 		log.Debug().Err(err).Msg("mql[packages]> could not read package updates")
 		return nil, fmt.Errorf("could not read package update list")

diff --git a/providers/os/resources/packages/rpm_updates.go b/providers/os/resources/packages/rpm_updates.go
@@ -52,7 +52,7 @@ type zypper struct {
 }
 
 // for Suse, updates are package updates
-// parses the output of `zypper --xmlout list-updates`
+// parses the output of `zypper -n --xmlout list-updates`
 func ParseZypperUpdates(input io.Reader) (map[string]PackageUpdate, error) {
 	pkgs := map[string]PackageUpdate{}
 	zypper, err := ParseZypper(input)

diff --git a/providers/os/resources/packages/rpm_updates_test.go b/providers/os/resources/packages/rpm_updates_test.go
@@ -41,7 +41,7 @@ func TestZypperUpdateParser(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	c, err := mock.RunCommand("zypper --xmlout list-updates")
+	c, err := mock.RunCommand("zypper -n --xmlout list-updates")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/providers/os/resources/packages/testdata/updates_zypper.toml b/providers/os/resources/packages/testdata/updates_zypper.toml
@@ -1,4 +1,4 @@
-[commands."zypper --xmlout list-updates"]
+[commands."zypper -n --xmlout list-updates"]
 stdout = """<?xml version='1.0'?>
 <stream>
 <message type="info">Loading repository data...</message>
@@ -246,7 +246,7 @@ drop-in replacement for sysvinit.</description>
 </stream>
 """
 
-[commands."zypper --xmlout list-updates -t patch"]
+[commands."zypper -n --xmlout list-updates -t patch"]
 stdout = """<?xml version='1.0'?>
 <stream>
 <progress id="raw-refresh" name="Retrieving repository &apos;NON OSS&apos; metadata" value="0"/>

diff --git a/providers/os/resources/services/sysv.go b/providers/os/resources/services/sysv.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/rs/zerolog/log"
 	"go.mondoo.com/cnquery/providers/os/connection/shared"
+	"go.mondoo.com/cnquery/utils/stringx"
 )
 
 type SysVServiceManager struct {
@@ -35,21 +36,28 @@ func (s *SysVServiceManager) List() ([]*Service, error) {
 		return nil, err
 	}
 
+	// eg. we ignore the following run levels since `service halt status` may shutdown the system
+	ignored := []string{"boot", "boot.local", "functions", "halt", "halt.local", "killall", "rc", "reboot", "shutdown", "single", "skeleton", ".depend.boot", ".depend.start", ".depend.stop"}
+	statusServices := []string{}
+	for i := range services {
+		service := services[i]
+		if stringx.Contains(ignored, service) {
+			continue
+		}
+		statusServices = append(statusServices, service)
+	}
+
 	// 3. mimic `service --status-all` by running `service x status` for each detected service
-	running, err := s.running(services)
+	running, err := s.running(statusServices)
 	if err != nil {
 		return nil, err
 	}
 
 	// aggregate data into service struct
 	res := []*Service{}
 
-	for i := range services {
-		service := services[i]
-
-		if service == "functions" || service == "killall" || service == "halt" {
-			continue
-		}
+	for i := range statusServices {
+		service := statusServices[i]
 
 		srv := &Service{
 			Name:      service,