From 0adcd55742085d158feab4e3be9e017f8545bcd4 Mon Sep 17 00:00:00 2001 From: derv82 Date: Sat, 21 Apr 2018 11:34:30 -0400 Subject: [PATCH] All tools inherit "Dependency". --- wifite/tools/aireplay.py | 2 +- wifite/tools/bully.py | 9 +++++++-- wifite/tools/dependency.py | 7 +++++-- wifite/tools/ifconfig.py | 7 ++++++- wifite/tools/iwconfig.py | 8 +++++++- wifite/tools/macchanger.py | 7 ++++++- wifite/tools/pyrit.py | 6 +++++- wifite/tools/reaver.py | 11 ++++++++--- wifite/tools/tshark.py | 6 +++++- wifite/tools/wash.py | 6 +++++- wifite/util/timer.py | 3 +++ wifite/wifite.py | 27 +++++++++++++++++++++++++-- 12 files changed, 83 insertions(+), 16 deletions(-) diff --git a/wifite/tools/aireplay.py b/wifite/tools/aireplay.py index 2c1ed1e..5806232 100755 --- a/wifite/tools/aireplay.py +++ b/wifite/tools/aireplay.py @@ -57,7 +57,7 @@ class WEPAttackType(object): class Aireplay(Thread, Dependency): dependency_required = True - dependency_name = 'aircrack-ng' + 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): diff --git a/wifite/tools/bully.py b/wifite/tools/bully.py index 84e2d26..17099cd 100755 --- a/wifite/tools/bully.py +++ b/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,7 +13,11 @@ 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.total_timeouts = 0 diff --git a/wifite/tools/dependency.py b/wifite/tools/dependency.py index 335b234..d575f57 100644 --- a/wifite/tools/dependency.py +++ b/wifite/tools/dependency.py @@ -1,5 +1,5 @@ -from ..util.process import Process -from ..util.color import Color +#!/usr/bin/python2.7 +# -*- coding: utf-8 -*- class Dependency(object): required_attr_names = ['dependency_name', 'dependency_url', 'dependency_required'] @@ -16,6 +16,9 @@ class Dependency(object): @classmethod def fails_dependency_check(cls): + from ..util.color import Color + from ..util.process import Process + if Process.exists(cls.dependency_name): return False diff --git a/wifite/tools/ifconfig.py b/wifite/tools/ifconfig.py index 6d53dfe..8e206e6 100755 --- a/wifite/tools/ifconfig.py +++ b/wifite/tools/ifconfig.py @@ -3,7 +3,12 @@ import re -class Ifconfig(object): +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=[]): diff --git a/wifite/tools/iwconfig.py b/wifite/tools/iwconfig.py index 939f15f..9cea05d 100755 --- a/wifite/tools/iwconfig.py +++ b/wifite/tools/iwconfig.py @@ -1,7 +1,13 @@ #!/usr/bin/python2.7 # -*- coding: utf-8 -*- -class Iwconfig(object): +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 diff --git a/wifite/tools/macchanger.py b/wifite/tools/macchanger.py index 0619b3f..8f2675a 100755 --- a/wifite/tools/macchanger.py +++ b/wifite/tools/macchanger.py @@ -1,10 +1,15 @@ #!/usr/bin/python2.7 # -*- coding: utf-8 -*- +from .dependency import Dependency from ..tools.ifconfig import Ifconfig from ..util.color import Color -class Macchanger(object): +class Macchanger(Dependency): + dependency_required = False + dependency_name = 'macchanger' + dependency_url = 'apt-get install macchanger' + is_changed = False @classmethod diff --git a/wifite/tools/pyrit.py b/wifite/tools/pyrit.py index 740da5e..3b7d0f7 100755 --- a/wifite/tools/pyrit.py +++ b/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 diff --git a/wifite/tools/reaver.py b/wifite/tools/reaver.py index ca9a276..69cc8b5 100755 --- a/wifite/tools/reaver.py +++ b/wifite/tools/reaver.py @@ -1,18 +1,23 @@ #!/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 ..util.timer import Timer -from ..tools.airodump import Airodump -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) diff --git a/wifite/tools/tshark.py b/wifite/tools/tshark.py index ff61af0..29dc370 100755 --- a/wifite/tools/tshark.py +++ b/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 diff --git a/wifite/tools/wash.py b/wifite/tools/wash.py index 0807c7c..274a456 100755 --- a/wifite/tools/wash.py +++ b/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 diff --git a/wifite/util/timer.py b/wifite/util/timer.py index 121d7e0..4f57854 100755 --- a/wifite/util/timer.py +++ b/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 diff --git a/wifite/wifite.py b/wifite/wifite.py index 1e689c8..3961b9b 100755 --- a/wifite/wifite.py +++ b/wifite/wifite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!/usr/bin/python3.7 # -*- coding: utf-8 -*- try: @@ -18,6 +18,18 @@ from .model.result import CrackResult from .model.handshake import Handshake from .tools.airmon import Airmon from .tools.airodump import Airodump +from .tools.aircrack import Aircrack +from .tools.aireplay import Aireplay +from .tools.ifconfig import Ifconfig +from .tools.iwconfig import Iwconfig +from .tools.hostapd import Hostapd +from .tools.dnsmasq import Dnsmasq +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 import json import os @@ -52,7 +64,18 @@ class Wifite(object): def dependency_check(self): ''' Check that required programs are installed ''' - apps = [Airmon, Airodump] #, Iwconfig, Ifconfig, Aircrack, Aireplay, Airodump] + apps = [ + # Aircrack + Airmon, Airodump, Aircrack, Aireplay, Airodump, + # wireless/net tools + Iwconfig, Ifconfig, + # WPS + Reaver, Bully, + # Cracking/handshakes + Pyrit, Tshark, + # Misc + Macchanger + ] if Configuration.use_eviltwin: apps.extend([Hostapd, Dnsmasq, Iptables])