From 711804afeb61d160e01391d699ea22aa6a627d21 Mon Sep 17 00:00:00 2001 From: kayos Date: Sun, 30 May 2021 20:16:03 -0700 Subject: [PATCH] added CLI flag for loading JSON manufacturer data --- main.go | 12 ++++++++++-- src/dust/banner.go | 2 -- src/eros/eros.go | 6 ++---- src/vars/projVars.go | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index ae8336d..4eb8e2a 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "github.com/rs/zerolog/log" ) +// ScanMgr will keep track of concurrently running scans var ScanMgr *scanStuff.Meta func listen() { @@ -31,6 +32,10 @@ func listen() { if *projVars.TFlag { projVars.TrackingMode = true } + + if *projVars.MFlag != "0" { + projVars.ManuFile = *projVars.MFlag + } } func obey() { @@ -53,7 +58,6 @@ func init() { dust.PrintBanner() - ScanMgr = &scanStuff.Meta{ Count: 0, Scans: make(map[int]*scanStuff.Scan), @@ -91,8 +95,12 @@ func init() { // see ./src/eros log.Debug().Msg("Initializing database engine") + eros.Awaken() - eros.ManufLoad() + + if *projVars.MFlag != "0" { + eros.ManufLoad() + } } func main() { diff --git a/src/dust/banner.go b/src/dust/banner.go index 2987a1c..bdc434d 100644 --- a/src/dust/banner.go +++ b/src/dust/banner.go @@ -2,8 +2,6 @@ package dust import "fmt" - func PrintBanner() { fmt.Println(b64d("
               [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄[90;40m▄[36;40m [0m[0m  [96;40m▄▄▄▄▄▄▄▄▄▄[36;40m▄[90;40m▄[36;40m [0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [0m
               [96;40m█[36;40m█▀┼┼┼┼[90;40m┼[36;40m┼▀[96;46m▀[96;40m▄[0m[0m  [96;40m█┼┼[36;40m┼┼[90;40m┼┼┼[36;40m┼▀[96;46m▀▄[90;46m▀[0m[0m  [96;40m█[36;40m█▀┼┼[90;40m┼┼┼[36;40m┼┼▀█[96;40m█[0m[0m  [96;40m█[36;40m█▀┼[90;40m┼┼┼┼┼┼[36;40m┼┼▐[96;40m█[0m[0m  [96;40m█[36;40m█▀┼┼[90;40m┼┼┼[36;40m┼┼▀█[96;40m█[0m[0m  [0m
               [96;40m█[36;40m▌┼[90;40m┼┼[96;46m▄[96;40m▀[96;46m▄[36;40m┼[90;40m┼[36;40m┼[96;40m█[0m[0m  [96;40m█┼[36;40m┼┼┼[96;46m▄[96;40m▀[96;46m▄[36;40m┼┼[90;40m┼[96;46m░[96;40m█[0m[0m  [96;40m█[36;40m▌┼┼┼[96;46m▄[96;40m▀[96;46m▄[36;40m┼┼[90;40m┼[36;40m▐[96;40m█[0m[0m  [96;40m█[36;40m▌┼┼┼[90;40m┼┼┼┼[36;40m┼┼▄█[96;40m█[0m[0m  [96;40m█[36;40m▌┼┼┼[96;46m▄[96;40m▀[96;46m▄[36;40m┼┼[90;40m┼[36;40m▐[96;40m█[0m[0m  [0m
               [96;40m█[36;40m┼[90;40m┼┼┼[36;40m▀[96;40m▀[36;40m▀[90;40m┼┼[36;40m┼[96;40m█[0m[0m  [96;40m█[36;40m┼┼[90;40m┼┼[36;40m▀[96;40m▀[36;40m▀┼[90;40m┼[96;46m▄▀[90;40m▀[0m[0m  [96;40m█[36;40m┼┼[90;40m┼┼[96;46m▓[36;40m [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;40m█[0m[0m  [36;40m▀[96;40m▀▀▀█[36;40m┼[90;40m┼┼[36;40m┼[96;40m█▀▀▀[36;40m▀[0m[0m  [96;40m█[36;40m┼┼[90;40m┼┼[96;46m▓[36;40m [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;40m█[0m[0m  [0m
               [96;46m▓[36;40m┼[90;40m┼[36;40m┼┼┼[90;40m┼[36;40m┼┼┼[96;40m▄▀[0m[0m  [96;46m▓[36;40m┼[90;40m┼┼┼[96;46m▓[96;40m▄[36;40m┼[90;40m┼┼[36;40m▀[96;46m▀[90;46m▀[0m[0m  [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;46m▒[36;40m [96;46m▒[90;40m┼┼[36;40m┼┼[96;46m▓[0m[0m  [36;40m    [96;46m▓[36;40m┼┼[90;40m┼[36;40m┼[96;46m▓[36;40m    [0m[0m  [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;46m▒[36;40m [96;46m▒[90;40m┼┼[36;40m┼┼[96;46m▓[0m[0m  [0m
               [96;46m▒[36;40m▌[90;40m┼[36;40m┼┼[96;46m▓[96;40m▀▀▀▀[90;40m▀[36;40m [0m[0m  [96;46m▒[96;40m┼[36;40m┼[90;40m┼[36;40m┼[96;46m▒[36;40m [96;46m▓[36;40m┼[90;40m┼[36;40m┼▓[96;46m▓[0m[0m  [96;46m▒[36;40m▌┼[90;40m┼[36;40m┼[96;46m░[36;40m▄[96;46m░[36;40m┼[90;40m┼[36;40m┼▐[96;46m▒[0m[0m  [36;40m    [96;46m▒[36;40m▌┼┼┼[96;46m▒[36;40m    [0m[0m  [96;46m▒[36;40m▌┼[90;40m┼[36;40m┼[96;46m░[36;40m▄[96;46m░[36;40m┼[90;40m┼[36;40m┼▐[96;46m▒[0m[0m  [0m
               [96;46m░[36;40m█▄┼▐[96;46m▒[36;40m      [0m[0m  [96;46m░[96;40m┼┼[36;40m┼┼[96;46m░[36;40m [96;46m▒[36;40m┼┼▄█[96;46m▒[0m[0m  [96;46m░[36;40m█▄┼┼[90;40m┼┼┼[36;40m┼┼▄█[96;46m░[0m[0m  [36;40m    [96;46m░[36;40m█▄┼┼[96;46m░[36;40m    [0m[0m  [96;46m░[36;40m█▄┼┼[90;40m┼┼┼[36;40m┼┼▄█[96;46m░[0m[0m  [0m
               [36;40m▀▀▀▀▀▀      [0m[0m  [36;40m▀▀▀▀▀▀ ▀▀▀▀▀[90;40m▀[0m[0m  [90;40m▀[36;40m▀▀▀▀▀▀▀▀▀▀▀[90;40m▀[0m[0m  [36;40m    ▀▀▀▀▀▀    [0m[0m  [90;40m▀[36;40m▀▀▀▀▀▀▀▀▀▀▀[90;40m▀[0m[0m  [0m


[36;40m▄[96;40m▄▄▄▄▄▄[36;40m▄[90;40m▄[36;40m [90;40m▄[96;40m▄▄▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄[36;40m▄     [0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄[36;40m▄ ▄[96;40m▄▄▄▄[36;40m▄[0m[0m  [36;40m▄[96;40m▄▄▄▄[36;40m▄     [0m[0m  [36;40m▄[96;40m▄▄▄▄▄▄▄▄▄[36;40m▄[0m[0m  [0m
[96;40m█[36;40m█▀┼┼[90;40m┼┼▀[90;46m▄[96;46m▀[90;46m▄[36;40m▀[90;40m┼[36;40m┼┼▀█[96;40m█[0m[0m  [96;40m█[36;40m█▀┼┼[90;40m┼┼┼[36;40m┼┼▀█[96;40m█[0m[0m  [96;40m█[36;40m█▀┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m█▀┼┼[90;40m┼[36;40m┼┼┼[90;40m┼[96;40m█[0m[0m  [96;40m█[36;40m█▀┼┼[90;40m┼[36;40m┼┼┼[90;40m┼[96;40m█[0m[0m  [96;40m█[36;40m█▀┼┼[96;40m█[36;40m [96;40m█[36;40m┼┼▀█[96;40m█[0m[0m  [96;40m█[36;40m█▀┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m█▀┼┼[90;40m┼[36;40m┼┼┼[90;40m┼[96;40m█[0m[0m  [0m
[96;40m█[36;40m▌┼┼┼[96;46m▄[96;40m▀[96;46m▄[36;40m┼ ▄[96;40m▀[96;46m▄[36;40m┼┼[90;40m┼[36;40m▐[96;40m█[0m[0m  [96;40m█[36;40m▌┼┼┼[96;46m▄[96;40m▀[96;46m▄[36;40m┼┼[90;40m┼[36;40m▐[96;40m█[0m[0m  [96;40m█[36;40m▌┼[90;40m┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m▌┼[90;40m┼┼[96;46m▄[96;40m▀▀▀▀[36;40m▀[0m[0m  [96;40m█[36;40m▌┼[90;40m┼┼[96;46m▄[96;40m▀▀▀▀[36;40m▀[0m[0m  [96;40m█[36;40m▌┼┼┼[96;40m█[36;40m [96;40m█[36;40m┼┼[90;40m┼[36;40m▐[96;40m█[0m[0m  [96;40m█[36;40m▌┼[90;40m┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m▌┼[90;40m┼┼[96;46m▄[96;40m▀▀▀▀[36;40m▀[0m[0m  [0m
[96;40m█[36;40m┼┼[90;40m┼┼[96;46m▓[36;40m [96;46m▓[36;40m┼┼[96;40m█[36;40m [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;40m█[0m[0m  [96;40m█[36;40m┼┼[90;40m┼┼[96;46m▓[36;40m [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;40m█[0m[0m  [96;40m█[36;40m┼[90;40m┼┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m┼[90;40m┼┼┼[96;40m█▄▄▄▄[36;40m [0m[0m  [96;40m█[36;40m┼[90;40m┼┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m┼┼[90;40m┼┼[96;46m▓[36;40m [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;40m█[0m[0m  [96;40m█[36;40m┼[90;40m┼┼┼[96;40m█[36;40m     [0m[0m  [96;40m█[36;40m┼[90;40m┼┼┼[96;40m█▄▄▄▄[36;40m [0m[0m  [0m
[96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;46m▒[36;40m [96;46m▒[90;40m┼[36;40m┼[96;46m▓[36;40m [96;46m▒[90;40m┼┼[36;40m┼┼[96;46m▓[0m[0m  [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;46m▒[36;40m [96;46m▒[90;40m┼┼[36;40m┼┼[96;46m▓[0m[0m  [96;46m▓[36;40m┼[90;40m┼┼┼[96;40m█[36;40m     [0m[0m  [96;46m▓[36;40m┼[90;40m┼┼┼[96;40m█▀▀▀▀[36;40m [0m[0m  [96;46m▓[36;40m┼[90;40m┼┼┼[96;40m█[36;40m     [0m[0m  [96;46m▓[36;40m┼[90;40m┼┼[36;40m┼[96;46m▒[36;40m [96;46m▒[90;40m┼┼[36;40m┼┼[96;46m▓[0m[0m  [96;46m▓[36;40m┼[90;40m┼┼┼[96;40m█[36;40m     [0m[0m  [96;46m▓[36;40m┼[90;40m┼┼┼[96;40m█▀▀▀▀[36;40m [0m[0m  [0m
[96;46m▒[36;40m▌┼[90;40m┼[36;40m┼[96;46m░[36;40m [96;46m░[36;40m┼▐[96;46m▒[36;40m [96;46m░[36;40m┼[90;40m┼[36;40m┼▐[96;46m▒[0m[0m  [96;46m▒[36;40m▌┼[90;40m┼[36;40m┼[96;46m░[36;40m▄[96;46m░[36;40m┼[90;40m┼[36;40m┼▐[96;46m▒[0m[0m  [96;46m▒[36;40m▌[90;40m┼┼┼[96;46m▀[96;40m▄▄▄▄[36;40m▄[0m[0m  [96;46m▒[36;40m▌[90;40m┼┼┼[96;46m▀[96;40m▄▄▄▄[36;40m▄[0m[0m  [96;46m▒[36;40m▌[90;40m┼┼┼[96;46m▀[96;40m▄▄▄▄[36;40m▄[0m[0m  [96;46m▒[36;40m▌┼[90;40m┼[36;40m┼[96;46m░[36;40m▄[96;46m░[36;40m┼[90;40m┼[36;40m┼▐[96;46m▒[0m[0m  [96;46m▒[36;40m▌[90;40m┼┼┼[96;46m▀[96;40m▄▄▄▄[36;40m▄[0m[0m  [96;46m▒[36;40m▌[90;40m┼┼┼[96;46m▀[96;40m▄▄▄▄[36;40m▄[0m[0m  [0m
[96;46m░[36;40m█▄┼┼[96;46m░[36;40m [96;46m░[36;40m┼█[96;46m░[36;40m [96;46m░[36;40m┼┼▄█[96;46m░[0m[0m  [96;46m░[36;40m█▄┼┼[90;40m┼┼┼[36;40m┼┼▄█[96;46m░[0m[0m  [96;46m░[36;40m█▄┼[90;40m┼┼[36;40m┼┼[90;40m┼[36;40m┼[96;46m▒[0m[0m  [96;46m░[36;40m█▄┼[90;40m┼┼[36;40m┼┼[90;40m┼[36;40m┼[96;46m▒[0m[0m  [96;46m░[36;40m█▄┼[90;40m┼┼[36;40m┼┼[90;40m┼[36;40m┼[96;46m▒[0m[0m  [96;46m░[36;40m█▄┼┼[90;40m┼┼┼[36;40m┼┼▄█[96;46m░[0m[0m  [96;46m░[36;40m█▄┼[90;40m┼┼[36;40m┼┼[90;40m┼[36;40m┼[96;46m▒[0m[0m  [96;46m░[36;40m█▄┼[90;40m┼┼[36;40m┼┼[90;40m┼[36;40m┼[96;46m▒[0m[0m  [0m
[90;40m▀[36;40m▀▀▀▀[90;40m▀[36;40m [90;40m▀[36;40m▀▀[90;40m▀[36;40m [90;40m▀[36;40m▀▀▀▀[90;40m▀[0m[0m  [90;40m▀[36;40m▀▀▀▀▀▀▀▀▀▀▀[90;40m▀[0m[0m  [36;40m▀▀▀▀▀▀▀▀▀▀▀[0m[0m  [36;40m▀▀▀▀▀▀▀▀▀▀▀[0m[0m  [36;40m▀▀▀▀▀▀▀▀▀▀▀[0m[0m  [90;40m▀[36;40m▀▀▀▀▀▀▀▀▀▀▀[90;40m▀[0m[0m  [36;40m▀▀▀▀▀▀▀▀▀▀▀[0m[0m  [36;40m▀▀▀▀▀▀▀▀▀▀▀[0m[0m  [0m

")) } - diff --git a/src/eros/eros.go b/src/eros/eros.go index f772304..87d9ae0 100644 --- a/src/eros/eros.go +++ b/src/eros/eros.go @@ -34,10 +34,9 @@ var ( // serviceDb will hold definitions of various bluetook services and will ultimately be updated via an HTTP repository serviceDb *bitcask.Bitcask - err error + err error Manufacturers ManufData - // DataDir - should be defined by config or cmd flag DataDir string = "./.eros-data/" ) @@ -114,11 +113,10 @@ type Payload struct { // placeholder } - // Ingest UUID will add the UUID to the manufacturer if it doesn't already exist func (manuf *Manufacturer) IngestUUID(uuid bluetooth.UUID) bool { - contains := func (s []bluetooth.UUID, v bluetooth.UUID) bool { + contains := func(s []bluetooth.UUID, v bluetooth.UUID) bool { for _, a := range s { if a == v { return true diff --git a/src/vars/projVars.go b/src/vars/projVars.go index 3b13bfa..862fe22 100644 --- a/src/vars/projVars.go +++ b/src/vars/projVars.go @@ -44,6 +44,7 @@ var AttackAdapter = bluetooth.DefaultAdapter var DFlag = flag.Bool("d", false, "global debug logging and pretty printing") var AFlag = flag.Bool("a", false, "attack mode") var TFlag = flag.Bool("t", false, "device tracking mode") +var MFlag = flag.String("m", "0", "json file with manufacturer identifying data to preload into eros") //flag.Parse()