diff --git a/scanner/alma.go b/scanner/alma.go index 007042d7..0e238ca6 100644 --- a/scanner/alma.go +++ b/scanner/alma.go @@ -90,7 +90,7 @@ func (o *alma) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } return []cmd{ diff --git a/scanner/amazon.go b/scanner/amazon.go index 56c12a7b..8c07a826 100644 --- a/scanner/amazon.go +++ b/scanner/amazon.go @@ -102,7 +102,7 @@ func (o *amazon) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } diff --git a/scanner/base.go b/scanner/base.go index 9b04e589..e03baada 100644 --- a/scanner/base.go +++ b/scanner/base.go @@ -1328,15 +1328,10 @@ func (l *base) parseGrepProcMap(stdout string) (soPaths []string) { return soPaths } -var errLSOFNoInternetFiles = xerrors.New("no Internet files located") - func (l *base) lsOfListen() (string, error) { - cmd := `lsof -i -P -n -V` + cmd := `lsof -i -P -n` r := l.exec(util.PrependProxyEnv(cmd), sudo) if !r.isSuccess() { - if strings.TrimSpace(r.Stdout) == "lsof: no Internet files located" { - return "", xerrors.Errorf("Failed to lsof: %w", errLSOFNoInternetFiles) - } return "", xerrors.Errorf("Failed to lsof: %s", r) } return r.Stdout, nil @@ -1392,7 +1387,7 @@ func (l *base) pkgPs(getOwnerPkgs func([]string) ([]string, error)) error { pidListenPorts := map[string][]models.PortStat{} stdout, err = l.lsOfListen() - if err != nil && !xerrors.Is(err, errLSOFNoInternetFiles) { + if err != nil { // warning only, continue scanning l.log.Warnf("Failed to lsof: %+v", err) } diff --git a/scanner/centos.go b/scanner/centos.go index 05b94494..bb6fb872 100644 --- a/scanner/centos.go +++ b/scanner/centos.go @@ -89,7 +89,7 @@ func (o *centos) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } return []cmd{ diff --git a/scanner/debian.go b/scanner/debian.go index 9fca9662..ae791087 100644 --- a/scanner/debian.go +++ b/scanner/debian.go @@ -132,7 +132,7 @@ func (o *debian) checkIfSudoNoPasswd() error { "stat /proc/1/exe", "ls -l /proc/1/exe", "cat /proc/1/maps", - "lsof -i -P -n -V", + "lsof -i -P -n", } if !o.getServerInfo().Mode.IsOffline() { diff --git a/scanner/fedora.go b/scanner/fedora.go index 2a2689a0..d66cce48 100644 --- a/scanner/fedora.go +++ b/scanner/fedora.go @@ -88,7 +88,7 @@ func (o *fedora) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } return []cmd{ diff --git a/scanner/rhel.go b/scanner/rhel.go index 6f1bc261..a56fc174 100644 --- a/scanner/rhel.go +++ b/scanner/rhel.go @@ -86,7 +86,7 @@ func (o *rhel) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } return []cmd{ diff --git a/scanner/rocky.go b/scanner/rocky.go index 84174a13..8ab4058f 100644 --- a/scanner/rocky.go +++ b/scanner/rocky.go @@ -90,7 +90,7 @@ func (o *rocky) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } return []cmd{ diff --git a/scanner/suse.go b/scanner/suse.go index 0423fb5d..eca253ce 100644 --- a/scanner/suse.go +++ b/scanner/suse.go @@ -158,7 +158,7 @@ func (o *suse) sudoNoPasswdCmdsFastRoot() []cmd { {"stat /proc/1/exe", exitStatusZero}, {"ls -l /proc/1/exe", exitStatusZero}, {"cat /proc/1/maps", exitStatusZero}, - {"lsof -i -P -n -V", exitStatusZero}, + {"lsof -i -P -n", exitStatusZero}, } } return []cmd{