github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 21:13:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fixed a panic in net.show.meta when rendeing open ports

Browse source
This commit is contained in:
Simone Margaritelli 2021-04-07 13:16:20 +02:00
commit 31b06638d8
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/net_recon/net_show.go
View file

@ -2,6 +2,7 @@ package net_recon
import ( import (
"fmt" "fmt"
"github.com/bettercap/bettercap/modules/syn_scan"
"sort" "sort"
"strings" "strings"
"time" "time"
@ -12,6 +13,7 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/evilsocket/islazy/tui" "github.com/evilsocket/islazy/tui"
"github.com/evilsocket/islazy/str"
) )
const ( const (
@ -297,9 +299,29 @@ func (mod *Discovery) showMeta(arg string) (err error) {
} }
for _, k := range keys { for _, k := range keys {
meta := t.Meta.Get(k)
val := ""
if s, ok := meta.(string); ok {
val = s
} else if ports, ok := meta.(map[int]*syn_scan.OpenPort); ok {
val = "ports: "
for _, info := range ports {
val += fmt.Sprintf("%s:%d", info.Proto, info.Port)
if info.Service != "" {
val += fmt.Sprintf("(%s)", info.Service)
}
if info.Banner != "" {
val += fmt.Sprintf(" [%s]", info.Banner)
}
val += " "
}
val = str.Trim(val)
} else {
val = fmt.Sprintf("%#v", meta)
}
rows = append(rows, []string{ rows = append(rows, []string{
tui.Green(k), tui.Green(k),
tui.Yellow(t.Meta.Get(k).(string)), tui.Yellow(val),
}) })
} }

2
network/net.go
View file

@ -112,7 +112,7 @@ func ParseTargets(targets string, aliasMap *data.UnsortedKV) (ips []net.IP, macs
} }
targets = strings.Trim(targets, ", ") targets = strings.Trim(targets, ", ")
fmt.Printf("targets=%s macs=%#v\n", targets, macs) // fmt.Printf("targets=%s macs=%#v\n", targets, macs)
// check and resolve aliases // check and resolve aliases
for _, targetAlias := range aliasParser.FindAllString(targets, -1) { for _, targetAlias := range aliasParser.FindAllString(targets, -1) {

4
network/net_linux.go
View file

@ -44,7 +44,7 @@ func SetInterfaceChannel(iface string, channel int) error {
Debug("SetInterfaceChannel(%s, %d) iw based", iface, channel) Debug("SetInterfaceChannel(%s, %d) iw based", iface, channel)
out, err := core.Exec("iw", []string{"dev", iface, "set", "channel", fmt.Sprintf("%d", channel)}) out, err := core.Exec("iw", []string{"dev", iface, "set", "channel", fmt.Sprintf("%d", channel)})
if err != nil { if err != nil {
return err return fmt.Errorf("iw: out=%s err=%s", out, err)
} else if out != "" { } else if out != "" {
return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out) return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out)
} }
@ -52,7 +52,7 @@ func SetInterfaceChannel(iface string, channel int) error {
Debug("SetInterfaceChannel(%s, %d) iwconfig based") Debug("SetInterfaceChannel(%s, %d) iwconfig based")
out, err := core.Exec("iwconfig", []string{iface, "channel", fmt.Sprintf("%d", channel)}) out, err := core.Exec("iwconfig", []string{iface, "channel", fmt.Sprintf("%d", channel)})
if err != nil { if err != nil {
return err return fmt.Errorf("iwconfig: out=%s err=%s", out, err)
} else if out != "" { } else if out != "" {
return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out) return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out)
} }