github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-06 04:52:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refact: refactored commands parsing code into session.ParseCommands function

Browse source
This commit is contained in:
evilsocket 2018-01-23 20:20:54 +01:00
parent d7672f7ab7
commit 7eebea30d0
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
main.go
View file

@ -3,7 +3,6 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"strings"
"github.com/evilsocket/bettercap-ng/core" "github.com/evilsocket/bettercap-ng/core"
"github.com/evilsocket/bettercap-ng/log" "github.com/evilsocket/bettercap-ng/log"
@ -50,12 +49,9 @@ func main() {
} }
} }
if *sess.Options.Commands != "" { for _, cmd := range session.ParseCommands(*sess.Options.Commands) {
for _, cmd := range strings.Split(*sess.Options.Commands, ";") { if err = sess.Run(cmd); err != nil {
cmd = strings.Trim(cmd, "\r\n\t ") log.Fatal("%s", err)
if err = sess.Run(cmd); err != nil {
log.Fatal("%s", err)
}
} }
} }
@ -69,8 +65,7 @@ func main() {
continue continue
} }
for _, cmd := range strings.Split(line, ";") { for _, cmd := range session.ParseCommands(line) {
cmd = strings.Trim(cmd, "\r\n\t ")
if err = sess.Run(cmd); err != nil { if err = sess.Run(cmd); err != nil {
log.Error("%s", err) log.Error("%s", err)
} }

11
session/session.go
View file

@ -46,6 +46,17 @@ type Session struct {
Events *EventPool `json:"-"` Events *EventPool `json:"-"`
} }
func ParseCommands(buffer string) []string {
cmds := make([]string, 0)
for _, cmd := range strings.Split(buffer, ";") {
cmd = strings.Trim(cmd, "\r\n\t ")
if cmd != "" {
cmds = append(cmds, cmd)
}
}
return cmds
}
func New() (*Session, error) { func New() (*Session, error) {
var err error var err error