# Conflicts: # AGENTS.md # acp_adapter/edit_approval.py # acp_adapter/server.py # agent/agent_init.py # agent/anthropic_adapter.py # agent/anthropic_credentials.py # agent/auxiliary_client.py # agent/azure_identity_adapter.py # agent/bedrock_adapter.py # agent/browser_registry.py # agent/chat_completion_helpers.py # agent/coding_context.py # agent/context_references.py # agent/conversation_loop.py # agent/copilot_acp_client.py # agent/credits_tracker.py # agent/curator.py # agent/curator_backup.py # agent/deadline.py # agent/display.py # agent/errors.py # agent/estop.py # agent/i18n.py # agent/image_gen_registry.py # agent/image_routing.py # agent/learning_graph.py # agent/learning_mutations.py # agent/lsp/servers.py # agent/model_metadata.py # agent/models_dev.py # agent/monitoring/gateway_health_export.py # agent/monitoring/otlp_exporter.py # agent/pet/store.py # agent/process_bootstrap.py # agent/prompt_builder.py # agent/proxy_sources/iron_proxy.py # agent/secret_sources/_cache.py # agent/secret_sources/bitwarden.py # agent/secret_sources/registry.py # agent/shell_hooks.py # agent/skill_bundles.py # agent/skill_commands.py # agent/skill_utils.py # agent/ssl_guard.py # agent/ssl_verify.py # agent/system_prompt.py # agent/terminal_env_registry.py # agent/trace_upload.py # agent/transcription_registry.py # agent/tts_registry.py # agent/verify/environment.py # agent/vertex_adapter.py # agent/video_gen_registry.py # agent/web_search_registry.py # cli.py # cron/jobs.py # cron/scheduler.py # gateway/agent_cache_pressure.py # gateway/cgroup_cleanup.py # gateway/channel_directory.py # gateway/config.py # gateway/control_socket.py # gateway/dead_targets.py # gateway/drain_control.py # gateway/hooks.py # gateway/kanban_watchers.py # gateway/lifecycle_ledger.py # gateway/mirror.py # gateway/pairing.py # gateway/platform_registry.py # gateway/platforms/helpers.py # gateway/platforms/weixin.py # gateway/readiness.py # gateway/restart_loop_guard.py # gateway/rich_sent_store.py # gateway/run.py # gateway/session.py # gateway/shutdown_flush.py # gateway/shutdown_forensics.py # gateway/slash_commands.py # gateway/status.py # gateway/sticker_cache.py # gateway/whatsapp_identity.py # hermes_bootstrap.py # hermes_cli/_early_recovery.py # hermes_cli/_install_repair.py # hermes_cli/_startup_fast.py # hermes_cli/_subprocess_compat.py # hermes_cli/agent_plugins.py # hermes_cli/auth.py # hermes_cli/backup.py # hermes_cli/banner.py # hermes_cli/browser_connect.py # hermes_cli/build_info.py # hermes_cli/cli_agent_setup_mixin.py # hermes_cli/cli_commands_mixin.py # hermes_cli/codex_models.py # hermes_cli/config.py # hermes_cli/config_defaults.py # hermes_cli/config_migrations.py # hermes_cli/container_boot.py # hermes_cli/dashboard_auth/registry.py # hermes_cli/debug.py # hermes_cli/dep_ensure.py # hermes_cli/doctor.py # hermes_cli/doctor_live.py # hermes_cli/dump.py # hermes_cli/env_loader.py # hermes_cli/foreign_sessions.py # hermes_cli/gateway.py # hermes_cli/gateway_windows.py # hermes_cli/gui_uninstall.py # hermes_cli/image_provenance.py # hermes_cli/install_identity.py # hermes_cli/kanban.py # hermes_cli/kanban_db.py # hermes_cli/linux_desktop_entry.py # hermes_cli/local_runtime/binaries.py # hermes_cli/local_runtime/endpoint.py # hermes_cli/local_runtime/growth.py # hermes_cli/local_runtime/supervisor.py # hermes_cli/logs.py # hermes_cli/macos_tcc_anchor.py # hermes_cli/main.py # hermes_cli/memory_setup.py # hermes_cli/model_catalog.py # hermes_cli/models.py # hermes_cli/nous_subscription.py # hermes_cli/npm_engine.py # hermes_cli/plugin_index.py # hermes_cli/plugins.py # hermes_cli/plugins_cmd.py # hermes_cli/profile_distribution.py # hermes_cli/profiles.py # hermes_cli/prompt_size.py # hermes_cli/psutil_android.py # hermes_cli/runtime_repair.py # hermes_cli/security_advisories.py # hermes_cli/security_audit.py # hermes_cli/security_audit_startup.py # hermes_cli/service_manager.py # hermes_cli/session_export_md.py # hermes_cli/setup.py # hermes_cli/skills_hub.py # hermes_cli/slack_cli.py # hermes_cli/status.py # hermes_cli/subcommands/gateway.py # hermes_cli/subcommands/uninstall.py # hermes_cli/tools_config.py # hermes_cli/uninstall.py # hermes_cli/update_cmd.py # hermes_cli/update_contract.py # hermes_cli/update_inventory.py # hermes_cli/update_lock.py # hermes_cli/update_receipt.py # hermes_cli/urllib_security.py # hermes_cli/web_routers/local_models.py # hermes_cli/web_routers/profiles.py # hermes_cli/web_routers/skills.py # hermes_cli/web_server.py # hermes_constants.py # hermes_state.py # plugins/disk-cleanup/__init__.py # plugins/disk-cleanup/disk_cleanup.py # plugins/google_meet/node/registry.py # plugins/google_meet/node/server.py # plugins/google_meet/process_manager.py # plugins/google_meet/realtime/openai_client.py # plugins/hermes-achievements/dashboard/plugin_api.py # plugins/memory/hindsight/__init__.py # plugins/memory/honcho/__init__.py # plugins/memory/honcho/cli.py # plugins/memory/honcho/client.py # plugins/memory/honcho/oauth.py # plugins/memory/honcho/session.py # plugins/memory/mem0/__init__.py # plugins/memory/mem0/_setup.py # plugins/memory/openviking/__init__.py # plugins/memory/retaindb/__init__.py # plugins/memory/supermemory/__init__.py # plugins/platforms/a2a/protocol.py # plugins/platforms/dingtalk/adapter.py # plugins/platforms/discord/adapter.py # plugins/platforms/feishu/adapter.py # plugins/platforms/google_chat/adapter.py # plugins/platforms/matrix/adapter.py # plugins/platforms/photon/adapter.py # plugins/platforms/photon/auth.py # plugins/platforms/photon/cli.py # plugins/platforms/slack/adapter.py # plugins/platforms/teams/adapter.py # plugins/platforms/telegram/adapter.py # plugins/platforms/wecom/callback_adapter.py # plugins/platforms/whatsapp/adapter.py # plugins/teams_pipeline/store.py # plugins/video_gen/fal/__init__.py # plugins/web/ddgs/provider.py # plugins/web/exa/provider.py # plugins/web/firecrawl/provider.py # plugins/web/parallel/provider.py # tests/agent/test_ssl_ca_guard.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_cmd_update_apt.py # tests/hermes_cli/test_dashboard_unified_launch.py # tests/hermes_cli/test_dep_ensure.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_live.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_kanban_boards.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_memory_setup_provider_arg.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_pip_install_detection.py # tests/hermes_cli/test_profile_export_credentials.py # tests/hermes_cli/test_psutil_android_extract.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_tui_npm_install.py # tests/hermes_cli/test_update_fleet_restart_pending.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_ui_build.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/tools/test_browser_chromium_autoinstall.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_lightpanda.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_open_timeout.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_suspect_recycle.py # tests/tools/test_find_shell.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_macos_protected_search.py # tests/tui_gateway/test_compute_host.py # tools/approval.py # tools/blueprints.py # tools/bot_mode_dm.py # tools/bot_mode_probe.py # tools/bot_relay.py # tools/browser_tool.py # tools/browser_use_cli.py # tools/checkpoint_manager.py # tools/code_execution_tool.py # tools/code_kernel.py # tools/computer_use/cua_backend.py # tools/cronjob_tools.py # tools/discord_tool.py # tools/environments/base.py # tools/environments/daytona.py # tools/environments/local.py # tools/environments/modal.py # tools/environments/vercel_sandbox.py # tools/fal_common.py # tools/file_operations.py # tools/lazy_deps.py # tools/mcp_tool.py # tools/neutts_synth.py # tools/process_registry.py # tools/read_extract.py # tools/registry.py # tools/skill_ledger.py # tools/skill_linter.py # tools/skill_manager_tool.py # tools/skill_usage.py # tools/skills_ast_audit.py # tools/skills_guard.py # tools/skills_hub.py # tools/skills_sync.py # tools/skills_sync_client.py # tools/skills_tool.py # tools/terminal_scope.py # tools/terminal_tool.py # tools/tirith_security.py # tools/transcription_tools.py # tools/tts_tool.py # tools/vision_tools.py # tools/voice_mode.py # tools/wake_word.py # tools/web_result_cache.py # tools/website_policy.py # tools/working_diff.py # tools/write_approval.py # tui_gateway/entry.py # tui_gateway/methods_tools.py # tui_gateway/server.py
264 lines
10 KiB
Python
264 lines
10 KiB
Python
"""OSV malware check for MCP extension packages.
|
|
|
|
Before launching an MCP server via npx/uvx, queries Google's free public OSV API for
|
|
known malware advisories (MAL-* IDs). Regular CVEs are ignored — only confirmed malware
|
|
is blocked. Fail-open: network errors allow the package to proceed (~300ms typical).
|
|
Inspired by Block/goose's extension malware check.
|
|
"""
|
|
import json
|
|
import logging
|
|
import os
|
|
import re
|
|
import threading
|
|
import time
|
|
import urllib.request
|
|
from pathlib import Path
|
|
from typing import Optional, Tuple
|
|
logger = logging.getLogger(__name__)
|
|
|
|
_OSV_ENDPOINT = os.getenv("OSV_ENDPOINT", "https://api.osv.dev/v1/query")
|
|
_TIMEOUT = 10 # seconds
|
|
|
|
# Result cache: (ecosystem, package, version) -> (expiry_wallclock, result). Reconnect
|
|
# ladders, parked-server self-probes and repeated `hermes mcp test` runs re-run the preflight
|
|
# for the SAME package on every spawn; uncached, a flapping server becomes a sustained OSV/DNS
|
|
# query stream. Clean AND blocked verdicts are reusable; network failures are NOT cached
|
|
# (fail-open covers them and caching one could mask a real advisory later).
|
|
# The cache is also persisted under the Hermes home so separate processes and gateway
|
|
# restarts reuse warm verdicts; expiry is absolute wall-clock time so it survives restarts.
|
|
# Trade-off: a MAL advisory published right after a clean verdict is noticed at TTL expiry
|
|
# (<= 1h by default) rather than at next process start — lower OSV_CHECK_CACHE_TTL to tighten.
|
|
# Without a cache, a flapping server turns into a sustained OSV query/DNS stream — the #75485 incident
|
|
# logged 779K api.osv.dev DNS queries in 16h from revival loops. Malware advisories don't appear or vanish
|
|
# on second-to-second timescales, so a successful verdict (clean OR blocked) is reusable. The window is the
|
|
# same one the in-process cache already accepted; it just now spans restarts.
|
|
_CACHE_TTL_S = float(os.getenv("OSV_CHECK_CACHE_TTL", "3600"))
|
|
_CACHE_MAX_ENTRIES = 256
|
|
_cache: dict = {}
|
|
_cache_lock = threading.Lock()
|
|
_disk_cache_loaded = False
|
|
_DISK_CACHE_VERSION = 1
|
|
|
|
|
|
def _disk_cache_path() -> Optional[Path]:
|
|
"""Return the path for the persistent OSV verdict cache.
|
|
|
|
Uses ``hermes_constants.get_hermes_home()`` so the cache follows the
|
|
active profile and is isolated across Hermes homes. The cache directory
|
|
is created on demand. Returns ``None`` when Hermes home cannot be
|
|
resolved, in which case only the in-process cache is used.
|
|
"""
|
|
try:
|
|
from hermes_constants import get_hermes_home
|
|
|
|
home = get_hermes_home()
|
|
except Exception:
|
|
return None
|
|
try:
|
|
cache_dir = home / "cache"
|
|
cache_dir.mkdir(parents=True, exist_ok=True)
|
|
return cache_dir / "osv_check.json"
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
def _load_disk_cache() -> None:
|
|
"""Load persistent cache entries from disk into the in-process cache.
|
|
|
|
Invoked under ``_cache_lock`` from every get/put but does real work only
|
|
once per process (``_disk_cache_loaded`` latch); a transient ``OSError``
|
|
leaves the latch unset so the next call retries. Skips expired or
|
|
malformed entries. Only adds missing keys so an in-memory overwrite
|
|
(e.g. a test forcing expiry) is not silently reversed by the disk copy.
|
|
"""
|
|
global _disk_cache_loaded
|
|
if _disk_cache_loaded:
|
|
return
|
|
|
|
path = _disk_cache_path()
|
|
if path is None:
|
|
_disk_cache_loaded = True
|
|
return
|
|
|
|
try:
|
|
with open(path, "r", encoding="utf-8-sig") as f:
|
|
data = json.load(f)
|
|
except FileNotFoundError:
|
|
data = None
|
|
except OSError:
|
|
# Transient I/O (file busy, brief permission flap). Retry next call.
|
|
return
|
|
except Exception:
|
|
# Malformed JSON or anything else: unrecoverable, don't spin on it.
|
|
data = None
|
|
|
|
_disk_cache_loaded = True
|
|
if not isinstance(data, dict) or data.get("version") != _DISK_CACHE_VERSION:
|
|
return
|
|
|
|
now = time.time()
|
|
for key_str, entry in data.get("entries", {}).items():
|
|
if not isinstance(entry, dict):
|
|
continue
|
|
expiry = entry.get("expiry")
|
|
result = entry.get("result")
|
|
if expiry is None or expiry <= now:
|
|
continue
|
|
parts = key_str.split("|", 2)
|
|
if len(parts) != 3:
|
|
continue
|
|
key = (parts[0], parts[1], parts[2] or None)
|
|
if key not in _cache:
|
|
_cache[key] = (expiry, result)
|
|
|
|
|
|
def _save_disk_cache() -> None:
|
|
"""Persist the in-process cache to disk.
|
|
|
|
Caller must hold ``_cache_lock`` for consistency. Writes atomically to
|
|
a sibling file then renames into place.
|
|
"""
|
|
path = _disk_cache_path()
|
|
if path is None:
|
|
return
|
|
|
|
entries: dict = {}
|
|
for key, (expiry, result) in _cache.items():
|
|
key_str = "|".join(str(k) if k is not None else "" for k in key)
|
|
entries[key_str] = {"expiry": expiry, "result": result}
|
|
|
|
data = {"version": _DISK_CACHE_VERSION, "entries": entries}
|
|
|
|
try:
|
|
# Shared atomic writer (temp file + fsync + rename); mkstemp's 0600
|
|
# is kept on create, so verdicts never sit in a world-readable file.
|
|
from utils import atomic_write_text
|
|
|
|
atomic_write_text(path, json.dumps(data))
|
|
except Exception as exc:
|
|
logger.debug("Failed to save OSV disk cache to %s: %s", path, exc)
|
|
|
|
|
|
def _cache_get(key) -> Tuple[bool, Optional[str]]:
|
|
"""Return (hit, result) for a fresh cache entry."""
|
|
with _cache_lock:
|
|
_load_disk_cache()
|
|
entry = _cache.get(key)
|
|
if entry is not None and time.time() < entry[0]:
|
|
return True, entry[1]
|
|
_cache.pop(key, None) # absent or expired
|
|
return False, None
|
|
|
|
|
|
def _cache_put(key, result: Optional[str]) -> None:
|
|
with _cache_lock:
|
|
_load_disk_cache()
|
|
if len(_cache) >= _CACHE_MAX_ENTRIES:
|
|
now = time.time()
|
|
for k in [k for k, (exp, _) in _cache.items() if exp <= now]:
|
|
del _cache[k]
|
|
if len(_cache) >= _CACHE_MAX_ENTRIES:
|
|
_cache.clear() # tiny working set in practice; safe reset
|
|
_cache[key] = (time.time() + _CACHE_TTL_S, result)
|
|
_save_disk_cache()
|
|
|
|
|
|
def check_package_for_malware(command: str, args: list) -> Optional[str]:
|
|
"""Check an MCP server package (inferred from ``command``/``args``) for MAL-* advisories.
|
|
Returns a BLOCKED message, else None — also on network errors/unknown commands (fail-open)."""
|
|
ecosystem = _infer_ecosystem(command)
|
|
if not ecosystem:
|
|
return None # not npx/uvx — skip
|
|
package, version = _parse_package_from_args(args, ecosystem)
|
|
if not package:
|
|
return None
|
|
cache_key = (ecosystem, package, version)
|
|
hit, cached = _cache_get(cache_key)
|
|
if hit:
|
|
return cached
|
|
try:
|
|
malware = _query_osv(package, ecosystem, version)
|
|
except Exception as exc:
|
|
# Fail-open; deliberately NOT cached — see _CACHE_TTL_S comment.
|
|
logger.debug("OSV check failed for %s/%s (allowing): %s", ecosystem, package, exc)
|
|
return None
|
|
result = None
|
|
if malware:
|
|
ids = ", ".join(m["id"] for m in malware[:3])
|
|
summaries = "; ".join(m.get("summary", m["id"])[:100] for m in malware[:3])
|
|
result = (f"BLOCKED: Package '{package}' ({ecosystem}) has known malware "
|
|
f"advisories: {ids}. Details: {summaries}")
|
|
_cache_put(cache_key, result)
|
|
return result
|
|
|
|
|
|
_ECOSYSTEM_BY_COMMAND = {
|
|
"npx": "npm", "npx.cmd": "npm", "uvx": "PyPI", "uvx.cmd": "PyPI", "pipx": "PyPI"}
|
|
|
|
|
|
def _infer_ecosystem(command: str) -> Optional[str]:
|
|
return _ECOSYSTEM_BY_COMMAND.get(os.path.basename(command).lower())
|
|
|
|
|
|
def _parse_package_from_args(args: list, ecosystem: str) -> Tuple[Optional[str], Optional[str]]:
|
|
"""Extract (package_name, version) from command args, or (None, None) if not parseable."""
|
|
# Skip flags to find the package token. npx's explicit install target (--package=NAME /
|
|
# --package NAME / -p NAME) names a package distinct from the executed binary.
|
|
package_token = None
|
|
take_next = False
|
|
for arg in args or ():
|
|
if not isinstance(arg, str):
|
|
continue
|
|
if take_next:
|
|
package_token = arg
|
|
break
|
|
if arg in ("--package", "-p"):
|
|
take_next = True
|
|
continue
|
|
if arg.startswith("--package="):
|
|
package_token = arg[len("--package="):]
|
|
break
|
|
if arg.startswith("-"):
|
|
continue
|
|
package_token = arg
|
|
break
|
|
if not package_token:
|
|
return None, None
|
|
parser = _PACKAGE_PARSERS.get(ecosystem)
|
|
return parser(package_token) if parser else (package_token, None)
|
|
|
|
|
|
def _parse_npm_package(token: str) -> Tuple[Optional[str], Optional[str]]:
|
|
"""Parse npm package: @scope/name@version or name@version."""
|
|
if token.startswith("@"):
|
|
match = re.match(r"^(@[^/]+/[^@]+)(?:@(.+))?$", token)
|
|
return (match.group(1), match.group(2)) if match else (token, None)
|
|
if "@" in token:
|
|
name, version = token.rsplit("@", 1)
|
|
return name, version if version != "latest" else None
|
|
return token, None
|
|
|
|
|
|
def _parse_pypi_package(token: str) -> Tuple[Optional[str], Optional[str]]:
|
|
"""Parse PyPI package: name==version or name[extras]==version."""
|
|
match = re.match(r"^([a-zA-Z0-9._-]+)(?:\[[^\]]*\])?(?:==(.+))?$", token)
|
|
return (match.group(1), match.group(2)) if match else (token, None)
|
|
|
|
|
|
_PACKAGE_PARSERS = {"npm": _parse_npm_package, "PyPI": _parse_pypi_package}
|
|
|
|
|
|
def _query_osv(package: str, ecosystem: str, version: Optional[str] = None) -> list:
|
|
"""Query the OSV API; return only MAL-* advisories (regular CVEs ignored)."""
|
|
payload = {"package": {"name": package, "ecosystem": ecosystem}}
|
|
if version:
|
|
payload["version"] = version
|
|
req = urllib.request.Request(
|
|
_OSV_ENDPOINT,
|
|
data=json.dumps(payload).encode("utf-8"),
|
|
headers={"Content-Type": "application/json", "User-Agent": "hermes-agent-osv-check/1.0"},
|
|
method="POST")
|
|
with urllib.request.urlopen(req, timeout=_TIMEOUT) as resp:
|
|
result = json.loads(resp.read())
|
|
return [v for v in result.get("vulns", []) if v.get("id", "").startswith("MAL-")]
|