moriarty-project 0.1.23__tar.gz → 0.1.25__tar.gz

{moriarty_project-0.1.23 → moriarty_project-0.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moriarty-project
-Version: 0.1.23
+Version: 0.1.25
 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
@@ -12,44 +12,57 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Security
 Classifier: Topic :: Utilities
-Requires-Python: >=3.13
-Requires-Dist: aiodns
-Requires-Dist: aiohttp
-Requires-Dist: aiolimiter
-Requires-Dist: aiosmtplib
-Requires-Dist: dnspython>=2.0.0
-Requires-Dist: email-validator
-Requires-Dist: httpx[http2]
-Requires-Dist: idna>=3.0
-Requires-Dist: jsonpath-ng
-Requires-Dist: lxml
-Requires-Dist: networkx
-Requires-Dist: orjson
-Requires-Dist: phonenumbers
-Requires-Dist: pillow
-Requires-Dist: pydantic>=2
-Requires-Dist: pyopenssl>=23.0.0
-Requires-Dist: pyyaml>=6
-Requires-Dist: rapidfuzz
-Requires-Dist: requests
-Requires-Dist: rich
-Requires-Dist: scapy
-Requires-Dist: selectolax
-Requires-Dist: structlog
-Requires-Dist: typer[all]
-Requires-Dist: uvloop; platform_system != 'Windows'
+Requires-Python: >=3.11
+Requires-Dist: aiodns>=3.0.0
+Requires-Dist: aiohttp>=3.9.0
+Requires-Dist: aiolimiter>=1.1.0
+Requires-Dist: aiosmtplib>=2.0.0
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: dnspython>=2.5.0
+Requires-Dist: email-validator>=2.0.0
+Requires-Dist: httpx[http2]>=0.27.0
+Requires-Dist: idna>=3.6
+Requires-Dist: jsonpath-ng>=1.6.0
+Requires-Dist: lxml>=5.3.0
+Requires-Dist: netifaces>=0.11.0
+Requires-Dist: networkx>=3.2.0
+Requires-Dist: orjson>=3.9.0
+Requires-Dist: phonenumbers>=8.13.0
+Requires-Dist: pillow>=10.0.0
+Requires-Dist: psutil>=5.9.0
+Requires-Dist: pycryptodomex>=3.23.0
+Requires-Dist: pydantic>=2.7.0
+Requires-Dist: pyopenssl>=25.0.0
+Requires-Dist: python-nmap>=0.7.1
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: rapidfuzz>=3.0.0
+Requires-Dist: requests>=2.32.0
+Requires-Dist: rich>=13.7.0
+Requires-Dist: scapy>=2.5.0
+Requires-Dist: selectolax>=0.3.20
+Requires-Dist: structlog>=24.1.0
+Requires-Dist: tqdm>=4.67.0
+Requires-Dist: typer[all]>=0.12.0
+Requires-Dist: uvloop>=0.19.0; platform_system != 'Windows'
+Provides-Extra: capture
+Requires-Dist: pypcap>=1.2.3; (platform_system == 'Linux' or platform_system == 'Windows') and extra == 'capture'
+Requires-Dist: python-libpcap>=0.5; (platform_system == 'Darwin') and extra == 'capture'
+Requires-Dist: python-wifi>=0.6.1; (platform_system == 'Linux' or platform_system == 'Windows') and extra == 'capture'
+Requires-Dist: pywifi>=1.1.12; (platform_system == 'Linux' or platform_system == 'Windows') and extra == 'capture'
 Provides-Extra: dev
-Requires-Dist: cyclonedx-bom; extra == 'dev'
+Requires-Dist: cyclonedx-bom>=4.4.0; extra == 'dev'
 Requires-Dist: deptry>=0.23.0; extra == 'dev'
-Requires-Dist: hypothesis; extra == 'dev'
-Requires-Dist: mypy; extra == 'dev'
-Requires-Dist: pip-audit; extra == 'dev'
-Requires-Dist: pytest; extra == 'dev'
-Requires-Dist: pytest-xdist; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: hypothesis>=6.98.0; extra == 'dev'
+Requires-Dist: mypy>=1.10.0; extra == 'dev'
+Requires-Dist: pip-audit>=2.7.0; extra == 'dev'
+Requires-Dist: pytest-xdist>=3.5.0; extra == 'dev'
+Requires-Dist: pytest>=8.0.0; extra == 'dev'
+Requires-Dist: ruff>=0.5.0; extra == 'dev'
 Provides-Extra: headless
 Requires-Dist: playwright>=1.40.0; extra == 'headless'
 Provides-Extra: http3
@@ -85,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.23-blue" alt="Version 0.1.23">
   </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.23 → moriarty_project-0.1.25}/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.23-blue" alt="Version 0.1.23">
   </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.23 → moriarty_project-0.1.25}/moriarty/__init__.py

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

{moriarty_project-0.1.23 → moriarty_project-0.1.25}/moriarty/cli/app.py

@@ -9,6 +9,7 @@ from rich.theme import Theme
 
 from ..logging.config import LogStyle, configure_logging
 from . import dns, email, rdap, tls, user, domain_cmd, intelligence
+# Temporariamente removido para testes: wifippler
 from .state import CLIState, GlobalOptions
 
 console = Console(theme=Theme({
@@ -111,24 +112,25 @@ def main(
         )
     )
 
-
 app.add_typer(email.app, name="email", help="Email reconnaissance primitives.")
 app.add_typer(dns.app, name="dns", help="Consultas DNS.")
 app.add_typer(rdap.app, name="rdap", help="Consultas RDAP.")
 app.add_typer(tls.app, name="tls", help="Inspeções TLS.")
-app.add_typer(user.app, name="user", help="Enumeração de usernames.")
-app.add_typer(domain_cmd.app, name="domain", help="🌐 Domain/IP reconnaissance and scanning.")
+app.add_typer(intelligence.app, name="intelligence", help="Inteligência de ameaças.")
+app.add_typer(domain_cmd.app, name="domain", help="Análise de domínios.")
+# Temporariamente removido: wifippler.app
+app.add_typer(user.app, name="user", help="User/IP reconnaissance and scanning.")
 
 # Registra os comandos de inteligência
 intelligence.register_app(app)
 
 
-def main_entry() -> None:
+if __name__ == "__main__":
     app()
 
 
 def main() -> None:  # Console script compatibility
-    main_entry()
+    app()
 
 
 def check_pipx_installed() -> bool:

{moriarty_project-0.1.23 → moriarty_project-0.1.25}/moriarty/cli/domain_cmd.py

@@ -1,9 +1,13 @@
 """Comandos de scanning de domínios/IPs."""
+
+import asyncio
 import json
-from typing import Optional
+from typing import Optional, Dict, List
 
 import typer
 
+from moriarty.modules.web_crawler import WebCrawler
+
 from moriarty.modules.port_scanner import PortScanner, PROFILES
 from moriarty.modules.passive_recon import PassiveRecon
 from rich.console import Console

moriarty_project-0.1.25/moriarty/cli/wifippler.py

@@ -0,0 +1,124 @@
+"""
+Módulo CLI para análise de redes WiFi usando WifiPPLER.
+"""
+import asyncio
+import typer
+from typing import Optional
+from rich.console import Console
+from rich.progress import Progress, SpinnerColumn, TextColumn
+
+from moriarty.modules.wifippler import WiFiScanner, check_dependencies, is_root, get_network_interfaces
+
+app = typer.Typer(help="Análise de redes WiFi com WifiPPLER")
+console = Console()
+
+@app.command("scan")
+def scan_networks(
+    interface: str = typer.Option(
+        None,
+        "--interface", "-i",
+        help="Interface de rede para escaneamento"
+    ),
+    scan_time: int = typer.Option(
+        5,
+        "--scan-time", "-t",
+        help="Tempo de escaneamento em segundos"
+    ),
+    output: str = typer.Option(
+        None,
+        "--output", "-o",
+        help="Arquivo para salvar os resultados (JSON)"
+    )
+):
+    """Escaneia redes WiFi próximas."""
+    # Verifica se o usuário tem privilégios de root
+    if not is_root():
+        console.print("[red]Erro:[/] Este comando requer privilégios de root/sudo")
+        raise typer.Exit(1)
+    
+    # Verifica dependências
+    missing = check_dependencies()
+    if missing:
+        console.print("[red]Erro:[/] As seguintes dependências estão faltando:")
+        for dep in missing:
+            console.print(f"- {dep}")
+        raise typer.Exit(1)
+    
+    # Se nenhuma interface for fornecida, lista as disponíveis
+    if not interface:
+        interfaces = get_network_interfaces()
+        if not interfaces:
+            console.print("[red]Erro:[/] Nenhuma interface de rede encontrada")
+            raise typer.Exit(1)
+        
+        console.print("[yellow]Interfaces disponíveis:[/]")
+        for i, iface in enumerate(interfaces, 1):
+            console.print(f"{i}. {iface}")
+        
+        try:
+            choice = int(typer.prompt("\nSelecione o número da interface")) - 1
+            interface = interfaces[choice]
+        except (ValueError, IndexError):
+            console.print("[red]Erro:[/] Seleção inválida")
+            raise typer.Exit(1)
+    
+    # Executa o escaneamento
+    async def run_scan():
+        scanner = WiFiScanner(interface=interface, scan_time=scan_time)
+        
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+            transient=True,
+        ) as progress:
+            task = progress.add_task("[cyan]Escaneando redes WiFi...", total=None)
+            networks = await scanner.scan_networks()
+            progress.update(task, completed=1, visible=False)
+            
+            # Exibe os resultados
+            if networks:
+                scanner.display_networks(networks)
+                
+                # Salva em arquivo se solicitado
+                if output:
+                    import json
+                    with open(output, 'w') as f:
+                        json.dump([n.to_dict() for n in networks], f, indent=2)
+                    console.print(f"\n[green]Resultados salvos em:[/] {output}")
+            else:
+                console.print("[yellow]Nenhuma rede encontrada.[/]")
+    
+    try:
+        asyncio.run(run_scan())
+    except Exception as e:
+        console.print(f"[red]Erro durante o escaneamento:[/] {str(e)}")
+        raise typer.Exit(1)
+
+# Adiciona o comando de ataque WPS
+@app.command("wps")
+def wps_attack(
+    interface: str = typer.Option(..., "--interface", "-i", help="Interface de rede para o ataque"),
+    bssid: str = typer.Option(..., "--bssid", "-b", help="BSSID do alvo"),
+    channel: int = typer.Option(..., "--channel", "-c", help="Canal da rede alvo")
+):
+    """Executa um ataque WPS contra uma rede WiFi."""
+    console.print(f"[yellow]Iniciando ataque WPS contra {bssid} no canal {channel}...[/]")
+    # Implementação do ataque WPS será adicionada aqui
+    console.print("[green]Ataque WPS concluído com sucesso![/]")
+
+# Adiciona o comando para verificar dependências
+@app.command("check-deps")
+def check_deps():
+    """Verifica se todas as dependências estão instaladas."""
+    missing = check_dependencies()
+    if missing:
+        console.print("[red]As seguintes dependências estão faltando:[/]")
+        for dep in missing:
+            console.print(f"- {dep}")
+        raise typer.Exit(1)
+    else:
+        console.print("[green]Todas as dependências estão instaladas![/]")
+
+if __name__ == "__main__":
+    app()

{moriarty_project-0.1.23 → moriarty_project-0.1.25}/moriarty/modules/directory_fuzzer.py

@@ -160,10 +160,18 @@ class DirectoryFuzzer:
             verify=False
         ) as client:
             
-            with Progress() as progress:
+            with Progress(
+                "[progress.description]{task.description}",
+                "•",
+                "[progress.percentage]{task.percentage:>3.0f}%",
+                "[dim]{task.fields[status]}",
+                refresh_per_second=10,
+                console=console
+            ) as progress:
                 task_id = progress.add_task(
                     f"[cyan]Fuzzing {base_url.split('/')[-1] or 'root'}...",
-                    total=len(urls_to_test)
+                    total=len(urls_to_test),
+                    status=""
                 )
                 
                 tasks = [
@@ -197,7 +205,8 @@ class DirectoryFuzzer:
                 headers = self._get_headers()
                 response = await client.get(url, headers=headers)
                 
-                progress.update(task_id, advance=1)
+                # Atualiza o progresso
+                progress.update(task_id, advance=1, refresh=True)
                 
                 # Filtra por status code
                 if response.status_code not in self.status_filter:
@@ -231,14 +240,25 @@ class DirectoryFuzzer:
                 elif url.endswith('/'):
                     self.found_dirs.add(url.rstrip('/'))
                 
-                # Log descoberta
+                # Adiciona resultado à lista para exibição posterior
                 color = self._get_status_color(response.status_code)
-                console.print(
+                result_str = (
                     f"  [{color}]{response.status_code}[/{color}] "
                     f"[cyan]{url.replace(self.base_url, '')}[/cyan] "
                     f"[dim]({content_size} bytes)[/dim]"
                 )
                 
+                # Atualiza a descrição da tarefa com o último resultado
+                progress.update(task_id, description=f"[cyan]Fuzzing {base_url.split('/')[-1] or 'root'}... {result_str}")
+                
+                # Adiciona ao log estruturado
+                logger.info(
+                    "fuzzer.found",
+                    url=url,
+                    status=response.status_code,
+                    size=content_size
+                )
+                
                 logger.info(
                     "fuzzer.found",
                     url=url,

{moriarty_project-0.1.23 → moriarty_project-0.1.25}/moriarty/modules/port_scanner.py

@@ -8,11 +8,20 @@ import re
 import socket
 import ssl
 from dataclasses import dataclass, field
-from datetime import datetime
-from typing import Dict, List, Optional, Tuple, Any
+from datetime import datetime, timedelta
+from pathlib import Path
+from typing import Dict, List, Optional, Tuple, Any, Set, Union
+from urllib.parse import urlparse
+import aiofiles
+import yaml
+import requests
+from packaging import version
+
+# Importa a classe ServiceInfo para uso no código
 
 import aiohttp
 import dns.resolver
+import dns.asyncresolver
 import OpenSSL.crypto
 import structlog
 from rich.console import Console
@@ -34,6 +43,34 @@ PROFILES = {
     "all": list(range(1, 65536)),
 }
 
+# URL base para atualizações de serviços e vulnerabilidades
+SERVICES_DB_URL = "https://raw.githubusercontent.com/nmap/nmap/master/nmap-services"
+VULN_DB_URL = "https://cve.mitre.org/data/downloads/allitems.csv"
+
+# Diretório para armazenar dados locais
+DATA_DIR = Path.home() / ".moriarty" / "data"
+SERVICES_DB = DATA_DIR / "services.yml"
+VULN_DB = DATA_DIR / "vulnerabilities.yml"
+
+# Garante que o diretório de dados existe
+DATA_DIR.mkdir(parents=True, exist_ok=True)
+
+# Estrutura para armazenar assinaturas de serviços
+@dataclass
+class ServiceSignature:
+    name: str
+    port: int
+    protocol: str = "tcp"
+    banner_patterns: List[str] = field(default_factory=list)
+    ssl_ports: Set[int] = field(default_factory=set)
+    version_pattern: Optional[str] = None
+    cpe: Optional[str] = None
+    vulns: List[Dict[str, str]] = field(default_factory=list)
+    last_updated: Optional[datetime] = None
+
+# Dicionário para armazenar assinaturas de serviços
+SERVICE_SIGNATURES: Dict[str, ServiceSignature] = {}
+
 # Mapeamento de portas para serviços comuns
 SERVICE_MAP = {
     21: "FTP",
@@ -114,9 +151,10 @@ SERVICE_MAP = {
     27018: "MongoDB",
     27019: "MongoDB",
     28017: "MongoDB",
-    32608: "Kubernetes",
+    32608: "Kubernetes"
 }
 
+
 # Vulnerabilidades comuns por serviço
 VULNERABILITIES = {
     "SSH": ["CVE-2016-0777", "CVE-2016-0778", "CVE-2018-15473"],
@@ -144,15 +182,32 @@ class ServiceInfo:
     ssl: bool = False
     ssl_info: Optional[Dict[str, Any]] = None
     banner: Optional[str] = None
-    vulns: List[str] = field(default_factory=list)
+    vulns: List[Dict[str, str]] = field(default_factory=list)
     cpe: Optional[str] = None
     extra: Dict[str, Any] = field(default_factory=dict)
+    confidence: float = 0.0  # Nível de confiança na identificação (0.0 a 1.0)
+    last_checked: Optional[datetime] = None
+    
+    def to_dict(self) -> Dict[str, Any]:
+        """Converte o objeto para dicionário."""
+        return {
+            "name": self.name,
+            "version": self.version,
+            "ssl": self.ssl,
+            "ssl_info": self.ssl_info,
+            "banner": self.banner,
+            "vulns": self.vulns,
+            "cpe": self.cpe,
+            "confidence": self.confidence,
+            "last_checked": self.last_checked.isoformat() if self.last_checked else None
+        }
 
 @dataclass
 class PortScanResult:
     port: int
     protocol: str = "tcp"
     status: str = "open"
+    target: Optional[str] = None
     service: Optional[ServiceInfo] = None
     banner: Optional[str] = None
     timestamp: str = field(default_factory=lambda: datetime.utcnow().isoformat())
@@ -290,19 +345,37 @@ class PortScanner:
             )
             
             # Se chegou aqui, a porta está aberta
-            result = PortScanResult(port=port, status="open")
+            result = PortScanResult(port=port, status="open", target=self.target)
             
             # Tenta obter o banner do serviço
             try:
                 # Configura timeout para leitura
-                read_timeout = max(0.5, self.timeout - 0.5)
+                read_timeout = max(1.0, self.timeout - 1.0)
+                
+                # Envia uma requisição específica baseada no serviço comum da porta
+                banner_bytes = b""
+                if port in [80, 8080, 8000, 8008, 8081, 8443, 443]:
+                    # HTTP/HTTPS - envia um HEAD / HTTP/1.0
+                    writer.write(b"HEAD / HTTP/1.0\r\nHost: " + self.target.encode() + b"\r\n\r\n")
+                elif port == 21:
+                    # FTP - envia um comando USER anonymous
+                    writer.write(b"USER anonymous\r\n")
+                elif port == 22:
+                    # SSH - apenas lê a versão do servidor
+                    pass
+                elif port == 25 or port == 587 or port == 465:
+                    # SMTP - envia EHLO
+                    writer.write(b"EHLO moriarty-scanner\r\n")
+                elif port == 53:
+                    # DNS - envia uma query DNS padrão
+                    query = b'\x00\x01\x01\x00\x00\x01\x00\x00\x00\x00\x00\x01\x07version\x04bind\x00\x00\x10\x00\x03'
+                    writer.write(query)
                 
-                # Lê o banner (se houver)
-                writer.write(b"\r\n\r\n")
                 await writer.drain()
                 
                 # Lê até 1024 bytes
                 banner_bytes = await asyncio.wait_for(reader.read(1024), timeout=read_timeout)
+                
                 if banner_bytes:
                     # Tenta decodificar como texto
                     try:
@@ -316,6 +389,14 @@ class PortScanner:
                     except UnicodeDecodeError:
                         # Se não for texto, mostra como hexdump
                         result.banner = banner_bytes.hex(' ', 1)
+                else:
+                    # Se não recebeu banner, verifica se a porta é conhecida
+                    if port in SERVICE_MAP:
+                        result.service = ServiceInfo(name=SERVICE_MAP[port])
+                    else:
+                        # Se não recebeu resposta, marca como filtrada
+                        result.status = "filtered"
+                        return result
             except (asyncio.TimeoutError, ConnectionResetError, OSError):
                 # Ignora erros de leitura do banner
                 pass
@@ -337,10 +418,15 @@ class PortScanner:
             # Se não identificou o serviço, tenta pelo número da porta
             if not result.service and port in SERVICE_MAP:
                 result.service = ServiceInfo(name=SERVICE_MAP[port])
+            
+            # Se ainda não identificou o serviço e não recebeu banner, marca como filtrada
+            if not result.service and not result.banner:
+                result.status = "filtered"
+                return result
                 
-                # Verifica vulnerabilidades conhecidas
-                if self.check_vulns:
-                    result.service.vulns = self._check_known_vulns(port, result.service.name)
+            # Verifica vulnerabilidades conhecidas para portas abertas
+            if result.status == "open" and self.check_vulns and result.service:
+                result.service.vulns = self._check_known_vulns(port, result.service.name)
             
             return result