Detect when AP has WPS Locked, show in target list

wifite/attack/all.py

@@ -54,7 +54,7 @@ class AttackAll(object):
             # WPA can have multiple attack vectors:
 
             # WPS
-            if target.wps:
+            if target.wps != False:
                 if Configuration.wps_pixie:
                     attacks.append(AttackWPS(target, pixie_dust=True))
                 if Configuration.wps_pin:

wifite/attack/pmkid.py

@@ -62,8 +62,8 @@ class AttackPMKID(Attack):
         Returns:
             True if handshake is captured. False otherwise.
         '''
-        # Skip if user only wants to run PixieDust attack
-        if Configuration.wps_only and self.target.wps:
+        # Skip if user only wants to attack WPS targets
+        if Configuration.wps_only and self.target.wps == False:
             Color.pl('\r{!} {O}Skipping PMKID attack on {R}%s{O} because {R}--wps-only{O} is set{W}' % self.target.essid)
             self.success = False
             return False

wifite/attack/wpa.py

@@ -27,15 +27,17 @@ class AttackWPA(Attack):
     def run(self):
         '''Initiates full WPA handshake capture attack.'''
 
-        if Configuration.use_pmkid_only:
-            self.success = False
-            return False
-        # Skip if user only wants to run PixieDust attack
-        if Configuration.wps_only and self.target.wps:
+        # Skip if target is not WPS
+        if Configuration.wps_only and self.target.wps == False:
             Color.pl('\r{!} {O}Skipping WPA-Handshake attack on {R}%s{O} because {R}--wps-only{O} is set{W}' % self.target.essid)
             self.success = False
             return self.success
 
+        # Skip if user only wants to run PMKID attack
+        if Configuration.use_pmkid_only:
+            self.success = False
+            return False
+
         # Capture the handshake (or use an old one)
         handshake = self.capture_handshake()