alexandre/wifite2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaning up arguments and help message

Browse Source
This commit is contained in:
derv82
2016-04-17 17:26:20 -04:00
parent 8b5f5ce3f4
commit 8381fed1ea
3 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Wifite.py
View File

@@ -29,19 +29,6 @@ class Wifite(object):
elif Configuration.check_handshake: elif Configuration.check_handshake:
self.check_handshake(Configuration.check_handshake) self.check_handshake(Configuration.check_handshake)
elif Configuration.crack_wpa:
# TODO: Crack .cap file at crack_wpa
Color.pl('{!} Unimplemented method: crack_wpa')
pass
elif Configuration.crack_wep:
# TODO: Crack .cap file at crack_wep
Color.pl('{!} Unimplemented method: crack_wep')
pass
elif Configuration.update:
# TODO: Get latest version from github
Color.pl('{!} Unimplemented method: update')
pass
else: else:
Configuration.get_interface() Configuration.get_interface()
self.run() self.run()

101
py/Arguments.py
View File

@@ -28,6 +28,7 @@ class Arguments(object):
metavar='[channel]', metavar='[channel]',
type=int, type=int,
help=Color.s('Wireless channel to scan (default: {G}all channels{W})')) help=Color.s('Wireless channel to scan (default: {G}all channels{W})'))
glob.add_argument('--channel', help=argparse.SUPPRESS, action='store', dest='channel', type=int)
glob.add_argument('-5', glob.add_argument('-5',
'--5ghz', '--5ghz',
action='store_true', action='store_true',
@@ -39,12 +40,14 @@ class Arguments(object):
metavar='[bssid]', metavar='[bssid]',
type=str, type=str,
help=Color.s('BSSID (e.g. {GR}AA:BB:CC:DD:EE:FF{W}) of access point to attack')) help=Color.s('BSSID (e.g. {GR}AA:BB:CC:DD:EE:FF{W}) of access point to attack'))
glob.add_argument('--bssid', help=argparse.SUPPRESS, action='store', dest='target_bssid', type=str)
glob.add_argument('-e', glob.add_argument('-e',
action='store', action='store',
dest='target_essid', dest='target_essid',
metavar='[essid]', metavar='[essid]',
type=str, type=str,
help=Color.s('ESSID (name) of access point to attack')) help=Color.s('ESSID (name) of access point to attack'))
glob.add_argument('--essid', help=argparse.SUPPRESS, action='store', dest='target_essid', type=str)
glob.add_argument('-v', glob.add_argument('-v',
'--verbose', '--verbose',
action='count', action='count',
@@ -58,69 +61,83 @@ class Arguments(object):
action='store_true', action='store_true',
dest='wep_filter', dest='wep_filter',
help=Color.s('Filter to display WEP-encrypted networks (default: {G}off{W})')) help=Color.s('Filter to display WEP-encrypted networks (default: {G}off{W})'))
wep.add_argument('-wep', help=argparse.SUPPRESS, action='store_true', dest='wep_filter')
wep.add_argument('--require-fakeauth', wep.add_argument('--require-fakeauth',
action='store_true', action='store_true',
dest='require_fakeauth', dest='require_fakeauth',
help=Color.s('Fails attacks if fake-auth fails (default: {G}off{W})')) help=Color.s('Fails attacks if fake-auth fails (default: {G}off{W})'))
wep.add_argument('-pps', 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('--pps',
action='store', action='store',
dest='wep_pps', dest='wep_pps',
metavar='[pps]', metavar='[pps]',
type=int, type=int,
help=Color.s('Packets Per Second to replay (default: {G}%d pps{W})') help=Color.s('Packets Per Second to replay (default: {G}%d pps{W})')
% Configuration.wep_pps) % Configuration.wep_pps)
wep.add_argument('-wept', wep.add_argument('-pps', help=argparse.SUPPRESS, action='store', dest='wep_pps', type=int)
wep.add_argument('--wept',
action='store', action='store',
dest='wep_timeout', dest='wep_timeout',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Seconds to wait before failing (default: {G}%d sec{W})') help=Color.s('Seconds to wait before failing (default: {G}%d sec{W})')
% Configuration.wep_timeout) % Configuration.wep_timeout)
wep.add_argument('-wepc', wep.add_argument('-wept', help=argparse.SUPPRESS, action='store', dest='wep_timeout', type=int)
wep.add_argument('--wepca',
action='store', action='store',
dest='wep_crack_at_ivs', dest='wep_crack_at_ivs',
metavar='[ivs]', metavar='[ivs]',
type=int, type=int,
help=Color.s('Start cracking at this many IVs (default: {G}%d ivs{W})') help=Color.s('Start cracking at this many IVs (default: {G}%d ivs{W})')
% Configuration.wep_crack_at_ivs) % Configuration.wep_crack_at_ivs)
wep.add_argument('-weprs', wep.add_argument('-wepca', help=argparse.SUPPRESS, action='store', dest='wep_crack_at_ivs', type=int)
wep.add_argument('--weprs',
action='store', action='store',
dest='wep_restart_stale_ivs', dest='wep_restart_stale_ivs',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Restart aireplay if no new IVs appear (default: {G}%d sec{W})') help=Color.s('Restart aireplay if no new IVs appear (default: {G}%d sec{W})')
% Configuration.wep_restart_stale_ivs) % Configuration.wep_restart_stale_ivs)
wep.add_argument('-weprc', wep.add_argument('-weprs', help=argparse.SUPPRESS, action='store', dest='wep_restart_stale_ivs', type=int)
wep.add_argument('--weprc',
action='store', action='store',
dest='wep_restart_aircrack', dest='wep_restart_aircrack',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Restart aircrack after this delay (default: {G}%d sec{W})') help=Color.s('Restart aircrack after this delay (default: {G}%d sec{W})')
% Configuration.wep_restart_aircrack) % Configuration.wep_restart_aircrack)
wep.add_argument('-arpreplay', wep.add_argument('-weprc', help=argparse.SUPPRESS, action='store', dest='wep_restart_aircrack', type=int)
wep.add_argument('--arpreplay',
action='store_true', action='store_true',
dest='wep_attack_replay', dest='wep_attack_replay',
help=Color.s('Use ARP-replay WEP attack (default: {G}on{W})')) help=Color.s('Use ARP-replay WEP attack (default: {G}on{W})'))
wep.add_argument('-fragment', wep.add_argument('-arpreplay', help=argparse.SUPPRESS, action='store_true', dest='wep_attack_replay')
wep.add_argument('--fragment',
action='store_true', action='store_true',
dest='wep_attack_fragment', dest='wep_attack_fragment',
help=Color.s('Use fragmentation WEP attack (default: {G}on{W})')) help=Color.s('Use fragmentation WEP attack (default: {G}on{W})'))
wep.add_argument('-chopchop', wep.add_argument('-fragment', help=argparse.SUPPRESS, action='store_true', dest='wep_attack_fragment')
wep.add_argument('--chopchop',
action='store_true', action='store_true',
dest='wep_attack_chopchop', dest='wep_attack_chopchop',
help=Color.s('Use chop-chop WEP attack (default: {G}on{W})')) help=Color.s('Use chop-chop WEP attack (default: {G}on{W})'))
wep.add_argument('-caffelatte', wep.add_argument('-chopchop', help=argparse.SUPPRESS, action='store_true', dest='wep_attack_chopchop')
wep.add_argument('--caffelatte',
action='store_true', action='store_true',
dest='wep_attack_caffe', dest='wep_attack_caffe',
help=Color.s('Use caffe-latte WEP attack (default: {G}on{W})')) help=Color.s('Use caffe-latte WEP attack (default: {G}on{W})'))
wep.add_argument('-p0841', wep.add_argument('-caffelatte', help=argparse.SUPPRESS, action='store_true', dest='wep_attack_caffelatte')
wep.add_argument('--p0841',
action='store_true', action='store_true',
dest='wep_attack_p0841', dest='wep_attack_p0841',
help=Color.s('Use p0841 WEP attack (default: {G}on{W})')) help=Color.s('Use p0841 WEP attack (default: {G}on{W})'))
wep.add_argument('-hirte', wep.add_argument('-p0841', help=argparse.SUPPRESS, action='store_true', dest='wep_attack_p0841')
wep.add_argument('--hirte',
action='store_true', action='store_true',
dest='wep_attack_hirte', dest='wep_attack_hirte',
help=Color.s('Use ARP-replay WEP attack (default: {G}on{W})')) help=Color.s('Use ARP-replay WEP attack (default: {G}on{W})'))
wep.add_argument('-hirte', help=argparse.SUPPRESS, action='store_true', dest='wep_attack_hirte')
# WPA # WPA
wpa = parser.add_argument_group('WPA-RELATED') wpa = parser.add_argument_group('WPA-RELATED')
@@ -128,27 +145,31 @@ class Arguments(object):
action='store_true', action='store_true',
dest='wpa_filter', dest='wpa_filter',
help=Color.s('Filter to display WPA-encrypted networks (includes WPS)')) help=Color.s('Filter to display WPA-encrypted networks (includes WPS)'))
wpa.add_argument('-wpadt', wpa.add_argument('-wpa', help=argparse.SUPPRESS, action='store_true', dest='wpa_filter')
wpa.add_argument('--wpadt',
action='store', action='store',
dest='wpa_deauth_timeout', dest='wpa_deauth_timeout',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Time to wait before failing a Deauth (default: {G}%d sec{W})') help=Color.s('Time to wait between sending Deauths (default: {G}%d sec{W})')
% Configuration.wpa_deauth_timeout) % Configuration.wpa_deauth_timeout)
wpa.add_argument('-wpat', wpa.add_argument('-wpadt', help=argparse.SUPPRESS, action='store', dest='wpa_deauth_timeout', type=int)
wpa.add_argument('--wpat',
action='store', action='store',
dest='wpa_attack_timeout', dest='wpa_attack_timeout',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Time to wait before failing WPA attack (default: {G}%d sec{W})') help=Color.s('Time to wait before failing WPA attack (default: {G}%d sec{W})')
% Configuration.wpa_attack_timeout) % Configuration.wpa_attack_timeout)
wpa.add_argument('-hs', wpa.add_argument('-wpat', help=argparse.SUPPRESS, action='store', dest='wpa_attack_timeout', type=int)
wpa.add_argument('--hs-dir',
action='store', action='store',
dest='wpa_handshake_dir', dest='wpa_handshake_dir',
metavar='[dir]', metavar='[dir]',
type=str, type=str,
help=Color.s('Directory to store handshake files (default: {G}%s{W})') help=Color.s('Directory to store handshake files (default: {G}%s{W})')
% Configuration.wpa_handshake_dir) % Configuration.wpa_handshake_dir)
wpa.add_argument('-hs-dir', help=argparse.SUPPRESS, action='store', dest='wpa_handshake_dir', type=str)
wpa.add_argument('--dict', wpa.add_argument('--dict',
action='store', action='store',
dest='wordlist', dest='wordlist',
@@ -156,6 +177,12 @@ class Arguments(object):
type=str, type=str,
help=Color.s('File containing passwords for cracking (default: {G}%s{W})') help=Color.s('File containing passwords for cracking (default: {G}%s{W})')
% Configuration.wordlist) % Configuration.wordlist)
wpa.add_argument('--strip',
action='store_true',
dest='wpa_strip_handshake',
default=False,
help=Color.s('Strip unnecessary packets from handshake capture using tshark or pyrit'))
wpa.add_argument('-strip', help=argparse.SUPPRESS, action='store_true', dest='wpa_strip_handshake')
# WPS # WPS
wps = parser.add_argument_group('WPS-RELATED') wps = parser.add_argument_group('WPS-RELATED')
@@ -163,6 +190,7 @@ class Arguments(object):
action='store_true', action='store_true',
dest='wps_filter', dest='wps_filter',
help=Color.s('Filter to display WPS-enabled networks')) help=Color.s('Filter to display WPS-enabled networks'))
wps.add_argument('-wps', help=argparse.SUPPRESS, action='store_true', dest='wps_filter')
wps.add_argument('--reaver', wps.add_argument('--reaver',
action='store_true', action='store_true',
dest='reaver_only', dest='reaver_only',
@@ -180,47 +208,52 @@ class Arguments(object):
dest='wps_pixie_timeout', dest='wps_pixie_timeout',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Time to wait before stopping PixieDust (default: {G}%d sec{W})') help=Color.s('Time to wait before failing PixieDust attack (default: {G}%d sec{W})')
% Configuration.wps_pixie_timeout) % Configuration.wps_pixie_timeout)
wps.add_argument('--pixiest', wps.add_argument('--pixiest',
action='store', action='store',
dest='wps_pixie_step_timeout', dest='wps_pixie_step_timeout',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Time to wait for a step to change before stopping PixieDust (default: {G}%d sec{W})') help=Color.s('Time to wait for a step to progress before failing PixieDust attack (default: {G}%d sec{W})')
% Configuration.wps_pixie_step_timeout) % Configuration.wps_pixie_step_timeout)
wps.add_argument('-wpst', wps.add_argument('--wpst',
action='store', action='store',
dest='wps_pin_timeout', dest='wps_pin_timeout',
metavar='[seconds]', metavar='[seconds]',
type=int, type=int,
help=Color.s('Time to wait before stopping PIN attack (default: {G}%d sec{W})') help=Color.s('Time to wait before failing WPS PIN attack (default: {G}%d sec{W})')
% Configuration.wps_pin_timeout) % Configuration.wps_pin_timeout)
wps.add_argument('-wpsmr', wps.add_argument('-wpst', help=argparse.SUPPRESS, action='store', dest='wps_pin_timeout', type=int)
wps.add_argument('--wpsmr',
action='store', action='store',
dest='wps_max_retries', dest='wps_max_retries',
metavar='[retries]', metavar='[retries]',
type=int, type=int,
help=Color.s('Maximum number of Retries before stopping (default: {G}%d{W})') help=Color.s('Maximum number of Retries before failing (default: {G}%d{W})')
% Configuration.wps_max_retries) % Configuration.wps_max_retries)
wps.add_argument('-wpsmf', wps.add_argument('-wpsmr', help=argparse.SUPPRESS, action='store', dest='wps_max_retries', type=int)
wps.add_argument('--wpsmf',
action='store', action='store',
dest='wps_fail_threshold', dest='wps_fail_threshold',
metavar='[fails]', metavar='[fails]',
type=int, type=int,
help=Color.s('Maximum number of Failures before stopping (default: {G}%d{W})') help=Color.s('Maximum number of Reaver Failures before failing attack (default: {G}%d{W})')
% Configuration.wps_fail_threshold) % Configuration.wps_fail_threshold)
wps.add_argument('-wpsmt', wps.add_argument('-wpsmf', help=argparse.SUPPRESS, action='store', dest='wps_fail_threshold', type=int)
wps.add_argument('--wpsmt',
action='store', action='store',
dest='wps_timeout_threshold', dest='wps_timeout_threshold',
metavar='[timeouts]', metavar='[timeouts]',
type=int, type=int,
help=Color.s('Maximum number of Timeouts before stopping (default: {G}%d{W})') help=Color.s('Maximum number of Timeouts before stopping (default: {G}%d{W})')
% Configuration.wps_timeout_threshold) % Configuration.wps_timeout_threshold)
wps.add_argument('-wpsmt', help=argparse.SUPPRESS, action='store', dest='wps_timeout_threshold', type=int)
wps.add_argument('--ignore-ratelimit', wps.add_argument('--ignore-ratelimit',
action='store_false', action='store_false',
dest='wps_skip_rate_limit', dest='wps_skip_rate_limit',
help=Color.s('Ignores attack if WPS is rate-limited (default: {G}on{W})')) 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')
# Commands # Commands
commands = parser.add_argument_group('COMMANDS') commands = parser.add_argument_group('COMMANDS')
@@ -228,29 +261,15 @@ class Arguments(object):
action='store_true', action='store_true',
dest='cracked', dest='cracked',
help=Color.s('Display previously-cracked access points')) help=Color.s('Display previously-cracked access points'))
commands.add_argument('--check-hs', commands.add_argument('-cracked', help=argparse.SUPPRESS, action='store_true', dest='cracked')
commands.add_argument('--check',
action='store', action='store',
metavar='file', metavar='file',
nargs='?', nargs='?',
const='<all>', const='<all>',
dest='check_handshake', dest='check_handshake',
help=Color.s('Check a .cap file (or all hs/*.cap files) for WPA handshakes')) help=Color.s('Check a .cap file (or all hs/*.cap files) for WPA handshakes'))
commands.add_argument('--crack-wpa', commands.add_argument('-check', help=argparse.SUPPRESS, action='store', nargs='?', const='<all>', dest='check_handshake')
action='store',
type=str,
dest='crack_wpa',
metavar='file',
help=Color.s('Crack a .cap file containing a WPA handshake'))
commands.add_argument('--crack-wep',
action='store',
type=str,
dest='crack_wep',
metavar='file',
help=Color.s('Crack a .cap file containing WEP IVS'))
commands.add_argument('--update',
action='store_true',
dest='update',
help=Color.s('Update to latest version of Wifite (on github)'))
return parser.parse_args() return parser.parse_args()

6
py/Configuration.py
View File

@@ -81,9 +81,6 @@ class Configuration(object):
# Commands # Commands
Configuration.show_cracked = False Configuration.show_cracked = False
Configuration.check_handshake = None Configuration.check_handshake = None
Configuration.crack_wpa = None
Configuration.crack_wep = None
Configuration.update = False
# Overwrite config values with arguments (if defined) # Overwrite config values with arguments (if defined)
Configuration.load_from_arguments() Configuration.load_from_arguments()
@@ -245,9 +242,6 @@ class Configuration(object):
# Commands # Commands
if args.cracked: Configuration.show_cracked = True if args.cracked: Configuration.show_cracked = True
if args.crack_wpa: Configuration.crack_wpa = args.crack_wpa
if args.crack_wep: Configuration.crack_wep = args.crack_wep
if args.update: Configuration.update = True
if args.check_handshake: Configuration.check_handshake = args.check_handshake if args.check_handshake: Configuration.check_handshake = args.check_handshake