From 885d464a266ea02809733615ad3b5cc20c7d7b39 Mon Sep 17 00:00:00 2001 From: byt3bl33d3r Date: Thu, 9 Oct 2014 22:21:17 +0200 Subject: [PATCH] fixed "or" statements when parsing config file arguments --- plugins/BeefAutorun.py | 2 +- plugins/FilePwn.py | 2 +- plugins/JavaPwn.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/BeefAutorun.py b/plugins/BeefAutorun.py index 0edbcd9..25a4c9c 100644 --- a/plugins/BeefAutorun.py +++ b/plugins/BeefAutorun.py @@ -23,7 +23,7 @@ class BeefAutorun(Plugin): def initialize(self, options): self.options = options - self.autoruncfg = "./config_files/beefautorun.cfg" or options.autoruncfg + self.autoruncfg = options.autoruncfg or "./config_files/beefautorun.cfg" self.beefip = options.beefip self.beefport = options.beefport self.beefuser = options.beefuser diff --git a/plugins/FilePwn.py b/plugins/FilePwn.py index 08073c4..739afef 100644 --- a/plugins/FilePwn.py +++ b/plugins/FilePwn.py @@ -38,7 +38,7 @@ class FilePwn(Plugin): def initialize(self, options): '''Called if plugin is enabled, passed the options namespace''' self.options = options - self.filepwncfg = "./config_files/filepwn.cfg" or options.filepwncfg + self.filepwncfg = options.filepwncfg or "./config_files/filepwn.cfg" self.binaryMimeTypes = ["application/octet-stream", 'application/x-msdownload', 'application/x-msdos-program', 'binary/octet-stream'] diff --git a/plugins/JavaPwn.py b/plugins/JavaPwn.py index d6914cb..02ffd15 100644 --- a/plugins/JavaPwn.py +++ b/plugins/JavaPwn.py @@ -30,7 +30,7 @@ class JavaPwn(BrowserProfiler, Plugin): self.msfport = options.msfport self.rpcip = options.rpcip self.rpcpass = options.rpcpass - self.javapwncfg = './config_files/javapwn.cfg' or options.javapwncfg + self.javapwncfg = options.javapwncfg or './config_files/javapwn.cfg' if not self.msfip: sys.exit('[-] JavaPwn plugin requires --msfip')