Skip to content

Commit

Permalink
Fallback to the first executable map if the given executable is inval…
Browse files Browse the repository at this point in the history
…id (#184)

When a core file is created from a Python script that's executed
directly via shebang, the reported executable will be the shell script.
This is a problem because when we proceed to analyse the core file
pystack fails as this is not the correct binary that was used to
generate the core.

To avoid this problem, detect when this happens and fall back to the
executable reported in the first map that has a path in the core, which
is generally the real executable that we need.

Signed-off-by: Pablo Galindo <[email protected]>
  • Loading branch information
pablogsal authored Jul 24, 2024
1 parent 2657eb6 commit c0b8b49
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 3 deletions.
1 change: 1 addition & 0 deletions news/184.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug that was causing Python scripts executed directly via shebang to report the shell script as the executable.
20 changes: 20 additions & 0 deletions src/pystack/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,26 @@ def process_core(parser: argparse.ArgumentParser, args: argparse.Namespace) -> N
if args.executable is None:
corefile_analyzer = CoreFileAnalyzer(corefile)
executable = pathlib.Path(corefile_analyzer.extract_executable())
if not executable.exists() or not is_elf(executable):
first_map = next(
(
map
for map in corefile_analyzer.extract_maps()
if map.path is not None
),
None,
)
if (
first_map is not None
and first_map.path is not None
and first_map.path.exists()
and is_elf(first_map.path)
):
executable = first_map.path
LOGGER.info(
"Setting executable automatically to the first map in the core: %s",
executable,
)
if not executable.exists():
raise errors.DetectedExecutableNotFound(
f"Detected executable doesn't exist: {executable}"
Expand Down
3 changes: 2 additions & 1 deletion src/pystack/_pystack.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ from typing import Optional
from typing import Tuple
from typing import Union

from .maps import VirtualMap
from .types import PyThread

class CoreFileAnalyzer:
Expand All @@ -17,7 +18,7 @@ class CoreFileAnalyzer:
def extract_build_ids(self) -> Iterable[Tuple[str, str, str]]: ...
def extract_executable(self) -> pathlib.Path: ...
def extract_failure_info(self) -> Dict[str, Any]: ...
def extract_maps(self) -> Iterable[Dict[str, Any]]: ...
def extract_maps(self) -> Iterable[VirtualMap]: ...
def extract_pid(self) -> int: ...
def extract_ps_info(self) -> Dict[str, Any]: ...
def missing_modules(self) -> List[str]: ...
Expand Down
2 changes: 1 addition & 1 deletion src/pystack/_pystack.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ cdef class CoreFileAnalyzer:
self._core_analyzer = make_shared[CoreFileExtractor](analyzer)

@intercept_runtime_errors(EngineError)
def extract_maps(self) -> Iterable[Dict[str, Any]]:
def extract_maps(self) -> Iterable[VirtualMap]:
mapped_files = self._core_analyzer.get().extractMappedFiles()
memory_maps = self._core_analyzer.get().MemoryMaps()
return generate_maps_from_core_data(mapped_files, memory_maps)
Expand Down
70 changes: 69 additions & 1 deletion tests/unit/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from pystack.errors import InvalidPythonProcess
from pystack.errors import MissingExecutableMaps
from pystack.errors import NotEnoughInformation
from pystack.maps import VirtualMap


def test_error_message_wih_permission_error_text():
Expand Down Expand Up @@ -505,7 +506,7 @@ def test_process_core_default_without_executable_and_executable_does_not_exist(c
"extracted_executable"
)
# THEN
path_exists_mock.side_effect = [True, False]
path_exists_mock.side_effect = [True, False, False, False]

with pytest.raises(SystemExit):
main()
Expand Down Expand Up @@ -1299,3 +1300,70 @@ def test_core_file_missing_build_ids_are_logged(caplog, native):
else []
)
assert record_messages == expected


def test_executable_is_not_elf_uses_the_first_map():
# GIVEN
argv = ["pystack", "core", "corefile"]

# WHEN
real_executable = Path("/foo/bar/executable")

with patch(
"pystack.__main__.get_process_threads_for_core"
) as get_process_threads_mock, patch("pystack.__main__.print_thread"), patch(
"pystack.__main__.is_elf", lambda x: x == real_executable
), patch(
"pystack.__main__.is_gzip", return_value=False
), patch(
"sys.argv", argv
), patch(
"pathlib.Path.exists", return_value=True
), patch(
"pystack.__main__.CoreFileAnalyzer"
) as core_analyzer_test:
core_analyzer_test().extract_executable.return_value = "extracted_executable"
core_analyzer_test().extract_maps.return_value = [
VirtualMap(
start=0x1000,
end=0x2000,
flags="r-xp",
offset=0,
device="00:00",
inode=0,
filesize=0,
path=None,
),
VirtualMap(
start=0x2000,
end=0x3000,
flags="rw-p",
offset=0,
device="00:00",
inode=0,
filesize=0,
path=Path("/foo/bar/executable"),
),
VirtualMap(
start=0x3000,
end=0x4000,
flags="r--p",
offset=0,
device="00:00",
inode=0,
filesize=0,
path=None,
),
]
main()

# THEN

get_process_threads_mock.assert_called_with(
Path("corefile"),
real_executable,
library_search_path="",
native_mode=NativeReportingMode.OFF,
locals=False,
method=StackMethod.AUTO,
)

0 comments on commit c0b8b49

Please sign in to comment.