github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-13 00:23:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refact: some refactoring to proxy modules

Browse source
This commit is contained in:
evilsocket 2018-01-11 19:53:14 +01:00
parent 195650777f
commit 291e87de39
11 changed files with 332 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

2
caplets/http-req-dump.js
View file

@ -118,7 +118,7 @@ function dumpRaw(req) {
}
function onRequest(req, res) {
log( BOLD(req.Client), " > ", B(req.Method), req.Hostname + req.Path + ( req.Query ? "?" + req.Query : '') );
log( BOLD(req.Client), " > ", B(req.Method), " " + req.Hostname + req.Path + ( req.Query ? "?" + req.Query : '') );
dumpHeaders(req);

15
modules/api_rest.go
View file

@ -145,11 +145,12 @@ func (api *RestAPI) Configure() error {
}
func (api *RestAPI) Start() error {
if err := api.Configure(); err != nil {
if api.Running() == true {
return session.ErrAlreadyStarted
} else if err := api.Configure(); err != nil {
return err
}
if api.Running() == false {
api.SetRunning(true)
go func() {
log.Info("API server starting on https://%s", api.server.Addr)
@ -162,16 +163,12 @@ func (api *RestAPI) Start() error {
return nil
}
return fmt.Errorf("REST API server already started.")
}
func (api *RestAPI) Stop() error {
if api.Running() == true {
if api.Running() == false {
return session.ErrAlreadyStopped
}
api.SetRunning(false)
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
return api.server.Shutdown(ctx)
} else {
return fmt.Errorf("REST API server already stopped.")
}
}

57
modules/arp_spoof.go
View file

@ -16,12 +16,14 @@ import (
type ArpSpoofer struct {
session.SessionModule
done chan bool
addresses []net.IP
}
func NewArpSpoofer(s *session.Session) *ArpSpoofer {
p := &ArpSpoofer{
SessionModule: session.NewSessionModule("arp.spoof", s),
done: make(chan bool),
addresses: make([]net.IP, 0),
}
p.AddParam(session.NewStringParameter("arp.spoof.targets", session.ParamSubnet, "", "IP addresses to spoof."))
@ -99,8 +101,8 @@ func (p *ArpSpoofer) getMAC(ip net.IP, probe bool) (net.HardwareAddr, error) {
return hw, nil
}
func (p *ArpSpoofer) sendArp(addresses []net.IP, saddr net.IP, smac net.HardwareAddr, check_running bool, probe bool) {
for _, ip := range addresses {
func (p *ArpSpoofer) sendArp(saddr net.IP, smac net.HardwareAddr, check_running bool, probe bool) {
for _, ip := range p.addresses {
if p.shouldSpoof(ip) == false {
log.Debug("Skipping address %s from ARP spoofing.", ip)
continue
@ -127,32 +129,17 @@ func (p *ArpSpoofer) sendArp(addresses []net.IP, saddr net.IP, smac net.Hardware
}
func (p *ArpSpoofer) unSpoof() error {
var targets string
if err, v := p.Param("arp.spoof.targets").Get(p.Session); err != nil {
return err
} else {
targets = v.(string)
}
list, err := iprange.Parse(targets)
if err != nil {
return fmt.Errorf("Error while parsing arp.spoof.targets variable '%s': %s.", targets, err)
}
addresses := list.Expand()
from := p.Session.Gateway.IP
from_hw := p.Session.Gateway.HW
log.Info("Restoring ARP cache of %d targets (%s).", len(addresses), targets)
log.Info("Restoring ARP cache of %d targets.", len(p.addresses))
p.sendArp(addresses, from, from_hw, false, false)
p.sendArp(from, from_hw, false, false)
return nil
}
func (p *ArpSpoofer) Start() error {
if p.Running() == false {
func (p *ArpSpoofer) Configure() error {
var err error
var targets string
@ -164,19 +151,26 @@ func (p *ArpSpoofer) Start() error {
if err != nil {
return fmt.Errorf("Error while parsing arp.spoof.targets variable '%s': %s.", targets, err)
}
addresses := list.Expand()
p.addresses = list.Expand()
return nil
}
func (p *ArpSpoofer) Start() error {
if p.Running() == true {
return session.ErrAlreadyStarted
} else if err := p.Configure(); err != nil {
return err
}
p.SetRunning(true)
go func() {
from := p.Session.Gateway.IP
from_hw := p.Session.Interface.HW
log.Info("ARP spoofer started, probing %d targets (%s).", len(addresses), targets)
log.Info("ARP spoofer started, probing %d targets.", len(p.addresses))
for p.Running() {
p.sendArp(addresses, from, from_hw, true, false)
p.sendArp(from, from_hw, true, false)
time.Sleep(1 * time.Second)
}
@ -184,23 +178,20 @@ func (p *ArpSpoofer) Start() error {
}()
return nil
} else {
return fmt.Errorf("ARP spoofer already started.")
}
}
func (p *ArpSpoofer) Stop() error {
if p.Running() == true {
p.SetRunning(false)
if p.Running() == false {
return session.ErrAlreadyStopped
}
log.Info("Waiting for ARP spoofer to stop ...")
p.SetRunning(false)
<-p.done
p.unSpoof()
return nil
} else {
return fmt.Errorf("ARP spoofer already stopped.")
}
}

27
modules/events_stream.go
View file

@ -10,12 +10,14 @@ import (
type EventsStream struct {
session.SessionModule
filter string
quit chan bool
}
func NewEventsStream(s *session.Session) *EventsStream {
stream := &EventsStream{
SessionModule: session.NewSessionModule("events.stream", s),
filter: "",
quit: make(chan bool),
}
@ -58,12 +60,18 @@ func (s EventsStream) Author() string {
return "Simone Margaritelli <evilsocket@protonmail.com>"
}
func (s *EventsStream) Start() error {
if s.Running() == false {
func (s *EventsStream) Configure() error {
var err error
var filter string
if err, s.filter = s.StringParam("events.stream.filter"); err != nil {
return err
}
return nil
}
if err, filter = s.StringParam("events.stream.filter"); err != nil {
func (s *EventsStream) Start() error {
if s.Running() == true {
return session.ErrAlreadyStarted
} else if err := s.Configure(); err != nil {
return err
}
@ -74,7 +82,7 @@ func (s *EventsStream) Start() error {
var e session.Event
select {
case e = <-s.Session.Events.NewEvents:
if filter == "" || strings.Contains(e.Tag, filter) {
if s.filter == "" || strings.Contains(e.Tag, s.filter) {
tm := e.Time.Format("2006-01-02 15:04:05")
if e.Tag == "sys.log" {
@ -96,14 +104,11 @@ func (s *EventsStream) Start() error {
return nil
}
return fmt.Errorf("Events stream already started.")
}
func (s *EventsStream) Stop() error {
if s.Running() == true {
if s.Running() == false {
return session.ErrAlreadyStopped
}
s.SetRunning(false)
s.quit <- true
return nil
}
return fmt.Errorf("Events stream already stopped.")
}

80
modules/http_proxy.go
View file

@ -116,6 +116,28 @@ func NewHttpProxy(s *session.Session) *HttpProxy {
return p
}
func (p *HttpProxy) doProxy(req *http.Request) bool {
blacklist := []string{
"localhost",
"127.0.0.1",
p.address,
}
if req.Host == "" {
log.Error("Got request with empty host: %v", req)
return false
}
for _, blacklisted := range blacklist {
if strings.HasPrefix(req.Host, blacklisted) {
log.Error("Got request with blacklisted host: %s", req.Host)
return false
}
}
return true
}
func (p *HttpProxy) Name() string {
return "http.proxy"
}
@ -128,16 +150,12 @@ func (p *HttpProxy) Author() string {
return "Simone Margaritelli <evilsocket@protonmail.com>"
}
func (p *HttpProxy) Start() error {
func (p *HttpProxy) Configure() error {
var err error
var http_port int
var proxy_port int
var scriptPath string
if p.Running() == true {
return fmt.Errorf("HTTP proxy already started.")
}
if err, p.address = p.StringParam("http.proxy.address"); err != nil {
return err
}
@ -160,6 +178,8 @@ func (p *HttpProxy) Start() error {
}
}
p.server = http.Server{Addr: fmt.Sprintf("%s:%d", p.address, proxy_port), Handler: p.proxy}
if p.Session.Firewall.IsForwardingEnabled() == false {
log.Info("Enabling forwarding.")
p.Session.Firewall.EnableForwarding(true)
@ -177,10 +197,18 @@ func (p *HttpProxy) Start() error {
log.Debug("Applied redirection %s", p.redirection.String())
address := fmt.Sprintf("%s:%d", p.address, proxy_port)
p.server = http.Server{Addr: address, Handler: p.proxy}
go func() {
return nil
}
func (p *HttpProxy) Start() error {
if p.Running() == true {
return session.ErrAlreadyStarted
} else if err := p.Configure(); err != nil {
return err
}
p.SetRunning(true)
go func() {
if err := p.server.ListenAndServe(); err != nil {
p.SetRunning(false)
log.Warning("%s", err)
@ -191,11 +219,11 @@ func (p *HttpProxy) Start() error {
}
func (p *HttpProxy) Stop() error {
if p.Running() == true {
if p.Running() == false {
return session.ErrAlreadyStopped
}
p.SetRunning(false)
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
p.server.Shutdown(ctx)
if p.redirection != nil {
log.Debug("Disabling redirection %s", p.redirection.String())
if err := p.Session.Firewall.EnableRedirection(p.redirection, false); err != nil {
@ -203,30 +231,8 @@ func (p *HttpProxy) Stop() error {
}
p.redirection = nil
}
return nil
} else {
return fmt.Errorf("HTTP proxy stopped.")
}
}
func (p *HttpProxy) doProxy(req *http.Request) bool {
blacklist := []string{
"localhost",
"127.0.0.1",
p.address,
}
if req.Host == "" {
log.Error("Got request with empty host: %v", req)
return false
}
for _, blacklisted := range blacklist {
if strings.HasPrefix(req.Host, blacklisted) {
log.Error("Got request with blacklisted host: %s", req.Host)
return false
}
}
return true
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
return p.server.Shutdown(ctx)
}

15
modules/http_server.go
View file

@ -88,11 +88,12 @@ func (httpd *HttpServer) Configure() error {
}
func (httpd *HttpServer) Start() error {
if err := httpd.Configure(); err != nil {
if httpd.Running() == true {
return session.ErrAlreadyStarted
} else if err := httpd.Configure(); err != nil {
return err
}
if httpd.Running() == false {
httpd.SetRunning(true)
go func() {
log.Info("httpd server starting on http://%s", httpd.server.Addr)
@ -105,16 +106,12 @@ func (httpd *HttpServer) Start() error {
return nil
}
return fmt.Errorf("httpd server already started.")
}
func (httpd *HttpServer) Stop() error {
if httpd.Running() == true {
if httpd.Running() == false {
return session.ErrAlreadyStopped
}
httpd.SetRunning(false)
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
return httpd.server.Shutdown(ctx)
} else {
return fmt.Errorf("httpd server already stopped.")
}
}

33
modules/net_probe.go
View file

@ -13,6 +13,7 @@ import (
type Prober struct {
session.SessionModule
throttle int
}
func NewProber(s *session.Session) *Prober {
@ -78,15 +79,21 @@ func (p *Prober) sendProbe(from net.IP, from_hw net.HardwareAddr, ip net.IP) {
}
}
func (p *Prober) Start() error {
if p.Running() == false {
func (p *Prober) Configure() error {
var err error
var throttle int
if err, throttle = p.IntParam("net.probe.throttle"); err != nil {
if err, p.throttle = p.IntParam("net.probe.throttle"); err != nil {
return err
} else {
log.Debug("Throttling packets of %d ms.", throttle)
log.Debug("Throttling packets of %d ms.", p.throttle)
}
return nil
}
func (p *Prober) Start() error {
if p.Running() == true {
return session.ErrAlreadyStarted
} else if err := p.Configure(); err != nil {
return err
}
p.SetRunning(true)
@ -110,8 +117,8 @@ func (p *Prober) Start() error {
p.sendProbe(from, from_hw, ip)
if throttle > 0 {
time.Sleep(time.Duration(throttle) * time.Millisecond)
if p.throttle > 0 {
time.Sleep(time.Duration(p.throttle) * time.Millisecond)
}
}
@ -120,16 +127,12 @@ func (p *Prober) Start() error {
}()
return nil
} else {
return fmt.Errorf("Network prober already started.")
}
}
func (p *Prober) Stop() error {
if p.Running() == true {
if p.Running() == false {
return session.ErrAlreadyStopped
}
p.SetRunning(false)
return nil
} else {
return fmt.Errorf("Network prober already stopped.")
}
}

27
modules/net_recon.go
View file

@ -1,11 +1,11 @@
package modules
import (
"fmt"
"time"
"github.com/evilsocket/bettercap-ng/log"
"github.com/evilsocket/bettercap-ng/net"
"github.com/evilsocket/bettercap-ng/session"
"time"
)
type Discovery struct {
@ -108,8 +108,17 @@ func (d *Discovery) runDiff() {
}
}
func (d *Discovery) Configure() error {
return nil
}
func (d *Discovery) Start() error {
if d.Running() == false {
if d.Running() == true {
return session.ErrAlreadyStarted
} else if err := d.Configure(); err != nil {
return err
}
d.SetRunning(true)
go func() {
@ -134,9 +143,6 @@ func (d *Discovery) Start() error {
}()
return nil
} else {
return fmt.Errorf("Network discovery already started.")
}
}
func (d *Discovery) Show() error {
@ -145,11 +151,10 @@ func (d *Discovery) Show() error {
}
func (d *Discovery) Stop() error {
if d.Running() == true {
d.SetRunning(false)
if d.Running() == false {
return session.ErrAlreadyStopped
}
d.quit <- true
d.SetRunning(false)
return nil
} else {
return fmt.Errorf("Network discovery already stopped.")
}
}

25
modules/net_sniff.go
View file

@ -117,8 +117,7 @@ func (s *Sniffer) onPacketMatched(pkt gopacket.Packet) {
}
}
func (s *Sniffer) Start() error {
if s.Running() == false {
func (s *Sniffer) Configure() error {
var err error
if err, s.Ctx = s.GetContext(); err != nil {
@ -129,10 +128,20 @@ func (s *Sniffer) Start() error {
return err
}
s.Stats = NewSnifferStats()
return nil
}
func (s *Sniffer) Start() error {
if s.Running() == true {
return session.ErrAlreadyStarted
} else if err := s.Configure(); err != nil {
return err
}
s.SetRunning(true)
go func() {
s.Stats = NewSnifferStats()
defer s.Ctx.Close()
src := gopacket.NewPacketSource(s.Ctx.Handle, s.Ctx.Handle.LinkType())
@ -170,16 +179,12 @@ func (s *Sniffer) Start() error {
}()
return nil
} else {
return fmt.Errorf("Network sniffer already started.")
}
}
func (s *Sniffer) Stop() error {
if s.Running() == true {
if s.Running() == false {
return session.ErrAlreadyStopped
}
s.SetRunning(false)
return nil
} else {
return fmt.Errorf("Network sniffer already stopped.")
}
}

4
session/session.go
View file

@ -2,6 +2,7 @@ package session
import (
"bufio"
"errors"
"fmt"
"os"
"os/signal"
@ -20,6 +21,9 @@ import (
var (
I = (*Session)(nil)
ErrAlreadyStarted = errors.New("Module is already running.")
ErrAlreadyStopped = errors.New("Module is not running.")
)
type Session struct {

4
session/session_core_handlers.go
View file

@ -89,6 +89,10 @@ func (s *Session) activeHandler(args []string, sess *Session) error {
}
func (s *Session) exitHandler(args []string, sess *Session) error {
for _, mod := range s.Modules {
mod.Stop()
}
s.Active = false
s.Input.Close()
return nil