mirror of
https://github.com/bettercap/bettercap
synced 2025-08-21 14:03:17 -07:00
misc: small fix or general refactoring i did not bother commenting
This commit is contained in:
evilsocket
parent
bf3671465b
commit
4eead7eafa
58 changed files with 2052 additions and 2052 deletions
|
|
@ -38,7 +38,7 @@ type EventsStream struct {
|
|||
}
|
||||
|
||||
func NewEventsStream(s *session.Session) *EventsStream {
|
||||
stream := &EventsStream{
|
||||
mod := &EventsStream{
|
||||
SessionModule: session.NewSessionModule("events.stream", s),
|
||||
output: os.Stdout,
|
||||
quit: make(chan bool),
|
||||
|
|
@ -47,19 +47,19 @@ func NewEventsStream(s *session.Session) *EventsStream {
|
|||
ignoreList: NewIgnoreList(),
|
||||
}
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.stream on", "",
|
||||
mod.AddHandler(session.NewModuleHandler("events.stream on", "",
|
||||
"Start events stream.",
|
||||
func(args []string) error {
|
||||
return stream.Start()
|
||||
return mod.Start()
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.stream off", "",
|
||||
mod.AddHandler(session.NewModuleHandler("events.stream off", "",
|
||||
"Stop events stream.",
|
||||
func(args []string) error {
|
||||
return stream.Stop()
|
||||
return mod.Stop()
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.show LIMIT?", "events.show(\\s\\d+)?",
|
||||
mod.AddHandler(session.NewModuleHandler("events.show LIMIT?", "events.show(\\s\\d+)?",
|
||||
"Show events stream.",
|
||||
func(args []string) error {
|
||||
limit := -1
|
||||
|
|
@ -67,10 +67,10 @@ func NewEventsStream(s *session.Session) *EventsStream {
|
|||
arg := str.Trim(args[0])
|
||||
limit, _ = strconv.Atoi(arg)
|
||||
}
|
||||
return stream.Show(limit)
|
||||
return mod.Show(limit)
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.waitfor TAG TIMEOUT?", `events.waitfor ([^\s]+)([\s\d]*)`,
|
||||
mod.AddHandler(session.NewModuleHandler("events.waitfor TAG TIMEOUT?", `events.waitfor ([^\s]+)([\s\d]*)`,
|
||||
"Wait for an event with the given tag either forever or for a timeout in seconds.",
|
||||
func(args []string) error {
|
||||
tag := args[0]
|
||||
|
|
@ -85,163 +85,163 @@ func NewEventsStream(s *session.Session) *EventsStream {
|
|||
timeout = n
|
||||
}
|
||||
}
|
||||
return stream.startWaitingFor(tag, timeout)
|
||||
return mod.startWaitingFor(tag, timeout)
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.ignore FILTER", "events.ignore ([^\\s]+)",
|
||||
mod.AddHandler(session.NewModuleHandler("events.ignore FILTER", "events.ignore ([^\\s]+)",
|
||||
"Events with an identifier matching this filter will not be shown (use multiple times to add more filters).",
|
||||
func(args []string) error {
|
||||
return stream.ignoreList.Add(args[0])
|
||||
return mod.ignoreList.Add(args[0])
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.include FILTER", "events.include ([^\\s]+)",
|
||||
mod.AddHandler(session.NewModuleHandler("events.include FILTER", "events.include ([^\\s]+)",
|
||||
"Used to remove filters passed with the events.ignore command.",
|
||||
func(args []string) error {
|
||||
return stream.ignoreList.Remove(args[0])
|
||||
return mod.ignoreList.Remove(args[0])
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.filters", "",
|
||||
mod.AddHandler(session.NewModuleHandler("events.filters", "",
|
||||
"Print the list of filters used to ignore events.",
|
||||
func(args []string) error {
|
||||
if stream.ignoreList.Empty() {
|
||||
if mod.ignoreList.Empty() {
|
||||
fmt.Printf("Ignore filters list is empty.\n")
|
||||
} else {
|
||||
stream.ignoreList.RLock()
|
||||
defer stream.ignoreList.RUnlock()
|
||||
mod.ignoreList.RLock()
|
||||
defer mod.ignoreList.RUnlock()
|
||||
|
||||
for _, filter := range stream.ignoreList.Filters() {
|
||||
for _, filter := range mod.ignoreList.Filters() {
|
||||
fmt.Printf(" '%s'\n", string(filter))
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}))
|
||||
|
||||
stream.AddHandler(session.NewModuleHandler("events.clear", "",
|
||||
mod.AddHandler(session.NewModuleHandler("events.clear", "",
|
||||
"Clear events stream.",
|
||||
func(args []string) error {
|
||||
stream.Session.Events.Clear()
|
||||
mod.Session.Events.Clear()
|
||||
return nil
|
||||
}))
|
||||
|
||||
stream.AddParam(session.NewStringParameter("events.stream.output",
|
||||
mod.AddParam(session.NewStringParameter("events.stream.output",
|
||||
"",
|
||||
"",
|
||||
"If not empty, events will be written to this file instead of the standard output."))
|
||||
|
||||
stream.AddParam(session.NewBoolParameter("events.stream.output.rotate",
|
||||
mod.AddParam(session.NewBoolParameter("events.stream.output.rotate",
|
||||
"true",
|
||||
"If true will enable log rotation."))
|
||||
|
||||
stream.AddParam(session.NewBoolParameter("events.stream.output.rotate.compress",
|
||||
mod.AddParam(session.NewBoolParameter("events.stream.output.rotate.compress",
|
||||
"true",
|
||||
"If true will enable log rotation compression."))
|
||||
|
||||
stream.AddParam(session.NewStringParameter("events.stream.output.rotate.how",
|
||||
mod.AddParam(session.NewStringParameter("events.stream.output.rotate.how",
|
||||
"size",
|
||||
"(size|time)",
|
||||
"Rotate by 'size' or 'time'."))
|
||||
|
||||
stream.AddParam(session.NewStringParameter("events.stream.output.rotate.format",
|
||||
mod.AddParam(session.NewStringParameter("events.stream.output.rotate.format",
|
||||
"2006-01-02 15:04:05",
|
||||
"",
|
||||
"Datetime format to use for log rotation file names."))
|
||||
|
||||
stream.AddParam(session.NewDecimalParameter("events.stream.output.rotate.when",
|
||||
mod.AddParam(session.NewDecimalParameter("events.stream.output.rotate.when",
|
||||
"10",
|
||||
"File size (in MB) or time duration (in seconds) for log rotation."))
|
||||
|
||||
stream.AddParam(session.NewBoolParameter("events.stream.http.request.dump",
|
||||
mod.AddParam(session.NewBoolParameter("events.stream.http.request.dump",
|
||||
"false",
|
||||
"If true all HTTP requests will be dumped."))
|
||||
|
||||
stream.AddParam(session.NewBoolParameter("events.stream.http.response.dump",
|
||||
mod.AddParam(session.NewBoolParameter("events.stream.http.response.dump",
|
||||
"false",
|
||||
"If true all HTTP responses will be dumped."))
|
||||
|
||||
return stream
|
||||
return mod
|
||||
}
|
||||
|
||||
func (s EventsStream) Name() string {
|
||||
func (mod EventsStream) Name() string {
|
||||
return "events.stream"
|
||||
}
|
||||
|
||||
func (s EventsStream) Description() string {
|
||||
func (mod EventsStream) Description() string {
|
||||
return "Print events as a continuous stream."
|
||||
}
|
||||
|
||||
func (s EventsStream) Author() string {
|
||||
func (mod EventsStream) Author() string {
|
||||
return "Simone Margaritelli <evilsocket@gmail.com>"
|
||||
}
|
||||
|
||||
func (s *EventsStream) Configure() (err error) {
|
||||
func (mod *EventsStream) Configure() (err error) {
|
||||
var output string
|
||||
|
||||
if err, output = s.StringParam("events.stream.output"); err == nil {
|
||||
if err, output = mod.StringParam("events.stream.output"); err == nil {
|
||||
if output == "" {
|
||||
s.output = os.Stdout
|
||||
} else if s.outputName, err = fs.Expand(output); err == nil {
|
||||
s.output, err = os.OpenFile(s.outputName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
||||
mod.output = os.Stdout
|
||||
} else if mod.outputName, err = fs.Expand(output); err == nil {
|
||||
mod.output, err = os.OpenFile(mod.outputName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
||||
}
|
||||
}
|
||||
|
||||
if err, s.rotation.Enabled = s.BoolParam("events.stream.output.rotate"); err != nil {
|
||||
if err, mod.rotation.Enabled = mod.BoolParam("events.stream.output.rotate"); err != nil {
|
||||
return err
|
||||
} else if err, s.rotation.Compress = s.BoolParam("events.stream.output.rotate.compress"); err != nil {
|
||||
} else if err, mod.rotation.Compress = mod.BoolParam("events.stream.output.rotate.compress"); err != nil {
|
||||
return err
|
||||
} else if err, s.rotation.Format = s.StringParam("events.stream.output.rotate.format"); err != nil {
|
||||
} else if err, mod.rotation.Format = mod.StringParam("events.stream.output.rotate.format"); err != nil {
|
||||
return err
|
||||
} else if err, s.rotation.How = s.StringParam("events.stream.output.rotate.how"); err != nil {
|
||||
} else if err, mod.rotation.How = mod.StringParam("events.stream.output.rotate.how"); err != nil {
|
||||
return err
|
||||
} else if err, s.rotation.Period = s.DecParam("events.stream.output.rotate.when"); err != nil {
|
||||
} else if err, mod.rotation.Period = mod.DecParam("events.stream.output.rotate.when"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err, s.dumpHttpReqs = s.BoolParam("events.stream.http.request.dump"); err != nil {
|
||||
if err, mod.dumpHttpReqs = mod.BoolParam("events.stream.http.request.dump"); err != nil {
|
||||
return err
|
||||
} else if err, s.dumpHttpResp = s.BoolParam("events.stream.http.response.dump"); err != nil {
|
||||
} else if err, mod.dumpHttpResp = mod.BoolParam("events.stream.http.response.dump"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *EventsStream) Start() error {
|
||||
if err := s.Configure(); err != nil {
|
||||
func (mod *EventsStream) Start() error {
|
||||
if err := mod.Configure(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return s.SetRunning(true, func() {
|
||||
s.eventListener = s.Session.Events.Listen()
|
||||
defer s.Session.Events.Unlisten(s.eventListener)
|
||||
return mod.SetRunning(true, func() {
|
||||
mod.eventListener = mod.Session.Events.Listen()
|
||||
defer mod.Session.Events.Unlisten(mod.eventListener)
|
||||
|
||||
for {
|
||||
var e session.Event
|
||||
select {
|
||||
case e = <-s.eventListener:
|
||||
if e.Tag == s.waitFor {
|
||||
s.waitFor = ""
|
||||
s.waitChan <- &e
|
||||
case e = <-mod.eventListener:
|
||||
if e.Tag == mod.waitFor {
|
||||
mod.waitFor = ""
|
||||
mod.waitChan <- &e
|
||||
}
|
||||
|
||||
if !s.ignoreList.Ignored(e) {
|
||||
s.View(e, true)
|
||||
if !mod.ignoreList.Ignored(e) {
|
||||
mod.View(e, true)
|
||||
}
|
||||
|
||||
case <-s.quit:
|
||||
case <-mod.quit:
|
||||
return
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (s *EventsStream) Show(limit int) error {
|
||||
events := s.Session.Events.Sorted()
|
||||
func (mod *EventsStream) Show(limit int) error {
|
||||
events := mod.Session.Events.Sorted()
|
||||
num := len(events)
|
||||
|
||||
selected := []session.Event{}
|
||||
for i := range events {
|
||||
e := events[num-1-i]
|
||||
if !s.ignoreList.Ignored(e) {
|
||||
if !mod.ignoreList.Ignored(e) {
|
||||
selected = append(selected, e)
|
||||
if len(selected) == limit {
|
||||
break
|
||||
|
|
@ -252,43 +252,43 @@ func (s *EventsStream) Show(limit int) error {
|
|||
if numSelected := len(selected); numSelected > 0 {
|
||||
fmt.Println()
|
||||
for i := range selected {
|
||||
s.View(selected[numSelected-1-i], false)
|
||||
mod.View(selected[numSelected-1-i], false)
|
||||
}
|
||||
s.Session.Refresh()
|
||||
mod.Session.Refresh()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *EventsStream) startWaitingFor(tag string, timeout int) error {
|
||||
func (mod *EventsStream) startWaitingFor(tag string, timeout int) error {
|
||||
if timeout == 0 {
|
||||
s.Info("waiting for event %s ...", tui.Green(tag))
|
||||
mod.Info("waiting for event %s ...", tui.Green(tag))
|
||||
} else {
|
||||
s.Info("waiting for event %s for %d seconds ...", tui.Green(tag), timeout)
|
||||
mod.Info("waiting for event %s for %d seconds ...", tui.Green(tag), timeout)
|
||||
go func() {
|
||||
time.Sleep(time.Duration(timeout) * time.Second)
|
||||
s.waitFor = ""
|
||||
s.waitChan <- nil
|
||||
mod.waitFor = ""
|
||||
mod.waitChan <- nil
|
||||
}()
|
||||
}
|
||||
|
||||
s.waitFor = tag
|
||||
event := <-s.waitChan
|
||||
mod.waitFor = tag
|
||||
event := <-mod.waitChan
|
||||
|
||||
if event == nil {
|
||||
return fmt.Errorf("'events.waitFor %s %d' timed out.", tag, timeout)
|
||||
} else {
|
||||
s.Debug("got event: %v", event)
|
||||
mod.Debug("got event: %v", event)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *EventsStream) Stop() error {
|
||||
return s.SetRunning(false, func() {
|
||||
s.quit <- true
|
||||
if s.output != os.Stdout {
|
||||
s.output.Close()
|
||||
func (mod *EventsStream) Stop() error {
|
||||
return mod.SetRunning(false, func() {
|
||||
mod.quit <- true
|
||||
if mod.output != os.Stdout {
|
||||
mod.output.Close()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,15 +20,15 @@ import (
|
|||
|
||||
const eventTimeFormat = "15:04:05"
|
||||
|
||||
func (s *EventsStream) viewLogEvent(e session.Event) {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] [%s] %s\n",
|
||||
func (mod *EventsStream) viewLogEvent(e session.Event) {
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
e.Label(),
|
||||
e.Data.(session.LogMessage).Message)
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewEndpointEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewEndpointEvent(e session.Event) {
|
||||
t := e.Data.(*network.Endpoint)
|
||||
vend := ""
|
||||
name := ""
|
||||
|
|
@ -44,7 +44,7 @@ func (s *EventsStream) viewEndpointEvent(e session.Event) {
|
|||
}
|
||||
|
||||
if e.Tag == "endpoint.new" {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] endpoint %s%s detected as %s%s.\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] endpoint %s%s detected as %s%s.\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
tui.Bold(t.IpAddress),
|
||||
|
|
@ -52,7 +52,7 @@ func (s *EventsStream) viewEndpointEvent(e session.Event) {
|
|||
tui.Green(t.HwAddress),
|
||||
tui.Dim(vend))
|
||||
} else if e.Tag == "endpoint.lost" {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] endpoint %s%s %s%s lost.\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] endpoint %s%s %s%s lost.\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
tui.Red(t.IpAddress),
|
||||
|
|
@ -60,82 +60,82 @@ func (s *EventsStream) viewEndpointEvent(e session.Event) {
|
|||
tui.Green(t.HwAddress),
|
||||
tui.Dim(vend))
|
||||
} else {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
t.String())
|
||||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewModuleEvent(e session.Event) {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %s\n",
|
||||
func (mod *EventsStream) viewModuleEvent(e session.Event) {
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
e.Data)
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewSnifferEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewSnifferEvent(e session.Event) {
|
||||
if strings.HasPrefix(e.Tag, "net.sniff.http.") {
|
||||
s.viewHttpEvent(e)
|
||||
mod.viewHttpEvent(e)
|
||||
} else {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
e.Data.(net_sniff.SnifferEvent).Message)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewSynScanEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewSynScanEvent(e session.Event) {
|
||||
se := e.Data.(syn_scan.SynScanEvent)
|
||||
fmt.Fprintf(s.output, "[%s] [%s] found open port %d for %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] found open port %d for %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
se.Port,
|
||||
tui.Bold(se.Address))
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewUpdateEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewUpdateEvent(e session.Event) {
|
||||
update := e.Data.(*github.RepositoryRelease)
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] an update to version %s is available at %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] an update to version %s is available at %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Bold(tui.Yellow(e.Tag)),
|
||||
tui.Bold(*update.TagName),
|
||||
*update.HTMLURL)
|
||||
}
|
||||
|
||||
func (s *EventsStream) doRotation() {
|
||||
if s.output == os.Stdout {
|
||||
func (mod *EventsStream) doRotation() {
|
||||
if mod.output == os.Stdout {
|
||||
return
|
||||
} else if !s.rotation.Enabled {
|
||||
} else if !mod.rotation.Enabled {
|
||||
return
|
||||
}
|
||||
|
||||
s.rotation.Lock()
|
||||
defer s.rotation.Unlock()
|
||||
mod.rotation.Lock()
|
||||
defer mod.rotation.Unlock()
|
||||
|
||||
doRotate := false
|
||||
if info, err := s.output.Stat(); err == nil {
|
||||
if s.rotation.How == "size" {
|
||||
doRotate = float64(info.Size()) >= float64(s.rotation.Period*1024*1024)
|
||||
} else if s.rotation.How == "time" {
|
||||
doRotate = info.ModTime().Unix()%int64(s.rotation.Period) == 0
|
||||
if info, err := mod.output.Stat(); err == nil {
|
||||
if mod.rotation.How == "size" {
|
||||
doRotate = float64(info.Size()) >= float64(mod.rotation.Period*1024*1024)
|
||||
} else if mod.rotation.How == "time" {
|
||||
doRotate = info.ModTime().Unix()%int64(mod.rotation.Period) == 0
|
||||
}
|
||||
}
|
||||
|
||||
if doRotate {
|
||||
var err error
|
||||
|
||||
name := fmt.Sprintf("%s-%s", s.outputName, time.Now().Format(s.rotation.Format))
|
||||
name := fmt.Sprintf("%s-%s", mod.outputName, time.Now().Format(mod.rotation.Format))
|
||||
|
||||
if err := s.output.Close(); err != nil {
|
||||
if err := mod.output.Close(); err != nil {
|
||||
fmt.Printf("could not close log for rotation: %s\n", err)
|
||||
return
|
||||
}
|
||||
|
||||
if err := os.Rename(s.outputName, name); err != nil {
|
||||
fmt.Printf("could not rename %s to %s: %s\n", s.outputName, name, err)
|
||||
} else if s.rotation.Compress {
|
||||
if err := os.Rename(mod.outputName, name); err != nil {
|
||||
fmt.Printf("could not rename %s to %s: %s\n", mod.outputName, name, err)
|
||||
} else if mod.rotation.Compress {
|
||||
zipName := fmt.Sprintf("%s.zip", name)
|
||||
if err = zip.Files(zipName, []string{name}); err != nil {
|
||||
fmt.Printf("error creating %s: %s", zipName, err)
|
||||
|
|
@ -144,37 +144,37 @@ func (s *EventsStream) doRotation() {
|
|||
}
|
||||
}
|
||||
|
||||
s.output, err = os.OpenFile(s.outputName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
||||
mod.output, err = os.OpenFile(mod.outputName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
||||
if err != nil {
|
||||
fmt.Printf("could not open %s: %s", s.outputName, err)
|
||||
fmt.Printf("could not open %s: %s", mod.outputName, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) View(e session.Event, refresh bool) {
|
||||
func (mod *EventsStream) View(e session.Event, refresh bool) {
|
||||
if e.Tag == "sys.log" {
|
||||
s.viewLogEvent(e)
|
||||
mod.viewLogEvent(e)
|
||||
} else if strings.HasPrefix(e.Tag, "endpoint.") {
|
||||
s.viewEndpointEvent(e)
|
||||
mod.viewEndpointEvent(e)
|
||||
} else if strings.HasPrefix(e.Tag, "wifi.") {
|
||||
s.viewWiFiEvent(e)
|
||||
mod.viewWiFiEvent(e)
|
||||
} else if strings.HasPrefix(e.Tag, "ble.") {
|
||||
s.viewBLEEvent(e)
|
||||
mod.viewBLEEvent(e)
|
||||
} else if strings.HasPrefix(e.Tag, "mod.") {
|
||||
s.viewModuleEvent(e)
|
||||
mod.viewModuleEvent(e)
|
||||
} else if strings.HasPrefix(e.Tag, "net.sniff.") {
|
||||
s.viewSnifferEvent(e)
|
||||
mod.viewSnifferEvent(e)
|
||||
} else if e.Tag == "syn.scan" {
|
||||
s.viewSynScanEvent(e)
|
||||
mod.viewSynScanEvent(e)
|
||||
} else if e.Tag == "update.available" {
|
||||
s.viewUpdateEvent(e)
|
||||
mod.viewUpdateEvent(e)
|
||||
} else {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %v\n", e.Time.Format(eventTimeFormat), tui.Green(e.Tag), e)
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %v\n", e.Time.Format(eventTimeFormat), tui.Green(e.Tag), e)
|
||||
}
|
||||
|
||||
if refresh && s.output == os.Stdout {
|
||||
s.Session.Refresh()
|
||||
if refresh && mod.output == os.Stdout {
|
||||
mod.Session.Refresh()
|
||||
}
|
||||
|
||||
s.doRotation()
|
||||
mod.doRotation()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import (
|
|||
"github.com/evilsocket/islazy/tui"
|
||||
)
|
||||
|
||||
func (s *EventsStream) viewBLEEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewBLEEvent(e session.Event) {
|
||||
if e.Tag == "ble.device.new" {
|
||||
dev := e.Data.(*network.BLEDevice)
|
||||
name := dev.Device.Name()
|
||||
|
|
@ -24,7 +24,7 @@ func (s *EventsStream) viewBLEEvent(e session.Event) {
|
|||
vend = fmt.Sprintf(" (%s)", tui.Yellow(vend))
|
||||
}
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] new BLE device%s detected as %s%s %s.\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] new BLE device%s detected as %s%s %s.\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
name,
|
||||
|
|
@ -42,7 +42,7 @@ func (s *EventsStream) viewBLEEvent(e session.Event) {
|
|||
vend = fmt.Sprintf(" (%s)", tui.Yellow(vend))
|
||||
}
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] BLE device%s %s%s lost.\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] BLE device%s %s%s lost.\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
name,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@ import (
|
|||
"github.com/bettercap/bettercap/session"
|
||||
)
|
||||
|
||||
func (s *EventsStream) viewBLEEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewBLEEvent(e session.Event) {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ var (
|
|||
reJsonKey = regexp.MustCompile(`("[^"]+"):`)
|
||||
)
|
||||
|
||||
func (s *EventsStream) shouldDumpHttpRequest(req net_sniff.HTTPRequest) bool {
|
||||
if s.dumpHttpReqs {
|
||||
func (mod *EventsStream) shouldDumpHttpRequest(req net_sniff.HTTPRequest) bool {
|
||||
if mod.dumpHttpReqs {
|
||||
// dump all
|
||||
return true
|
||||
} else if req.Method != "GET" {
|
||||
|
|
@ -38,8 +38,8 @@ func (s *EventsStream) shouldDumpHttpRequest(req net_sniff.HTTPRequest) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
func (s *EventsStream) shouldDumpHttpResponse(res net_sniff.HTTPResponse) bool {
|
||||
if s.dumpHttpResp {
|
||||
func (mod *EventsStream) shouldDumpHttpResponse(res net_sniff.HTTPResponse) bool {
|
||||
if mod.dumpHttpResp {
|
||||
return true
|
||||
} else if strings.Contains(res.ContentType, "text/plain") {
|
||||
return true
|
||||
|
|
@ -58,7 +58,7 @@ func (s *EventsStream) shouldDumpHttpResponse(res net_sniff.HTTPResponse) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
func (s *EventsStream) dumpForm(body []byte) string {
|
||||
func (mod *EventsStream) dumpForm(body []byte) string {
|
||||
form := []string{}
|
||||
for _, v := range strings.Split(string(body), "&") {
|
||||
if strings.Contains(v, "=") {
|
||||
|
|
@ -81,23 +81,23 @@ func (s *EventsStream) dumpForm(body []byte) string {
|
|||
return "\n" + strings.Join(form, "&") + "\n"
|
||||
}
|
||||
|
||||
func (s *EventsStream) dumpText(body []byte) string {
|
||||
func (mod *EventsStream) dumpText(body []byte) string {
|
||||
return "\n" + tui.Bold(tui.Red(string(body))) + "\n"
|
||||
}
|
||||
|
||||
func (s *EventsStream) dumpGZIP(body []byte) string {
|
||||
func (mod *EventsStream) dumpGZIP(body []byte) string {
|
||||
buffer := bytes.NewBuffer(body)
|
||||
uncompressed := bytes.Buffer{}
|
||||
reader, err := gzip.NewReader(buffer)
|
||||
if err != nil {
|
||||
return s.dumpRaw(body)
|
||||
return mod.dumpRaw(body)
|
||||
} else if _, err = uncompressed.ReadFrom(reader); err != nil {
|
||||
return s.dumpRaw(body)
|
||||
return mod.dumpRaw(body)
|
||||
}
|
||||
return s.dumpRaw(uncompressed.Bytes())
|
||||
return mod.dumpRaw(uncompressed.Bytes())
|
||||
}
|
||||
|
||||
func (s *EventsStream) dumpJSON(body []byte) string {
|
||||
func (mod *EventsStream) dumpJSON(body []byte) string {
|
||||
var buf bytes.Buffer
|
||||
var pretty string
|
||||
|
||||
|
|
@ -110,25 +110,25 @@ func (s *EventsStream) dumpJSON(body []byte) string {
|
|||
return "\n" + reJsonKey.ReplaceAllString(pretty, tui.Green(`$1:`)) + "\n"
|
||||
}
|
||||
|
||||
func (s *EventsStream) dumpXML(body []byte) string {
|
||||
func (mod *EventsStream) dumpXML(body []byte) string {
|
||||
// TODO: indent xml
|
||||
return "\n" + string(body) + "\n"
|
||||
}
|
||||
|
||||
func (s *EventsStream) dumpRaw(body []byte) string {
|
||||
func (mod *EventsStream) dumpRaw(body []byte) string {
|
||||
return "\n" + hex.Dump(body) + "\n"
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewHttpRequest(e session.Event) {
|
||||
func (mod *EventsStream) viewHttpRequest(e session.Event) {
|
||||
se := e.Data.(net_sniff.SnifferEvent)
|
||||
req := se.Data.(net_sniff.HTTPRequest)
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
se.Message)
|
||||
|
||||
if s.shouldDumpHttpRequest(req) {
|
||||
if mod.shouldDumpHttpRequest(req) {
|
||||
dump := fmt.Sprintf("%s %s %s\n", tui.Bold(req.Method), req.URL, tui.Dim(req.Proto))
|
||||
dump += fmt.Sprintf("%s: %s\n", tui.Blue("Host"), tui.Yellow(req.Host))
|
||||
for name, values := range req.Headers {
|
||||
|
|
@ -139,34 +139,34 @@ func (s *EventsStream) viewHttpRequest(e session.Event) {
|
|||
|
||||
if req.Body != nil {
|
||||
if req.IsType("application/x-www-form-urlencoded") {
|
||||
dump += s.dumpForm(req.Body)
|
||||
dump += mod.dumpForm(req.Body)
|
||||
} else if req.IsType("text/plain") {
|
||||
dump += s.dumpText(req.Body)
|
||||
dump += mod.dumpText(req.Body)
|
||||
} else if req.IsType("text/xml") {
|
||||
dump += s.dumpXML(req.Body)
|
||||
dump += mod.dumpXML(req.Body)
|
||||
} else if req.IsType("gzip") {
|
||||
dump += s.dumpGZIP(req.Body)
|
||||
dump += mod.dumpGZIP(req.Body)
|
||||
} else if req.IsType("application/json") {
|
||||
dump += s.dumpJSON(req.Body)
|
||||
dump += mod.dumpJSON(req.Body)
|
||||
} else {
|
||||
dump += s.dumpRaw(req.Body)
|
||||
dump += mod.dumpRaw(req.Body)
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Fprintf(s.output, "\n%s\n", dump)
|
||||
fmt.Fprintf(mod.output, "\n%s\n", dump)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewHttpResponse(e session.Event) {
|
||||
func (mod *EventsStream) viewHttpResponse(e session.Event) {
|
||||
se := e.Data.(net_sniff.SnifferEvent)
|
||||
res := se.Data.(net_sniff.HTTPResponse)
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
se.Message)
|
||||
|
||||
if s.shouldDumpHttpResponse(res) {
|
||||
if mod.shouldDumpHttpResponse(res) {
|
||||
dump := fmt.Sprintf("%s %s\n", tui.Dim(res.Protocol), res.Status)
|
||||
for name, values := range res.Headers {
|
||||
for _, value := range values {
|
||||
|
|
@ -177,22 +177,22 @@ func (s *EventsStream) viewHttpResponse(e session.Event) {
|
|||
if res.Body != nil {
|
||||
// TODO: add more interesting response types
|
||||
if res.IsType("text/plain") {
|
||||
dump += s.dumpText(res.Body)
|
||||
dump += mod.dumpText(res.Body)
|
||||
} else if res.IsType("application/json") {
|
||||
dump += s.dumpJSON(res.Body)
|
||||
dump += mod.dumpJSON(res.Body)
|
||||
} else if res.IsType("text/xml") {
|
||||
dump += s.dumpXML(res.Body)
|
||||
dump += mod.dumpXML(res.Body)
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Fprintf(s.output, "\n%s\n", dump)
|
||||
fmt.Fprintf(mod.output, "\n%s\n", dump)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewHttpEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewHttpEvent(e session.Event) {
|
||||
if e.Tag == "net.sniff.http.request" {
|
||||
s.viewHttpRequest(e)
|
||||
mod.viewHttpRequest(e)
|
||||
} else if e.Tag == "net.sniff.http.response" {
|
||||
s.viewHttpResponse(e)
|
||||
mod.viewHttpResponse(e)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import (
|
|||
"github.com/evilsocket/islazy/tui"
|
||||
)
|
||||
|
||||
func (s *EventsStream) viewWiFiApEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewWiFiApEvent(e session.Event) {
|
||||
ap := e.Data.(*network.AccessPoint)
|
||||
vend := ""
|
||||
if ap.Vendor != "" {
|
||||
|
|
@ -23,7 +23,7 @@ func (s *EventsStream) viewWiFiApEvent(e session.Event) {
|
|||
}
|
||||
|
||||
if e.Tag == "wifi.ap.new" {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] wifi access point %s%s detected as %s%s.\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] wifi access point %s%s detected as %s%s.\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
tui.Bold(ap.ESSID()),
|
||||
|
|
@ -31,21 +31,21 @@ func (s *EventsStream) viewWiFiApEvent(e session.Event) {
|
|||
tui.Green(ap.BSSID()),
|
||||
tui.Dim(vend))
|
||||
} else if e.Tag == "wifi.ap.lost" {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] wifi access point %s (%s) lost.\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] wifi access point %s (%s) lost.\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
tui.Red(ap.ESSID()),
|
||||
ap.BSSID())
|
||||
} else {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
ap.String())
|
||||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewWiFiClientProbeEvent(e session.Event) {
|
||||
probe := e.Data.(wifi.WiFiProbeEvent)
|
||||
func (mod *EventsStream) viewWiFiClientProbeEvent(e session.Event) {
|
||||
probe := e.Data.(wifi.ProbeEvent)
|
||||
desc := ""
|
||||
if probe.FromAlias != "" {
|
||||
desc = fmt.Sprintf(" (%s)", probe.FromAlias)
|
||||
|
|
@ -57,7 +57,7 @@ func (s *EventsStream) viewWiFiClientProbeEvent(e session.Event) {
|
|||
rssi = fmt.Sprintf(" (%d dBm)", probe.RSSI)
|
||||
}
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] station %s%s is probing for SSID %s%s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] station %s%s is probing for SSID %s%s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
probe.FromAddr.String(),
|
||||
|
|
@ -66,14 +66,14 @@ func (s *EventsStream) viewWiFiClientProbeEvent(e session.Event) {
|
|||
tui.Yellow(rssi))
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewWiFiHandshakeEvent(e session.Event) {
|
||||
hand := e.Data.(wifi.WiFiHandshakeEvent)
|
||||
func (mod *EventsStream) viewWiFiHandshakeEvent(e session.Event) {
|
||||
hand := e.Data.(wifi.HandshakeEvent)
|
||||
|
||||
from := hand.Station.String()
|
||||
to := hand.AP.String()
|
||||
what := "handshake"
|
||||
|
||||
if ap, found := s.Session.WiFi.Get(hand.AP.String()); found {
|
||||
if ap, found := mod.Session.WiFi.Get(hand.AP.String()); found {
|
||||
to = fmt.Sprintf("%s (%s)", tui.Bold(ap.ESSID()), tui.Dim(ap.BSSID()))
|
||||
what = fmt.Sprintf("%s handshake", ap.Encryption)
|
||||
}
|
||||
|
|
@ -82,7 +82,7 @@ func (s *EventsStream) viewWiFiHandshakeEvent(e session.Event) {
|
|||
what = "RSN PMKID"
|
||||
}
|
||||
|
||||
fmt.Fprintf(s.output, "[%s] [%s] captured %s -> %s %s to %s\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] captured %s -> %s %s to %s\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
from,
|
||||
|
|
@ -91,20 +91,20 @@ func (s *EventsStream) viewWiFiHandshakeEvent(e session.Event) {
|
|||
hand.File)
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewWiFiClientEvent(e session.Event) {
|
||||
ce := e.Data.(wifi.WiFiClientEvent)
|
||||
func (mod *EventsStream) viewWiFiClientEvent(e session.Event) {
|
||||
ce := e.Data.(wifi.ClientEvent)
|
||||
|
||||
ce.Client.Alias = s.Session.Lan.GetAlias(ce.Client.BSSID())
|
||||
ce.Client.Alias = mod.Session.Lan.GetAlias(ce.Client.BSSID())
|
||||
|
||||
if e.Tag == "wifi.client.new" {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] new station %s detected for %s (%s)\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] new station %s detected for %s (%s)\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
ce.Client.String(),
|
||||
tui.Bold(ce.AP.ESSID()),
|
||||
tui.Dim(ce.AP.BSSID()))
|
||||
} else if e.Tag == "wifi.client.lost" {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] station %s disconnected from %s (%s)\n",
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] station %s disconnected from %s (%s)\n",
|
||||
e.Time.Format(eventTimeFormat),
|
||||
tui.Green(e.Tag),
|
||||
ce.Client.String(),
|
||||
|
|
@ -113,16 +113,16 @@ func (s *EventsStream) viewWiFiClientEvent(e session.Event) {
|
|||
}
|
||||
}
|
||||
|
||||
func (s *EventsStream) viewWiFiEvent(e session.Event) {
|
||||
func (mod *EventsStream) viewWiFiEvent(e session.Event) {
|
||||
if strings.HasPrefix(e.Tag, "wifi.ap.") {
|
||||
s.viewWiFiApEvent(e)
|
||||
mod.viewWiFiApEvent(e)
|
||||
} else if e.Tag == "wifi.client.probe" {
|
||||
s.viewWiFiClientProbeEvent(e)
|
||||
mod.viewWiFiClientProbeEvent(e)
|
||||
} else if e.Tag == "wifi.client.handshake" {
|
||||
s.viewWiFiHandshakeEvent(e)
|
||||
mod.viewWiFiHandshakeEvent(e)
|
||||
} else if e.Tag == "wifi.client.new" || e.Tag == "wifi.client.lost" {
|
||||
s.viewWiFiClientEvent(e)
|
||||
mod.viewWiFiClientEvent(e)
|
||||
} else {
|
||||
fmt.Fprintf(s.output, "[%s] [%s] %v\n", e.Time.Format(eventTimeFormat), tui.Green(e.Tag), e)
|
||||
fmt.Fprintf(mod.output, "[%s] [%s] %v\n", e.Time.Format(eventTimeFormat), tui.Green(e.Tag), e)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue