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

go vet fixes

Browse source
This commit is contained in:
bonedaddy 2020-12-24 17:31:40 -08:00
parent 8acf81f61d
commit 05b8e3065e
No known key found for this signature in database
GPG key ID: 5386234333106B29
6 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/events_stream/events_stream.go
View file

@ -222,15 +222,15 @@ func NewEventsStream(s *session.Session) *EventsStream {
return mod return mod
} }
func (mod EventsStream) Name() string { func (mod *EventsStream) Name() string {
return "events.stream" return "events.stream"
} }
func (mod EventsStream) Description() string { func (mod *EventsStream) Description() string {
return "Print events as a continuous stream." return "Print events as a continuous stream."
} }
func (mod EventsStream) Author() string { func (mod *EventsStream) Author() string {
return "Simone Margaritelli <evilsocket@gmail.com>" return "Simone Margaritelli <evilsocket@gmail.com>"
} }

2
modules/syn_scan/dns_grabber.go
View file

@ -13,7 +13,7 @@ func grabChaos(addr string, q string) string {
c := new(dns.Client) c := new(dns.Client)
m := new(dns.Msg) m := new(dns.Msg)
m.Question = make([]dns.Question, 1) m.Question = make([]dns.Question, 1)
m.Question[0] = dns.Question{q, dns.TypeTXT, dns.ClassCHAOS} m.Question[0] = dns.Question{Name: q, Qtype: dns.TypeTXT, Qclass: dns.ClassCHAOS}
if in, _, _ := c.Exchange(m, addr); in != nil && len(in.Answer) > 0 { if in, _, _ := c.Exchange(m, addr); in != nil && len(in.Answer) > 0 {
s := in.Answer[0].String() s := in.Answer[0].String()
if match := chaosParser.FindStringSubmatch(s); len(match) > 0 { if match := chaosParser.FindStringSubmatch(s); len(match) > 0 {

6
session/command_handler.go
View file

@ -1,13 +1,14 @@
package session package session
import ( import (
"github.com/bettercap/readline"
"regexp" "regexp"
"sync" "sync"
"github.com/bettercap/readline"
) )
type CommandHandler struct { type CommandHandler struct {
sync.Mutex *sync.Mutex
Name string Name string
Description string Description string
Completer *readline.PrefixCompleter Completer *readline.PrefixCompleter
@ -17,6 +18,7 @@ type CommandHandler struct {
func NewCommandHandler(name string, expr string, desc string, exec func(args []string, s *Session) error) CommandHandler { func NewCommandHandler(name string, expr string, desc string, exec func(args []string, s *Session) error) CommandHandler {
return CommandHandler{ return CommandHandler{
Mutex: &sync.Mutex{},
Name: name, Name: name,
Description: desc, Description: desc,
Completer: nil, Completer: nil,

3
session/events.go
View file

@ -38,7 +38,7 @@ func (e Event) Label() string {
} }
type EventPool struct { type EventPool struct {
sync.Mutex *sync.Mutex
debug bool debug bool
silent bool silent bool
@ -48,6 +48,7 @@ type EventPool struct {
func NewEventPool(debug bool, silent bool) *EventPool { func NewEventPool(debug bool, silent bool) *EventPool {
return &EventPool{ return &EventPool{
Mutex: &sync.Mutex{},
debug: debug, debug: debug,
silent: silent, silent: silent,
events: make([]Event, 0), events: make([]Event, 0),

40
session/events_test.go
View file

@ -82,7 +82,7 @@ func TestNewEventPool(t *testing.T) {
func TestEventPool_SetSilent(t *testing.T) { func TestEventPool_SetSilent(t *testing.T) {
type fields struct { type fields struct {
Mutex sync.Mutex Mutex *sync.Mutex
debug bool debug bool
silent bool silent bool
events []Event events []Event
@ -98,32 +98,32 @@ func TestEventPool_SetSilent(t *testing.T) {
}{ }{
{ {
name: "Set silent on non-silent event pool", name: "Set silent on non-silent event pool",
fields: fields{silent: false, debug: false}, fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
{ {
name: "Set silent on silent event pool", name: "Set silent on silent event pool",
fields: fields{silent: true, debug: false}, fields: fields{silent: true, debug: false, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
{ {
name: "Set non-silent on non-silent event pool", name: "Set non-silent on non-silent event pool",
fields: fields{silent: false, debug: false}, fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: false}, args: args{s: false},
}, },
{ {
name: "Set silent on silent event pool", name: "Set silent on silent event pool",
fields: fields{silent: true, debug: false}, fields: fields{silent: true, debug: false, Mutex: &sync.Mutex{}},
args: args{s: false}, args: args{s: false},
}, },
{ {
name: "Set silent on non-silent and debug event pool", name: "Set silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true}, fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
{ {
name: "Set non-silent on non-silent and debug event pool", name: "Set non-silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true}, fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: false}, args: args{s: false},
}, },
} }
@ -146,7 +146,7 @@ func TestEventPool_SetSilent(t *testing.T) {
func TestEventPool_SetDebug(t *testing.T) { func TestEventPool_SetDebug(t *testing.T) {
type fields struct { type fields struct {
Mutex sync.Mutex Mutex *sync.Mutex
debug bool debug bool
silent bool silent bool
events []Event events []Event
@ -164,32 +164,32 @@ func TestEventPool_SetDebug(t *testing.T) {
}{ }{
{ {
name: "Set debug on non-debug event pool", name: "Set debug on non-debug event pool",
fields: fields{silent: false, debug: false}, fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
{ {
name: "Set debug on debug event pool", name: "Set debug on debug event pool",
fields: fields{silent: false, debug: true}, fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
{ {
name: "Set non-debug on non-debug event pool", name: "Set non-debug on non-debug event pool",
fields: fields{silent: false, debug: false}, fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: false}, args: args{s: false},
}, },
{ {
name: "Set non-debug on debug event pool", name: "Set non-debug on debug event pool",
fields: fields{silent: false, debug: true}, fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: false}, args: args{s: false},
}, },
{ {
name: "Set silent on non-silent and debug event pool", name: "Set silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true}, fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
{ {
name: "Set non-silent on non-silent and debug event pool", name: "Set non-silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true}, fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true}, args: args{s: true},
}, },
} }
@ -212,7 +212,7 @@ func TestEventPool_SetDebug(t *testing.T) {
func TestEventPool_Clear(t *testing.T) { func TestEventPool_Clear(t *testing.T) {
type fields struct { type fields struct {
Mutex sync.Mutex Mutex *sync.Mutex
debug bool debug bool
silent bool silent bool
events []Event events []Event
@ -225,11 +225,11 @@ func TestEventPool_Clear(t *testing.T) {
}{ }{
{ {
name: "Clear events on empty list", name: "Clear events on empty list",
fields: fields{debug: false, silent: false, events: []Event{}}, fields: fields{debug: false, silent: false, events: []Event{}, Mutex: &sync.Mutex{}},
}, },
{ {
name: "Clear events", name: "Clear events",
fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}}, fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}, Mutex: &sync.Mutex{}},
}, },
} }
for _, tt := range tests { for _, tt := range tests {
@ -251,7 +251,7 @@ func TestEventPool_Clear(t *testing.T) {
func TestEventPool_Add(t *testing.T) { func TestEventPool_Add(t *testing.T) {
type fields struct { type fields struct {
Mutex sync.Mutex Mutex *sync.Mutex
debug bool debug bool
silent bool silent bool
events []Event events []Event
@ -268,12 +268,12 @@ func TestEventPool_Add(t *testing.T) {
}{ }{
{ {
name: "Add event with nil data on empty event list", name: "Add event with nil data on empty event list",
fields: fields{debug: false, silent: false, events: []Event{}}, fields: fields{debug: false, silent: false, events: []Event{}, Mutex: &sync.Mutex{}},
args: args{tag: "tag with empty data", data: nil}, args: args{tag: "tag with empty data", data: nil},
}, },
{ {
name: "Add event with nil data", name: "Add event with nil data",
fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}}, fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}, Mutex: &sync.Mutex{}},
args: args{tag: "tag with empty data", data: nil}, args: args{tag: "tag with empty data", data: nil},
}, },
} }

3
session/module_handler.go
View file

@ -19,7 +19,7 @@ const (
) )
type ModuleHandler struct { type ModuleHandler struct {
sync.Mutex *sync.Mutex
Name string Name string
Description string Description string
@ -30,6 +30,7 @@ type ModuleHandler struct {
func NewModuleHandler(name string, expr string, desc string, exec func(args []string) error) ModuleHandler { func NewModuleHandler(name string, expr string, desc string, exec func(args []string) error) ModuleHandler {
h := ModuleHandler{ h := ModuleHandler{
Mutex: &sync.Mutex{},
Name: name, Name: name,
Description: desc, Description: desc,
Parser: nil, Parser: nil,