moriarty-project 0.1.24__py3-none-any.whl → 0.1.25__py3-none-any.whl

moriarty/__init__.py

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

moriarty/modules/port_scanner.py

@@ -8,8 +8,14 @@ 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
 
@@ -37,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",
@@ -117,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"],
@@ -147,9 +182,25 @@ 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:
@@ -299,14 +350,32 @@ class PortScanner:
             # 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:
@@ -320,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
@@ -341,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
             

{moriarty_project-0.1.24.dist-info → moriarty_project-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moriarty-project
-Version: 0.1.24
+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
@@ -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.24-blue" alt="Version 0.1.24">
+    <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">
@@ -152,7 +152,7 @@ Description-Content-Type: text/markdown
 pipx install moriarty-project
 
 # OU para instalar uma versão específica
-# pipx install moriarty-project==0.1.24
+# pipx install moriarty-project==0.1.23
 
 # Verificar a instalação
 moriarty --help

{moriarty_project-0.1.24.dist-info → moriarty_project-0.1.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-moriarty/__init__.py,sha256=p4Djdhmv6FeCw-z_OFHcm4SkmafU1L00Iny0SkEY3Kk,85
+moriarty/__init__.py,sha256=6gfNgVpti1BJIBlPYh_ygBNbEQ7CuvrDMFT3oL7q6UA,85
 moriarty/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moriarty/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moriarty/assets/modules/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -386,7 +386,7 @@ moriarty/modules/orchestrator.py,sha256=uhK4UP69uWUxCK4a_bGk_BI8I-coBM8mO8Ear3pc
 moriarty/modules/passive_recon.py,sha256=5XUJgyWvITMUf4W76QyNfbRgF1AitQ5xK9MbwzVURxM,16568
 moriarty/modules/phone_extractor.py,sha256=Bv4VVWPqf67CQfkMDJddggtEU5UUbra2FP5DLik2Gxw,5298
 moriarty/modules/pipeline_orchestrator.py,sha256=qP2WcvorM_pAjacJ8VuZ-1TQ7lDVLvnyFD9T4PvWq9I,26337
-moriarty/modules/port_scanner.py,sha256=FNExysXgxHU-z77yYIRL2om7C23WkiF-AMliPjSmQhQ,33432
+moriarty/modules/port_scanner.py,sha256=eyrtmJ4z5-IyOizbDODeQWTNI9Z0DnlHcWEPH3ckp3Q,36913
 moriarty/modules/rdap.py,sha256=XlrTDalbSxszEwIQFHt-XWON_P9UsLLiR84DGSKAwrk,1859
 moriarty/modules/rdap_extended.py,sha256=Gef7zyOY5nuS2qn8a9iaXA7Tx3TJHZJBWpqa-BZaq4U,6447
 moriarty/modules/stealth_mode.py,sha256=9LJWXSgBjDsTZYslHz4zSnzDoC3JFdBcu3oOYN1IPhA,24459
@@ -413,7 +413,7 @@ moriarty/tests/test_email_service.py,sha256=mWqimjQRlljZNBuNePvSzhfq5FZ4mljrILGW
 moriarty/tests/test_models.py,sha256=etklIISEUts3banaSRDSjhv-g6kd4wxucchCmlJkx6Y,1282
 moriarty/tests/test_orchestrator.py,sha256=Do3M1qnbqPf_1pR3v89FXxhiwfYPZfXRvcfl05isQvs,856
 moriarty/tests/test_tls_client.py,sha256=bQ46yXlIYNZwPTd8WGs6eUynHj56hVosxBycSU1gJe4,461
-moriarty_project-0.1.24.dist-info/METADATA,sha256=y2VGfhCSIvtkV5IfEcieRpC4sMLhSRRlEJjsasUJ_gw,11709
-moriarty_project-0.1.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-moriarty_project-0.1.24.dist-info/entry_points.txt,sha256=L4TAUKy7HAy5hT46ZqS6eNOCmUTMi4x7ehZkIkTNnuE,51
-moriarty_project-0.1.24.dist-info/RECORD,,
+moriarty_project-0.1.25.dist-info/METADATA,sha256=JCScdJfoDJl7lQRQv23CQl_UkFXeqRUspQFl2OIIA0k,11709
+moriarty_project-0.1.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+moriarty_project-0.1.25.dist-info/entry_points.txt,sha256=L4TAUKy7HAy5hT46ZqS6eNOCmUTMi4x7ehZkIkTNnuE,51
+moriarty_project-0.1.25.dist-info/RECORD,,