implement fixes by cyberkimchi in #2227

L1ghtn1ng · L1ghtn1ng · commit 419291a3e729 · 2026-02-08T13:31:49.000Z
diff --git a/tests/discovery/test_shodan_engine.py b/tests/discovery/test_shodan_engine.py
@@ -0,0 +1,44 @@
+import socket
+import sys
+from collections import OrderedDict
+
+import pytest
+
+
+class TestShodanEngine:
+    @pytest.mark.asyncio
+    async def test_shodan_engine_processes_without_work_item_error_and_yields_hostnames(self, monkeypatch, capsys):
+        # Import inside the test so monkeypatching affects the already-imported module namespace.
+        import theHarvester.__main__ as main_module
+
+        # Make DNS resolution deterministic and offline.
+        monkeypatch.setattr(socket, "gethostbyname", lambda _domain: "1.2.3.4", raising=True)
+
+        # Avoid filesystem/sqlite side effects.
+        class DummyStashManager:
+            async def do_init(self) -> None:
+                return None
+
+            async def store_all(self, domain, all, res_type, source) -> None:  # noqa: A002
+                return None
+
+        monkeypatch.setattr(main_module.stash, "StashManager", DummyStashManager, raising=True)
+
+        # Stub Shodan search to avoid network and API key requirements.
+        class DummySearchShodan:
+            async def search_ip(self, ip):
+                return OrderedDict({ip: {"hostnames": ["a.example.com", "b.example.com"]}})
+
+        monkeypatch.setattr(main_module.shodansearch, "SearchShodan", DummySearchShodan, raising=True)
+
+        # Run the CLI path that uses the engine queue/worker (`-b shodan`).
+        monkeypatch.setattr(sys, "argv", ["theHarvester", "-d", "example.com", "-b", "shodan"], raising=True)
+
+        with pytest.raises(SystemExit) as excinfo:
+            await main_module.start()
+        assert excinfo.value.code == 0
+
+        out = capsys.readouterr().out
+        assert 'A error occurred while processing a "work item"' not in out
+        assert "a.example.com" in out
+        assert "b.example.com" in out
diff --git a/theHarvester/__main__.py b/theHarvester/__main__.py
@@ -1016,7 +1016,7 @@ def __init__(self, domain):
                                 self.hosts = set()
                                 self.shodan = shodan_search
 
-                            async def do_search(self):
+                            async def process(self, use_proxy: bool = False):
                                 import socket
 
                                 try:
@@ -1027,13 +1027,17 @@ async def do_search(self):
                                     if ip in result and isinstance(result[ip], dict):
                                         # Add the IP as a host for consistency with other modules
                                         self.hosts.add(ip)
+
+                                        for host in result[ip].get('hostnames', []):
+                                            self.hosts.add(host)
+
                                         print(f'Found Shodan data for {ip}')
                                     elif ip in result and isinstance(result[ip], str):
                                         print(f'{ip}: {result[ip]}')
                                 except Exception as e:
                                     print(f'Error in Shodan search: {e}')
 
-                            def get_hostnames(self):
+                            async def get_hostnames(self):
                                 return list(self.hosts)
 
                         shodan_wrapper = ShodanWrapper(word)
