github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 13:09:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact: better sniffer messages

Browse source
This commit is contained in:
evilsocket 2018-02-05 18:56:52 +01:00
commit e64a24dd13
5 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/events_view.go
View file

@ -37,11 +37,9 @@ func (s EventsStream) viewModuleEvent(e session.Event) {
func (s EventsStream) viewSnifferEvent(e session.Event) { func (s EventsStream) viewSnifferEvent(e session.Event) {
se := e.Data.(SnifferEvent) se := e.Data.(SnifferEvent)
fmt.Printf("[%s] [%s] %s > %s | %s\n", fmt.Printf("[%s] [%s] %s\n",
e.Time.Format(eventTimeFormat), e.Time.Format(eventTimeFormat),
core.Green(e.Tag), core.Green(e.Tag),
se.Source,
se.Destination,
se.Message) se.Message)
} }

3
modules/net_sniff_dns.go
View file

@ -43,8 +43,7 @@ func dnsParser(ip *layers.IPv4, pkt gopacket.Packet, udp *layers.UDP) bool {
"Hostname": hostname, "Hostname": hostname,
"Addresses": ips, "Addresses": ips,
}, },
"[%s] %s %s > %s : %s is %s", "%s %s > %s : %s is %s",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_DGRAY+core.FG_WHITE, "dns"), core.W(core.BG_DGRAY+core.FG_WHITE, "dns"),
vIP(ip.SrcIP), vIP(ip.SrcIP),
vIP(ip.DstIP), vIP(ip.DstIP),

3
modules/net_sniff_http.go
View file

@ -52,8 +52,7 @@ func httpParser(ip *layers.IPv4, pkt gopacket.Packet, tcp *layers.TCP) bool {
"path": url, "path": url,
"agent": ua, "agent": ua,
}, },
"[%s] %s %s %s %s %s", "%s %s %s %s %s",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_RED+core.FG_BLACK, "http"), core.W(core.BG_RED+core.FG_BLACK, "http"),
vIP(ip.SrcIP), vIP(ip.SrcIP),
core.W(core.BG_LBLUE+core.FG_BLACK, method), core.W(core.BG_LBLUE+core.FG_BLACK, method),

9
modules/net_sniff_parsers.go
View file

@ -28,8 +28,7 @@ func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
SniffData{ SniffData{
"Size": len(ip.Payload), "Size": len(ip.Payload),
}, },
"[%s] %s %s:%s > %s:%s %s", "%s %s:%s > %s:%s %s",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_LBLUE+core.FG_BLACK, "tcp"), core.W(core.BG_LBLUE+core.FG_BLACK, "tcp"),
vIP(ip.SrcIP), vIP(ip.SrcIP),
vPort(tcp.SrcPort), vPort(tcp.SrcPort),
@ -56,8 +55,7 @@ func udpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
SniffData{ SniffData{
"Size": len(ip.Payload), "Size": len(ip.Payload),
}, },
"[%s] %s %s:%s > %s:%s %s", "%s %s:%s > %s:%s %s",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_DGRAY+core.FG_WHITE, "udp"), core.W(core.BG_DGRAY+core.FG_WHITE, "udp"),
vIP(ip.SrcIP), vIP(ip.SrcIP),
vPort(udp.SrcPort), vPort(udp.SrcPort),
@ -78,8 +76,7 @@ func unkParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
SniffData{ SniffData{
"Size": len(ip.Payload), "Size": len(ip.Payload),
}, },
"[%s] %s %s > %s %s", "%s %s > %s %s",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_DGRAY+core.FG_WHITE, pkt.TransportLayer().LayerType().String()), core.W(core.BG_DGRAY+core.FG_WHITE, pkt.TransportLayer().LayerType().String()),
vIP(ip.SrcIP), vIP(ip.SrcIP),
vIP(ip.DstIP), vIP(ip.DstIP),

3
modules/net_sniff_sni.go
View file

@ -39,8 +39,7 @@ func sniParser(ip *layers.IPv4, pkt gopacket.Packet, tcp *layers.TCP) bool {
SniffData{ SniffData{
"Domain": domain, "Domain": domain,
}, },
"[%s] %s %s > %s", "%s %s > %s",
vTime(pkt.Metadata().Timestamp),
core.W(core.BG_YELLOW+core.FG_WHITE, "sni"), core.W(core.BG_YELLOW+core.FG_WHITE, "sni"),
vIP(ip.SrcIP), vIP(ip.SrcIP),
core.Yellow("https://"+domain), core.Yellow("https://"+domain),