Cleaning up imports, fixing a few bugs.

wifite/attack/wep.py

@@ -34,6 +34,7 @@ class AttackWEP(Attack):
         aircrack = None # Aircrack process, not started yet
         fakeauth_proc = None
         replay_file = None
+        airodump_target = None
 
         attacks_remaining = list(Configuration.wep_attacks)
         while len(attacks_remaining) > 0:
@@ -245,6 +246,9 @@ class AttackWEP(Attack):
             Ask user what attack to perform next (re-orders attacks_remaining, returns False),
             or if we should stop attacking this target (returns True).
         '''
+        if target is None:
+            Color.pl("")
+            return True
         target_name = target.essid if target.essid_known else target.bssid
 
         Color.pl("\n\n{!} {O}Interrupted")
@@ -322,9 +326,11 @@ class AttackWEP(Attack):
 
 
 if __name__ == '__main__':
-    from Target import Target
+    Configuration.initialize(True)
+    from ..model.target import Target
     fields = "A4:2B:8C:16:6B:3A, 2015-05-27 19:28:44, 2015-05-27 19:28:46,  6,  54e,WEP, WEP, , -58,        2,        0,   0.  0.  0.  0,   9, Test Router Please Ignore, ".split(',')
     target = Target(fields)
     wep = AttackWEP(target)
     wep.run()
+    Configuration.exit_gracefully(0)
 

wifite/attack/wpa.py

@@ -293,8 +293,14 @@ class AttackWPA(Attack):
             Aireplay.deauth(target.bssid, client_mac=client, timeout=2)
 
 if __name__ == '__main__':
-    from Target import Target
+    Configuration.initialize(True)
+    from ..model.target import Target
     fields = "A4:2B:8C:16:6B:3A, 2015-05-27 19:28:44, 2015-05-27 19:28:46,  11,  54e,WPA, WPA, , -58,        2,        0,   0.  0.  0.  0,   9, Test Router Please Ignore, ".split(',')
     target = Target(fields)
     wpa = AttackWPA(target)
-    wpa.run()
+    try:
+        wpa.run()
+    except KeyboardInterrupt:
+        Color.pl("")
+        pass
+    Configuration.exit_gracefully(0)