gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2025-12-12 15:49:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

vverbose: prefer isinstance checks over strings

Browse Source 
which also makes mypy happier
This commit is contained in:
Willi Ballenthin
2022-12-07 13:14:05 +00:00
parent c195afa0b3
commit 1d8a3486cd
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
capa/render/vverbose.py
View File

@@ -144,24 +144,25 @@ def render_feature(ostream, match: rd.Match, feature: frzf.Feature, indent=0):
if value is None:
raise ValueError("%s contains None" % key)
if key not in ("regex", "substring"):
if not isinstance(feature, (frzf.RegexFeature, frzf.SubstringFeature)):
# like:
# number: 10 = SOME_CONSTANT @ 0x401000
if key == "string":
if isinstance(feature, frzf.StringFeature):
value = render_string_value(value)
elif key in ("number", "offset", "operand number", "operand offset"):
elif isinstance(
feature, (frzf.NumberFeature, frzf.OffsetFeature, frzf.OperandNumberFeature, frzf.OperandOffsetFeature)
):
assert isinstance(value, int)
value = f"0x{value:X}"
if key == "property":
if feature.access is not None:
key = f"property/{feature.access}"
if isinstance(feature, frzf.PropertyFeature) and feature.access is not None:
key = f"property/{feature.access}"
elif key == "operand number":
elif isinstance(feature, frzf.OperandNumberFeature):
key = f"operand[{feature.index}].number"
elif key == "operand offset":
elif isinstance(feature, frzf.OperandOffsetFeature):
key = f"operand[{feature.index}].offset"
ostream.write(f"{key}: ")
@@ -173,7 +174,7 @@ def render_feature(ostream, match: rd.Match, feature: frzf.Feature, indent=0):
ostream.write(capa.rules.DESCRIPTION_SEPARATOR)
ostream.write(feature.description)
if key not in ("os", "arch", "format"):
if not isinstance(feature, (frzf.OSFeature, frzf.ArchFeature, frzf.FormatFeature)):
render_locations(ostream, match.locations)
ostream.write("\n")
else: