diff --git a/caplets/ap.cap b/caplets/ap.cap new file mode 100644 index 00000000..7ff95390 --- /dev/null +++ b/caplets/ap.cap @@ -0,0 +1,17 @@ +set api.rest.username changeme +set api.rest.password changeme +set api.rest.address 0.0.0.0 + +set net.sniff.local true +set net.sniff.verbose false +set net.sniff.filter not arp and not udp port 53 + +events.stream off +events.clear + +set events.stream.filter target. +events.stream on + +net.recon on +api.rest on +net.sniff on diff --git a/modules/api_rest.go b/modules/api_rest.go index ca512505..83ca9c09 100644 --- a/modules/api_rest.go +++ b/modules/api_rest.go @@ -98,7 +98,7 @@ func (api *RestAPI) Configure() error { var address string var port int - if err, address = api.StringParam("api.rest.addr"); err != nil { + if err, address = api.StringParam("api.rest.address"); err != nil { return err } else if err, port = api.IntParam("api.rest.port"); err != nil { return err diff --git a/session/module.go b/session/module.go index cc650c62..e05a7e0a 100644 --- a/session/module.go +++ b/session/module.go @@ -1,6 +1,9 @@ package session -import "sync" +import ( + "fmt" + "sync" +) type Module interface { Name() string @@ -51,18 +54,27 @@ func (m *SessionModule) Param(name string) *ModuleParam { } func (m SessionModule) StringParam(name string) (error, string) { - if err, v := m.params[name].Get(m.Session); err != nil { - return err, "" + if p, found := m.params[name]; found == true { + if err, v := p.Get(m.Session); err != nil { + return err, "" + } else { + return nil, v.(string) + } } else { - return nil, v.(string) + return fmt.Errorf("Parameter %s does not exist.", name), "" } } func (m SessionModule) IntParam(name string) (error, int) { - if err, v := m.params[name].Get(m.Session); err != nil { - return err, 0 + if p, found := m.params[name]; found == true { + if err, v := p.Get(m.Session); err != nil { + return err, 0 + } else { + return nil, v.(int) + } + } else { - return nil, v.(int) + return fmt.Errorf("Parameter %s does not exist.", name), 0 } }