moriarty-project 0.1.13__tar.gz → 0.1.15__tar.gz

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moriarty-project
-Version: 0.1.13
+Version: 0.1.15
 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/pypi/v/moriarty-project?color=blue&label=PyPI" alt="PyPI version">
+    <img src="https://img.shields.io/badge/version-0.1.15-blue" alt="Version 0.1.15">
   </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.13 → moriarty_project-0.1.15}/README.md

@@ -19,7 +19,7 @@
 <!-- Badges -->
 <p align="center">
   <a href="https://pypi.org/project/moriarty-project/">
-    <img src="https://img.shields.io/pypi/v/moriarty-project?color=blue&label=PyPI" alt="PyPI version">
+    <img src="https://img.shields.io/badge/version-0.1.15-blue" alt="Version 0.1.15">
   </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.13 → moriarty_project-0.1.15}/moriarty/__init__.py

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

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/attacks/deauth.py

@@ -22,7 +22,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from ...core.models.network import WiFiNetwork, WiFiClient
-from ...utils import (
+from ...core.utils import (
     is_root, check_dependencies, get_network_interfaces,
     set_monitor_mode, restore_network_interface, command_exists,
     get_interface_mac

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/attacks/handshake.py

@@ -18,7 +18,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, TimeElapsedColumn
 
 from ...core.models.network import WiFiNetwork, WiFiClient
-from ...utils import (
+from ...core.utils import (
     is_root, check_dependencies, get_network_interfaces,
     set_monitor_mode, restore_network_interface, command_exists,
     get_interface_mac

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/attacks/pmkid.py

@@ -18,7 +18,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, TimeElapsedColumn
 
 from ...core.models.network import WiFiNetwork
-from ...utils import (
+from ...core.utils import (
     is_root, check_dependencies, get_network_interfaces,
     set_monitor_mode, restore_network_interface, command_exists
 )

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/attacks/wep.py

@@ -24,7 +24,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, TimeElapsedColumn
 
 from ...core.models.network import WiFiNetwork
-from ...utils import (
+from ...core.utils import (
     is_root, check_dependencies, get_network_interfaces,
     set_monitor_mode, restore_network_interface, command_exists
 )

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/attacks/wpa.py

@@ -20,7 +20,7 @@ from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, TimeElapsedColumn
 
 from ...core.models.network import WiFiNetwork, WiFiClient
-from ...utils import (
+from ...core.utils import (
     is_root, check_dependencies, get_network_interfaces,
     set_monitor_mode, restore_network_interface, command_exists
 )

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/utils/__init__.py

@@ -6,6 +6,7 @@ import sys
 import re
 import subprocess
 import shlex
+import shutil
 import logging
 import socket
 import fcntl
@@ -100,24 +101,41 @@ def check_dependencies() -> List[str]:
         if not command_exists(dep):
             missing.append(dep)
     
-    return missing
 
 def command_exists(cmd: str) -> bool:
     """Verifica se um comando existe no sistema."""
     return shutil.which(cmd) is not None
 
-def get_network_interfaces() -> List[str]:
-    """Retorna a lista de interfaces de rede sem fio disponíveis."""
-    interfaces = []
+# A função get_wireless_interfaces já está definida acima, então não precisamos duplicá-la
+
+def run_command(cmd: Union[str, List[str]], capture_output: bool = False, 
+               check: bool = True, **kwargs) -> subprocess.CompletedProcess:
+    """
+    Executa um comando no shell com tratamento de erros.
     
-    try:
-        for interface in netifaces.interfaces():
-            if interface.startswith(('wlan', 'wlp', 'wlo', 'wlp')):
-                interfaces.append(interface)
-    except Exception as e:
-        logger.error(f"Erro ao obter interfaces de rede: {e}")
+    Args:
+        cmd: Comando a ser executado (string ou lista)
+        capture_output: Se deve capturar a saída padrão e de erro
+        check: Se deve lançar uma exceção em caso de código de saída diferente de zero
+        **kwargs: Argumentos adicionais para subprocess.run()
+        
+    Returns:
+        subprocess.ClosedProcess: Resultado da execução do comando
+    """
+    if isinstance(cmd, str):
+        cmd = cmd.split()
+    
+    kwargs.setdefault('stdout', subprocess.PIPE if capture_output else None)
+    kwargs.setdefault('stderr', subprocess.PIPE if capture_output else None)
+    kwargs.setdefault('text', True)
     
-    return interfaces
+    try:
+        return subprocess.run(cmd, check=check, **kwargs)
+    except subprocess.CalledProcessError as e:
+        logger.error(f"Command failed with exit code {e.returncode}: {' '.join(cmd)}")
+        if capture_output and e.stderr:
+            logger.error(f"Error output: {e.stderr.strip()}")
+        raise
 
 def get_monitor_interfaces() -> List[str]:
     """Retorna a lista de interfaces em modo monitor."""
@@ -600,13 +618,3 @@ def randomize_mac(interface: str) -> bool:
     except subprocess.CalledProcessError as e:
         logger.error(f"Falha ao aleatorizar o endereço MAC: {e}")
         return False
-
-def get_wireless_interfaces() -> List[Dict[str, Any]]:
-    """
-    Obtém uma lista de interfaces de rede sem fio.
-    
-    Returns:
-        List[Dict[str, Any]]: Lista de interfaces sem fio com suas propriedades
-    """
-    return [iface for iface in get_network_interfaces() 
-            if iface.get('wireless', False)]

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/moriarty/modules/wifippler/core/utils.py

@@ -173,13 +173,54 @@ def get_network_interfaces() -> List[Dict[str, Any]]:
 
 def get_wireless_interfaces() -> List[Dict[str, Any]]:
     """
-    Get a list of wireless network interfaces.
+    Obtém uma lista de interfaces de rede sem fio.
     
     Returns:
-        List[Dict[str, Any]]: List of wireless interfaces with their properties
+        List[Dict[str, Any]]: Lista de interfaces sem fio com suas propriedades.
+        Cada dicionário contém as seguintes chaves:
+        - name: Nome da interface
+        - mac: Endereço MAC da interface
+        - ip: Endereço IP da interface
+        - wireless: True se for uma interface sem fio
+        - up: True se a interface estiver ativa
+        - mtu: Tamanho máximo de unidade de transmissão
+        
+    Raises:
+        RuntimeError: Se ocorrer um erro ao obter as interfaces de rede
     """
-    return [iface for iface in get_network_interfaces() 
-            if iface.get('wireless', False)]
+    try:
+        interfaces = get_network_interfaces()
+        if not interfaces:
+            logger.warning("Nenhuma interface de rede encontrada")
+            return []
+            
+        wireless_interfaces = []
+        for iface in interfaces:
+            try:
+                if iface.get('wireless', False):
+                    # Adiciona informações adicionais à interface
+                    iface_info = {
+                        'name': iface.get('name', ''),
+                        'mac': iface.get('mac', ''),
+                        'ip': iface.get('ip', ''),
+                        'wireless': True,
+                        'up': iface.get('up', False),
+                        'mtu': iface.get('mtu', 0)
+                    }
+                    wireless_interfaces.append(iface_info)
+            except Exception as e:
+                logger.error(f"Erro ao processar interface {iface.get('name', 'desconhecida')}: {e}")
+                continue
+                
+        if not wireless_interfaces:
+            logger.warning("Nenhuma interface sem fio encontrada")
+            
+        return wireless_interfaces
+        
+    except Exception as e:
+        error_msg = f"Erro ao obter interfaces sem fio: {e}"
+        logger.error(error_msg)
+        raise RuntimeError(error_msg) from e
 
 def get_interface_mac(interface: str) -> Optional[str]:
     """

{moriarty_project-0.1.13 → moriarty_project-0.1.15}/pyproject.toml

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