diff --git a/caplets/ap.cap b/caplets/ap.cap index 70da11ef..b750c07d 100644 --- a/caplets/ap.cap +++ b/caplets/ap.cap @@ -10,6 +10,5 @@ events.clear set events.stream.filter target. events.stream on -net.recon on api.rest on net.sniff on diff --git a/caplets/beef-active.cap b/caplets/beef-active.cap index 57e4d3ed..701aa3e6 100644 --- a/caplets/beef-active.cap +++ b/caplets/beef-active.cap @@ -4,8 +4,6 @@ # inject beef hook set http.proxy.script caplets/beef-inject.js -# keep reading arp table for network mapping -net.recon on # redirect http traffic to a proxy http.proxy on # wait for everything to start properly diff --git a/caplets/beef-passive.cap b/caplets/beef-passive.cap index ff961942..35e97dcd 100644 --- a/caplets/beef-passive.cap +++ b/caplets/beef-passive.cap @@ -1,7 +1,5 @@ # inject beef hook set http.proxy.script caplets/beef-inject.js -# keep reading arp table for network mapping -net.recon on # redirect http traffic to a proxy http.proxy on # wait for everything to start properly diff --git a/caplets/http-req-dump.cap b/caplets/http-req-dump.cap index 7e98ce7b..40c3fdb3 100644 --- a/caplets/http-req-dump.cap +++ b/caplets/http-req-dump.cap @@ -4,7 +4,6 @@ # events.stream off -net.recon on net.probe on sleep 1 net.probe off diff --git a/caplets/login-man-abuse.cap b/caplets/login-man-abuse.cap index 4638c4f3..fab079a4 100644 --- a/caplets/login-man-abuse.cap +++ b/caplets/login-man-abuse.cap @@ -3,7 +3,6 @@ # sudo ./bettercap-ng -caplet caplets/login-man-abuse.cap -eval "set arp.spoof.targets 192.168.1.53" set http.proxy.script caplets/login-man-abuse.js -net.recon on http.proxy on sleep 1 arp.spoof on diff --git a/caplets/mitm6.cap b/caplets/mitm6.cap index 02e545a4..a77d349c 100644 --- a/caplets/mitm6.cap +++ b/caplets/mitm6.cap @@ -6,8 +6,6 @@ set dhcp6.spoof.domains microsoft.com, google.com # let's give em some contents set http.server.path caplets/www -# check who's alive on the network -net.recon on # serve files http.server on # redirect DNS request by spoofing DHCPv6 packets diff --git a/caplets/netmon.cap b/caplets/netmon.cap index d6d2ba50..6938ce74 100644 --- a/caplets/netmon.cap +++ b/caplets/netmon.cap @@ -1,4 +1,3 @@ -net.recon on net.probe on clear ticker on diff --git a/caplets/recon-active.cap b/caplets/recon-active.cap index 1afea18f..7cc12956 100644 --- a/caplets/recon-active.cap +++ b/caplets/recon-active.cap @@ -1,5 +1,4 @@ net.probe on -net.recon on sleep 5 net.show quit diff --git a/caplets/recon-passive.cap b/caplets/recon-passive.cap index 4dd84ea1..de98445d 100644 --- a/caplets/recon-passive.cap +++ b/caplets/recon-passive.cap @@ -1,4 +1,3 @@ -net.recon on sleep 1 net.show quit diff --git a/caplets/rest-api.cap b/caplets/rest-api.cap index dd0dfee8..0bf65603 100644 --- a/caplets/rest-api.cap +++ b/caplets/rest-api.cap @@ -4,6 +4,5 @@ set api.rest.password bcap # set api.rest.port 8082 net.probe on -net.recon on api.rest on diff --git a/caplets/simple-passwords-sniffer.cap b/caplets/simple-passwords-sniffer.cap index 30260ed0..3a207f5b 100644 --- a/caplets/simple-passwords-sniffer.cap +++ b/caplets/simple-passwords-sniffer.cap @@ -1,6 +1,3 @@ -# keep reading arp table for network mapping -net.recon on - set net.sniff.regexp .*password=.+ set net.sniff.output passwords.cap diff --git a/caplets/stsoy.cap b/caplets/stsoy.cap index e1cdf1aa..8bbf4f31 100644 --- a/caplets/stsoy.cap +++ b/caplets/stsoy.cap @@ -8,8 +8,6 @@ set http.proxy.script caplets/beef-inject.js # let's give em some contents set http.server.path caplets/www -# check who's alive on the network -net.recon on # serve files http.server on # redirect DNS request by spoofing DHCPv6 packets diff --git a/caplets/web-override.cap b/caplets/web-override.cap index 27338cfb..2548c812 100644 --- a/caplets/web-override.cap +++ b/caplets/web-override.cap @@ -3,7 +3,6 @@ # sudo ./bettercap-ng -caplet caplets/web-override.cap -eval "set arp.spoof.targets 192.168.1.64" set http.proxy.script caplets/web-override.js -net.recon on http.proxy on arp.spoof on events.clear diff --git a/caplets/web-override.js b/caplets/web-override.js index 7a053766..1bc28afd 100644 --- a/caplets/web-override.js +++ b/caplets/web-override.js @@ -4,7 +4,7 @@ function onRequest(req, res) { res.Status = 200; res.ContentType = "text/html"; res.Headers = "Connection: close"; - res.Body = readFile("caplets/web-override.html"); + res.Body = readFile("caplets/www/index.html"); res.Updated(); } diff --git a/main.go b/main.go index 13c0b043..5f4b0daf 100644 --- a/main.go +++ b/main.go @@ -41,6 +41,8 @@ func main() { if err = sess.Run("events.stream on"); err != nil { log.Fatal("%", err) + } else if err = sess.Run("net.recon on"); err != nil { + log.Fatal("%", err) } defer sess.Close() diff --git a/modules/ticker.go b/modules/ticker.go index bb419274..9692a80a 100644 --- a/modules/ticker.go +++ b/modules/ticker.go @@ -82,7 +82,7 @@ func (t *Ticker) Start() error { t.SetRunning(true) go func() { - log.Info("Ticker running with period %ds.", t.Period) + log.Info("Ticker running with period %ds.", t.Period.Seconds()) tick := time.Tick(t.Period) for _ = range tick { if t.Running() == false {