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 gateway regexp for macOS (closes #645)

Browse source
This commit is contained in:
Simone Margaritelli 2019-11-11 17:27:42 +01:00
commit 9c3790764a
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
network/net_darwin.go
View file

@ -13,16 +13,15 @@ import (
const airPortPath = "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport" const airPortPath = "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport"
var IPv4RouteParser = regexp.MustCompile(`^([a-z]+)+\s+(\d+\.+\d+.\d.+\d)+\s+([a-zA-z]+)+\s+(\d+)+\s+(\d+)+\s+([a-zA-Z]+\d+)$`) var IPv4RouteParser = regexp.MustCompile(`([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+).*`)
var IPv4RouteTokens = 7 var IPv4RouteTokens = 5
var IPv4RouteCmd = "netstat" var IPv4RouteCmd = "netstat"
var IPv4RouteCmdOpts = []string{"-n", "-r"} var IPv4RouteCmdOpts = []string{"-n", "-r"}
var WiFiChannelParser = regexp.MustCompile(`(?m)^.*Supported Channels: (.*)$`) var WiFiChannelParser = regexp.MustCompile(`(?m)^.*Supported Channels: (.*)$`)
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[6]
flags := tokens[3] flags := tokens[3]
ifname2 := tokens[4]
if ifname == ifname2 && flags == "UGSc" { if ifname == ifname2 && flags == "UGSc" {
gateway := tokens[2] gateway := tokens[2]
return f(gateway) return f(gateway)

2
network/net_gateway.go
View file

@ -25,7 +25,7 @@ func FindGateway(iface *Endpoint) (*Endpoint, error) {
for _, line := range strings.Split(output, "\n") { for _, line := range strings.Split(output, "\n") {
if line = str.Trim(line); strings.Contains(line, ifName) { if line = str.Trim(line); strings.Contains(line, ifName) {
m := IPv4RouteParser.FindStringSubmatch(line) m := IPv4RouteParser.FindStringSubmatch(line)
if len(m) == IPv4RouteTokens { if len(m) >= IPv4RouteTokens {
Debug("FindGateway(%s) line '%s' matched with %v", iface.Name(), line, m) Debug("FindGateway(%s) line '%s' matched with %v", iface.Name(), line, m)
return IPv4RouteIsGateway(ifName, m, func(gateway string) (*Endpoint, error) { return IPv4RouteIsGateway(ifName, m, func(gateway string) (*Endpoint, error) {
if gateway == iface.IpAddress { if gateway == iface.IpAddress {