github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-07 21:42:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact: refactored module status checks in Configure methods for consistency

Browse source
This commit is contained in:
evilsocket 2018-03-07 12:47:15 +01:00
parent a8e6b497a3
commit 1e7d99433e
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
13 changed files with 52 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/api_rest.go
View file

@ -113,7 +113,9 @@ func (api *RestAPI) Configure() error {
var ip string var ip string
var port int var port int
if err, ip = api.StringParam("api.rest.address"); err != nil { if api.Running() {
return session.ErrAlreadyStarted
} else if err, ip = api.StringParam("api.rest.address"); err != nil {
return err return err
} else if err, port = api.IntParam("api.rest.port"); err != nil { } else if err, port = api.IntParam("api.rest.port"); err != nil {
return err return err
@ -155,9 +157,7 @@ func (api *RestAPI) Configure() error {
} }
func (api *RestAPI) Start() error { func (api *RestAPI) Start() error {
if api.Running() == true { if err := api.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := api.Configure(); err != nil {
return err return err
} }

8
modules/ble_recon.go
View file

@ -111,7 +111,9 @@ func (d *BLERecon) isEnumerating() bool {
} }
func (d *BLERecon) Configure() (err error) { func (d *BLERecon) Configure() (err error) {
if d.gattDevice == nil { if d.Running() {
return session.ErrAlreadyStarted
} else if d.gattDevice == nil {
log.Info("Initializing BLE device ...") log.Info("Initializing BLE device ...")
// hey Paypal GATT library, could you please just STFU?! // hey Paypal GATT library, could you please just STFU?!
@ -147,9 +149,7 @@ func (d *BLERecon) pruner() {
} }
func (d *BLERecon) Start() error { func (d *BLERecon) Start() error {
if d.Running() { if err := d.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := d.Configure(); err != nil {
return err return err
} }

8
modules/dhcp6_spoof.go
View file

@ -77,6 +77,10 @@ func (s DHCP6Spoofer) Author() string {
func (s *DHCP6Spoofer) Configure() error { func (s *DHCP6Spoofer) Configure() error {
var err error var err error
if s.Running() {
return session.ErrAlreadyStarted
}
if s.Handle, err = pcap.OpenLive(s.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil { if s.Handle, err = pcap.OpenLive(s.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil {
return err return err
} }
@ -354,9 +358,7 @@ func (s *DHCP6Spoofer) onPacket(pkt gopacket.Packet) {
} }
func (s *DHCP6Spoofer) Start() error { func (s *DHCP6Spoofer) Start() error {
if s.Running() == true { if err := s.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := s.Configure(); err != nil {
return err return err
} }

8
modules/dns_spoof.go
View file

@ -80,6 +80,10 @@ func (s *DNSSpoofer) Configure() error {
var err error var err error
var addr string var addr string
if s.Running() {
return session.ErrAlreadyStarted
}
if s.Handle, err = pcap.OpenLive(s.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil { if s.Handle, err = pcap.OpenLive(s.Session.Interface.Name(), 65536, true, pcap.BlockForever); err != nil {
return err return err
} }
@ -264,9 +268,7 @@ func (s *DNSSpoofer) onPacket(pkt gopacket.Packet) {
} }
func (s *DNSSpoofer) Start() error { func (s *DNSSpoofer) Start() error {
if s.Running() == true { if err := s.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := s.Configure(); err != nil {
return err return err
} }

1
modules/events_stream.go
View file

@ -125,7 +125,6 @@ func (s *EventsStream) Configure() error {
func (s *EventsStream) Start() error { func (s *EventsStream) Start() error {
return s.SetRunning(true, func() { return s.SetRunning(true, func() {
s.eventListener = s.Session.Events.Listen() s.eventListener = s.Session.Events.Listen()
for { for {
var e session.Event var e session.Event

8
modules/gps.go
View file

@ -71,7 +71,9 @@ func (gps *GPS) Author() string {
} }
func (gps *GPS) Configure() (err error) { func (gps *GPS) Configure() (err error) {
if err, gps.serialPort = gps.StringParam("gps.device"); err != nil { if gps.Running() {
return session.ErrAlreadyStarted
} else if err, gps.serialPort = gps.StringParam("gps.device"); err != nil {
return err return err
} else if err, gps.baudRate = gps.IntParam("gps.baudrate"); err != nil { } else if err, gps.baudRate = gps.IntParam("gps.baudrate"); err != nil {
return err return err
@ -117,9 +119,7 @@ func (gps *GPS) Show() error {
} }
func (gps *GPS) Start() error { func (gps *GPS) Start() error {
if gps.Running() == true { if err := gps.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := gps.Configure(); err != nil {
return err return err
} }

20
modules/http_proxy.go
View file

@ -67,19 +67,15 @@ func (p *HttpProxy) Configure() error {
var httpPort int var httpPort int
var scriptPath string var scriptPath string
if err, address = p.StringParam("http.proxy.address"); err != nil { if p.Running() == true {
return session.ErrAlreadyStarted
} else if err, address = p.StringParam("http.proxy.address"); err != nil {
return err return err
} } else if err, proxyPort = p.IntParam("http.proxy.port"); err != nil {
if err, proxyPort = p.IntParam("http.proxy.port"); err != nil {
return err return err
} } else if err, httpPort = p.IntParam("http.port"); err != nil {
if err, httpPort = p.IntParam("http.port"); err != nil {
return err return err
} } else if err, scriptPath = p.StringParam("http.proxy.script"); err != nil {
if err, scriptPath = p.StringParam("http.proxy.script"); err != nil {
return err return err
} }
@ -87,9 +83,7 @@ func (p *HttpProxy) Configure() error {
} }
func (p *HttpProxy) Start() error { func (p *HttpProxy) Start() error {
if p.Running() == true { if err := p.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := p.Configure(); err != nil {
return err return err
} }

8
modules/http_server.go
View file

@ -89,6 +89,10 @@ func (httpd *HttpServer) Configure() error {
var certFile string var certFile string
var keyFile string var keyFile string
if httpd.Running() == true {
return session.ErrAlreadyStarted
}
if err, path = httpd.StringParam("http.server.path"); err != nil { if err, path = httpd.StringParam("http.server.path"); err != nil {
return err return err
} }
@ -145,9 +149,7 @@ func (httpd *HttpServer) Configure() error {
} }
func (httpd *HttpServer) Start() error { func (httpd *HttpServer) Start() error {
if httpd.Running() == true { if err := httpd.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := httpd.Configure(); err != nil {
return err return err
} }

8
modules/https_proxy.go
View file

@ -82,6 +82,10 @@ func (p *HttpsProxy) Configure() error {
var certFile string var certFile string
var keyFile string var keyFile string
if p.Running() == true {
return session.ErrAlreadyStarted
}
if err, address = p.StringParam("https.proxy.address"); err != nil { if err, address = p.StringParam("https.proxy.address"); err != nil {
return err return err
} }
@ -125,9 +129,7 @@ func (p *HttpsProxy) Configure() error {
} }
func (p *HttpsProxy) Start() error { func (p *HttpsProxy) Start() error {
if p.Running() == true { if err := p.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := p.Configure(); err != nil {
return err return err
} }

8
modules/net_sniff.go
View file

@ -125,7 +125,9 @@ func (s *Sniffer) onPacketMatched(pkt gopacket.Packet) {
func (s *Sniffer) Configure() error { func (s *Sniffer) Configure() error {
var err error var err error
if err, s.Ctx = s.GetContext(); err != nil { if s.Running() == true {
return session.ErrAlreadyStarted
} else if err, s.Ctx = s.GetContext(); err != nil {
if s.Ctx != nil { if s.Ctx != nil {
s.Ctx.Close() s.Ctx.Close()
s.Ctx = nil s.Ctx = nil
@ -137,9 +139,7 @@ func (s *Sniffer) Configure() error {
} }
func (s *Sniffer) Start() error { func (s *Sniffer) Start() error {
if s.Running() == true { if err := s.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := s.Configure(); err != nil {
return err return err
} }

8
modules/tcp_proxy.go
View file

@ -83,7 +83,9 @@ func (p *TcpProxy) Configure() error {
var proxyAddress string var proxyAddress string
var scriptPath string var scriptPath string
if err, address = p.StringParam("tcp.address"); err != nil { if p.Running() == true {
return session.ErrAlreadyStarted
} else if err, address = p.StringParam("tcp.address"); err != nil {
return err return err
} else if err, proxyAddress = p.StringParam("tcp.proxy.address"); err != nil { } else if err, proxyAddress = p.StringParam("tcp.proxy.address"); err != nil {
return err return err
@ -190,9 +192,7 @@ func (p *TcpProxy) handleConnection(c *net.TCPConn) {
} }
func (p *TcpProxy) Start() error { func (p *TcpProxy) Start() error {
if p.Running() == true { if err := p.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := p.Configure(); err != nil {
return err return err
} }

8
modules/ticker.go
View file

@ -59,7 +59,9 @@ func (t *Ticker) Configure() error {
var commands string var commands string
var period int var period int
if err, commands = t.StringParam("ticker.commands"); err != nil { if t.Running() == true {
return session.ErrAlreadyStarted
} else if err, commands = t.StringParam("ticker.commands"); err != nil {
return err return err
} else if err, period = t.IntParam("ticker.period"); err != nil { } else if err, period = t.IntParam("ticker.period"); err != nil {
return err return err
@ -72,9 +74,7 @@ func (t *Ticker) Configure() error {
} }
func (t *Ticker) Start() error { func (t *Ticker) Start() error {
if t.Running() == true { if err := t.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := t.Configure(); err != nil {
return err return err
} }

4
modules/wifi_recon.go
View file

@ -594,9 +594,7 @@ func (w *WiFiRecon) trackPacket(pkt gopacket.Packet) {
} }
func (w *WiFiRecon) Start() error { func (w *WiFiRecon) Start() error {
if w.Running() == true { if err := w.Configure(); err != nil {
return session.ErrAlreadyStarted
} else if err := w.Configure(); err != nil {
return err return err
} }