diff --git a/config/tomlloader.go b/config/tomlloader.go index 2deed5e4..63d56f99 100644 --- a/config/tomlloader.go +++ b/config/tomlloader.go @@ -138,14 +138,12 @@ func (c TOMLLoader) Load(pathToToml string) error { if len(server.Enablerepo) == 0 { server.Enablerepo = Conf.Default.Enablerepo } - if len(server.Enablerepo) != 0 { - for _, repo := range server.Enablerepo { - switch repo { - case "base", "updates": - // nop - default: - return xerrors.Errorf("For now, enablerepo have to be base or updates: %s", server.Enablerepo) - } + for _, repo := range server.Enablerepo { + switch repo { + case "base", "updates": + // nop + default: + return xerrors.Errorf("For now, enablerepo have to be base or updates: %s", server.Enablerepo) } } diff --git a/reporter/util.go b/reporter/util.go index c14a7c24..3c90cc2b 100644 --- a/reporter/util.go +++ b/reporter/util.go @@ -378,25 +378,23 @@ No CVE-IDs are found in updatable packages. } data = append(data, []string{"Affected Pkg", line}) - if len(pack.AffectedProcs) != 0 { - for _, p := range pack.AffectedProcs { - if len(p.ListenPortStats) == 0 { - data = append(data, []string{"", fmt.Sprintf(" - PID: %s %s", p.PID, p.Name)}) - continue - } - - var ports []string - for _, pp := range p.ListenPortStats { - if len(pp.PortReachableTo) == 0 { - ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port)) - } else { - ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo)) - } - } - - data = append(data, []string{"", - fmt.Sprintf(" - PID: %s %s, Port: %s", p.PID, p.Name, ports)}) + for _, p := range pack.AffectedProcs { + if len(p.ListenPortStats) == 0 { + data = append(data, []string{"", fmt.Sprintf(" - PID: %s %s", p.PID, p.Name)}) + continue } + + var ports []string + for _, pp := range p.ListenPortStats { + if len(pp.PortReachableTo) == 0 { + ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port)) + } else { + ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo)) + } + } + + data = append(data, []string{"", + fmt.Sprintf(" - PID: %s %s, Port: %s", p.PID, p.Name, ports)}) } } } diff --git a/scanner/base.go b/scanner/base.go index 9e00dbfb..9b04e589 100644 --- a/scanner/base.go +++ b/scanner/base.go @@ -1183,10 +1183,8 @@ func (l *base) execExternalPortScan(scanDestIPPorts map[string][]string) ([]stri func formatNmapOptionsToString(conf *config.PortScanConf) string { cmd := []string{conf.ScannerBinPath} - if len(conf.ScanTechniques) != 0 { - for _, technique := range conf.ScanTechniques { - cmd = append(cmd, "-"+technique) - } + for _, technique := range conf.ScanTechniques { + cmd = append(cmd, "-"+technique) } if conf.SourcePort != "" { diff --git a/tui/tui.go b/tui/tui.go index b98e2317..b4dd9378 100644 --- a/tui/tui.go +++ b/tui/tui.go @@ -719,24 +719,22 @@ func setChangelogLayout(g *gocui.Gui) error { } lines = append(lines, line) - if len(pack.AffectedProcs) != 0 { - for _, p := range pack.AffectedProcs { - if len(p.ListenPortStats) == 0 { - lines = append(lines, fmt.Sprintf(" * PID: %s %s", p.PID, p.Name)) - continue - } - - var ports []string - for _, pp := range p.ListenPortStats { - if len(pp.PortReachableTo) == 0 { - ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port)) - } else { - ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo)) - } - } - - lines = append(lines, fmt.Sprintf(" * PID: %s %s Port: %s", p.PID, p.Name, ports)) + for _, p := range pack.AffectedProcs { + if len(p.ListenPortStats) == 0 { + lines = append(lines, fmt.Sprintf(" * PID: %s %s", p.PID, p.Name)) + continue } + + var ports []string + for _, pp := range p.ListenPortStats { + if len(pp.PortReachableTo) == 0 { + ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port)) + } else { + ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo)) + } + } + + lines = append(lines, fmt.Sprintf(" * PID: %s %s Port: %s", p.PID, p.Name, ports)) } } }