bully: improve the old bully

Author: kimocoder

wifite/tools/bully.py

@@ -20,10 +20,16 @@ class Bully(Attack, Dependency):
     dependency_name = 'bully'
     dependency_url = 'https://github.com/kimocoder/bully'
 
-    def __init__(self, target2, target3, pixie_dust=True):
-        super().__init__(target3)
+    def __init__(self, target2, target3=None, pixie_dust=True):
+        # Backward compatibility: if only one target is passed
+        if target3 is None:
+            super().__init__(target2)
+            self.target = target2
+        else:
+            super().__init__(target3)
+            self.target = target2
+
         self.pid = None
-        self.target = target2
         self.pixie_dust = pixie_dust
 
         self.total_attempts = 0
@@ -42,21 +48,14 @@ def __init__(self, target2, target3, pixie_dust=True):
         self.cmd = []
 
         if Process.exists('stdbuf'):
-            self.cmd.extend([
-                'stdbuf', '-o0'  # No buffer. See https://stackoverflow.com/a/40453613/7510292
-            ])
+            self.cmd.extend(['stdbuf', '-o0'])
 
+        # Build Bully command
         self.cmd.extend([
             'bully',
-            '--bssid', target2.bssid,
-            '--channel', target2.channel,
-            # '--detectlock', # Detect WPS lockouts unreported by AP
-
-            # Restoring session from '/root/.bully/34210901927c.run'
-            # WARNING: WPS checksum was bruteforced in prior session, now autogenerated
-            # Use --force to ignore above warning(s) and continue anyway
+            '--bssid', self.target.bssid,
+            '--channel', self.target.channel,
             '--force',
-
             '-v', '4',
             Configuration.interface
         ])
@@ -66,6 +65,7 @@ def __init__(self, target2, target3, pixie_dust=True):
 
         self.bully_proc = None
 
+
     def run(self):
         with Airodump(channel=self.target.channel,
                       target_bssid=self.target.bssid,