github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-16 10:03:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fixed the way endpoints metas are rendered on the net.show table

Browse source
This commit is contained in:
evilsocket 2018-08-30 17:59:42 +03:00
parent 798df7e32f
commit a58d59d4cb
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/net_recon_show.go
View file

@ -4,7 +4,6 @@ import (
"fmt"
"os"
"sort"
"strings"
"time"
"github.com/bettercap/bettercap/core"
@ -31,7 +30,7 @@ func (p ProtoPairList) Len() int { return len(p) }
func (p ProtoPairList) Less(i, j int) bool { return p[i].Hits < p[j].Hits }
func (p ProtoPairList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func (d *Discovery) getRow(e *network.Endpoint, withMeta bool) []string {
func (d *Discovery) getRow(e *network.Endpoint, withMeta bool) [][]string {
sinceStarted := time.Since(d.Session.StartedAt)
sinceFirstSeen := time.Since(e.FirstSeen)
@ -86,17 +85,28 @@ func (d *Discovery) getRow(e *network.Endpoint, withMeta bool) []string {
seen,
}
if withMeta {
metas := []string{}
e.Meta.Each(func(name string, value interface{}) {
metas = append(metas, fmt.Sprintf("%s=%s", core.Bold(name), core.Yellow(value.(string))))
})
sort.Strings(metas)
row = append(row, strings.Join(metas, ", "))
if !withMeta {
return [][]string{row}
} else if e.Meta.Empty() {
return [][]string{append(row, core.Dim("-"))}
}
return row
metas := []string{}
e.Meta.Each(func(name string, value interface{}) {
metas = append(metas, fmt.Sprintf("%s:%s", core.Green(name), core.Yellow(value.(string))))
})
sort.Strings(metas)
rows := [][]string{}
for i, m := range metas {
if i == 0 {
rows = append(rows, append(row, m))
} else {
rows = append(rows, []string{"", "", "", "", "", "", "", m})
}
}
return rows
}
func (d *Discovery) Show(by string) error {
@ -136,7 +146,9 @@ func (d *Discovery) Show(by string) error {
rows := make([][]string, 0)
for i, t := range targets {
rows = append(rows, d.getRow(t, hasMeta))
for _, r := range d.getRow(t, hasMeta) {
rows = append(rows, r)
}
if i == pad {
rows = append(rows, padCols)
}