diff --git a/main.go b/main.go index 9c954937..5ddd2613 100644 --- a/main.go +++ b/main.go @@ -35,31 +35,8 @@ func main() { fmt.Printf("%s (type '%s' for a list of commands)\n\n", tui.Bold(appName), tui.Bold("help")) - sess.Register(modules.NewEventsStream(sess)) - sess.Register(modules.NewTicker(sess)) - sess.Register(modules.NewUpdateModule(sess)) - sess.Register(modules.NewCapletsModule(sess)) - sess.Register(modules.NewMacChanger(sess)) - sess.Register(modules.NewProber(sess)) - sess.Register(modules.NewDiscovery(sess)) - sess.Register(modules.NewArpSpoofer(sess)) - sess.Register(modules.NewDHCP6Spoofer(sess)) - sess.Register(modules.NewDNSSpoofer(sess)) - sess.Register(modules.NewSniffer(sess)) - sess.Register(modules.NewPacketProxy(sess)) - sess.Register(modules.NewAnyProxy(sess)) - sess.Register(modules.NewTcpProxy(sess)) - sess.Register(modules.NewHttpProxy(sess)) - sess.Register(modules.NewHttpsProxy(sess)) - sess.Register(modules.NewHttpServer(sess)) - sess.Register(modules.NewHttpsServer(sess)) - sess.Register(modules.NewRestAPI(sess)) - sess.Register(modules.NewWOL(sess)) - sess.Register(modules.NewWiFiModule(sess)) - sess.Register(modules.NewBLERecon(sess)) - sess.Register(modules.NewSynScanner(sess)) - sess.Register(modules.NewGPS(sess)) - sess.Register(modules.NewMySQLServer(sess)) + // Load all modules + modules.LoadModules(sess) if err = sess.Start(); err != nil { log.Fatal("%s", err) diff --git a/modules/any_proxy.go b/modules/any_proxy/any_proxy.go similarity index 99% rename from modules/any_proxy.go rename to modules/any_proxy/any_proxy.go index 7ec73443..5185db7e 100644 --- a/modules/any_proxy.go +++ b/modules/any_proxy/any_proxy.go @@ -1,4 +1,4 @@ -package modules +package any_proxy import ( "github.com/bettercap/bettercap/firewall" diff --git a/modules/api_rest.go b/modules/api_rest/api_rest.go similarity index 99% rename from modules/api_rest.go rename to modules/api_rest/api_rest.go index 7a87e503..2656e621 100644 --- a/modules/api_rest.go +++ b/modules/api_rest/api_rest.go @@ -1,4 +1,4 @@ -package modules +package api_rest import ( "context" diff --git a/modules/api_rest_controller.go b/modules/api_rest/api_rest_controller.go similarity index 99% rename from modules/api_rest_controller.go rename to modules/api_rest/api_rest_controller.go index 52e8b059..e9e915b1 100644 --- a/modules/api_rest_controller.go +++ b/modules/api_rest/api_rest_controller.go @@ -1,4 +1,4 @@ -package modules +package api_rest import ( "crypto/subtle" diff --git a/modules/api_rest_ws.go b/modules/api_rest/api_rest_ws.go similarity index 99% rename from modules/api_rest_ws.go rename to modules/api_rest/api_rest_ws.go index 931ea9c3..4d2b00c2 100644 --- a/modules/api_rest_ws.go +++ b/modules/api_rest/api_rest_ws.go @@ -1,4 +1,4 @@ -package modules +package api_rest import ( "encoding/json" diff --git a/modules/arp_spoof.go b/modules/arp_spoof/arp_spoof.go similarity index 99% rename from modules/arp_spoof.go rename to modules/arp_spoof/arp_spoof.go index dcf41751..2967d831 100644 --- a/modules/arp_spoof.go +++ b/modules/arp_spoof/arp_spoof.go @@ -1,4 +1,4 @@ -package modules +package arp_spoof import ( "bytes" diff --git a/modules/ble_options_linux.go b/modules/ble/ble_options_linux.go similarity index 96% rename from modules/ble_options_linux.go rename to modules/ble/ble_options_linux.go index c5286130..4163dde0 100644 --- a/modules/ble_options_linux.go +++ b/modules/ble/ble_options_linux.go @@ -1,4 +1,4 @@ -package modules +package ble import ( "github.com/bettercap/gatt" diff --git a/modules/ble_recon.go b/modules/ble/ble_recon.go similarity index 99% rename from modules/ble_recon.go rename to modules/ble/ble_recon.go index c082e0b7..9611171a 100644 --- a/modules/ble_recon.go +++ b/modules/ble/ble_recon.go @@ -1,7 +1,7 @@ // +build !windows // +build !darwin -package modules +package ble import ( "encoding/hex" diff --git a/modules/ble_recon_events.go b/modules/ble/ble_recon_events.go similarity index 99% rename from modules/ble_recon_events.go rename to modules/ble/ble_recon_events.go index 11216785..6a4da701 100644 --- a/modules/ble_recon_events.go +++ b/modules/ble/ble_recon_events.go @@ -1,7 +1,7 @@ // +build !windows // +build !darwin -package modules +package ble import ( "github.com/bettercap/bettercap/log" diff --git a/modules/ble_recon_sort.go b/modules/ble/ble_recon_sort.go similarity index 95% rename from modules/ble_recon_sort.go rename to modules/ble/ble_recon_sort.go index 3b504646..017586ac 100644 --- a/modules/ble_recon_sort.go +++ b/modules/ble/ble_recon_sort.go @@ -1,7 +1,7 @@ // +build !windows // +build !darwin -package modules +package ble import ( "github.com/bettercap/bettercap/network" diff --git a/modules/ble_recon_view.go b/modules/ble/ble_recon_view.go similarity index 99% rename from modules/ble_recon_view.go rename to modules/ble/ble_recon_view.go index 13740f90..b913be9b 100644 --- a/modules/ble_recon_view.go +++ b/modules/ble/ble_recon_view.go @@ -1,7 +1,7 @@ // +build !windows // +build !darwin -package modules +package ble import ( "fmt" diff --git a/modules/ble_unsupported.go b/modules/ble/ble_unsupported.go similarity index 98% rename from modules/ble_unsupported.go rename to modules/ble/ble_unsupported.go index f09134b0..be7f21ea 100644 --- a/modules/ble_unsupported.go +++ b/modules/ble/ble_unsupported.go @@ -1,6 +1,6 @@ // +build windows darwin -package modules +package ble import ( "github.com/bettercap/bettercap/session" diff --git a/modules/caplets.go b/modules/caplets/caplets.go similarity index 99% rename from modules/caplets.go rename to modules/caplets/caplets.go index 98a1ecd2..f3d35cc0 100644 --- a/modules/caplets.go +++ b/modules/caplets/caplets.go @@ -1,4 +1,4 @@ -package modules +package caplets import ( "fmt" diff --git a/modules/dhcp6_spoof.go b/modules/dhcp6_spoof/dhcp6_spoof.go similarity index 99% rename from modules/dhcp6_spoof.go rename to modules/dhcp6_spoof/dhcp6_spoof.go index 2a068ad0..e85349bd 100644 --- a/modules/dhcp6_spoof.go +++ b/modules/dhcp6_spoof/dhcp6_spoof.go @@ -1,4 +1,4 @@ -package modules +package dhcp6_spoof import ( "bytes" diff --git a/modules/net_recon.go b/modules/discovery/net_recon.go similarity index 92% rename from modules/net_recon.go rename to modules/discovery/net_recon.go index 3fc046b5..b0e0b096 100644 --- a/modules/net_recon.go +++ b/modules/discovery/net_recon.go @@ -1,6 +1,7 @@ -package modules +package discovery import ( + "github.com/bettercap/bettercap/modules/utils" "time" "github.com/bettercap/bettercap/log" @@ -10,7 +11,7 @@ import ( type Discovery struct { session.SessionModule - selector *ViewSelector + selector *utils.ViewSelector } func NewDiscovery(s *session.Session) *Discovery { @@ -52,7 +53,8 @@ func NewDiscovery(s *session.Session) *Discovery { return d.showMeta(args[0]) })) - d.selector = ViewSelectorFor(&d.SessionModule, "net.show", []string{"ip", "mac", "seen", "sent", "rcvd"}, "ip asc") + d.selector = utils.ViewSelectorFor(&d.SessionModule, "net.show", []string{"ip", "mac", "seen", "sent", "rcvd"}, + "ip asc") return d } diff --git a/modules/net_show.go b/modules/discovery/net_show.go similarity index 94% rename from modules/net_show.go rename to modules/discovery/net_show.go index 51361020..74d5d9d9 100644 --- a/modules/net_show.go +++ b/modules/discovery/net_show.go @@ -1,4 +1,4 @@ -package modules +package discovery import ( "fmt" @@ -16,9 +16,9 @@ import ( ) var ( - aliveTimeInterval = time.Duration(10) * time.Second - presentTimeInterval = time.Duration(1) * time.Minute - justJoinedTimeInterval = time.Duration(10) * time.Second + AliveTimeInterval = time.Duration(10) * time.Second + PresentTimeInterval = time.Duration(1) * time.Minute + JustJoinedTimeInterval = time.Duration(10) * time.Second ) type ProtoPair struct { @@ -42,7 +42,7 @@ func (d *Discovery) getRow(e *network.Endpoint, withMeta bool) [][]string { // if endpoint was not found in ARP at least once addr = tui.Dim(addr) mac = tui.Dim(mac) - } else if sinceStarted > (justJoinedTimeInterval*2) && sinceFirstSeen <= justJoinedTimeInterval { + } else if sinceStarted > (JustJoinedTimeInterval*2) && sinceFirstSeen <= JustJoinedTimeInterval { // if endpoint was first seen in the last 10 seconds addr = tui.Bold(addr) mac = tui.Bold(mac) @@ -67,10 +67,10 @@ func (d *Discovery) getRow(e *network.Endpoint, withMeta bool) [][]string { seen := e.LastSeen.Format("15:04:05") sinceLastSeen := time.Since(e.LastSeen) - if sinceStarted > aliveTimeInterval && sinceLastSeen <= aliveTimeInterval { + if sinceStarted > AliveTimeInterval && sinceLastSeen <= AliveTimeInterval { // if endpoint seen in the last 10 seconds seen = tui.Bold(seen) - } else if sinceLastSeen <= presentTimeInterval { + } else if sinceLastSeen <= PresentTimeInterval { // if endpoint seen in the last 60 seconds } else { // not seen in a while diff --git a/modules/net_show_sort.go b/modules/discovery/net_show_sort.go similarity index 99% rename from modules/net_show_sort.go rename to modules/discovery/net_show_sort.go index 7958f6fc..56f7efba 100644 --- a/modules/net_show_sort.go +++ b/modules/discovery/net_show_sort.go @@ -1,4 +1,4 @@ -package modules +package discovery import ( "github.com/bettercap/bettercap/network" diff --git a/modules/dns_spoof.go b/modules/dns_spoof/dns_spoof.go similarity index 99% rename from modules/dns_spoof.go rename to modules/dns_spoof/dns_spoof.go index 8265517d..a45b04b7 100644 --- a/modules/dns_spoof.go +++ b/modules/dns_spoof/dns_spoof.go @@ -1,4 +1,4 @@ -package modules +package dns_spoof import ( "bytes" diff --git a/modules/dns_spoof_hosts.go b/modules/dns_spoof/dns_spoof_hosts.go similarity index 98% rename from modules/dns_spoof_hosts.go rename to modules/dns_spoof/dns_spoof_hosts.go index c4cbe3f0..5f4580e6 100644 --- a/modules/dns_spoof_hosts.go +++ b/modules/dns_spoof/dns_spoof_hosts.go @@ -1,4 +1,4 @@ -package modules +package dns_spoof import ( "bufio" diff --git a/modules/events_ignore_list.go b/modules/events_stream/events_ignore_list.go similarity index 98% rename from modules/events_ignore_list.go rename to modules/events_stream/events_ignore_list.go index c66845d3..036142e2 100644 --- a/modules/events_ignore_list.go +++ b/modules/events_stream/events_ignore_list.go @@ -1,4 +1,4 @@ -package modules +package events_stream import ( "errors" diff --git a/modules/events_stream.go b/modules/events_stream/events_stream.go similarity index 99% rename from modules/events_stream.go rename to modules/events_stream/events_stream.go index 564646bf..e80b31fa 100644 --- a/modules/events_stream.go +++ b/modules/events_stream/events_stream.go @@ -1,4 +1,4 @@ -package modules +package events_stream import ( "fmt" diff --git a/modules/events_view.go b/modules/events_stream/events_view.go similarity index 95% rename from modules/events_view.go rename to modules/events_stream/events_view.go index b99c390b..d9e5031d 100644 --- a/modules/events_view.go +++ b/modules/events_stream/events_view.go @@ -1,7 +1,8 @@ -package modules +package events_stream import ( "fmt" + "github.com/bettercap/bettercap/modules/net_sniff" "os" "strings" "time" @@ -9,6 +10,8 @@ import ( "github.com/bettercap/bettercap/network" "github.com/bettercap/bettercap/session" + "github.com/bettercap/bettercap/modules/syn_scan" + "github.com/google/go-github/github" "github.com/evilsocket/islazy/tui" @@ -78,12 +81,12 @@ func (s *EventsStream) viewSnifferEvent(e session.Event) { fmt.Fprintf(s.output, "[%s] [%s] %s\n", e.Time.Format(eventTimeFormat), tui.Green(e.Tag), - e.Data.(SnifferEvent).Message) + e.Data.(net_sniff.SnifferEvent).Message) } } func (s *EventsStream) viewSynScanEvent(e session.Event) { - se := e.Data.(SynScanEvent) + se := e.Data.(syn_scan.SynScanEvent) fmt.Fprintf(s.output, "[%s] [%s] found open port %d for %s\n", e.Time.Format(eventTimeFormat), tui.Green(e.Tag), diff --git a/modules/events_view_ble.go b/modules/events_stream/events_view_ble.go similarity index 98% rename from modules/events_view_ble.go rename to modules/events_stream/events_view_ble.go index 0bea77a2..d630549d 100644 --- a/modules/events_view_ble.go +++ b/modules/events_stream/events_view_ble.go @@ -1,7 +1,7 @@ // +build !windows // +build !darwin -package modules +package events_stream import ( "fmt" diff --git a/modules/events_view_ble_unsupported.go b/modules/events_stream/events_view_ble_unsupported.go similarity index 86% rename from modules/events_view_ble_unsupported.go rename to modules/events_stream/events_view_ble_unsupported.go index 11dc7e6e..e4329d03 100644 --- a/modules/events_view_ble_unsupported.go +++ b/modules/events_stream/events_view_ble_unsupported.go @@ -1,6 +1,6 @@ // +build windows darwin -package modules +package events_stream import ( "github.com/bettercap/bettercap/session" diff --git a/modules/events_view_http.go b/modules/events_stream/events_view_http.go similarity index 92% rename from modules/events_view_http.go rename to modules/events_stream/events_view_http.go index 65913842..dc529202 100644 --- a/modules/events_view_http.go +++ b/modules/events_stream/events_view_http.go @@ -1,4 +1,4 @@ -package modules +package events_stream import ( "bytes" @@ -6,6 +6,7 @@ import ( "encoding/hex" "encoding/json" "fmt" + "github.com/bettercap/bettercap/modules/net_sniff" "net/url" "regexp" "strings" @@ -19,7 +20,7 @@ var ( reJsonKey = regexp.MustCompile(`("[^"]+"):`) ) -func (s *EventsStream) shouldDumpHttpRequest(req HTTPRequest) bool { +func (s *EventsStream) shouldDumpHttpRequest(req net_sniff.HTTPRequest) bool { if s.dumpHttpReqs { // dump all return true @@ -37,7 +38,7 @@ func (s *EventsStream) shouldDumpHttpRequest(req HTTPRequest) bool { return false } -func (s *EventsStream) shouldDumpHttpResponse(res HTTPResponse) bool { +func (s *EventsStream) shouldDumpHttpResponse(res net_sniff.HTTPResponse) bool { if s.dumpHttpResp { return true } else if strings.Contains(res.ContentType, "text/plain") { @@ -119,8 +120,8 @@ func (s *EventsStream) dumpRaw(body []byte) string { } func (s *EventsStream) viewHttpRequest(e session.Event) { - se := e.Data.(SnifferEvent) - req := se.Data.(HTTPRequest) + se := e.Data.(net_sniff.SnifferEvent) + req := se.Data.(net_sniff.HTTPRequest) fmt.Fprintf(s.output, "[%s] [%s] %s\n", e.Time.Format(eventTimeFormat), @@ -157,8 +158,8 @@ func (s *EventsStream) viewHttpRequest(e session.Event) { } func (s *EventsStream) viewHttpResponse(e session.Event) { - se := e.Data.(SnifferEvent) - res := se.Data.(HTTPResponse) + se := e.Data.(net_sniff.SnifferEvent) + res := se.Data.(net_sniff.HTTPResponse) fmt.Fprintf(s.output, "[%s] [%s] %s\n", e.Time.Format(eventTimeFormat), diff --git a/modules/events_view_wifi.go b/modules/events_stream/events_view_wifi.go similarity index 94% rename from modules/events_view_wifi.go rename to modules/events_stream/events_view_wifi.go index 907de7d6..6cab951d 100644 --- a/modules/events_view_wifi.go +++ b/modules/events_stream/events_view_wifi.go @@ -1,7 +1,8 @@ -package modules +package events_stream import ( "fmt" + "github.com/bettercap/bettercap/modules/wifi" "strings" "github.com/bettercap/bettercap/network" @@ -44,7 +45,7 @@ func (s *EventsStream) viewWiFiApEvent(e session.Event) { } func (s *EventsStream) viewWiFiClientProbeEvent(e session.Event) { - probe := e.Data.(WiFiProbeEvent) + probe := e.Data.(wifi.WiFiProbeEvent) desc := "" if probe.FromAlias != "" { desc = fmt.Sprintf(" (%s)", probe.FromAlias) @@ -66,7 +67,7 @@ func (s *EventsStream) viewWiFiClientProbeEvent(e session.Event) { } func (s *EventsStream) viewWiFiHandshakeEvent(e session.Event) { - hand := e.Data.(WiFiHandshakeEvent) + hand := e.Data.(wifi.WiFiHandshakeEvent) from := hand.Station.String() to := hand.AP.String() @@ -91,7 +92,7 @@ func (s *EventsStream) viewWiFiHandshakeEvent(e session.Event) { } func (s *EventsStream) viewWiFiClientEvent(e session.Event) { - ce := e.Data.(WiFiClientEvent) + ce := e.Data.(wifi.WiFiClientEvent) ce.Client.Alias = s.Session.Lan.GetAlias(ce.Client.BSSID()) diff --git a/modules/gps.go b/modules/gps/gps.go similarity index 99% rename from modules/gps.go rename to modules/gps/gps.go index 9ed030da..c98689c8 100644 --- a/modules/gps.go +++ b/modules/gps/gps.go @@ -1,4 +1,4 @@ -package modules +package gps import ( "fmt" diff --git a/modules/http_proxy.go b/modules/http_proxy/http_proxy.go similarity index 99% rename from modules/http_proxy.go rename to modules/http_proxy/http_proxy.go index cdd42f56..da42b517 100644 --- a/modules/http_proxy.go +++ b/modules/http_proxy/http_proxy.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "github.com/bettercap/bettercap/session" diff --git a/modules/http_proxy_base.go b/modules/http_proxy/http_proxy_base.go similarity index 99% rename from modules/http_proxy_base.go rename to modules/http_proxy/http_proxy_base.go index a1c91120..f34dcb1d 100644 --- a/modules/http_proxy_base.go +++ b/modules/http_proxy/http_proxy_base.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "bufio" diff --git a/modules/http_proxy_base_cookietracker.go b/modules/http_proxy/http_proxy_base_cookietracker.go similarity index 98% rename from modules/http_proxy_base_cookietracker.go rename to modules/http_proxy/http_proxy_base_cookietracker.go index d60f7802..0aa9e792 100644 --- a/modules/http_proxy_base_cookietracker.go +++ b/modules/http_proxy/http_proxy_base_cookietracker.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "fmt" diff --git a/modules/http_proxy_base_filters.go b/modules/http_proxy/http_proxy_base_filters.go similarity index 99% rename from modules/http_proxy_base_filters.go rename to modules/http_proxy/http_proxy_base_filters.go index de7110fa..dcd24bbd 100644 --- a/modules/http_proxy_base_filters.go +++ b/modules/http_proxy/http_proxy_base_filters.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "io/ioutil" diff --git a/modules/http_proxy_base_hosttracker.go b/modules/http_proxy/http_proxy_base_hosttracker.go similarity index 98% rename from modules/http_proxy_base_hosttracker.go rename to modules/http_proxy/http_proxy_base_hosttracker.go index 4543bb49..0eb3f079 100644 --- a/modules/http_proxy_base_hosttracker.go +++ b/modules/http_proxy/http_proxy_base_hosttracker.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "net" diff --git a/modules/http_proxy_base_sslstriper.go b/modules/http_proxy/http_proxy_base_sslstriper.go similarity index 99% rename from modules/http_proxy_base_sslstriper.go rename to modules/http_proxy/http_proxy_base_sslstriper.go index 6e0094c8..f24c372b 100644 --- a/modules/http_proxy_base_sslstriper.go +++ b/modules/http_proxy/http_proxy_base_sslstriper.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "fmt" diff --git a/modules/http_proxy_cert_cache.go b/modules/http_proxy/http_proxy_cert_cache.go similarity index 96% rename from modules/http_proxy_cert_cache.go rename to modules/http_proxy/http_proxy_cert_cache.go index 1a5e70d3..8bff6005 100644 --- a/modules/http_proxy_cert_cache.go +++ b/modules/http_proxy/http_proxy_cert_cache.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "crypto/tls" diff --git a/modules/http_proxy_js_request.go b/modules/http_proxy/http_proxy_js_request.go similarity index 99% rename from modules/http_proxy_js_request.go rename to modules/http_proxy/http_proxy_js_request.go index cc59b534..975c86a9 100644 --- a/modules/http_proxy_js_request.go +++ b/modules/http_proxy/http_proxy_js_request.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "bytes" diff --git a/modules/http_proxy_js_response.go b/modules/http_proxy/http_proxy_js_response.go similarity index 99% rename from modules/http_proxy_js_response.go rename to modules/http_proxy/http_proxy_js_response.go index 0931c51c..8969c59f 100644 --- a/modules/http_proxy_js_response.go +++ b/modules/http_proxy/http_proxy_js_response.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "bytes" diff --git a/modules/http_proxy_script.go b/modules/http_proxy/http_proxy_script.go similarity index 99% rename from modules/http_proxy_script.go rename to modules/http_proxy/http_proxy_script.go index 0a33b9e5..f064e044 100644 --- a/modules/http_proxy_script.go +++ b/modules/http_proxy/http_proxy_script.go @@ -1,4 +1,4 @@ -package modules +package http_proxy import ( "net/http" diff --git a/modules/http_server.go b/modules/http_server/http_server.go similarity index 99% rename from modules/http_server.go rename to modules/http_server/http_server.go index b0d1bdd8..18d6ea58 100644 --- a/modules/http_server.go +++ b/modules/http_server/http_server.go @@ -1,4 +1,4 @@ -package modules +package http_server import ( "context" diff --git a/modules/https_proxy.go b/modules/https_proxy/https_proxy.go similarity index 96% rename from modules/https_proxy.go rename to modules/https_proxy/https_proxy.go index ee32b2a5..28c5986a 100644 --- a/modules/https_proxy.go +++ b/modules/https_proxy/https_proxy.go @@ -1,22 +1,23 @@ -package modules +package https_proxy import ( "github.com/bettercap/bettercap/log" "github.com/bettercap/bettercap/session" "github.com/bettercap/bettercap/tls" + "github.com/bettercap/bettercap/modules/http_proxy" "github.com/evilsocket/islazy/fs" ) type HttpsProxy struct { session.SessionModule - proxy *HTTPProxy + proxy *http_proxy.HTTPProxy } func NewHttpsProxy(s *session.Session) *HttpsProxy { p := &HttpsProxy{ SessionModule: session.NewSessionModule("https.proxy", s), - proxy: NewHTTPProxy(s), + proxy: http_proxy.NewHTTPProxy(s), } p.AddParam(session.NewIntParameter("https.port", diff --git a/modules/https_server.go b/modules/https_server/https_server.go similarity index 99% rename from modules/https_server.go rename to modules/https_server/https_server.go index bf6ac304..6d8c1428 100644 --- a/modules/https_server.go +++ b/modules/https_server/https_server.go @@ -1,4 +1,4 @@ -package modules +package https_server import ( "context" diff --git a/modules/mac_changer.go b/modules/mac_changer/mac_changer.go similarity index 99% rename from modules/mac_changer.go rename to modules/mac_changer/mac_changer.go index ccab733c..fcc0cdc9 100644 --- a/modules/mac_changer.go +++ b/modules/mac_changer/mac_changer.go @@ -1,4 +1,4 @@ -package modules +package mac_changer import ( "fmt" diff --git a/modules/modules.go b/modules/modules.go new file mode 100644 index 00000000..6b249fd7 --- /dev/null +++ b/modules/modules.go @@ -0,0 +1,61 @@ +package modules + +import ( + "github.com/bettercap/bettercap/modules/any_proxy" + "github.com/bettercap/bettercap/modules/api_rest" + "github.com/bettercap/bettercap/modules/arp_spoof" + "github.com/bettercap/bettercap/modules/ble" + "github.com/bettercap/bettercap/modules/caplets" + "github.com/bettercap/bettercap/modules/dhcp6_spoof" + "github.com/bettercap/bettercap/modules/discovery" + "github.com/bettercap/bettercap/modules/dns_spoof" + "github.com/bettercap/bettercap/modules/events_stream" + "github.com/bettercap/bettercap/modules/gps" + "github.com/bettercap/bettercap/modules/http_proxy" + "github.com/bettercap/bettercap/modules/http_server" + "github.com/bettercap/bettercap/modules/https_proxy" + "github.com/bettercap/bettercap/modules/https_server" + "github.com/bettercap/bettercap/modules/mac_changer" + "github.com/bettercap/bettercap/modules/mysql_server" + "github.com/bettercap/bettercap/modules/net_sniff" + "github.com/bettercap/bettercap/modules/packet_proxy" + "github.com/bettercap/bettercap/modules/prober" + "github.com/bettercap/bettercap/modules/syn_scan" + "github.com/bettercap/bettercap/modules/tcp_proxy" + "github.com/bettercap/bettercap/modules/ticker" + "github.com/bettercap/bettercap/modules/update" + "github.com/bettercap/bettercap/modules/wifi" + "github.com/bettercap/bettercap/modules/wol" + + "github.com/bettercap/bettercap/session" +) + +func LoadModules(sess *session.Session) { + + sess.Register(any_proxy.NewAnyProxy(sess)) + sess.Register(arp_spoof.NewArpSpoofer(sess)) + sess.Register(api_rest.NewRestAPI(sess)) + sess.Register(ble.NewBLERecon(sess)) + sess.Register(caplets.NewCapletsModule(sess)) + sess.Register(dhcp6_spoof.NewDHCP6Spoofer(sess)) + sess.Register(discovery.NewDiscovery(sess)) + sess.Register(dns_spoof.NewDNSSpoofer(sess)) + sess.Register(events_stream.NewEventsStream(sess)) + sess.Register(gps.NewGPS(sess)) + sess.Register(http_proxy.NewHttpProxy(sess)) + sess.Register(http_server.NewHttpServer(sess)) + sess.Register(https_proxy.NewHttpsProxy(sess)) + sess.Register(https_server.NewHttpsServer(sess)) + sess.Register(mac_changer.NewMacChanger(sess)) + sess.Register(mysql_server.NewMySQLServer(sess)) + sess.Register(net_sniff.NewSniffer(sess)) + sess.Register(packet_proxy.NewPacketProxy(sess)) + sess.Register(prober.NewProber(sess)) + sess.Register(syn_scan.NewSynScanner(sess)) + sess.Register(tcp_proxy.NewTcpProxy(sess)) + sess.Register(ticker.NewTicker(sess)) + sess.Register(update.NewUpdateModule(sess)) + sess.Register(wifi.NewWiFiModule(sess)) + sess.Register(wol.NewWOL(sess)) + +} diff --git a/modules/mysql_server.go b/modules/mysql_server/mysql_server.go similarity index 99% rename from modules/mysql_server.go rename to modules/mysql_server/mysql_server.go index 96a34b5e..1b17bade 100644 --- a/modules/mysql_server.go +++ b/modules/mysql_server/mysql_server.go @@ -1,4 +1,4 @@ -package modules +package mysql_server import ( "bufio" diff --git a/modules/net_sniff.go b/modules/net_sniff/net_sniff.go similarity index 99% rename from modules/net_sniff.go rename to modules/net_sniff/net_sniff.go index 49ab2902..615d616f 100644 --- a/modules/net_sniff.go +++ b/modules/net_sniff/net_sniff.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_context.go b/modules/net_sniff/net_sniff_context.go similarity index 99% rename from modules/net_sniff_context.go rename to modules/net_sniff/net_sniff_context.go index 0a30ad8b..e7652d49 100644 --- a/modules/net_sniff_context.go +++ b/modules/net_sniff/net_sniff_context.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "os" diff --git a/modules/net_sniff_dns.go b/modules/net_sniff/net_sniff_dns.go similarity index 98% rename from modules/net_sniff_dns.go rename to modules/net_sniff/net_sniff_dns.go index 013b846c..c9ef71f5 100644 --- a/modules/net_sniff_dns.go +++ b/modules/net_sniff/net_sniff_dns.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "github.com/google/gopacket" diff --git a/modules/net_sniff_dot11.go b/modules/net_sniff/net_sniff_dot11.go similarity index 96% rename from modules/net_sniff_dot11.go rename to modules/net_sniff/net_sniff_dot11.go index 26985ab6..5ace85d2 100644 --- a/modules/net_sniff_dot11.go +++ b/modules/net_sniff/net_sniff_dot11.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "github.com/google/gopacket" diff --git a/modules/net_sniff_event.go b/modules/net_sniff/net_sniff_event.go similarity index 97% rename from modules/net_sniff_event.go rename to modules/net_sniff/net_sniff_event.go index cc79e36a..573f8d15 100644 --- a/modules/net_sniff_event.go +++ b/modules/net_sniff/net_sniff_event.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_ftp.go b/modules/net_sniff/net_sniff_ftp.go similarity index 97% rename from modules/net_sniff_ftp.go rename to modules/net_sniff/net_sniff_ftp.go index 4928f8ea..1f1194f8 100644 --- a/modules/net_sniff_ftp.go +++ b/modules/net_sniff/net_sniff_ftp.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "regexp" diff --git a/modules/net_sniff_fuzz.go b/modules/net_sniff/net_sniff_fuzz.go similarity index 99% rename from modules/net_sniff_fuzz.go rename to modules/net_sniff/net_sniff_fuzz.go index 61396449..a48b11b2 100644 --- a/modules/net_sniff_fuzz.go +++ b/modules/net_sniff/net_sniff_fuzz.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "math/rand" diff --git a/modules/net_sniff_http.go b/modules/net_sniff/net_sniff_http.go similarity index 99% rename from modules/net_sniff_http.go rename to modules/net_sniff/net_sniff_http.go index ba92bb5f..82e9d038 100644 --- a/modules/net_sniff_http.go +++ b/modules/net_sniff/net_sniff_http.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "bufio" diff --git a/modules/net_sniff_krb5.go b/modules/net_sniff/net_sniff_krb5.go similarity index 97% rename from modules/net_sniff_krb5.go rename to modules/net_sniff/net_sniff_krb5.go index aaac6ea5..f81b70ae 100644 --- a/modules/net_sniff_krb5.go +++ b/modules/net_sniff/net_sniff_krb5.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "encoding/asn1" diff --git a/modules/net_sniff_mdns.go b/modules/net_sniff/net_sniff_mdns.go similarity index 98% rename from modules/net_sniff_mdns.go rename to modules/net_sniff/net_sniff_mdns.go index 50f510a6..7678b073 100644 --- a/modules/net_sniff_mdns.go +++ b/modules/net_sniff/net_sniff_mdns.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "strings" diff --git a/modules/net_sniff_ntlm.go b/modules/net_sniff/net_sniff_ntlm.go similarity index 98% rename from modules/net_sniff_ntlm.go rename to modules/net_sniff/net_sniff_ntlm.go index 95e572b1..a0df6787 100644 --- a/modules/net_sniff_ntlm.go +++ b/modules/net_sniff/net_sniff_ntlm.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "regexp" diff --git a/modules/net_sniff_parsers.go b/modules/net_sniff/net_sniff_parsers.go similarity index 98% rename from modules/net_sniff_parsers.go rename to modules/net_sniff/net_sniff_parsers.go index 5c040f1d..1a6f71a6 100644 --- a/modules/net_sniff_parsers.go +++ b/modules/net_sniff/net_sniff_parsers.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_sni.go b/modules/net_sniff/net_sniff_sni.go similarity index 98% rename from modules/net_sniff_sni.go rename to modules/net_sniff/net_sniff_sni.go index 10b165d3..f6bef96a 100644 --- a/modules/net_sniff_sni.go +++ b/modules/net_sniff/net_sniff_sni.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_stats.go b/modules/net_sniff/net_sniff_stats.go similarity index 98% rename from modules/net_sniff_stats.go rename to modules/net_sniff/net_sniff_stats.go index f4ccab9a..b6dc245d 100644 --- a/modules/net_sniff_stats.go +++ b/modules/net_sniff/net_sniff_stats.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "github.com/bettercap/bettercap/log" diff --git a/modules/net_sniff_tcp.go b/modules/net_sniff/net_sniff_tcp.go similarity index 98% rename from modules/net_sniff_tcp.go rename to modules/net_sniff/net_sniff_tcp.go index e2861858..02f7db3b 100644 --- a/modules/net_sniff_tcp.go +++ b/modules/net_sniff/net_sniff_tcp.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_teamviewer.go b/modules/net_sniff/net_sniff_teamviewer.go similarity index 97% rename from modules/net_sniff_teamviewer.go rename to modules/net_sniff/net_sniff_teamviewer.go index bdb758d0..b3ead0b4 100644 --- a/modules/net_sniff_teamviewer.go +++ b/modules/net_sniff/net_sniff_teamviewer.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "github.com/bettercap/bettercap/packets" diff --git a/modules/net_sniff_udp.go b/modules/net_sniff/net_sniff_udp.go similarity index 98% rename from modules/net_sniff_udp.go rename to modules/net_sniff/net_sniff_udp.go index 7227529f..598f3ccf 100644 --- a/modules/net_sniff_udp.go +++ b/modules/net_sniff/net_sniff_udp.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_upnp.go b/modules/net_sniff/net_sniff_upnp.go similarity index 97% rename from modules/net_sniff_upnp.go rename to modules/net_sniff/net_sniff_upnp.go index 7474fb5b..f0b7d48b 100644 --- a/modules/net_sniff_upnp.go +++ b/modules/net_sniff/net_sniff_upnp.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/net_sniff_views.go b/modules/net_sniff/net_sniff_views.go similarity index 98% rename from modules/net_sniff_views.go rename to modules/net_sniff/net_sniff_views.go index 2a0239df..74f36ecb 100644 --- a/modules/net_sniff_views.go +++ b/modules/net_sniff/net_sniff_views.go @@ -1,4 +1,4 @@ -package modules +package net_sniff import ( "fmt" diff --git a/modules/packet_proxy_darwin.go b/modules/packet_proxy/packet_proxy_darwin.go similarity index 97% rename from modules/packet_proxy_darwin.go rename to modules/packet_proxy/packet_proxy_darwin.go index 46ababb3..0de8a7fe 100644 --- a/modules/packet_proxy_darwin.go +++ b/modules/packet_proxy/packet_proxy_darwin.go @@ -1,4 +1,4 @@ -package modules +package packet_proxy import ( "github.com/bettercap/bettercap/session" diff --git a/modules/packet_proxy_linux.go b/modules/packet_proxy/packet_proxy_linux.go similarity index 97% rename from modules/packet_proxy_linux.go rename to modules/packet_proxy/packet_proxy_linux.go index 88465d60..b12a3c5d 100644 --- a/modules/packet_proxy_linux.go +++ b/modules/packet_proxy/packet_proxy_linux.go @@ -1,6 +1,6 @@ // +build !amd64 -package modules +package packet_proxy import ( "github.com/bettercap/bettercap/session" diff --git a/modules/packet_proxy_linux_amd64.go b/modules/packet_proxy/packet_proxy_linux_amd64.go similarity index 99% rename from modules/packet_proxy_linux_amd64.go rename to modules/packet_proxy/packet_proxy_linux_amd64.go index c3ee0fb2..e2c5cb23 100644 --- a/modules/packet_proxy_linux_amd64.go +++ b/modules/packet_proxy/packet_proxy_linux_amd64.go @@ -1,4 +1,4 @@ -package modules +package packet_proxy import ( "fmt" diff --git a/modules/packet_proxy_windows.go b/modules/packet_proxy/packet_proxy_windows.go similarity index 97% rename from modules/packet_proxy_windows.go rename to modules/packet_proxy/packet_proxy_windows.go index 46ababb3..0de8a7fe 100644 --- a/modules/packet_proxy_windows.go +++ b/modules/packet_proxy/packet_proxy_windows.go @@ -1,4 +1,4 @@ -package modules +package packet_proxy import ( "github.com/bettercap/bettercap/session" diff --git a/modules/net_probe.go b/modules/prober/net_probe.go similarity index 99% rename from modules/net_probe.go rename to modules/prober/net_probe.go index a3c5a152..454bf991 100644 --- a/modules/net_probe.go +++ b/modules/prober/net_probe.go @@ -1,4 +1,4 @@ -package modules +package prober import ( "sync" diff --git a/modules/net_probe_mdns.go b/modules/prober/net_probe_mdns.go similarity index 96% rename from modules/net_probe_mdns.go rename to modules/prober/net_probe_mdns.go index 14af0e2d..959c6db6 100644 --- a/modules/net_probe_mdns.go +++ b/modules/prober/net_probe_mdns.go @@ -1,4 +1,4 @@ -package modules +package prober import ( "net" diff --git a/modules/net_probe_nbns.go b/modules/prober/net_probe_nbns.go similarity index 97% rename from modules/net_probe_nbns.go rename to modules/prober/net_probe_nbns.go index 885353e7..079a1394 100644 --- a/modules/net_probe_nbns.go +++ b/modules/prober/net_probe_nbns.go @@ -1,4 +1,4 @@ -package modules +package prober import ( "fmt" diff --git a/modules/net_probe_upnp.go b/modules/prober/net_probe_upnp.go similarity index 97% rename from modules/net_probe_upnp.go rename to modules/prober/net_probe_upnp.go index e912dc4a..5c1b01da 100644 --- a/modules/net_probe_upnp.go +++ b/modules/prober/net_probe_upnp.go @@ -1,4 +1,4 @@ -package modules +package prober import ( "fmt" diff --git a/modules/net_probe_wsd.go b/modules/prober/net_probe_wsd.go similarity index 97% rename from modules/net_probe_wsd.go rename to modules/prober/net_probe_wsd.go index eaaf34a4..b17795e4 100644 --- a/modules/net_probe_wsd.go +++ b/modules/prober/net_probe_wsd.go @@ -1,4 +1,4 @@ -package modules +package prober import ( "fmt" diff --git a/modules/syn_scan.go b/modules/syn_scan/syn_scan.go similarity index 99% rename from modules/syn_scan.go rename to modules/syn_scan/syn_scan.go index 590901d8..0c3e94c5 100644 --- a/modules/syn_scan.go +++ b/modules/syn_scan/syn_scan.go @@ -1,4 +1,4 @@ -package modules +package syn_scan import ( "fmt" diff --git a/modules/syn_scan_event.go b/modules/syn_scan/syn_scan_event.go similarity index 96% rename from modules/syn_scan_event.go rename to modules/syn_scan/syn_scan_event.go index 0d896b18..ae58ce40 100644 --- a/modules/syn_scan_event.go +++ b/modules/syn_scan/syn_scan_event.go @@ -1,4 +1,4 @@ -package modules +package syn_scan import ( "github.com/bettercap/bettercap/network" diff --git a/modules/syn_scan_reader.go b/modules/syn_scan/syn_scan_reader.go similarity index 98% rename from modules/syn_scan_reader.go rename to modules/syn_scan/syn_scan_reader.go index a643890f..ee8d84b7 100644 --- a/modules/syn_scan_reader.go +++ b/modules/syn_scan/syn_scan_reader.go @@ -1,4 +1,4 @@ -package modules +package syn_scan import ( "net" diff --git a/modules/tcp_proxy.go b/modules/tcp_proxy/tcp_proxy.go similarity index 99% rename from modules/tcp_proxy.go rename to modules/tcp_proxy/tcp_proxy.go index f651fa32..ac995b8b 100644 --- a/modules/tcp_proxy.go +++ b/modules/tcp_proxy/tcp_proxy.go @@ -1,4 +1,4 @@ -package modules +package tcp_proxy import ( "fmt" diff --git a/modules/tcp_proxy_script.go b/modules/tcp_proxy/tcp_proxy_script.go similarity index 98% rename from modules/tcp_proxy_script.go rename to modules/tcp_proxy/tcp_proxy_script.go index 712963be..056e348c 100644 --- a/modules/tcp_proxy_script.go +++ b/modules/tcp_proxy/tcp_proxy_script.go @@ -1,4 +1,4 @@ -package modules +package tcp_proxy import ( "net" diff --git a/modules/ticker.go b/modules/ticker/ticker.go similarity index 99% rename from modules/ticker.go rename to modules/ticker/ticker.go index dd7e49c7..5225caa5 100644 --- a/modules/ticker.go +++ b/modules/ticker/ticker.go @@ -1,4 +1,4 @@ -package modules +package ticker import ( "time" diff --git a/modules/update.go b/modules/update/update.go similarity index 99% rename from modules/update.go rename to modules/update/update.go index ee46cd16..0dcec499 100644 --- a/modules/update.go +++ b/modules/update/update.go @@ -1,4 +1,4 @@ -package modules +package update import ( "context" diff --git a/modules/view_selector.go b/modules/utils/view_selector.go similarity index 99% rename from modules/view_selector.go rename to modules/utils/view_selector.go index a5e0a745..ec6347fe 100644 --- a/modules/view_selector.go +++ b/modules/utils/view_selector.go @@ -1,4 +1,4 @@ -package modules +package utils import ( "fmt" diff --git a/modules/wifi.go b/modules/wifi/wifi.go similarity index 98% rename from modules/wifi.go rename to modules/wifi/wifi.go index ca3050f3..3ffd2c2c 100644 --- a/modules/wifi.go +++ b/modules/wifi/wifi.go @@ -1,7 +1,8 @@ -package modules +package wifi import ( "fmt" + "github.com/bettercap/bettercap/modules/utils" "net" "strconv" "sync" @@ -47,7 +48,7 @@ type WiFiModule struct { writes *sync.WaitGroup reads *sync.WaitGroup chanLock *sync.Mutex - selector *ViewSelector + selector *utils.ViewSelector } func NewWiFiModule(s *session.Session) *WiFiModule { @@ -208,7 +209,7 @@ func NewWiFiModule(s *session.Session) *WiFiModule { return w.Show() })) - w.selector = ViewSelectorFor(&w.SessionModule, "wifi.show", + w.selector = utils.ViewSelectorFor(&w.SessionModule, "wifi.show", []string{"rssi", "bssid", "essid", "channel", "encryption", "clients", "seen", "sent", "rcvd"}, "rssi asc") w.AddHandler(session.NewModuleHandler("wifi.recon.channel", `wifi\.recon\.channel[\s]+([0-9]+(?:[, ]+[0-9]+)*|clear)`, diff --git a/modules/wifi_ap.go b/modules/wifi/wifi_ap.go similarity index 99% rename from modules/wifi_ap.go rename to modules/wifi/wifi_ap.go index 68556128..65da8e2c 100644 --- a/modules/wifi_ap.go +++ b/modules/wifi/wifi_ap.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "errors" diff --git a/modules/wifi_assoc.go b/modules/wifi/wifi_assoc.go similarity index 99% rename from modules/wifi_assoc.go rename to modules/wifi/wifi_assoc.go index 4eb1d16f..9b644352 100644 --- a/modules/wifi_assoc.go +++ b/modules/wifi/wifi_assoc.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "bytes" diff --git a/modules/wifi_deauth.go b/modules/wifi/wifi_deauth.go similarity index 99% rename from modules/wifi_deauth.go rename to modules/wifi/wifi_deauth.go index b4083104..1a05ac7c 100644 --- a/modules/wifi_deauth.go +++ b/modules/wifi/wifi_deauth.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "bytes" diff --git a/modules/wifi_events.go b/modules/wifi/wifi_events.go similarity index 96% rename from modules/wifi_events.go rename to modules/wifi/wifi_events.go index fdf327f9..0f33e95f 100644 --- a/modules/wifi_events.go +++ b/modules/wifi/wifi_events.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "net" diff --git a/modules/wifi_hopping.go b/modules/wifi/wifi_hopping.go similarity index 99% rename from modules/wifi_hopping.go rename to modules/wifi/wifi_hopping.go index 4ce6ba83..374bb016 100644 --- a/modules/wifi_hopping.go +++ b/modules/wifi/wifi_hopping.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "time" diff --git a/modules/wifi_recon.go b/modules/wifi/wifi_recon.go similarity index 99% rename from modules/wifi_recon.go rename to modules/wifi/wifi_recon.go index 0b93d422..0d5a0c89 100644 --- a/modules/wifi_recon.go +++ b/modules/wifi/wifi_recon.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "bytes" diff --git a/modules/wifi_show.go b/modules/wifi/wifi_show.go similarity index 96% rename from modules/wifi_show.go rename to modules/wifi/wifi_show.go index e308b2a2..00a19661 100644 --- a/modules/wifi_show.go +++ b/modules/wifi/wifi_show.go @@ -1,7 +1,8 @@ -package modules +package wifi import ( "fmt" + "github.com/bettercap/bettercap/modules/discovery" "os" "sort" "strconv" @@ -26,17 +27,17 @@ func (w *WiFiModule) getRow(station *network.Station) ([]string, bool) { sinceFirstSeen := time.Since(station.FirstSeen) bssid := station.HwAddress - if sinceStarted > (justJoinedTimeInterval*2) && sinceFirstSeen <= justJoinedTimeInterval { + if sinceStarted > (discovery.JustJoinedTimeInterval*2) && sinceFirstSeen <= discovery.JustJoinedTimeInterval { // if endpoint was first seen in the last 10 seconds bssid = tui.Bold(bssid) } seen := station.LastSeen.Format("15:04:05") sinceLastSeen := time.Since(station.LastSeen) - if sinceStarted > aliveTimeInterval && sinceLastSeen <= aliveTimeInterval { + if sinceStarted > discovery.AliveTimeInterval && sinceLastSeen <= discovery.AliveTimeInterval { // if endpoint seen in the last 10 seconds seen = tui.Bold(seen) - } else if sinceLastSeen > presentTimeInterval { + } else if sinceLastSeen > discovery.PresentTimeInterval { // if endpoint not seen in the last 60 seconds seen = tui.Dim(seen) } diff --git a/modules/wifi_show_sort.go b/modules/wifi/wifi_show_sort.go similarity index 99% rename from modules/wifi_show_sort.go rename to modules/wifi/wifi_show_sort.go index 5aa3bacf..d69171d0 100644 --- a/modules/wifi_show_sort.go +++ b/modules/wifi/wifi_show_sort.go @@ -1,4 +1,4 @@ -package modules +package wifi import ( "github.com/bettercap/bettercap/network" diff --git a/modules/wol.go b/modules/wol/wol.go similarity index 99% rename from modules/wol.go rename to modules/wol/wol.go index 8476b32e..a820baba 100644 --- a/modules/wol.go +++ b/modules/wol/wol.go @@ -1,4 +1,4 @@ -package modules +package wol import ( "fmt"