OWO: add OWO detection support

kimocoder · kimocoder · commit 7e95691b5815 · 2025-10-26T14:13:36.000+01:00
diff --git a/wifite/model/target.py b/wifite/model/target.py
@@ -139,6 +139,10 @@ def __init__(self, fields):
         # For compatibility with existing logic that expects a single string:
         self.encryption = self.primary_encryption # Overwrite with primary for now
         self.authentication = self.primary_authentication # Overwrite with primary for now
+        
+        # WPA3 information (will be populated by scanner)
+        self.wpa3_info = None
+        
         self.validate()
 
     def __eq__(self, other):
@@ -169,6 +173,36 @@ def transfer_info(self, other):
         if hasattr(self, 'primary_authentication'):
             other.primary_authentication = self.primary_authentication
             other.full_authentication_string = self.full_authentication_string
+        if hasattr(self, 'wpa3_info'):
+            other.wpa3_info = self.wpa3_info
+
+    @property
+    def is_wpa3(self):
+        """Check if target supports WPA3."""
+        if self.wpa3_info is None:
+            return False
+        return self.wpa3_info.has_wpa3
+    
+    @property
+    def is_transition(self):
+        """Check if target is in WPA3 transition mode (supports both WPA2 and WPA3)."""
+        if self.wpa3_info is None:
+            return False
+        return self.wpa3_info.is_transition
+    
+    @property
+    def pmf_status(self):
+        """Get PMF (Protected Management Frames) status."""
+        if self.wpa3_info is None:
+            return 'disabled'
+        return self.wpa3_info.pmf_status
+    
+    @property
+    def is_dragonblood_vulnerable(self):
+        """Check if target is vulnerable to Dragonblood attacks."""
+        if self.wpa3_info is None:
+            return False
+        return self.wpa3_info.dragonblood_vulnerable
 
     def validate(self):
         """ Checks that the target is valid. """
@@ -232,37 +266,53 @@ def to_str(self, show_bssid=False, show_manufacturer=False):
         channel = Color.s(f'{channel_color}{str(self.channel).rjust(3)}')
 
         # Use primary_encryption and primary_authentication for display
-        display_encryption = self.primary_encryption.rjust(4) # Adjusted rjust for WPA3
-        auth_suffix = ''
-        if self.primary_encryption == 'WPA3':
-            display_encryption = Color.s('{P}%s' % display_encryption) # Purple for WPA3
-            if self.primary_authentication == 'SAE':
-                auth_suffix = Color.s('{P}-S') # Purple for SAE
-            elif self.primary_authentication == 'MGT':
-                 auth_suffix = Color.s('{R}-E') # Red for Enterprise
-        elif self.primary_encryption == 'WPA2':
-            display_encryption = Color.s('{O}%s' % display_encryption) # Orange for WPA2
-            if self.primary_authentication == 'PSK':
-                auth_suffix = Color.s('{O}-P')
-            elif self.primary_authentication == 'MGT':
-                auth_suffix = Color.s('{R}-E')
-        elif self.primary_encryption == 'WPA':
-            display_encryption = Color.s('{O}%s' % display_encryption) # Orange for WPA
-            if self.primary_authentication == 'PSK':
-                auth_suffix = Color.s('{O}-P')
-            elif self.primary_authentication == 'MGT':
-                auth_suffix = Color.s('{R}-E')
-        elif self.primary_encryption == 'WEP':
-            display_encryption = Color.s('{G}%s' % display_encryption) # Green for WEP
-        elif self.primary_encryption == 'OWE':
-            display_encryption = Color.s('{B}%s' % display_encryption) # Blue for OWE
+        # Check for WPA3 transition mode
+        if self.is_transition:
+            # Show "W23" for transition mode (WPA2/WPA3)
+            display_encryption = Color.s('{P}W23') # Purple for WPA3 transition
+            auth_suffix = ''
+            # Add PMF indicator for transition mode
+            if self.pmf_status == 'required':
+                auth_suffix = Color.s('{P}+') # PMF required
+            elif self.pmf_status == 'optional':
+                auth_suffix = Color.s('{O}~') # PMF optional
         else:
-            display_encryption = Color.s('{W}%s' % display_encryption) # White for others
+            display_encryption = self.primary_encryption.rjust(4) # Adjusted rjust for WPA3
+            auth_suffix = ''
+            if self.primary_encryption == 'WPA3':
+                display_encryption = Color.s('{P}%s' % display_encryption) # Purple for WPA3
+                if self.primary_authentication == 'SAE':
+                    auth_suffix = Color.s('{P}-S') # Purple for SAE
+                elif self.primary_authentication == 'MGT':
+                     auth_suffix = Color.s('{R}-E') # Red for Enterprise
+                # Add PMF indicator for WPA3-only
+                if self.pmf_status == 'required':
+                    auth_suffix += Color.s('{P}+') # PMF required
+            elif self.primary_encryption == 'WPA2':
+                display_encryption = Color.s('{O}%s' % display_encryption) # Orange for WPA2
+                if self.primary_authentication == 'PSK':
+                    auth_suffix = Color.s('{O}-P')
+                elif self.primary_authentication == 'MGT':
+                    auth_suffix = Color.s('{R}-E')
+            elif self.primary_encryption == 'WPA':
+                display_encryption = Color.s('{O}%s' % display_encryption) # Orange for WPA
+                if self.primary_authentication == 'PSK':
+                    auth_suffix = Color.s('{O}-P')
+                elif self.primary_authentication == 'MGT':
+                    auth_suffix = Color.s('{R}-E')
+            elif self.primary_encryption == 'WEP':
+                display_encryption = Color.s('{G}%s' % display_encryption) # Green for WEP
+            elif self.primary_encryption == 'OWE':
+                display_encryption = Color.s('{B}%s' % display_encryption) # Blue for OWE
+            else:
+                display_encryption = Color.s('{W}%s' % display_encryption) # White for others
 
         # Calculate padding for ENCR column based on its content length
-        # Max length of ENCR (e.g. WPA2-P) is 6. OPN is 3.
+        # Max length of ENCR (e.g. WPA2-P or W23+) is now variable
         # Pad with spaces to ensure alignment
-        encryption_padding = " " * (5 - len(self.primary_encryption + self.primary_authentication)) # Max length of WPA2-P is 6 (WPA2 + -P)
+        base_len = 3 if self.is_transition else len(self.primary_encryption)
+        suffix_len = len(auth_suffix.replace(Color.s('{P}'), '').replace(Color.s('{O}'), '').replace(Color.s('{R}'), '').replace(Color.s('{W}'), ''))
+        encryption_padding = " " * max(0, 7 - base_len - suffix_len)
         encryption_display_string = f"{display_encryption}{auth_suffix}{encryption_padding}"
 
         power = f'{str(self.power).rjust(3)}db'
diff --git a/wifite/tools/airodump.py b/wifite/tools/airodump.py
@@ -5,6 +5,7 @@
 from .tshark import Tshark
 from .wash import Wash
 from ..util.process import Process
+from ..util.wpa3 import WPA3Detector, WPA3Info
 from ..config import Configuration
 from ..model.target import Target, WPSState
 from ..model.client import Client
@@ -199,6 +200,9 @@ def get_targets(self, old_targets=None, apply_filter=True, target_archives=None)
                 # No tshark, or it failed. Fall-back to wash
                 Wash.check_for_wps_and_update_targets(capfile, new_targets)
 
+        # Detect WPA3 capabilities for all targets
+        Airodump.detect_wpa3_capabilities(new_targets)
+
         if apply_filter:
             # Filter targets based on encryption, WPS capability & power
             new_targets = Airodump.filter_targets(new_targets, skip_wps=self.skip_wps)
@@ -286,6 +290,32 @@ def get_targets_from_csv(csv_filename):
 
         return targets2
 
+    @staticmethod
+    def detect_wpa3_capabilities(targets):
+        """
+        Detect and store WPA3 capabilities for all targets.
+        
+        This method analyzes each target's encryption and authentication
+        information to determine WPA3 support, transition mode, PMF status,
+        and other WPA3-related capabilities.
+        
+        Performance: Detection results are cached in target.wpa3_info.
+        Subsequent calls to WPA3Detector methods will use cached data.
+        
+        Args:
+            targets: List of Target objects to analyze
+        """
+        for target in targets:
+            # Skip if already detected (cached)
+            if hasattr(target, 'wpa3_info') and target.wpa3_info is not None:
+                continue
+            
+            # Detect WPA3 capability (use_cache=False since we're setting it)
+            wpa3_info_dict = WPA3Detector.detect_wpa3_capability(target, use_cache=False)
+            
+            # Create WPA3Info object and attach to target for caching
+            target.wpa3_info = WPA3Info.from_dict(wpa3_info_dict)
+
     @staticmethod
     def filter_targets(targets5, skip_wps=False):
         """ Filters targets based on Configuration """
diff --git a/wifite/ui/components.py b/wifite/ui/components.py
@@ -61,16 +61,45 @@ class EncryptionBadge:
     }
 
     @staticmethod
-    def render(encryption_type: str) -> Text:
+    def render(encryption_type: str, target=None) -> Text:
         """
         Render encryption type as a colored badge.
 
         Args:
             encryption_type: Encryption type string (e.g., "WPA2", "WEP")
+            target: Optional Target object for WPA3 transition mode detection
 
         Returns:
             Rich Text object with colored encryption badge
         """
+        # Check for WPA3 transition mode
+        if target and hasattr(target, 'is_transition') and target.is_transition:
+            text = Text("W23", style="magenta")  # Magenta for transition mode
+            # Add PMF indicator
+            if hasattr(target, 'pmf_status'):
+                if target.pmf_status == 'required':
+                    text.append("+", style="green")  # PMF required
+                elif target.pmf_status == 'optional':
+                    text.append("~", style="yellow")  # PMF optional
+            # Add Dragonblood vulnerability indicator
+            if hasattr(target, 'wpa3_info') and target.wpa3_info and target.wpa3_info.dragonblood_vulnerable:
+                text.append("!", style="red bold")  # Dragonblood vulnerable
+            return text
+        
+        # Check for WPA3-only with PMF indicator
+        if target and hasattr(target, 'is_wpa3') and target.is_wpa3:
+            enc_upper = encryption_type.upper()
+            color = EncryptionBadge.COLORS.get(enc_upper, "white")
+            text = Text(encryption_type, style=color)
+            # Add PMF indicator for WPA3
+            if hasattr(target, 'pmf_status') and target.pmf_status == 'required':
+                text.append("+", style="green")  # PMF required
+            # Add Dragonblood vulnerability indicator
+            if hasattr(target, 'wpa3_info') and target.wpa3_info and target.wpa3_info.dragonblood_vulnerable:
+                text.append("!", style="red bold")  # Dragonblood vulnerable
+            return text
+        
+        # Standard encryption display
         enc_upper = encryption_type.upper()
         color = EncryptionBadge.COLORS.get(enc_upper, "white")
         return Text(encryption_type, style=color)
diff --git a/wifite/ui/scanner_view.py b/wifite/ui/scanner_view.py
@@ -20,18 +20,20 @@
 class ScannerView:
     """Interactive scanning interface with real-time updates."""
 
-    def __init__(self, tui_controller):
+    def __init__(self, tui_controller, session=None):
         """
         Initialize scanner view.
 
         Args:
             tui_controller: TUIController instance for rendering
+            session: Optional SessionState for resumed sessions
         """
         self.tui = tui_controller
         self.targets = []
         self.scan_start_time = time.time()
         self.decloaking = False
         self.max_visible_targets = 50  # Limit displayed targets for performance
+        self.session = session  # Store session for resume status display
 
     def update_targets(self, targets: List, decloaking: bool = False):
         """
@@ -79,7 +81,8 @@ def _render_header(self) -> Panel:
 
         # Count targets by encryption type
         wep_count = sum(1 for t in self.targets if 'WEP' in t.encryption)
-        wpa_count = sum(1 for t in self.targets if 'WPA' in t.encryption)
+        wpa_count = sum(1 for t in self.targets if 'WPA' in t.encryption and not hasattr(t, 'is_wpa3') or not t.is_wpa3)
+        wpa3_count = sum(1 for t in self.targets if hasattr(t, 'is_wpa3') and t.is_wpa3)
         wps_count = sum(1 for t in self.targets if hasattr(t, 'wps') and t.wps)
 
         # Count clients
@@ -88,7 +91,33 @@ def _render_header(self) -> Panel:
         # Build header text - single line for compactness
         header = Text()
         header.append("wifite2 ", style="bold cyan")
-        header.append("- Scanning", style="bold yellow")
+        
+        # Show resume indicator if this is a resumed session
+        if self.session:
+            header.append("- ", style="white")
+            header.append("RESUMED SESSION", style="bold magenta")
+            header.append(" - Scanning", style="bold yellow")
+            
+            # Add session progress info
+            summary = self.session.get_progress_summary()
+            header.append(f" | Progress: ", style="white")
+            header.append(f"{summary['completed']}", style="green")
+            header.append("/", style="white")
+            header.append(f"{summary['total']}", style="cyan")
+            
+            # Add session age
+            age_hours = summary['age_hours']
+            if age_hours < 1:
+                age_str = f"{int(age_hours * 60)}m"
+            elif age_hours < 24:
+                age_str = f"{int(age_hours)}h"
+            else:
+                age_str = f"{int(age_hours / 24)}d"
+            header.append(f" | Age: ", style="white")
+            header.append(age_str, style="yellow")
+        else:
+            header.append("- Scanning", style="bold yellow")
+        
         if self.decloaking:
             header.append(" & decloaking", style="yellow")
         header.append(f" {minutes:02d}:{seconds:02d} | ", style="white")
@@ -98,6 +127,8 @@ def _render_header(self) -> Panel:
         header.append(f"{wep_count}", style="red")
         header.append(f" | WPA: ", style="white")
         header.append(f"{wpa_count}", style="yellow")
+        header.append(f" | WPA3: ", style="white")
+        header.append(f"{wpa3_count}", style="magenta")
         header.append(f" | WPS: ", style="white")
         header.append(f"{wps_count}", style="cyan")
         header.append(f" | Clients: ", style="white")
@@ -141,7 +172,7 @@ def _render_targets_table(self) -> Table:
         
         table.add_column("CH", style="white", width=3, justify="center")
         table.add_column("PWR", style="white", width=5, justify="center")
-        table.add_column("ENC", style="white", width=8)
+        table.add_column("ENC", style="white", width=12)  # Increased width for WPA3 indicators
         table.add_column("WPS", style="white", width=4, justify="center")
         table.add_column("CLIENTS", style="white", width=7, justify="right")
 
@@ -237,14 +268,31 @@ def _format_power(self, target) -> Text:
     def _format_encryption(self, target) -> Text:
         """
         Format encryption type with color coding.
+        Shows WPA3/Transition/WPA2 status, PMF indicators, and Dragonblood markers.
 
         Args:
             target: Target object
 
         Returns:
             Rich Text with colored encryption badge
         """
-        return EncryptionBadge.render(target.encryption)
+        enc_text = EncryptionBadge.render(target.encryption, target)
+        
+        # Add PMF indicator if WPA3 info is available
+        if hasattr(target, 'wpa3_info') and target.wpa3_info:
+            if target.wpa3_info.pmf_status == 'required':
+                enc_text.append(" ", style="white")
+                enc_text.append("🛡", style="cyan")  # Shield for PMF required
+            elif target.wpa3_info.pmf_status == 'optional':
+                enc_text.append(" ", style="white")
+                enc_text.append("◐", style="yellow")  # Half-circle for PMF optional
+        
+        # Add Dragonblood vulnerability marker
+        if hasattr(target, 'is_dragonblood_vulnerable') and target.is_dragonblood_vulnerable:
+            enc_text.append(" ", style="white")
+            enc_text.append("⚠", style="red bold")  # Warning for vulnerability
+        
+        return enc_text
 
     def _format_wps(self, target) -> Text:
         """
diff --git a/wifite/ui/selector_view.py b/wifite/ui/selector_view.py
@@ -342,7 +342,7 @@ def _format_encryption(self, target) -> Text:
         Returns:
             Rich Text with colored encryption badge
         """
-        return EncryptionBadge.render(target.encryption)
+        return EncryptionBadge.render(target.encryption, target)
 
     def _format_wps(self, target) -> Text:
         """
diff --git a/wifite/util/owe.py b/wifite/util/owe.py
diff --git a/wifite/util/owe_scanner.py b/wifite/util/owe_scanner.py
