From 44391125c2097656d5af9f66ff348e08a42e904f Mon Sep 17 00:00:00 2001 From: alexmozzhakov Date: Tue, 27 Feb 2018 09:23:38 +0200 Subject: [PATCH 1/2] Join options for autocomplete --- session/session.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/session/session.go b/session/session.go index 990db53d..1f5a916c 100644 --- a/session/session.go +++ b/session/session.go @@ -187,7 +187,11 @@ func (s *Session) setupReadline() error { tree[name] = []string{} } - tree[name] = append(tree[name], parts[1:]...) + var appendedOption = strings.Join(parts[1:], " ") + + if len(appendedOption) > 0 { + tree[name] = append(tree[name], appendedOption) + } } } From fca3e29b0688879b30389cee6612a9f418c62153 Mon Sep 17 00:00:00 2001 From: alexmozzhakov Date: Tue, 27 Feb 2018 09:24:12 +0200 Subject: [PATCH 2/2] Fix arp.spoof incorrect handling --- modules/arp_spoof.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/arp_spoof.go b/modules/arp_spoof.go index 7abb5ec0..0060fd2b 100644 --- a/modules/arp_spoof.go +++ b/modules/arp_spoof.go @@ -50,7 +50,13 @@ func NewArpSpoofer(s *session.Session) *ArpSpoofer { return p.Start() })) - p.AddHandler(session.NewModuleHandler("arp.spoof/ban off", "arp\\.(spoof|ban) off", + p.AddHandler(session.NewModuleHandler("arp.spoof off", "", + "Stop ARP spoofer.", + func(args []string) error { + return p.Stop() + })) + + p.AddHandler(session.NewModuleHandler("arp.ban off", "", "Stop ARP spoofer.", func(args []string) error { return p.Stop()