MCP/mcghidra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve instance discovery with custom host parameter and optimized timeouts

Browse Source
This commit is contained in:
Teal Bauer 2025-03-30 01:19:28 +01:00
parent 86d04860bf
commit a3ab275fcd
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -49,3 +49,4 @@ mvnw.cmd
hs_err_pid* hs_err_pid*
replay_pid* replay_pid*
/__pycache__

32
bridge_mcp_hydra.py
View File

@ -19,14 +19,13 @@ active_instances: Dict[int, dict] = {}
instances_lock = Lock() instances_lock = Lock()
DEFAULT_GHIDRA_PORT = 8192 DEFAULT_GHIDRA_PORT = 8192
DEFAULT_GHIDRA_HOST = "localhost" DEFAULT_GHIDRA_HOST = "localhost"
DISCOVERY_PORT_RANGE = range(8192, 8300) # Port range to scan for Ghidra instances # Port ranges for scanning
QUICK_DISCOVERY_RANGE = range(8192, 8202) # Limited range for interactive/triggered discovery (10 ports)
FULL_DISCOVERY_RANGE = range(8192, 8212) # Wider range for background discovery (20 ports)
mcp = FastMCP("hydra-mcp") mcp = FastMCP("hydra-mcp")
# Get host from environment variable, command line, or use default
ghidra_host = os.environ.get("GHIDRA_HYDRA_HOST", DEFAULT_GHIDRA_HOST) ghidra_host = os.environ.get("GHIDRA_HYDRA_HOST", DEFAULT_GHIDRA_HOST)
if len(sys.argv) > 1:
ghidra_host = sys.argv[1]
print(f"Using Ghidra host: {ghidra_host}") print(f"Using Ghidra host: {ghidra_host}")
def get_instance_url(port: int) -> str: def get_instance_url(port: int) -> str:
@ -188,18 +187,27 @@ def unregister_instance(port: int) -> str:
return f"No instance found on port {port}" return f"No instance found on port {port}"
@mcp.tool() @mcp.tool()
def discover_instances() -> dict: def discover_instances(host: str = None) -> dict:
"""Auto-discover Ghidra instances by scanning ports""" """Auto-discover Ghidra instances by scanning ports (quick discovery with limited range)
found_instances = []
for port in DISCOVERY_PORT_RANGE: Args:
host: Optional host to scan (defaults to configured ghidra_host)
"""
return _discover_instances(QUICK_DISCOVERY_RANGE, host=host, timeout=0.5)
def _discover_instances(port_range, host=None, timeout=0.5) -> dict:
"""Internal function to discover Ghidra instances by scanning ports"""
found_instances = []
scan_host = host if host is not None else ghidra_host
for port in port_range:
if port in active_instances: if port in active_instances:
continue continue
url = f"http://{ghidra_host}:{port}" url = f"http://{scan_host}:{port}"
try: try:
test_url = f"{url}/instances" test_url = f"{url}/instances"
response = requests.get(test_url, timeout=1) # Short timeout for scanning response = requests.get(test_url, timeout=timeout) # Short timeout for scanning
if response.ok: if response.ok:
result = register_instance(port, url) result = register_instance(port, url)
found_instances.append({"port": port, "url": url, "result": result}) found_instances.append({"port": port, "url": url, "result": result})
@ -277,7 +285,9 @@ def periodic_discovery():
"""Periodically discover new instances""" """Periodically discover new instances"""
while True: while True:
try: try:
discover_instances() # Use the full discovery range
_discover_instances(FULL_DISCOVERY_RANGE, timeout=0.5)
# Also check if any existing instances are down # Also check if any existing instances are down
with instances_lock: with instances_lock:
ports_to_remove = [] ports_to_remove = []