github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-08 05:51:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

more lint driven refactoring

Browse source
This commit is contained in:
evilsocket 2018-04-26 12:19:52 +02:00
parent 0de6f3a76e
commit 1afab5d7be
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
7 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
network/arp.go
View file

@ -58,7 +58,7 @@ func ArpUpdate(iface string) (ArpTable, error) {
func ArpLookup(iface string, address string, refresh bool) (string, error) { func ArpLookup(iface string, address string, refresh bool) (string, error) {
// Refresh ARP table if first run or if a force refresh has been instructed. // Refresh ARP table if first run or if a force refresh has been instructed.
if ArpParsed() == false || refresh { if !ArpParsed() || refresh {
if _, err := ArpUpdate(iface); err != nil { if _, err := ArpUpdate(iface); err != nil {
return "", err return "", err
} }
@ -76,7 +76,7 @@ func ArpLookup(iface string, address string, refresh bool) (string, error) {
} }
func ArpInverseLookup(iface string, mac string, refresh bool) (string, error) { func ArpInverseLookup(iface string, mac string, refresh bool) (string, error) {
if ArpParsed() == false || refresh { if !ArpParsed() || refresh {
if _, err := ArpUpdate(iface); err != nil { if _, err := ArpUpdate(iface); err != nil {
return "", err return "", err
} }

2
network/arp_parser_linux.go
View file

@ -2,7 +2,7 @@ package network
import "regexp" import "regexp"
var ArpTableParser = regexp.MustCompile("^([\\d\\.]+)\\s+dev\\s+(\\w+)\\s+\\w+\\s+([a-f0-9:]{17})\\s+\\w+$") var ArpTableParser = regexp.MustCompile(`^([\d\.]+)\s+dev\s+(\w+)\s+\w+\s+([a-f0-9:]{17})\s+\w+$`)
var ArpTableTokens = 4 var ArpTableTokens = 4
var ArpTableTokenIndex = []int{1, 3, 2} var ArpTableTokenIndex = []int{1, 3, 2}
var ArpCmd = "ip" var ArpCmd = "ip"

7
network/ble.go
View file

@ -35,13 +35,8 @@ func NewBLE(newcb BLEDevNewCallback, lostcb BLEDevLostCallback) *BLE {
func (b *BLE) MarshalJSON() ([]byte, error) { func (b *BLE) MarshalJSON() ([]byte, error) {
doc := bleJSON{ doc := bleJSON{
Devices: make([]*BLEDevice, 0), Devices: b.Devices(),
} }
for _, dev := range b.Devices() {
doc.Devices = append(doc.Devices, dev)
}
return json.Marshal(doc) return json.Marshal(doc)
} }

18
network/lan.go
View file

@ -16,15 +16,13 @@ type EndpointLostCallback func(e *Endpoint)
type LAN struct { type LAN struct {
sync.Mutex sync.Mutex
hosts map[string]*Endpoint
hosts map[string]*Endpoint iface *Endpoint
iface *Endpoint gateway *Endpoint
gateway *Endpoint ttl map[string]uint
ttl map[string]uint aliases *Aliases
aliases *Aliases newCb EndpointNewCallback
newCb EndpointNewCallback lostCb EndpointLostCallback
lostCb EndpointLostCallback
aliasesFileName string
} }
type lanJSON struct { type lanJSON struct {
@ -146,7 +144,7 @@ func (lan *LAN) shouldIgnore(ip, mac string) bool {
} }
// skip everything which is not in our subnet (multicast noise) // skip everything which is not in our subnet (multicast noise)
addr := net.ParseIP(ip) addr := net.ParseIP(ip)
return lan.iface.Net.Contains(addr) == false return !lan.iface.Net.Contains(addr)
} }
func (lan *LAN) Has(ip string) bool { func (lan *LAN) Has(ip string) bool {

4
network/net.go
View file

@ -133,7 +133,7 @@ func buildEndpointFromInterface(iface net.Interface) (*Endpoint, error) {
for _, a := range addrs { for _, a := range addrs {
address := a.String() address := a.String()
if IPv4Validator.MatchString(address) { if IPv4Validator.MatchString(address) {
if strings.IndexRune(address, '/') == -1 { if strings.ContainsRune(address, '/') {
// plain ip // plain ip
e.SetIP(address) e.SetIP(address)
} else { } else {
@ -201,7 +201,7 @@ func FindInterface(name string) (*Endpoint, error) {
for _, address := range addrs { for _, address := range addrs {
ip := address.String() ip := address.String()
if strings.Contains(ip, "127.0.0.1") == false && IPv4Validator.MatchString(ip) { if !strings.Contains(ip, "127.0.0.1") && IPv4Validator.MatchString(ip) {
return buildEndpointFromInterface(iface) return buildEndpointFromInterface(iface)
} }
} }

6
network/net_linux.go
View file

@ -12,11 +12,11 @@ import (
) )
// only matches gateway lines // only matches gateway lines
var IPv4RouteParser = regexp.MustCompile("^(default|[0-9\\.]+)\\svia\\s([0-9\\.]+)\\sdev\\s(\\w+)\\s.*$") var IPv4RouteParser = regexp.MustCompile(`^(default|[0-9\.]+)\svia\s([0-9\.]+)\sdev\s(\w+)\s.*$`)
var IPv4RouteTokens = 4 var IPv4RouteTokens = 4
var IPv4RouteCmd = "ip" var IPv4RouteCmd = "ip"
var IPv4RouteCmdOpts = []string{"route"} var IPv4RouteCmdOpts = []string{"route"}
var WiFiFreqParser = regexp.MustCompile("^\\s+Channel.([0-9]+)\\s+:\\s+([0-9\\.]+)\\s+GHz.*$") var WiFiFreqParser = regexp.MustCompile(`^\s+Channel.([0-9]+)\s+:\s+([0-9\.]+)\s+GHz.*$`)
func IPv4RouteIsGateway(ifname string, tokens []string, f func(gateway string) (*Endpoint, error)) (*Endpoint, error) { func IPv4RouteIsGateway(ifname string, tokens []string, f func(gateway string) (*Endpoint, error)) (*Endpoint, error) {
ifname2 := tokens[3] ifname2 := tokens[3]
@ -54,7 +54,7 @@ func GetSupportedFrequencies(iface string) ([]int, error) {
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
matches := WiFiFreqParser.FindStringSubmatch(line) matches := WiFiFreqParser.FindStringSubmatch(line)
if matches != nil && len(matches) == 3 { if len(matches) == 3 {
if freq, err := strconv.ParseFloat(matches[2], 64); err == nil { if freq, err := strconv.ParseFloat(matches[2], 64); err == nil {
freqs = append(freqs, int(freq*1000)) freqs = append(freqs, int(freq*1000))
} }

4
network/wifi.go
View file

@ -115,7 +115,7 @@ func (w *WiFi) Remove(mac string) {
// get non printable characters .... (ref #61) // get non printable characters .... (ref #61)
func isBogusMacESSID(essid string) bool { func isBogusMacESSID(essid string) bool {
for _, c := range essid { for _, c := range essid {
if strconv.IsPrint(c) == false { if !strconv.IsPrint(c) {
return true return true
} }
} }
@ -131,7 +131,7 @@ func (w *WiFi) AddIfNew(ssid, mac string, frequency int, rssi int8) *AccessPoint
ap.LastSeen = time.Now() ap.LastSeen = time.Now()
ap.RSSI = rssi ap.RSSI = rssi
// always get the cleanest one // always get the cleanest one
if isBogusMacESSID(ssid) == false { if !isBogusMacESSID(ssid) {
ap.Hostname = ssid ap.Hostname = ssid
} }
return ap return ap