Skip to content

Commit b9a532c

Browse files
committed
Added CPIO archive support #883
1 parent 34c8706 commit b9a532c

6 files changed

Lines changed: 11 additions & 6 deletions

File tree

config/dpkg/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Description: Data files for plaso (log2timeline)
1717

1818
Package: python3-plaso
1919
Architecture: all
20-
Depends: plaso-data (>= ${binary:Version}), libbde-python3 (>= 20140531), libcreg-python3 (>= 20200725), libesedb-python3 (>= 20150409), libevt-python3 (>= 20191104), libevtx-python3 (>= 20141112), libewf-python3 (>= 20131210), libfsapfs-python3 (>= 20201107), libfsext-python3 (>= 20200819), libfshfs-python3 (>= 20201103), libfsntfs-python3 (>= 20200805), libfsxfs-python3 (>= 20201114), libfvde-python3 (>= 20160719), libfwnt-python3 (>= 20180117), libfwsi-python3 (>= 20150606), liblnk-python3 (>= 20150830), libluksde-python3 (>= 20200101), libmsiecf-python3 (>= 20150314), libolecf-python3 (>= 20151223), libqcow-python3 (>= 20131204), libregf-python3 (>= 20201002), libscca-python3 (>= 20190605), libsigscan-python3 (>= 20190629), libsmdev-python3 (>= 20140529), libsmraw-python3 (>= 20140612), libvhdi-python3 (>= 20131210), libvmdk-python3 (>= 20140421), libvshadow-python3 (>= 20160109), libvslvm-python3 (>= 20160109), python3-artifacts (>= 20190305), python3-bencode, python3-certifi (>= 2016.9.26), python3-cffi-backend (>= 1.9.1), python3-chardet (>= 2.0.1), python3-cryptography (>= 2.0.2), python3-dateutil (>= 1.5), python3-defusedxml (>= 0.5.0), python3-dfdatetime (>= 20200824), python3-dfvfs (>= 20201114), python3-dfwinreg (>= 20201002), python3-dtfabric (>= 20200621), python3-elasticsearch (>= 7.0), python3-future (>= 0.16.0), python3-idna (>= 2.5), python3-lz4 (>= 0.10.0), python3-pefile (>= 2018.8.8), python3-psutil (>= 5.4.3), python3-pyparsing (>= 2.3.0), python3-pytsk3 (>= 20160721), python3-redis (>= 3.4), python3-requests (>= 2.18.0), python3-six (>= 1.1.0), python3-tz, python3-urllib3 (>= 1.21.1), python3-xlsxwriter (>= 0.9.3), python3-yaml (>= 3.10), python3-yara (>= 3.4.0), python3-zmq (>= 2.1.11), ${python3:Depends}, ${misc:Depends}
20+
Depends: plaso-data (>= ${binary:Version}), libbde-python3 (>= 20140531), libcreg-python3 (>= 20200725), libesedb-python3 (>= 20150409), libevt-python3 (>= 20191104), libevtx-python3 (>= 20141112), libewf-python3 (>= 20131210), libfsapfs-python3 (>= 20201107), libfsext-python3 (>= 20200819), libfshfs-python3 (>= 20201103), libfsntfs-python3 (>= 20200805), libfsxfs-python3 (>= 20201114), libfvde-python3 (>= 20160719), libfwnt-python3 (>= 20180117), libfwsi-python3 (>= 20150606), liblnk-python3 (>= 20150830), libluksde-python3 (>= 20200101), libmsiecf-python3 (>= 20150314), libolecf-python3 (>= 20151223), libqcow-python3 (>= 20131204), libregf-python3 (>= 20201002), libscca-python3 (>= 20190605), libsigscan-python3 (>= 20190629), libsmdev-python3 (>= 20140529), libsmraw-python3 (>= 20140612), libvhdi-python3 (>= 20131210), libvmdk-python3 (>= 20140421), libvshadow-python3 (>= 20160109), libvslvm-python3 (>= 20160109), python3-artifacts (>= 20190305), python3-bencode, python3-certifi (>= 2016.9.26), python3-cffi-backend (>= 1.9.1), python3-chardet (>= 2.0.1), python3-cryptography (>= 2.0.2), python3-dateutil (>= 1.5), python3-defusedxml (>= 0.5.0), python3-dfdatetime (>= 20200824), python3-dfvfs (>= 20201231), python3-dfwinreg (>= 20201002), python3-dtfabric (>= 20200621), python3-elasticsearch (>= 7.0), python3-future (>= 0.16.0), python3-idna (>= 2.5), python3-lz4 (>= 0.10.0), python3-pefile (>= 2018.8.8), python3-psutil (>= 5.4.3), python3-pyparsing (>= 2.3.0), python3-pytsk3 (>= 20160721), python3-redis (>= 3.4), python3-requests (>= 2.18.0), python3-six (>= 1.1.0), python3-tz, python3-urllib3 (>= 1.21.1), python3-xlsxwriter (>= 0.9.3), python3-yaml (>= 3.10), python3-yara (>= 3.4.0), python3-zmq (>= 2.1.11), ${python3:Depends}, ${misc:Depends}
2121
Description: Python 3 module of plaso (log2timeline)
2222
Plaso (log2timeline) is a framework to create super timelines. Its
2323
purpose is to extract timestamps from various files found on typical

dependencies.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ version_property: __version__
5656

5757
[dfvfs]
5858
dpkg_name: python3-dfvfs
59-
minimum_version: 20201114
59+
minimum_version: 20201231
6060
rpm_name: python3-dfvfs
6161
version_property: __version__
6262

plaso/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
'dateutil': ('__version__', '1.5', None, True),
2828
'defusedxml': ('__version__', '0.5.0', None, True),
2929
'dfdatetime': ('__version__', '20200824', None, True),
30-
'dfvfs': ('__version__', '20201114', None, True),
30+
'dfvfs': ('__version__', '20201231', None, True),
3131
'dfwinreg': ('__version__', '20201002', None, True),
3232
'dtfabric': ('__version__', '20200621', None, True),
3333
'elasticsearch': ('__versionstr__', '7.0', None, False),

plaso/engine/worker.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,12 @@ def _ProcessArchiveTypes(self, mediator, path_spec, type_indicators):
499499
'archive file: {1:s}').format(type_indicators, display_name))
500500

501501
for type_indicator in type_indicators:
502-
if type_indicator == dfvfs_definitions.TYPE_INDICATOR_TAR:
502+
if type_indicator == dfvfs_definitions.TYPE_INDICATOR_CPIO:
503+
archive_path_spec = path_spec_factory.Factory.NewPathSpec(
504+
dfvfs_definitions.TYPE_INDICATOR_CPIO, location='/',
505+
parent=path_spec)
506+
507+
elif type_indicator == dfvfs_definitions.TYPE_INDICATOR_TAR:
503508
archive_path_spec = path_spec_factory.Factory.NewPathSpec(
504509
dfvfs_definitions.TYPE_INDICATOR_TAR, location='/',
505510
parent=path_spec)

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ chardet >= 2.0.1
99
cryptography >= 2.0.2
1010
defusedxml >= 0.5.0
1111
dfdatetime >= 20200824
12-
dfvfs >= 20201114
12+
dfvfs >= 20201231
1313
dfwinreg >= 20201002
1414
dtfabric >= 20200621
1515
elasticsearch >= 7.0

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ requires = libbde-python3 >= 20140531
5555
python3-dateutil >= 1.5
5656
python3-defusedxml >= 0.5.0
5757
python3-dfdatetime >= 20200824
58-
python3-dfvfs >= 20201114
58+
python3-dfvfs >= 20201231
5959
python3-dfwinreg >= 20201002
6060
python3-dtfabric >= 20200621
6161
python3-elasticsearch >= 7.0

0 commit comments

Comments
 (0)