mirror of
https://github.com/bettercap/bettercap
synced 2025-08-14 02:36:57 -07:00
new: all hid periods are now configurable by dedicated parameters
This commit is contained in:
evilsocket
parent
17c639126d
commit
f6649aa82b
3 changed files with 198 additions and 156 deletions
193
modules/hid/hid.go
Normal file
193
modules/hid/hid.go
Normal file
|
|
@ -0,0 +1,193 @@
|
|||
package hid
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/bettercap/bettercap/modules/utils"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/bettercap/nrf24"
|
||||
)
|
||||
|
||||
type HIDRecon struct {
|
||||
session.SessionModule
|
||||
dongle *nrf24.Dongle
|
||||
waitGroup *sync.WaitGroup
|
||||
channel int
|
||||
hopPeriod time.Duration
|
||||
pingPeriod time.Duration
|
||||
sniffPeriod time.Duration
|
||||
lastHop time.Time
|
||||
lastPing time.Time
|
||||
useLNA bool
|
||||
sniffLock *sync.Mutex
|
||||
sniffAddrRaw []byte
|
||||
sniffAddr string
|
||||
pingPayload []byte
|
||||
inSniffMode bool
|
||||
inPromMode bool
|
||||
inInjectMode bool
|
||||
keyLayout string
|
||||
scriptPath string
|
||||
parser DuckyParser
|
||||
selector *utils.ViewSelector
|
||||
}
|
||||
|
||||
/*
|
||||
TODO:
|
||||
|
||||
- make session.Session.HID JSON serializable for the API
|
||||
- fix compilation for unsupported platforms
|
||||
- update docs
|
||||
- test test test
|
||||
*/
|
||||
func NewHIDRecon(s *session.Session) *HIDRecon {
|
||||
mod := &HIDRecon{
|
||||
SessionModule: session.NewSessionModule("hid", s),
|
||||
waitGroup: &sync.WaitGroup{},
|
||||
sniffLock: &sync.Mutex{},
|
||||
hopPeriod: 100 * time.Millisecond,
|
||||
pingPeriod: 100 * time.Millisecond,
|
||||
sniffPeriod: 500 * time.Millisecond,
|
||||
lastHop: time.Now(),
|
||||
lastPing: time.Now(),
|
||||
useLNA: true,
|
||||
channel: 1,
|
||||
sniffAddrRaw: nil,
|
||||
sniffAddr: "",
|
||||
inSniffMode: false,
|
||||
inPromMode: false,
|
||||
inInjectMode: false,
|
||||
pingPayload: []byte{0x0f, 0x0f, 0x0f, 0x0f},
|
||||
keyLayout: "US",
|
||||
scriptPath: "",
|
||||
}
|
||||
|
||||
mod.AddHandler(session.NewModuleHandler("hid.recon on", "",
|
||||
"Start scanning for HID devices on the 2.4Ghz spectrum.",
|
||||
func(args []string) error {
|
||||
return mod.Start()
|
||||
}))
|
||||
|
||||
mod.AddHandler(session.NewModuleHandler("hid.recon off", "",
|
||||
"Stop scanning for HID devices on the 2.4Ghz spectrum.",
|
||||
func(args []string) error {
|
||||
return mod.Stop()
|
||||
}))
|
||||
|
||||
sniff := session.NewModuleHandler("hid.sniff ADDRESS", `(?i)^hid\.sniff ([a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}|clear)$`,
|
||||
"Start sniffing a specific ADDRESS in order to collect payloads, use 'clear' to stop collecting.",
|
||||
func(args []string) error {
|
||||
return mod.setSniffMode(args[0])
|
||||
})
|
||||
|
||||
sniff.Complete("hid.sniff", s.HIDCompleter)
|
||||
|
||||
mod.AddHandler(sniff)
|
||||
|
||||
mod.AddHandler(session.NewModuleHandler("hid.show", "",
|
||||
"Show a list of detected HID devices on the 2.4Ghz spectrum.",
|
||||
func(args []string) error {
|
||||
return mod.Show()
|
||||
}))
|
||||
|
||||
inject := session.NewModuleHandler("hid.inject ADDRESS LAYOUT FILENAME", `(?i)^hid\.inject ([a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2})\s+(.+)\s+(.+)$`,
|
||||
"Parse the duckyscript FILENAME and inject it as HID frames spoofing the device ADDRESS, using the LAYOUT keyboard mapping.",
|
||||
func(args []string) error {
|
||||
if err := mod.setInjectionMode(args[0]); err != nil {
|
||||
return err
|
||||
}
|
||||
mod.keyLayout = args[1]
|
||||
mod.scriptPath = args[2]
|
||||
return nil
|
||||
})
|
||||
|
||||
inject.Complete("hid.inject", s.HIDCompleter)
|
||||
|
||||
mod.AddHandler(inject)
|
||||
|
||||
mod.AddParam(session.NewBoolParameter("hid.lna",
|
||||
"true",
|
||||
"If true, enable the LNA power amplifier for CrazyRadio devices."))
|
||||
|
||||
mod.AddParam(session.NewIntParameter("hid.hop.period",
|
||||
"100",
|
||||
"Time in milliseconds to stay on each channel before hopping to the next one."))
|
||||
|
||||
mod.AddParam(session.NewIntParameter("hid.ping.period",
|
||||
"100",
|
||||
"Time in milliseconds to attempt to ping a device on a given channel while in sniffer mode."))
|
||||
|
||||
mod.AddParam(session.NewIntParameter("hid.sniff.period",
|
||||
"500",
|
||||
"Time in milliseconds to automatically sniff payloads from a device, once it's detected, in order to determine its type."))
|
||||
|
||||
mod.parser = DuckyParser{mod}
|
||||
mod.selector = utils.ViewSelectorFor(&mod.SessionModule, "hid.show", []string{"mac", "seen"}, "mac desc")
|
||||
|
||||
return mod
|
||||
}
|
||||
|
||||
func (mod HIDRecon) Name() string {
|
||||
return "hid"
|
||||
}
|
||||
|
||||
func (mod HIDRecon) Description() string {
|
||||
return "A scanner and frames injection module for HID devices on the 2.4Ghz spectrum, using Nordic Semiconductor nRF24LU1+ based USB dongles and Bastille Research RFStorm firmware."
|
||||
}
|
||||
|
||||
func (mod HIDRecon) Author() string {
|
||||
return "Simone Margaritelli <evilsocket@gmail.com> (this module and the nrf24 client library), Bastille Research (the rfstorm firmware and original research), phikshun and infamy for JackIt."
|
||||
}
|
||||
|
||||
func (mod *HIDRecon) Configure() error {
|
||||
var err error
|
||||
var n int
|
||||
|
||||
if err, mod.useLNA = mod.BoolParam("hid.lna"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err, n = mod.IntParam("hid.hop.period"); err != nil {
|
||||
return err
|
||||
} else {
|
||||
mod.hopPeriod = time.Duration(n) * time.Millisecond
|
||||
}
|
||||
|
||||
if err, n = mod.IntParam("hid.ping.period"); err != nil {
|
||||
return err
|
||||
} else {
|
||||
mod.pingPeriod = time.Duration(n) * time.Millisecond
|
||||
}
|
||||
|
||||
if err, n = mod.IntParam("hid.sniff.period"); err != nil {
|
||||
return err
|
||||
} else {
|
||||
mod.sniffPeriod = time.Duration(n) * time.Millisecond
|
||||
}
|
||||
|
||||
if mod.dongle, err = nrf24.Open(); err != nil {
|
||||
return fmt.Errorf("make sure that a nRF24LU1+ based USB dongle is connected and running the rfstorm firmware: %s", err)
|
||||
}
|
||||
|
||||
mod.Debug("using device %s", mod.dongle.String())
|
||||
|
||||
if mod.useLNA {
|
||||
if err = mod.dongle.EnableLNA(); err != nil {
|
||||
return fmt.Errorf("make sure your device supports LNA, otherwise set hid.lna to false and retry: %s", err)
|
||||
}
|
||||
mod.Debug("LNA enabled")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mod *HIDRecon) Stop() error {
|
||||
return mod.SetRunning(false, func() {
|
||||
mod.waitGroup.Wait()
|
||||
mod.dongle.Close()
|
||||
mod.Debug("device closed")
|
||||
})
|
||||
}
|
||||
|
|
@ -1,159 +1,11 @@
|
|||
package hid
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/bettercap/bettercap/modules/utils"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/bettercap/nrf24"
|
||||
)
|
||||
|
||||
type HIDRecon struct {
|
||||
session.SessionModule
|
||||
dongle *nrf24.Dongle
|
||||
waitGroup *sync.WaitGroup
|
||||
channel int
|
||||
hopPeriod time.Duration
|
||||
pingPeriod time.Duration
|
||||
sniffPeriod time.Duration
|
||||
lastHop time.Time
|
||||
lastPing time.Time
|
||||
useLNA bool
|
||||
sniffLock *sync.Mutex
|
||||
sniffAddrRaw []byte
|
||||
sniffAddr string
|
||||
pingPayload []byte
|
||||
inSniffMode bool
|
||||
inPromMode bool
|
||||
inInjectMode bool
|
||||
keyLayout string
|
||||
scriptPath string
|
||||
parser DuckyParser
|
||||
selector *utils.ViewSelector
|
||||
}
|
||||
|
||||
/*
|
||||
TODO:
|
||||
|
||||
- parse all Durations as parameters
|
||||
- make session.Session.HID JSON serializable for the API
|
||||
- fix compilation for unsupported platforms
|
||||
- update docs
|
||||
- test test test
|
||||
*/
|
||||
func NewHIDRecon(s *session.Session) *HIDRecon {
|
||||
mod := &HIDRecon{
|
||||
SessionModule: session.NewSessionModule("hid", s),
|
||||
waitGroup: &sync.WaitGroup{},
|
||||
sniffLock: &sync.Mutex{},
|
||||
hopPeriod: 100 * time.Millisecond,
|
||||
pingPeriod: 100 * time.Millisecond,
|
||||
sniffPeriod: 500 * time.Millisecond,
|
||||
lastHop: time.Now(),
|
||||
lastPing: time.Now(),
|
||||
useLNA: true,
|
||||
channel: 1,
|
||||
sniffAddrRaw: nil,
|
||||
sniffAddr: "",
|
||||
inSniffMode: false,
|
||||
inPromMode: false,
|
||||
inInjectMode: false,
|
||||
pingPayload: []byte{0x0f, 0x0f, 0x0f, 0x0f},
|
||||
keyLayout: "US",
|
||||
scriptPath: "",
|
||||
}
|
||||
|
||||
mod.AddHandler(session.NewModuleHandler("hid.recon on", "",
|
||||
"Start scanning for HID devices on the 2.4Ghz spectrum.",
|
||||
func(args []string) error {
|
||||
return mod.Start()
|
||||
}))
|
||||
|
||||
mod.AddHandler(session.NewModuleHandler("hid.recon off", "",
|
||||
"Stop scanning for HID devices on the 2.4Ghz spectrum.",
|
||||
func(args []string) error {
|
||||
return mod.Stop()
|
||||
}))
|
||||
|
||||
mod.AddParam(session.NewBoolParameter("hid.lna",
|
||||
"true",
|
||||
"If true, enable the LNA power amplifier for CrazyRadio devices."))
|
||||
|
||||
sniff := session.NewModuleHandler("hid.sniff ADDRESS", `(?i)^hid\.sniff ([a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}|clear)$`,
|
||||
"Start sniffing a specific ADDRESS in order to collect payloads, use 'clear' to stop collecting.",
|
||||
func(args []string) error {
|
||||
return mod.setSniffMode(args[0])
|
||||
})
|
||||
|
||||
sniff.Complete("hid.sniff", s.HIDCompleter)
|
||||
|
||||
mod.AddHandler(sniff)
|
||||
|
||||
mod.AddHandler(session.NewModuleHandler("hid.show", "",
|
||||
"Show a list of detected HID devices on the 2.4Ghz spectrum.",
|
||||
func(args []string) error {
|
||||
return mod.Show()
|
||||
}))
|
||||
|
||||
inject := session.NewModuleHandler("hid.inject ADDRESS LAYOUT FILENAME", `(?i)^hid\.inject ([a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2})\s+(.+)\s+(.+)$`,
|
||||
"Parse the duckyscript FILENAME and inject it as HID frames spoofing the device ADDRESS, using the LAYOUT keyboard mapping.",
|
||||
func(args []string) error {
|
||||
if err := mod.setInjectionMode(args[0]); err != nil {
|
||||
return err
|
||||
}
|
||||
mod.keyLayout = args[1]
|
||||
mod.scriptPath = args[2]
|
||||
return nil
|
||||
})
|
||||
|
||||
inject.Complete("hid.inject", s.HIDCompleter)
|
||||
|
||||
mod.AddHandler(inject)
|
||||
|
||||
mod.parser = DuckyParser{mod}
|
||||
mod.selector = utils.ViewSelectorFor(&mod.SessionModule, "hid.show", []string{"mac", "seen"}, "mac desc")
|
||||
|
||||
return mod
|
||||
}
|
||||
|
||||
func (mod HIDRecon) Name() string {
|
||||
return "hid"
|
||||
}
|
||||
|
||||
func (mod HIDRecon) Description() string {
|
||||
return "A scanner and frames injection module for HID devices on the 2.4Ghz spectrum, using Nordic Semiconductor nRF24LU1+ based USB dongles and Bastille Research RFStorm firmware."
|
||||
}
|
||||
|
||||
func (mod HIDRecon) Author() string {
|
||||
return "Simone Margaritelli <evilsocket@gmail.com> (this module and the nrf24 client library), Bastille Research (the rfstorm firmware and original research), phikshun and infamy for JackIt."
|
||||
}
|
||||
|
||||
func (mod *HIDRecon) Configure() error {
|
||||
var err error
|
||||
|
||||
if err, mod.useLNA = mod.BoolParam("hid.lna"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if mod.dongle, err = nrf24.Open(); err != nil {
|
||||
return fmt.Errorf("make sure that a nRF24LU1+ based USB dongle is connected and running the rfstorm firmware: %s", err)
|
||||
}
|
||||
|
||||
mod.Debug("using device %s", mod.dongle.String())
|
||||
|
||||
if mod.useLNA {
|
||||
if err = mod.dongle.EnableLNA(); err != nil {
|
||||
return fmt.Errorf("make sure your device supports LNA, otherwise set hid.lna to false and retry: %s", err)
|
||||
}
|
||||
mod.Debug("LNA enabled")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mod *HIDRecon) doHopping() {
|
||||
if mod.inPromMode == false {
|
||||
if err := mod.dongle.EnterPromiscMode(); err != nil {
|
||||
|
|
@ -243,11 +95,3 @@ func (mod *HIDRecon) Start() error {
|
|||
mod.Debug("stopped")
|
||||
})
|
||||
}
|
||||
|
||||
func (mod *HIDRecon) Stop() error {
|
||||
return mod.SetRunning(false, func() {
|
||||
mod.waitGroup.Wait()
|
||||
mod.dongle.Close()
|
||||
mod.Debug("device closed")
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package hid
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/bettercap/bettercap/network"
|
||||
|
|
@ -14,6 +15,10 @@ func (mod *HIDRecon) isSniffing() bool {
|
|||
}
|
||||
|
||||
func (mod *HIDRecon) setSniffMode(mode string) error {
|
||||
if !mod.Running() {
|
||||
return fmt.Errorf("please turn hid.recon on")
|
||||
}
|
||||
|
||||
mod.sniffLock.Lock()
|
||||
defer mod.sniffLock.Unlock()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue