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

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-02-15 20:03:42 +01:00
parent c744875136
commit 3832cafd20
1 changed files with 15 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
modules/arp_spoof.go
View file

@ -143,44 +143,34 @@ func (p *ArpSpoofer) pktRouter(eth *layers.Ethernet, ip4 *layers.IPv4, pkt gopac
if eth == nil || ip4 == nil { if eth == nil || ip4 == nil {
return return
} }
// If DST_MAC is not our Interface.IP ignore
if bytes.Compare(eth.DstMAC, p.Session.Interface.HW) != 0 {
return
}
// check if this packet is from or to one of the spoofing targets // check if this packet is from or to one of the spoofing targets
// and therefore needs patching and forwarding. // and therefore needs patching and forwarding.
for _, target := range p.addresses { for _, target := range p.addresses {
// we're only interested in packets: // packet not from/to this target
// if !ip4.SrcIP.Equal(target) && !ip4.DstIP.Equal(target) {
// 1. generated from one of our targets. continue
// 2. going to the router IP }
// 3. but with our mac addresses as destination
targetMAC, err := p.getMAC(target, true) targetMAC, err := p.getMAC(target, false)
if err != nil { if err != nil {
log.Error("Error retrieving target MAC address for %s", target.String(), err) log.Error("Error retrieving target MAC address for %s", target.String(), err)
return continue
} }
isEthFromTarget := bytes.Compare(eth.SrcMAC, targetMAC) == 0
// If SRC_MAC is different from both TARGET(s) & GW ignore // If SRC_MAC is different from both TARGET(s) & GW ignore
if bytes.Compare(eth.SrcMAC, targetMAC) != 0 && bytes.Compare(eth.SrcMAC, p.Session.Gateway.HW) != 0 { if isEthFromTarget == false && bytes.Compare(eth.SrcMAC, p.Session.Gateway.HW) != 0 {
// TODO Delete this debug
//log.Debug("[ignored] [%s] ===> [%s]", eth.SrcMAC, eth.DstMAC)
continue
}
// If DST_MAC is not our Interface.IP ignore
if bytes.Compare(eth.DstMAC, p.Session.Interface.HW) != 0 {
// TODO Delete this debug
//log.Warning("[notForMiTM] [(%s) %s] ===> [%s (%s)]", eth.SrcMAC, ip4.SrcIP, ip4.DstIP, eth.DstMAC)
continue
}
if !ip4.SrcIP.Equal(target) && !ip4.DstIP.Equal(target) {
// TODO Delete this debug
//log.Warning("[notTarget] [(%s) %s] ===> [%s (%s)]", eth.SrcMAC, ip4.SrcIP, ip4.DstIP, eth.DstMAC)
continue continue
} }
// log.Info("Got packet to route: %s\n", pkt.String()) // log.Info("Got packet to route: %s\n", pkt.String())
if bytes.Compare(eth.SrcMAC, targetMAC) == 0 { if isEthFromTarget {
copy(eth.SrcMAC, p.Session.Interface.HW) copy(eth.SrcMAC, p.Session.Interface.HW)
copy(ip4.SrcIP, p.Session.Interface.IP) copy(ip4.SrcIP, p.Session.Interface.IP)
copy(eth.DstMAC, p.Session.Gateway.HW) copy(eth.DstMAC, p.Session.Gateway.HW)
@ -193,11 +183,9 @@ func (p *ArpSpoofer) pktRouter(eth *layers.Ethernet, ip4 *layers.IPv4, pkt gopac
copy(eth.DstMAC, targetMAC) copy(eth.DstMAC, targetMAC)
copy(ip4.DstIP, target) copy(ip4.DstIP, target)
log.Info("Gatway is sending") log.Info("Gateway is sending")
} }
//log.Info("After: %s\n", pkt.String())
data := pkt.Data() data := pkt.Data()
if err := p.Session.Queue.Send(data); err != nil { if err := p.Session.Queue.Send(data); err != nil {
log.Error("Could not reinject packet: %s", err) log.Error("Could not reinject packet: %s", err)