diff --git a/reporter/util.go b/reporter/util.go index 8671e22f..1cc4b50a 100644 --- a/reporter/util.go +++ b/reporter/util.go @@ -255,6 +255,7 @@ No CVE-IDs are found in updatable packages. // v2max := vinfo.MaxCvss2Score().Value.Score // v3max := vinfo.MaxCvss3Score().Value.Score + packnames := strings.Join(vinfo.AffectedPackages.Names(), ", ") // packname := vinfo.AffectedPackages.FormatTuiSummary() // packname += strings.Join(vinfo.CpeURIs, ", ") @@ -263,12 +264,12 @@ No CVE-IDs are found in updatable packages. exploits = "POC" } - link := "" - if strings.HasPrefix(vinfo.CveID, "CVE-") { - link = fmt.Sprintf("https://nvd.nist.gov/vuln/detail/%s", vinfo.CveID) - } else if strings.HasPrefix(vinfo.CveID, "WPVDBID-") { - link = fmt.Sprintf("https://wpscan.com/vulnerabilities/%s", strings.TrimPrefix(vinfo.CveID, "WPVDBID-")) - } + // link := "" + // if strings.HasPrefix(vinfo.CveID, "CVE-") { + // link = fmt.Sprintf("https://nvd.nist.gov/vuln/detail/%s", vinfo.CveID) + // } else if strings.HasPrefix(vinfo.CveID, "WPVDBID-") { + // link = fmt.Sprintf("https://wpscan.com/vulnerabilities/%s", strings.TrimPrefix(vinfo.CveID, "WPVDBID-")) + // } data = append(data, []string{ vinfo.CveIDDiffFormat(), @@ -279,7 +280,7 @@ No CVE-IDs are found in updatable packages. exploits, fmt.Sprintf("%9s", vinfo.AlertDict.FormatSource()), fmt.Sprintf("%7s", vinfo.PatchStatus(r.Packages)), - link, + packnames, }) } @@ -294,9 +295,11 @@ No CVE-IDs are found in updatable packages. "PoC", "Alert", "Fixed", - "NVD", + // "NVD", + "Packages", }) table.SetBorder(true) + table.SetRowLine(true) table.AppendBulk(data) table.Render() return fmt.Sprintf("%s\n%s", header, b.String()) diff --git a/scanner/scanner.go b/scanner/scanner.go index fc62d60c..9809f201 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -456,7 +456,7 @@ func validateSSHConfig(c *config.ServerInfo) error { sshKeyScanArgs = append(sshKeyScanArgs, fmt.Sprintf("%s >> %s", hostname, knownHostsPaths[0])) sshConnCmd := fmt.Sprintf("ssh %s", strings.Join(sshConnArgs, " ")) sshKeyScancmd := fmt.Sprintf("ssh-keyscan %s", strings.Join(sshKeyScanArgs, " ")) - return xerrors.Errorf("Failed to find the host in known_hosts. Plaese exec `$ %s` or `$ %s`", sshConnCmd, sshKeyScancmd) + return xerrors.Errorf("Failed to find the host in known_hosts. Please exec `$ %s` or `$ %s`", sshConnCmd, sshKeyScancmd) } func (s Scanner) detectContainerOSes(hosts []osTypeInterface) (actives, inactives []osTypeInterface) {