fix(envscan): handle rpm/dpkg error correctly

Author: iseki0

envinspection/inspection.go

@@ -68,18 +68,16 @@ func inspectInstalledSoftware(ctx context.Context, module *model.Module) {
 		} else {
 			LOG.Warnf("Software inspection error(%s): %s, ", fn, e)
 		}
-		if errors.Is(e, exec.ErrNotFound) {
-			continue
-		}
 		foundCmd = true
-		var cError cError
-		if errors.As(e, &cError) {
-			if cError.Content == "" {
-				cError.Content = "(no stderr output)"
+		var pError *exec.ExitError
+		if errors.As(e, &pError) {
+			var stderrText = strings.TrimSpace(string(pError.Stderr))
+			if stderrText == "" {
+				stderrText = "(no stderr output)"
 			}
 			scanerr.Add(ctx, scanerr.Param{
 				Kind:    "env_inspection_error",
-				Content: cError.Content,
+				Content: string(pError.Stderr),
 			})
 		}
 	}

envinspection/utils.go

@@ -6,25 +6,9 @@ import (
 	"os/exec"
 )
 
-type cError struct {
-	Content string
-	Err     error
-}
-
-func (e cError) Error() string {
-	return e.Err.Error()
-}
-
 func handleCmd(ctx context.Context, cmd *exec.Cmd) (string, error) {
-	var stdout, stderr bytes.Buffer
+	var stdout bytes.Buffer
 	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
 	err := cmd.Run()
-	if err != nil {
-		return "", cError{
-			Content: stderr.String(),
-			Err:     err,
-		}
-	}
-	return stdout.String(), nil
+	return stdout.String(), err
 }