github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 02:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: implemented dns packet parser

Browse source
This commit is contained in:
evilsocket 2018-01-10 02:26:18 +01:00
commit 27b1f48584
5 changed files with 79 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
caplets/local-sniffer.cap
View file

@ -3,7 +3,7 @@ events.clear
set events.stream.filter net.sniff
events.stream on
set net.sniffer.verbose true
set net.sniffer.verbose false
set net.sniffer.local true
net.sniffer on

8
modules/net_sniff.go
View file

@ -25,7 +25,7 @@ func NewSniffer(s *session.Session) *Sniffer {
sniff.AddParam(session.NewBoolParameter("net.sniffer.verbose",
"true",
"Print captured packets to screen."))
"If true, will print every captured packet, otherwise only selected ones."))
sniff.AddParam(session.NewBoolParameter("net.sniffer.local",
"false",
@ -117,11 +117,7 @@ func (s Sniffer) isLocalPacket(packet gopacket.Packet) bool {
}
func (s *Sniffer) onPacketMatched(pkt gopacket.Packet) {
if s.Ctx.Verbose == false {
return
}
if mainParser(pkt) == true {
if mainParser(pkt, s.Ctx.Verbose) == true {
s.Stats.NumDumped++
}
}

36
modules/net_sniff_dns.go Normal file
View file

@ -0,0 +1,36 @@
package modules
import (
"fmt"
"github.com/evilsocket/bettercap-ng/core"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
)
func dnsParser(ip *layers.IPv4, pkt gopacket.Packet, udp *layers.UDP) bool {
dns, parsed := pkt.Layer(layers.LayerTypeDNS).(*layers.DNS)
if parsed == false {
return false
}
if dns.OpCode != layers.DNSOpCodeQuery || len(dns.Answers) == 0 {
return false
}
for _, a := range dns.Answers {
if a.IP == nil {
continue
}
fmt.Printf("[%s] %s %s > %s : %s is %s\n",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_DGRAY+core.FG_WHITE, "dns"),
vIP(ip.SrcIP),
vIP(ip.DstIP),
core.Yellow(string(a.Name)),
vIP(a.IP))
}
return true
}

68
modules/net_sniff_parsers.go
View file

@ -10,46 +10,56 @@ import (
"github.com/google/gopacket/layers"
)
func tcpParser(ip *layers.IPv4, pkt gopacket.Packet) {
func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
tcp := pkt.Layer(layers.LayerTypeTCP).(*layers.TCP)
if sniParser(ip, pkt, tcp) {
return
}
fmt.Printf("[%s] %s %s:%s > %s:%s %s\n",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_LBLUE+core.FG_BLACK, "tcp"),
vIP(ip.SrcIP),
vPort(tcp.SrcPort),
vIP(ip.DstIP),
vPort(tcp.DstPort),
core.Dim(fmt.Sprintf("%d bytes", len(ip.Payload))))
if verbose == true {
fmt.Printf("[%s] %s %s:%s > %s:%s %s\n",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_LBLUE+core.FG_BLACK, "tcp"),
vIP(ip.SrcIP),
vPort(tcp.SrcPort),
vIP(ip.DstIP),
vPort(tcp.DstPort),
core.Dim(fmt.Sprintf("%d bytes", len(ip.Payload))))
}
}
func udpParser(ip *layers.IPv4, pkt gopacket.Packet) {
func udpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
udp := pkt.Layer(layers.LayerTypeUDP).(*layers.UDP)
fmt.Printf("[%s] %s %s:%s > %s:%s %s\n",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_DGRAY+core.FG_WHITE, "udp"),
vIP(ip.SrcIP),
vPort(udp.SrcPort),
vIP(ip.DstIP),
vPort(udp.DstPort),
core.Dim(fmt.Sprintf("%d bytes", len(ip.Payload))))
if dnsParser(ip, pkt, udp) {
return
}
if verbose == true {
fmt.Printf("[%s] %s %s:%s > %s:%s %s\n",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_DGRAY+core.FG_WHITE, "udp"),
vIP(ip.SrcIP),
vPort(udp.SrcPort),
vIP(ip.DstIP),
vPort(udp.DstPort),
core.Dim(fmt.Sprintf("%d bytes", len(ip.Payload))))
}
}
func unkParser(ip *layers.IPv4, pkt gopacket.Packet) {
fmt.Printf("[%s] [%s] %s > %s (%d bytes)\n",
vTime(pkt.Metadata().Timestamp),
pkt.TransportLayer().LayerType(),
vIP(ip.SrcIP),
vIP(ip.DstIP),
len(ip.Payload))
func unkParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
if verbose == true {
fmt.Printf("[%s] [%s] %s > %s (%d bytes)\n",
vTime(pkt.Metadata().Timestamp),
pkt.TransportLayer().LayerType(),
vIP(ip.SrcIP),
vIP(ip.DstIP),
len(ip.Payload))
}
}
func mainParser(pkt gopacket.Packet) bool {
func mainParser(pkt gopacket.Packet, verbose bool) bool {
nlayer := pkt.NetworkLayer()
if nlayer == nil {
log.Warning("Missing network layer skipping packet.")
@ -70,11 +80,11 @@ func mainParser(pkt gopacket.Packet) bool {
}
if tlayer.LayerType() == layers.LayerTypeTCP {
tcpParser(ip, pkt)
tcpParser(ip, pkt, verbose)
} else if tlayer.LayerType() == layers.LayerTypeUDP {
udpParser(ip, pkt)
udpParser(ip, pkt, verbose)
} else {
unkParser(ip, pkt)
unkParser(ip, pkt, verbose)
}
return true

2
modules/net_sniff_views.go
View file

@ -17,7 +17,7 @@ func vTime(t time.Time) string {
func vIP(ip net.IP) string {
if session.I.Interface.IP.Equal(ip) {
return core.Dim("-")
return core.Dim("local")
} else if session.I.Gateway.IP.Equal(ip) {
return "gateway"
}