Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: do not trim api names that include :: #1897

Merged
merged 3 commits into from
Jan 8, 2024
Merged

fix: do not trim api names that include :: #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1d433a
fix: do not trim api names that include ::
mike-hunhoff Dec 9, 2023
297423c
merge upstream
mike-hunhoff Jan 8, 2024
3bddb1d
extend tests to cover dll_trim_part for .NET
mike-hunhoff Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion capa/rules/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,9 @@ def trim_dll_part(api: str) -> str:

# kernel32.CreateFileA
if api.count(".") == 1:
api = api.split(".")[1]
if "::" not in api:
# skip System.Convert::FromBase64String
api = api.split(".")[1]
return api


Expand Down
2 changes: 2 additions & 0 deletions tests/test_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,7 @@ def test_count_api():
features:
- or:
- count(api(kernel32.CreateFileA)): 1
- count(api(System.Convert::FromBase64String)): 1
"""
)
r = capa.rules.Rule.from_yaml(rule)
Expand All @@ -957,6 +958,7 @@ def test_count_api():
assert bool(r.evaluate({API("kernel32.CreateFile"): set()})) is False
assert bool(r.evaluate({API("CreateFile"): {ADDR1}})) is False
assert bool(r.evaluate({API("CreateFileA"): {ADDR1}})) is True
assert bool(r.evaluate({API("System.Convert::FromBase64String"): {ADDR1}})) is True


def test_invalid_number():
Expand Down
Loading