github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 04:59:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: fixed a crash happening during wifi.recon/wifi.show where no APs have WPS (fixes #423)

Browse source
This commit is contained in:
evilsocket 2019-01-29 12:36:20 +01:00
commit 8230b8bca6
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/wifi_show.go
View file

@ -215,15 +215,11 @@ func (w *WiFiModule) colDecorate(colNames []string, name string, dir string) {
} }
} }
func (w *WiFiModule) colNames(nrows int, withWPS bool) []string { func (w *WiFiModule) colNames(nrows int) []string {
columns := []string(nil) columns := []string(nil)
if !w.isApSelected() { if !w.isApSelected() {
if withWPS { columns = []string{"RSSI", "BSSID", "SSID", "Encryption", "WPS", "Ch", "Clients", "Sent", "Recvd", "Last Seen"}
columns = []string{"RSSI", "BSSID", "SSID", "Encryption", "WPS", "Ch", "Clients", "Sent", "Recvd", "Last Seen"}
} else {
columns = []string{"RSSI", "BSSID", "SSID", "Encryption", "Ch", "Clients", "Sent", "Recvd", "Last Seen"}
}
} else if nrows > 0 { } else if nrows > 0 {
columns = []string{"RSSI", "MAC", "Ch", "Sent", "Received", "Last Seen"} columns = []string{"RSSI", "MAC", "Ch", "Sent", "Received", "Last Seen"}
fmt.Printf("\n%s clients:\n", w.ap.HwAddress) fmt.Printf("\n%s clients:\n", w.ap.HwAddress)
@ -263,19 +259,15 @@ func (w *WiFiModule) Show() (err error) {
return return
} }
hasWPS := false
rows := make([][]string, 0) rows := make([][]string, 0)
for _, s := range stations { for _, s := range stations {
if row, include := w.getRow(s); include { if row, include := w.getRow(s); include {
if len(s.WPS) > 0 {
hasWPS = true
}
rows = append(rows, row) rows = append(rows, row)
} }
} }
nrows := len(rows) nrows := len(rows)
if nrows > 0 { if nrows > 0 {
tui.Table(os.Stdout, w.colNames(nrows, hasWPS), rows) tui.Table(os.Stdout, w.colNames(nrows), rows)
} }
w.Session.Queue.Stats.RLock() w.Session.Queue.Stats.RLock()