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

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

Browse source
This commit is contained in:
evilsocket 2018-02-16 22:49:49 +01:00
commit be82e83787
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main.go
View file

@ -49,7 +49,7 @@ func main() {
sess.Register(modules.NewHttpsProxy(sess)) sess.Register(modules.NewHttpsProxy(sess))
sess.Register(modules.NewRestAPI(sess)) sess.Register(modules.NewRestAPI(sess))
sess.Register(modules.NewWOL(sess)) sess.Register(modules.NewWOL(sess))
sess.Register(modules.NewWDiscovery(sess)) sess.Register(modules.NewWiFiRecon(sess))
if err = sess.Start(); err != nil { if err = sess.Start(); err != nil {
log.Fatal("%s", err) log.Fatal("%s", err)

34
modules/wifi_recon.go
View file

@ -24,7 +24,7 @@ import (
"github.com/olekukonko/tablewriter" "github.com/olekukonko/tablewriter"
) )
type WDiscovery struct { type WiFiRecon struct {
session.SessionModule session.SessionModule
wifi *WiFi wifi *WiFi
@ -34,8 +34,8 @@ type WDiscovery struct {
apTarget net.HardwareAddr apTarget net.HardwareAddr
} }
func NewWDiscovery(s *session.Session) *WDiscovery { func NewWiFiRecon(s *session.Session) *WiFiRecon {
w := &WDiscovery{ w := &WiFiRecon{
SessionModule: session.NewSessionModule("wifi.recon", s), SessionModule: session.NewSessionModule("wifi.recon", s),
stats: NewWiFiStats(), stats: NewWiFiStats(),
cliTarget: make([]byte, 0), cliTarget: make([]byte, 0),
@ -105,19 +105,19 @@ func NewWDiscovery(s *session.Session) *WDiscovery {
return w return w
} }
func (w WDiscovery) Name() string { func (w WiFiRecon) Name() string {
return "wifi.recon" return "wifi.recon"
} }
func (w WDiscovery) Description() string { func (w WiFiRecon) Description() string {
return "A module to monitor and perform wireless attacks on 802.11." return "A module to monitor and perform wireless attacks on 802.11."
} }
func (w WDiscovery) Author() string { func (w WiFiRecon) Author() string {
return "Gianluca Braga <matrix86@protonmail.com>" return "Gianluca Braga <matrix86@protonmail.com>"
} }
func (w *WDiscovery) getRow(station *WiFiStation) []string { func (w *WiFiRecon) getRow(station *WiFiStation) []string {
sinceStarted := time.Since(w.Session.StartedAt) sinceStarted := time.Since(w.Session.StartedAt)
sinceFirstSeen := time.Since(station.FirstSeen) sinceFirstSeen := time.Since(station.FirstSeen)
@ -180,7 +180,7 @@ func (a BywifiSeenSorter) Less(i, j int) bool {
return a[i].LastSeen.After(a[j].LastSeen) return a[i].LastSeen.After(a[j].LastSeen)
} }
func (w *WDiscovery) showTable(header []string, rows [][]string) { func (w *WiFiRecon) showTable(header []string, rows [][]string) {
fmt.Println() fmt.Println()
table := tablewriter.NewWriter(os.Stdout) table := tablewriter.NewWriter(os.Stdout)
table.SetHeader(header) table.SetHeader(header)
@ -189,7 +189,7 @@ func (w *WDiscovery) showTable(header []string, rows [][]string) {
table.Render() table.Render()
} }
func (w *WDiscovery) Show(by string) error { func (w *WiFiRecon) Show(by string) error {
if w.wifi == nil { if w.wifi == nil {
return errors.New("WiFi is not yet initialized.") return errors.New("WiFi is not yet initialized.")
} }
@ -213,7 +213,7 @@ func (w *WDiscovery) Show(by string) error {
return nil return nil
} }
func (w *WDiscovery) sendDeauthPacket(ap net.HardwareAddr, client net.HardwareAddr) { func (w *WiFiRecon) sendDeauthPacket(ap net.HardwareAddr, client net.HardwareAddr) {
for seq := uint16(0); seq < 64; seq++ { for seq := uint16(0); seq < 64; seq++ {
if err, pkt := packets.NewDot11Deauth(ap, client, ap, layers.Dot11TypeMgmtDeauthentication, layers.Dot11ReasonClass2FromNonAuth, seq); err != nil { if err, pkt := packets.NewDot11Deauth(ap, client, ap, layers.Dot11TypeMgmtDeauthentication, layers.Dot11ReasonClass2FromNonAuth, seq); err != nil {
log.Error("Could not create deauth packet: %s", err) log.Error("Could not create deauth packet: %s", err)
@ -237,7 +237,7 @@ func (w *WDiscovery) sendDeauthPacket(ap net.HardwareAddr, client net.HardwareAd
} }
} }
func (w *WDiscovery) startDeauth() error { func (w *WiFiRecon) startDeauth() error {
isTargetingAP := len(w.apTarget) > 0 isTargetingAP := len(w.apTarget) > 0
if isTargetingAP { if isTargetingAP {
isTargetingCLI := len(w.cliTarget) > 0 isTargetingCLI := len(w.cliTarget) > 0
@ -255,7 +255,7 @@ func (w *WDiscovery) startDeauth() error {
return errors.New("No base station or client set.") return errors.New("No base station or client set.")
} }
func (w *WDiscovery) discoverAccessPoints(packet gopacket.Packet) { func (w *WiFiRecon) discoverAccessPoints(packet gopacket.Packet) {
radiotapLayer := packet.Layer(layers.LayerTypeRadioTap) radiotapLayer := packet.Layer(layers.LayerTypeRadioTap)
if radiotapLayer == nil { if radiotapLayer == nil {
return return
@ -289,7 +289,7 @@ func (w *WDiscovery) discoverAccessPoints(packet gopacket.Packet) {
} }
} }
func (w *WDiscovery) discoverClients(bs net.HardwareAddr, packet gopacket.Packet) { func (w *WiFiRecon) discoverClients(bs net.HardwareAddr, packet gopacket.Packet) {
radiotapLayer := packet.Layer(layers.LayerTypeRadioTap) radiotapLayer := packet.Layer(layers.LayerTypeRadioTap)
if radiotapLayer == nil { if radiotapLayer == nil {
return return
@ -320,7 +320,7 @@ func (w *WDiscovery) discoverClients(bs net.HardwareAddr, packet gopacket.Packet
} }
} }
func (w *WDiscovery) Configure() error { func (w *WiFiRecon) Configure() error {
var err error var err error
var ihandle *pcap.InactiveHandle var ihandle *pcap.InactiveHandle
@ -344,7 +344,7 @@ func (w *WDiscovery) Configure() error {
return nil return nil
} }
func (w *WDiscovery) updateStats(packet gopacket.Packet) { func (w *WiFiRecon) updateStats(packet gopacket.Packet) {
radiotapLayer := packet.Layer(layers.LayerTypeRadioTap) radiotapLayer := packet.Layer(layers.LayerTypeRadioTap)
if radiotapLayer == nil { if radiotapLayer == nil {
return return
@ -378,7 +378,7 @@ func (w *WDiscovery) updateStats(packet gopacket.Packet) {
w.stats.Collect(dot11.Address4, bytes) w.stats.Collect(dot11.Address4, bytes)
} }
func (w *WDiscovery) Start() error { func (w *WiFiRecon) Start() error {
if w.Running() == true { if w.Running() == true {
return session.ErrAlreadyStarted return session.ErrAlreadyStarted
} else if err := w.Configure(); err != nil { } else if err := w.Configure(); err != nil {
@ -406,6 +406,6 @@ func (w *WDiscovery) Start() error {
return nil return nil
} }
func (w *WDiscovery) Stop() error { func (w *WiFiRecon) Stop() error {
return w.SetRunning(false, nil) return w.SetRunning(false, nil)
} }