fix: commands passed with -eval are executed after modules in autostart are activated

This commit is contained in:
evilsocket 2019-02-15 13:59:21 +01:00
commit 6980b864f5
No known key found for this signature in database
GPG key ID: 1564D7F30393A456

20
main.go
View file

@ -42,28 +42,28 @@ func main() {
log.Fatal("%s", err) log.Fatal("%s", err)
} }
// Some modules are enabled by default in order
// to make the interactive session useful.
for _, modName := range str.Comma(*sess.Options.AutoStart) {
if err = sess.Run(modName + " on"); err != nil {
log.Fatal("error while starting module %s: %s", modName, err)
}
}
// Commands sent with -eval are used to set specific // Commands sent with -eval are used to set specific
// caplet parameters (i.e. arp.spoof.targets) via command // caplet parameters (i.e. arp.spoof.targets) via command
// line, therefore they need to be executed first otherwise // line, therefore they need to be executed first otherwise
// modules might already be started. // modules might already be started.
for _, cmd := range session.ParseCommands(*sess.Options.Commands) { for _, cmd := range session.ParseCommands(*sess.Options.Commands) {
if err = sess.Run(cmd); err != nil { if err = sess.Run(cmd); err != nil {
log.Error("Error while running '%s': %s", tui.Bold(cmd), tui.Red(err.Error())) log.Error("error while running '%s': %s", tui.Bold(cmd), tui.Red(err.Error()))
}
}
// Some modules are enabled by default in order
// to make the interactive session useful.
for _, modName := range str.Comma(*sess.Options.AutoStart) {
if err = sess.Run(modName + " on"); err != nil {
log.Fatal("Error while starting module %s: %s", modName, err)
} }
} }
// Then run the caplet if specified. // Then run the caplet if specified.
if *sess.Options.Caplet != "" { if *sess.Options.Caplet != "" {
if err = sess.RunCaplet(*sess.Options.Caplet); err != nil { if err = sess.RunCaplet(*sess.Options.Caplet); err != nil {
log.Error("Error while running caplet %s: %s", tui.Bold(*sess.Options.Caplet), tui.Red(err.Error())) log.Error("error while running caplet %s: %s", tui.Bold(*sess.Options.Caplet), tui.Red(err.Error()))
} }
} }