Merge pull request #449 from kimocoder/claude/project-audit-scan-3FEN6

Claude/project audit scan 3 fen6

Author: kimocoder

setup.py

@@ -19,8 +19,11 @@
     packages=[
         'wifite',
         'wifite/attack',
+        'wifite/attack/portal',
         'wifite/model',
+        'wifite/native',
         'wifite/tools',
+        'wifite/ui',
         'wifite/util',
     ],
     data_files=[

wifite/args.py

@@ -7,7 +7,7 @@
 import sys
 
 
-class Arguments(object):
+class Arguments:
     """ Holds arguments used by the Wifite """
 
     def __init__(self, configuration):

wifite/attack/all.py

@@ -20,7 +20,7 @@ class Answer(Enum):
     Continue = 3
     Ignore = 4
 
-class AttackAll(object):
+class AttackAll:
     @classmethod
     def attack_multiple(cls, targets, session=None, session_mgr=None):
         """

wifite/attack/pmkid.py

@@ -224,15 +224,15 @@ def run_hashcat(self):
         if Configuration.skip_crack:
             if self.view:
                 self.view.add_log("Skipping crack phase (--skip-crack flag)")
-            return self._extracted_from_run_hashcat_44(
+            return self._handle_hashcat_failure(
                 '{+} Not cracking pmkid because {C}skip-crack{W} was used{W}')
 
         # Crack it.
         if Process.exists(Hashcat.dependency_name):
             try:
                 self.success = self.crack_pmkid_file(pmkid_file)
             except KeyboardInterrupt:
-                return self._extracted_from_run_hashcat_44(
+                return self._handle_hashcat_failure(
                     '\n{!} {R}Failed to crack PMKID: {O}Cracking interrupted by user{W}'
                 )
         else:
@@ -244,9 +244,8 @@ def run_hashcat(self):
 
         return True  # Even if we don't crack it, capturing a PMKID is 'successful'
 
-    # TODO Rename this here and in `run_hashcat`
-    def _extracted_from_run_hashcat_44(self, arg0):
-        Color.pl(arg0)
+    def _handle_hashcat_failure(self, message):
+        Color.pl(message)
         self.success = False
         return True
 
@@ -481,7 +480,7 @@ def crack_pmkid_file(self, pmkid_file):
 
         if key is not None:
             log_info('AttackPMKID', f'PMKID cracked successfully! Password: {key}')
-            return self._extracted_from_crack_pmkid_file_31(key, pmkid_file)
+            return self._handle_pmkid_crack_success(key, pmkid_file)
         # Failed to crack.
         if Configuration.wordlist is not None:
             log_warning('AttackPMKID', 'PMKID crack failed: passphrase not found in wordlist')
@@ -492,8 +491,7 @@ def crack_pmkid_file(self, pmkid_file):
                           '{R}Failed {O}Passphrase not found in dictionary.\n')
         return False
 
-    # TODO Rename this here and in `crack_pmkid_file`
-    def _extracted_from_crack_pmkid_file_31(self, key, pmkid_file):
+    def _handle_pmkid_crack_success(self, key, pmkid_file):
         # Successfully cracked.
         if self.view:
             self.view.add_log(f"Successfully cracked PMKID!")
@@ -615,31 +613,29 @@ def save_pmkid(self, pmkid_hash):
         """Saves a copy of the pmkid (handshake) to hs/ directory."""
         # Create handshake dir
         if self.do_airCRACK:
-            return self._extracted_from_save_pmkid_6(pmkid_hash)
+            return self._copy_pmkid_to_file(pmkid_hash)
         if not os.path.exists(Configuration.wpa_handshake_dir):
             os.makedirs(Configuration.wpa_handshake_dir)
 
-        pmkid_file = self._extracted_from_save_pmkid_21('.22000')
+        pmkid_file = self._generate_pmkid_filepath('.22000')
         with open(pmkid_file, 'w') as pmkid_handle:
             pmkid_handle.write(pmkid_hash)
             pmkid_handle.write('\n')
 
         return pmkid_file
 
-    # TODO Rename this here and in `save_pmkid`
-    def _extracted_from_save_pmkid_21(self, arg0):
+    def _generate_pmkid_filepath(self, extension):
         # Generate filesystem-safe filename from bssid, essid and date
         essid_safe = re.sub('[^a-zA-Z0-9]', '', self.target.essid)
         bssid_safe = self.target.bssid.replace(':', '-')
         date = time.strftime('%Y-%m-%dT%H-%M-%S')
-        result = f'pmkid_{essid_safe}_{bssid_safe}_{date}{arg0}'
+        result = f'pmkid_{essid_safe}_{bssid_safe}_{date}{extension}'
         result = os.path.join(Configuration.wpa_handshake_dir, result)
 
         Color.p('\n{+} Saving copy of {C}PMKID Hash{W} to {C}%s{W} ' % result)
         return result
 
-    # TODO Rename this here and in `save_pmkid`
-    def _extracted_from_save_pmkid_6(self, pmkid_hash):
-        pmkid_file = self._extracted_from_save_pmkid_21('.cap')
+    def _copy_pmkid_to_file(self, pmkid_hash):
+        pmkid_file = self._generate_pmkid_filepath('.cap')
         copy(pmkid_hash, pmkid_file)
         return pmkid_file

wifite/attack/wpa.py

@@ -360,12 +360,12 @@ def run(self):
 
         # Check for the --skip-crack flag
         if Configuration.skip_crack:
-            return self._extracted_from_run_30(
+            return self._handle_attack_failure(
                 '{+} Not cracking handshake because {C}skip-crack{W} was used{W}'
             )
         # Check wordlist
         if Configuration.wordlist is None:
-            return self._extracted_from_run_30(
+            return self._handle_attack_failure(
                 '{!} {O}Not cracking handshake because wordlist ({R}--dict{O}) is not set'
             )
         elif not os.path.exists(Configuration.wordlist):
@@ -438,9 +438,8 @@ def run(self):
             self.success = True
         return self.success
 
-    # TODO Rename this here and in `run`
-    def _extracted_from_run_30(self, arg0):
-        Color.pl(arg0)
+    def _handle_attack_failure(self, message):
+        Color.pl(message)
         self.success = False
         return False
 

wifite/attack/wps.py

@@ -51,7 +51,7 @@ def run(self):
             return False
 
         if not Configuration.wps_pixie and self.pixie_dust:
-            return self._extracted_from_run_14(
+            return self._handle_wps_skip(
                 '\r{!} {O}--no-pixie{R} was given, ignoring WPS Pixie-Dust Attack on {O}%s{W}'
             )
         if not Configuration.wps_no_nullpin and self.null_pin:
@@ -60,7 +60,7 @@ def run(self):
             return False
 
         if not Configuration.wps_pin and not self.pixie_dust:
-            return self._extracted_from_run_14(
+            return self._handle_wps_skip(
                 '\r{!} {O}--pixie{R} was given, ignoring WPS PIN Attack on {O}%s{W}'
             )
 
@@ -90,9 +90,8 @@ def run(self):
         else:
             return self.run_reaver()
 
-    # TODO Rename this here and in `run`
-    def _extracted_from_run_14(self, arg0):
-        Color.pl(arg0 % self.target.essid)
+    def _handle_wps_skip(self, message):
+        Color.pl(message % self.target.essid)
         self.success = False
         return False
 

wifite/config.py

@@ -7,7 +7,7 @@
 from .tools.macchanger import Macchanger
 
 
-class Configuration(object):
+class Configuration:
     """ Stores configuration variables and functions for Wifite. """
 
     initialized = False  # Flag indicating config has been initialized

wifite/model/attack.py

@@ -5,7 +5,7 @@
 from ..config import Configuration
 
 
-class Attack(object):
+class Attack:
     """Contains functionality common to all attacks."""
 
     target_wait = min(60, Configuration.wpa_attack_timeout)

wifite/model/client.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
-class Client(object):
+class Client:
     """
         Holds details for a 'Client' - a wireless device (e.g. computer)
         that is associated with an Access Point (e.g. router)

wifite/model/handshake.py

@@ -9,7 +9,7 @@
 import os
 
 
-class Handshake(object):
+class Handshake:
 
     def __init__(self, capfile, bssid=None, essid=None):
         self.capfile = capfile