Skip to content

Commit 8428e81

Browse files
committed
Fix up remaining type-hints
Updates type hints on some fields of the result namedtuples to be their `objects.Primitive` types instead of Python primitives, and does any conversion to Python primitives in the generator methods.
1 parent a5dfc6a commit 8428e81

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

volatility3/framework/plugins/windows/mftscan.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class MFTScan(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface):
2525
class MFTScanResult(NamedTuple):
2626
offset: format_hints.Hex
2727
record_type: str
28-
record_number: int
29-
link_count: int
28+
record_number: objects.Integer
29+
link_count: objects.Integer
3030
mft_type: str
3131
permissions: Union[str, interfaces.renderers.BaseAbsentValue]
3232
attribute_type: str
@@ -275,8 +275,8 @@ class ADS(interfaces.plugins.PluginInterface):
275275

276276
class ADSResult(NamedTuple):
277277
offset: format_hints.Hex
278-
signature: str
279-
record_number: int
278+
signature: objects.String
279+
record_number: objects.Integer
280280
attribute_type: str
281281
filename: Union[objects.String, interfaces.renderers.BaseAbsentValue]
282282
stream_name: Union[objects.String, interfaces.renderers.BaseAbsentValue]
@@ -379,7 +379,7 @@ class ResidentData(interfaces.plugins.PluginInterface):
379379

380380
class ResidentDataResult(NamedTuple):
381381
offset: format_hints.Hex
382-
signature: str
382+
signature: objects.String
383383
record_number: int
384384
attribute_type: str
385385
filename: Union[objects.String, interfaces.renderers.BaseAbsentValue]
@@ -426,7 +426,7 @@ def parse_resident_data(
426426

427427
return cls.ResidentDataResult(
428428
format_hints.Hex(attr.Attr_Data.vol.offset),
429-
str(mft_record.get_signature()),
429+
mft_record.get_signature(),
430430
mft_record.RecordNumber,
431431
attr.Attr_Header.AttrType.lookup(),
432432
filename,
@@ -449,7 +449,7 @@ def _generator(self):
449449
# exposed through classmethods.
450450
yield 0, (
451451
resident_data_entry.offset,
452-
resident_data_entry.signature,
452+
str(resident_data_entry.signature),
453453
int(resident_data_entry.record_number),
454454
resident_data_entry.attribute_type,
455455
str(resident_data_entry.filename),

0 commit comments

Comments
 (0)