moriarty-project 0.1.21__tar.gz → 0.1.22__tar.gz

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moriarty-project
-Version: 0.1.21
+Version: 0.1.22
 Summary: Client-side OSINT toolkit with forensic-grade evidence handling.
 Project-URL: Homepage, https://github.com/DonatoReis/moriarty
 Project-URL: Documentation, https://github.com/DonatoReis/moriarty#readme
@@ -98,7 +98,7 @@ Description-Content-Type: text/markdown
 <!-- Badges -->
 <p align="center">
   <a href="https://pypi.org/project/moriarty-project/">
-    <img src="https://img.shields.io/badge/version-0.1.21-blue" alt="Version 0.1.21">
+    <img src="https://img.shields.io/badge/version-0.1.22-blue" alt="Version 0.1.22">
   </a>
   <a href="https://www.python.org/downloads/">
     <img src="https://img.shields.io/pypi/pyversions/moriarty-project?color=blue" alt="Python Versions">

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/README.md

@@ -19,7 +19,7 @@
 <!-- Badges -->
 <p align="center">
   <a href="https://pypi.org/project/moriarty-project/">
-    <img src="https://img.shields.io/badge/version-0.1.21-blue" alt="Version 0.1.21">
+    <img src="https://img.shields.io/badge/version-0.1.22-blue" alt="Version 0.1.22">
   </a>
   <a href="https://www.python.org/downloads/">
     <img src="https://img.shields.io/pypi/pyversions/moriarty-project?color=blue" alt="Python Versions">

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/moriarty/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import annotations
 
 __all__ = ["__version__"]
-__version__ = "0.1.21"
+__version__ = "0.1.22"

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/moriarty/modules/wifippler/core/models/network.py

@@ -21,6 +21,30 @@ class WiFiSecurityType(Enum):
     WPS = auto()   # WiFi Protected Setup
 
 
+# Mapeamento de códigos de segurança para WiFiSecurityType
+SECURITY_MAP = {
+    'WPA2': WiFiSecurityType.WPA2,
+    'WPA3': WiFiSecurityType.WPA3,
+    'WPA2-EAP': WiFiSecurityType.WPA2_ENTERPRISE,
+    'WPA3-EAP': WiFiSecurityType.WPA3_ENTERPRISE,
+    'WEP': WiFiSecurityType.WEP,
+    'OPEN': WiFiSecurityType.NONE,
+    'NONE': WiFiSecurityType.NONE,
+    'WPA': WiFiSecurityType.WPA,
+    'WPA2-PSK': WiFiSecurityType.WPA2,
+    'WPA3-PSK': WiFiSecurityType.WPA3,
+    'WPA2-PSK-CCMP': WiFiSecurityType.WPA2,
+    'WPA2-PSK-TKIP': WiFiSecurityType.WPA2,
+    'WPA-PSK': WiFiSecurityType.WPA,
+    'WPA-PSK-CCMP': WiFiSecurityType.WPA,
+    'WPA-PSK-TKIP': WiFiSecurityType.WPA,
+    'WPA2-ENTERPRISE': WiFiSecurityType.WPA2_ENTERPRISE,
+    'WPA3-ENTERPRISE': WiFiSecurityType.WPA3_ENTERPRISE,
+    'OWE': WiFiSecurityType.OWE,
+    'WPS': WiFiSecurityType.WPS,
+}
+
+
 class WiFiCipherType(Enum):
     """Tipos de cifra suportados."""
     NONE = auto()

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/moriarty/modules/wifippler/core/scanner.py

@@ -33,6 +33,10 @@ from moriarty.modules.wifippler.core.utils import (
     randomize_mac, get_wireless_interfaces
 )
 
+from moriarty.modules.wifippler.core.models.network import (
+    WiFiSecurityType, SECURITY_MAP
+)
+
 # Configuração de logging
 logging.basicConfig(
     level=logging.INFO,
@@ -47,16 +51,7 @@ class ScanMode(Enum):
     FAST = auto()      # Varredura rápida (canais mais comuns)
     DEEP = auto()      # Varredura profunda (todos os canais)
 
-class WiFiSecurityType(Enum):
-    """Tipos de segurança de rede WiFi."""
-    NONE = "Aberta"
-    WEP = "WEP"
-    WPA = "WPA"
-    WPA2 = "WPA2"
-    WPA3 = "WPA3"
-    WPA_WPA2 = "WPA/WPA2"
-    WPA2_WPA3 = "WPA2/WPA3"
-    UNKNOWN = "Desconhecido"
+# WiFiSecurityType agora é importado de moriarty.modules.wifippler.core.models.network
 
 @dataclass
 class WiFiClient:
@@ -329,10 +324,16 @@ class WiFiScanner:
             
         encryption = encryption.upper()
         
+        # Verifica se a criptografia está no mapeamento
+        for key, security_type in SECURITY_MAP.items():
+            if key in encryption:
+                return security_type
+                
+        # Tenta inferir o tipo de segurança com base em padrões comuns
         if 'WPA3' in encryption and 'WPA2' in encryption:
-            return WiFiSecurityType.WPA2_WPA3
+            return WiFiSecurityType.WPA2
         elif 'WPA2' in encryption and 'WPA' in encryption:
-            return WiFiSecurityType.WPA_WPA2
+            return WiFiSecurityType.WPA2
         elif 'WPA3' in encryption:
             return WiFiSecurityType.WPA3
         elif 'WPA2' in encryption:
@@ -341,8 +342,9 @@ class WiFiScanner:
             return WiFiSecurityType.WPA
         elif 'WEP' in encryption:
             return WiFiSecurityType.WEP
-        else:
-            return WiFiSecurityType.UNKNOWN
+            
+        # Se não conseguir determinar, retorna o tipo padrão
+        return WiFiSecurityType.WPA2
     
     def _channel_to_frequency(self, channel: int) -> int:
         """Converte um número de canal para frequência em MHz.
@@ -536,7 +538,7 @@ class WiFiScanner:
                 existing.frequency = self._channel_to_frequency(network.channel)
                 
             # Atualiza a segurança, se disponível
-            if network.security != WiFiSecurityType.UNKNOWN:
+            if network.security != WiFiSecurityType.NONE:
                 existing.security = network.security
                 existing.encryption = network.encryption
                 existing.cipher = network.cipher

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/moriarty/modules/wifippler/core/utils/__init__.py

@@ -3,9 +3,13 @@ Módulo de utilidades do WiFiPPLER.
 
 Este módulo fornece funções auxiliares para operações comuns de rede e sistema.
 """
-from typing import Optional, List, Dict, Any
+import os
+import subprocess
+from typing import Optional, List, Dict, Any, Union
 
 # Importações principais
+from ..models.network import WiFiCipherType, WiFiAuthType, WiFiNetwork, WiFiClient
+
 from .network import (
     get_interface_ip,
     get_interface_netmask,
@@ -13,7 +17,8 @@ from .network import (
     is_wireless_interface,
     get_network_interfaces,
     is_interface_up,
-    get_interface_mac
+    get_interface_mac,
+    get_monitor_interfaces
 )
 
 from .system import (
@@ -79,24 +84,7 @@ SIOCGIFNAME = 0x8910
 SIOCGIFFLAGS = 0x8913
 SIOCSIFFLAGS = 0x8914
 
-# Mapeamento de códigos de segurança
-SECURITY_MAP = {
-    'WPA2': WiFiSecurityType.WPA2,
-    'WPA3': WiFiSecurityType.WPA3,
-    'WPA2-EAP': WiFiSecurityType.WPA2_ENTERPRISE,
-    'WPA3-EAP': WiFiSecurityType.WPA3_ENTERPRISE,
-    'WEP': WiFiSecurityType.WEP,
-    'OPEN': WiFiSecurityType.NONE,
-    'NONE': WiFiSecurityType.NONE,
-    'WPA': WiFiSecurityType.WPA,
-    'WPA2-PSK': WiFiSecurityType.WPA2,
-    'WPA3-PSK': WiFiSecurityType.WPA3,
-    'WPA2-PSK-CCMP': WiFiSecurityType.WPA2,
-    'WPA2-PSK-TKIP': WiFiSecurityType.WPA2,
-    'WPA-PSK': WiFiSecurityType.WPA,
-    'WPA-PSK-CCMP': WiFiSecurityType.WPA,
-    'WPA-PSK-TKIP': WiFiSecurityType.WPA,
-}
+# O mapeamento de códigos de segurança foi movido para core/models/network.py
 
 # Mapeamento de cifras
 CIPHER_MAP = {

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/moriarty/modules/wifippler/core/utils/network.py

@@ -189,13 +189,12 @@ def get_interface_mtu(interface: str) -> int:
     """
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        return struct.unpack('I', fcntl.ioctl(
-            s.fileno(),
-            SIOCGIFMTU,
-            struct.pack('256s', interface[:15].encode('utf-8'))
-        )[16:20])[0]
-    except (IOError, OSError):
-        return 1500  # MTU padrão
+        ifreq = struct.pack('256s', interface.encode('utf-8')[:15])
+        mtu = fcntl.ioctl(s.fileno(), SIOCGIFMTU, ifreq)
+        return struct.unpack('H', mtu[16:18])[0]
+    except (IOError, OSError, struct.error):
+        return 1500  # Valor padrão para MTU
+
 
 def get_network_interfaces() -> List[Dict[str, Any]]:
     """Obtém uma lista de todas as interfaces de rede.
@@ -205,19 +204,59 @@ def get_network_interfaces() -> List[Dict[str, Any]]:
     """
     interfaces = []
     
-    # Lista todos os diretórios em /sys/class/net
-    for iface in os.listdir('/sys/class/net'):
-        # Ignora interfaces de loopback
-        if iface == 'lo':
-            continue
+    try:
+        # Lista todos os diretórios em /sys/class/net
+        for iface in os.listdir('/sys/class/net'):
+            if iface == 'lo':  # Ignora a interface de loopback
+                continue
+                
+            # Verifica se é uma interface wireless
+            is_wireless = is_wireless_interface(iface)
             
-        interfaces.append({
-            'name': iface,
-            'mac': get_interface_mac(iface),
-            'ip': get_interface_ip(iface),
-            'wireless': is_wireless_interface(iface),
-            'up': is_interface_up(iface),
-            'mtu': get_interface_mtu(iface)
-        })
+            interfaces.append({
+                'name': iface,
+                'mac': get_interface_mac(iface),
+                'ip': get_interface_ip(iface),
+                'wireless': is_wireless,
+                'up': is_interface_up(iface),
+                'mtu': get_interface_mtu(iface)
+            })
+    except Exception as e:
+        print(f"Erro ao listar interfaces de rede: {e}")
     
     return interfaces
+
+
+def get_monitor_interfaces() -> List[Dict[str, Any]]:
+    """Obtém uma lista de interfaces de rede em modo monitor.
+    
+    Returns:
+        List[Dict[str, Any]]: Lista de dicionários com informações das interfaces em modo monitor
+    """
+    monitor_interfaces = []
+    
+    try:
+        # Obtém todas as interfaces de rede
+        interfaces = get_network_interfaces()
+        
+        # Filtra apenas as interfaces sem fio
+        wireless_interfaces = [iface for iface in interfaces if iface.get('wireless')]
+        
+        # Verifica quais interfaces estão em modo monitor
+        for iface in wireless_interfaces:
+            ifname = iface['name']
+            
+            # Verifica se a interface está em modo monitor
+            try:
+                with open(f'/sys/class/net/{ifname}/type', 'r') as f:
+                    iftype = int(f.read().strip())
+                    # O tipo 803 indica modo monitor (IEEE80211_IF_TYPE_MONITOR)
+                    if iftype == 803:
+                        monitor_interfaces.append(iface)
+            except (IOError, ValueError):
+                continue
+                
+    except Exception as e:
+        print(f"Erro ao listar interfaces em modo monitor: {e}")
+    
+    return monitor_interfaces

{moriarty_project-0.1.21 → moriarty_project-0.1.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "moriarty-project"
-version = "0.1.21"
+version = "0.1.22"
 description = "Client-side OSINT toolkit with forensic-grade evidence handling."
 readme = "README.md"
 requires-python = ">=3.11"