new: new c2 module, first draft

bettercap · Jan 26, 2021 · 583a54c · 583a54c
1 parent 35dbb8a
commit 583a54c
Show file tree

Hide file tree

Showing 23 changed files with 579 additions and 163 deletions.
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/bettercap/bettercap
 go 1.12
 
 require (
+ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
  github.com/adrianmo/go-nmea v1.3.0
  github.com/antchfx/jsonquery v1.1.4
  github.com/antchfx/xpath v1.1.10 // indirect
@@ -38,6 +39,7 @@ require (
  github.com/pkg/errors v0.9.1 // indirect
  github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
  github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
+ github.com/thoj/go-ircevent v0.0.0-20190807115034-8e7ce4b5a1eb
  golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
  golang.org/x/net v0.0.0-20200925080053-05aa5d4ee321
  golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect

diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/adrianmo/go-nmea v1.1.0 h1:0NILSj14nj6LvVQHo/afHbyPgGz5qvp5PM6jmMyAQzY=
 github.com/adrianmo/go-nmea v1.1.0/go.mod h1:HHPxPAm2kmev+61qmkZh7xgZF/7qHtSpsWppip2Ipv8=
 github.com/adrianmo/go-nmea v1.3.0 h1:BFrLRj/oIh+DYujIKpuQievq7X3NDHYq57kNgsfr2GY=
@@ -151,6 +153,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/thoj/go-ircevent v0.0.0-20190807115034-8e7ce4b5a1eb h1:EavwSqheIJl3nb91HhkL73DwnT2Fk8W3yM7T7TuLZvA=
+github.com/thoj/go-ircevent v0.0.0-20190807115034-8e7ce4b5a1eb/go.mod h1:I0ZT9x8wStY6VOxtNOrLpnDURFs7HS0z1e1vhuKUEVc=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

diff --git a/modules/ble/ble_show.go b/modules/ble/ble_show.go
@@ -3,7 +3,6 @@
 package ble
 
 import (
- "os"
  "sort"
  "time"
 
@@ -146,7 +145,7 @@ func (mod *BLERecon) Show() error {
  }
 
  if len(rows) > 0 {
- tui.Table(os.Stdout, mod.colNames(hasName), rows)
+ tui.Table(mod.Session.Events.Stdout, mod.colNames(hasName), rows)
  mod.Session.Refresh()
  }
 

diff --git a/modules/ble/ble_show_services.go b/modules/ble/ble_show_services.go
@@ -5,7 +5,6 @@ package ble
 import (
  "encoding/binary"
  "fmt"
- "os"
  "strconv"
  "strings"
 
@@ -406,7 +405,7 @@ func (mod *BLERecon) showServices(p gatt.Peripheral, services []*gatt.Service) {
  if wantsToWrite && !foundToWrite {
  mod.Error("writable characteristics %s not found.", mod.writeUUID)
  } else {
- tui.Table(os.Stdout, columns, rows)
+ tui.Table(mod.Session.Events.Stdout, columns, rows)
  mod.Session.Refresh()
  }
 }