Skip to content

Commit f98c58d

Browse files
authored
Fix release (#1456)
* Fix a bug with pinfo call * Update version * add pinfo to dependency for plasojob
1 parent e102b06 commit f98c58d

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

poetry.lock

Lines changed: 14 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "turbinia"
3-
version = "20240311"
3+
version = "20240313"
44
description = "Automation and Scaling of Digital Forensics Tools"
55
authors = ["Turbinia Developers <[email protected]>"]
66
maintainers = ["Turbinia Developers <[email protected]>"]

turbinia/config/turbinia_config_tmpl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
'timeout': 1200
231231
}, {
232232
'job': 'PlasoJob',
233-
'programs': ['log2timeline'],
233+
'programs': ['log2timeline', 'pinfo'],
234234
'docker_image': None,
235235
'timeout': 86400
236236
}, {

turbinia/evidence.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ def _validate(self):
10581058
TurbiniaException: if validation fails.
10591059
"""
10601060
cmd = [
1061-
'pinfo.py',
1061+
'pinfo',
10621062
'--output-format',
10631063
'json',
10641064
'--sections',
@@ -1068,19 +1068,19 @@ def _validate(self):
10681068
total_file_events = 0
10691069

10701070
try:
1071-
log.info(f'Running pinfo.py to validate PlasoFile {self.local_path}')
1071+
log.info(f'Running pinfo to validate PlasoFile {self.local_path}')
10721072
command = subprocess.run(cmd, capture_output=True, check=True)
10731073
storage_counters_json = command.stdout.decode('utf-8').strip()
10741074
# pinfo.py might print warnings so we only need to last line of output
10751075
storage_counters_json = storage_counters_json.splitlines()[-1]
10761076
storage_counters = json.loads(storage_counters_json)
10771077
total_file_events = storage_counters.get('storage_counters', {}).get(
10781078
'parsers', {}).get('total', 0)
1079-
log.info(f'pinfo.py found {total_file_events} events.')
1079+
log.info(f'pinfo found {total_file_events} events.')
10801080
if not total_file_events:
10811081
raise TurbiniaException(
1082-
'PlasoFile validation failed, pinfo.py found no events.')
1083-
except subprocess.CalledProcessError as exception:
1082+
'PlasoFile validation failed, pinfo found no events.')
1083+
except (subprocess.CalledProcessError, FileNotFoundError) as exception:
10841084
raise TurbiniaException(
10851085
f'Error validating plaso file: {exception!s}') from exception
10861086
except json.decoder.JSONDecodeError as exception:

0 commit comments

Comments
 (0)