Skip to content

Commit

Permalink
Merge pull request #2324 from williballenthin/fix/2323
Browse files Browse the repository at this point in the history
rules: deduplicate API features with stripped DLL
  • Loading branch information
mr-tz authored Aug 22, 2024
2 parents df3c265 + 68a38b6 commit 0a6bc20
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

### Bug Fixes

- fix duplicate features shown in vverbose mode @williballenthin #2323

### capa explorer IDA Pro plugin

### Development
Expand Down
19 changes: 14 additions & 5 deletions capa/rules/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -575,28 +575,37 @@ def trim_dll_part(api: str) -> str:
return api


def unique(sequence):
"""deduplicate the items in the given sequence, returning a list with the same order.
via: https://stackoverflow.com/a/58666031
"""
seen = set()
return [x for x in sequence if not (x in seen or seen.add(x))] # type: ignore [func-returns-value]


def build_statements(d, scopes: Scopes):
if len(d.keys()) > 2:
raise InvalidRule("too many statements")

key = list(d.keys())[0]
description = pop_statement_description_entry(d[key])
if key == "and":
return ceng.And([build_statements(dd, scopes) for dd in d[key]], description=description)
return ceng.And(unique(build_statements(dd, scopes) for dd in d[key]), description=description)
elif key == "or":
return ceng.Or([build_statements(dd, scopes) for dd in d[key]], description=description)
return ceng.Or(unique(build_statements(dd, scopes) for dd in d[key]), description=description)
elif key == "not":
if len(d[key]) != 1:
raise InvalidRule("not statement must have exactly one child statement")
return ceng.Not(build_statements(d[key][0], scopes), description=description)
elif key.endswith(" or more"):
count = int(key[: -len("or more")])
return ceng.Some(count, [build_statements(dd, scopes) for dd in d[key]], description=description)
return ceng.Some(count, unique(build_statements(dd, scopes) for dd in d[key]), description=description)
elif key == "optional":
# `optional` is an alias for `0 or more`
# which is useful for documenting behaviors,
# like with `write file`, we might say that `WriteFile` is optionally found alongside `CreateFileA`.
return ceng.Some(0, [build_statements(dd, scopes) for dd in d[key]], description=description)
return ceng.Some(0, unique(build_statements(dd, scopes) for dd in d[key]), description=description)

elif key == "process":
if Scope.FILE not in scopes:
Expand Down Expand Up @@ -672,7 +681,7 @@ def build_statements(d, scopes: Scopes):
# - arch: i386
# - mnemonic: cmp
#
statements = ceng.And([build_statements(dd, Scopes(static=Scope.INSTRUCTION)) for dd in d[key]])
statements = ceng.And(unique(build_statements(dd, Scopes(static=Scope.INSTRUCTION)) for dd in d[key]))

return ceng.Subscope(Scope.INSTRUCTION, statements, description=description)

Expand Down

0 comments on commit 0a6bc20

Please sign in to comment.