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

Merge pull request #439 from rhaidiz/master

Browse source 
Add option to manually specify the gateway
This commit is contained in:
evilsocket 2019-02-12 10:07:30 +01:00 • committed by GitHub
commit 17952a3904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/options.go
View file

@ -4,6 +4,7 @@ import "flag"
type Options struct {
InterfaceName *string
Gateway *string
Caplet *string
AutoStart *string
Debug *bool
@ -19,6 +20,7 @@ type Options struct {
func ParseOptions() (Options, error) {
o := Options{
InterfaceName: flag.String("iface", "", "Network interface to bind to, if empty the default interface will be auto selected."),
Gateway: flag.String("gateway-override","","Use the provided IP address instead of the default gateway. If not specified or invalid, the default gateway will be used."),
AutoStart: flag.String("autostart", "events.stream, net.recon", "Comma separated list of modules to auto start."),
Caplet: flag.String("caplet", "", "Read commands from this file and execute them in the interactive session."),
Debug: flag.Bool("debug", false, "Print debug messages."),

17
network/net_gateway.go
View file

@ -3,6 +3,7 @@
package network
import (
"fmt"
"strings"
"github.com/bettercap/bettercap/core"
@ -48,3 +49,19 @@ func FindGateway(iface *Endpoint) (*Endpoint, error) {
Debug("FindGateway(%s): nothing found :/", iface.Name())
return nil, ErrNoGateway
}
func GatewayProvidedByUser(iface *Endpoint, gateway string) (*Endpoint, error) {
Debug("GatewayProvidedByUser(%s) [cmd=%v opts=%v parser=%v]", gateway, IPv4RouteCmd, IPv4RouteCmdOpts, IPv4RouteParser)
if IPv4Validator.MatchString(gateway) {
Debug("valid gateway ip %s",gateway)
ifName := iface.Name()
// we have the address, now we need its mac
mac, err := ArpLookup(ifName, gateway, false)
if err != nil {
return nil, err
}
Debug("gateway is %s[%s]", gateway, mac)
return NewEndpoint(gateway, mac), nil
}
return nil, fmt.Errorf("Provided gateway %s not a valid IPv4 address! Revert to find default gateway.",gateway)
}

5
session/session.go
View file

@ -226,12 +226,15 @@ func (s *Session) Start() error {
return err
}
if s.Gateway, err = network.FindGateway(s.Interface); err != nil {
if s.Gateway, err = network.GatewayProvidedByUser(s.Interface, *s.Options.Gateway); err != nil {
level := log.WARNING
if s.Interface.IsMonitor() {
level = log.DEBUG
}
s.Events.Log(level, "%s", err.Error())
if s.Gateway, err = network.FindGateway(s.Interface); err != nil {
s.Events.Log(level, "%s", err.Error())
}
}
if s.Gateway == nil || s.Gateway.IpAddress == s.Interface.IpAddress {