ARES - authorized red-team engagement automation with dashboard, campaign scope, module orchestration, OPSEC controls, encrypted vault, and reporting.
Python active-directorycloud-securitydefensive-validationfastapigood-first-issuemitre-attackopsecreactred-teamreportingsecurity
fix(resource): service_detect socket cleanup on timeout (MOD-060)
Mafifrizi4147e9f7b8d4
diff --git a/ares/modules/network/service_detect.py b/ares/modules/network/service_detect.pyindex 0f2c977..4c1077c 100644--- a/ares/modules/network/service_detect.py+++ b/ares/modules/network/service_detect.py@@ -95,6 +95,7 @@ def _fingerprint_os_from_banners(banners: list[str]) -> dict[str, Any] | None:async def _grab_banner(host: str, port: int, timeout: float = 4.0,use_tls: bool = False) -> str:"""Connect to port, optionally TLS-wrap, read banner bytes."""+ writer = Nonetry:if use_tls:ctx = ssl.create_default_context()@@ -119,15 +120,17 @@ async def _grab_banner(host: str, port: int, timeout: float = 4.0,await writer.drain()data = await asyncio.wait_for(reader.read(2048), timeout=timeout)- writer.close()- try:- await writer.wait_closed()- except Exception:- passreturn data.decode("utf-8", errors="replace").strip()[:1000]except Exception:return ""+ finally:+ if writer:+ writer.close()+ try:+ await asyncio.wait_for(writer.wait_closed(), timeout=2.0)+ except (asyncio.TimeoutError, Exception):+ pass # Best effort cleanup@module_contract(diff --git a/tests/unit/modules/test_service_detect_teardown.py b/tests/unit/modules/test_service_detect_teardown.pynew file mode 100644index 0000000..31acab8--- /dev/null+++ b/tests/unit/modules/test_service_detect_teardown.py@@ -0,0 +1,47 @@+from __future__ import annotations++import asyncio+from unittest.mock import AsyncMock, MagicMock, patch+import pytest++from ares.modules.network.service_detect import _grab_banner+++async def test_service_detect_socket_cleanup_on_timeout():+ """MOD-060: socket writer is closed and wait_closed is called even if TimeoutError occurs during read."""+ mock_reader = AsyncMock()+ mock_reader.read.side_effect = asyncio.TimeoutError("Read timed out")++ mock_writer = MagicMock()+ mock_writer.drain = AsyncMock()+ mock_writer.wait_closed = AsyncMock()++ async def fake_open_connection(*args, **kwargs):+ return mock_reader, mock_writer++ with patch("asyncio.open_connection", side_effect=fake_open_connection):+ banner = await _grab_banner("10.0.0.1", 80, timeout=1.0)+ assert banner == ""+ assert mock_writer.close.called+ assert mock_writer.wait_closed.called+++async def test_service_detect_socket_cleanup_on_normal_read():+ """MOD-060: socket writer is closed cleanly on normal read completion."""+ mock_reader = AsyncMock()+ mock_reader.read.return_value = b"SSH-2.0-OpenSSH_8.9p1\r\n"++ mock_writer = MagicMock()+ mock_writer.drain = AsyncMock()+ mock_writer.wait_closed = AsyncMock()++ async def fake_open_connection(*args, **kwargs):+ return mock_reader, mock_writer++ with patch("asyncio.open_connection", side_effect=fake_open_connection):+ banner = await _grab_banner("10.0.0.1", 22, timeout=1.0)+ assert "SSH-2.0-OpenSSH_8.9p1" in banner+ assert mock_writer.close.called+ assert mock_writer.wait_closed.called