kayos/zgrab2
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

order modules to run in specified order from .ini

Browse Source
This commit is contained in:
Alex 2017-08-30 15:47:39 -04:00
parent bd8dcd9b7b
commit 23a4636c34
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interface.go
View File

@ -37,6 +37,7 @@ func (b *BaseModule) SetDefaultPortAndName(cmd *flags.Command, port uint, name s
} }
var modules map[string]*Module var modules map[string]*Module
var orderedModules []string
func init() { func init() {
modules = make(map[string]*Module) modules = make(map[string]*Module)
@ -47,6 +48,6 @@ func RegisterModule(name string, m Module) {
if modules[name] != nil { if modules[name] != nil {
log.Fatal("name already used") log.Fatal("name already used")
} }
orderedModules = append(orderedModules, name)
modules[name] = &m modules[name] = &m
} }

3
processing.go
View File

@ -32,7 +32,8 @@ type ModuleResponse struct {
func grabTarget(input target, m *Monitor) []byte { func grabTarget(input target, m *Monitor) []byte {
moduleResult := make(map[string]ModuleResponse) moduleResult := make(map[string]ModuleResponse)
for _, action := range modules { for _, moduleName := range orderedModules {
action := modules[moduleName]
name, res := runHandler(*action, m, input.IP) name, res := runHandler(*action, m, input.IP)
moduleResult[name] = res moduleResult[name] = res
if res.Error != nil && !config.Multiple.ContinueOnError { if res.Error != nil && !config.Multiple.ContinueOnError {