dotnet update: emit enclosing class information for nested classes #1913

bkojusner · 2023-12-20T01:23:28Z

Draft PR with progress to resolve #1780

google-cla · 2023-12-20T01:23:33Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

capa/features/extractors/dnfile/helpers.py

mike-hunhoff

Great work @bkojusner - your code is coming along nicely. Please see my comments and suggestions. Let me know here if you have any questions 🚀

capa/features/extractors/dnfile/helpers.py

capa/features/extractors/dnfile/types.py

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

mike-hunhoff

Good work @bkojusner this is coming together nicely. Please address my comments and re-request a review from me when you're ready. Let me know if you have any questions along the way 😃.

capa/features/extractors/dnfile/helpers.py

capa/features/extractors/dnfile/types.py

capa/features/extractors/dotnetfile.py

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

bkojusner · 2024-01-04T20:17:49Z

Latest changes look great @bkojusner! I've left some minor comments for you to address.

We have two more items to complete:

Update the changelog to include an entry for the work that you completed in this PR

Add unit tests so we can ensure your code continues working after your PR is merged (see

capa/tests/fixtures.py

Line 1056 in 1fc26b4

FEATURE_PRESENCE_TESTS_DOTNET = sorted(

)

Uploaded two test samples for the unit tests at mandiant/capa-testfiles#224.

capa/features/extractors/dnfile/types.py

mike-hunhoff

@bkojusner nice work! A few small changes for you to address and then we are ready to merge 🚀

capa/features/extractors/dnfile/helpers.py

mike-hunhoff · 2024-01-05T16:09:29Z

capa/features/extractors/dnfile/helpers.py

+    nested_class_table = {}
+
+    # Used to find nested classes in typedef
+    for _rid, nestedclass in iter_dotnet_table(pe, dnfile.mdtable.NestedClass.number):


Is _rid being used here? If not, see my suggestion above

mike-hunhoff

great job @bkojusner LGTM 🚀

williballenthin · 2024-01-05T18:18:36Z

woohoo congrats @bkojusner!

mr-tz · 2024-01-08T10:19:54Z

awesome! 🥳

Update helpers.py

3f488f3

bkojusner added 2 commits December 20, 2023 13:05

Update helpers.py

94346e4

TypeRef correction in helpers.py

8049bdc

mike-hunhoff reviewed Dec 20, 2023

View reviewed changes

capa/features/extractors/dnfile/helpers.py Outdated Show resolved Hide resolved

bkojusner added 3 commits December 20, 2023 17:58

Fixed TypeRef to proper functionality

46103b5

Accounts for TypeRef updated tuple

b2621c7

Corrected TypeDef tuple creation in helpers.py

94a8b65

mike-hunhoff requested changes Dec 21, 2023

View reviewed changes

bkojusner and others added 13 commits December 21, 2023 16:35

Update types.py

eefdfcf

Update types.py

36110d5

Create helpers_draft.py

73c8db7

Update capa/features/extractors/dnfile/helpers.py

bfcbb0d

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update helper functions, variables, and draft further implementations

30267c0

Update helpers.py

4f05fc6

Update types.py

43e972a

Directly access TypeDef and TypeRef tables

7381a1c

Update helpers.py

b943ebb

Update helpers.py

931cd84

Delete capa/features/extractors/dnfile/helpers_draft.py

a1ea3f8

Update types.py

0150b17

Update dotnetfile.py

9966ca3

mike-hunhoff requested changes Jan 2, 2024

View reviewed changes

bkojusner added 7 commits January 2, 2024 15:45

Update types.py comment

8f16a57

Clean extract_file_class_features in dotnetfile.py

6257203

Cleaned up callers, var names, and other small items

74abe41

Update dotnetfile.py

66f01c0

Clean up caller logic in dotnetfile.py

f8a97cf

Clean up callers and update helper logic in helpers.py

bb381e5

Linter corrections for types.py

bda8727

bkojusner and others added 14 commits January 4, 2024 11:33

Update capa/features/extractors/dnfile/helpers.py

807fc1f

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update capa/features/extractors/dnfile/helpers.py

abccf7d

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update capa/features/extractors/dnfile/helpers.py

a1b9319

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update capa/features/extractors/dnfile/helpers.py

d9800b7

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update capa/features/extractors/dnfile/helpers.py

9ccdd01

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update capa/features/extractors/dnfile/helpers.py

d84f2b1

Co-authored-by: Mike Hunhoff <mike.hunhoff@gmail.com>

Update helpers.py

62533f7

Update dotnetfile.py

1dd923a

Update tuple type in types.py

b71c8ea

Update dotnetfile.py

500ded3

Update return value annotations in helpers.py

465cb35

Linting update types.py

c3b8e26

Linting update dotnetfile.py

89e7878

Added unit tests to fixtures.py

ee6f745

bkojusner mentioned this pull request Jan 4, 2024

dotnet samples with nested cases mandiant/capa-testfiles#224

Merged

mike-hunhoff reviewed Jan 5, 2024

View reviewed changes

capa/features/extractors/dnfile/types.py Show resolved Hide resolved

bkojusner added 4 commits January 5, 2024 10:08

Update types.py

3194caa

Linting fix for types.py

aff5a13

Update CHANGELOG.md

38ee13d

Merge branch 'master' into master

edbd336

bkojusner marked this pull request as ready for review January 5, 2024 15:50

bkojusner requested a review from mike-hunhoff January 5, 2024 15:50

mike-hunhoff requested changes Jan 5, 2024

View reviewed changes

Small changes to return types in helpers.py

3c6c82d

mike-hunhoff self-requested a review January 5, 2024 17:07

mike-hunhoff approved these changes Jan 5, 2024

View reviewed changes

mike-hunhoff merged commit 7584e4a into mandiant:master Jan 5, 2024
25 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dotnet update: emit enclosing class information for nested classes #1913

dotnet update: emit enclosing class information for nested classes #1913

bkojusner commented Dec 20, 2023

google-cla bot commented Dec 20, 2023

mike-hunhoff left a comment

mike-hunhoff left a comment

bkojusner commented Jan 4, 2024

mike-hunhoff left a comment

mike-hunhoff Jan 5, 2024

mike-hunhoff left a comment

williballenthin commented Jan 5, 2024

mr-tz commented Jan 8, 2024

dotnet update: emit enclosing class information for nested classes #1913

dotnet update: emit enclosing class information for nested classes #1913

Conversation

bkojusner commented Dec 20, 2023

google-cla bot commented Dec 20, 2023

mike-hunhoff left a comment

Choose a reason for hiding this comment

mike-hunhoff left a comment

Choose a reason for hiding this comment

bkojusner commented Jan 4, 2024

mike-hunhoff left a comment

Choose a reason for hiding this comment

mike-hunhoff Jan 5, 2024

Choose a reason for hiding this comment

mike-hunhoff left a comment

Choose a reason for hiding this comment

williballenthin commented Jan 5, 2024

mr-tz commented Jan 8, 2024