Instrument vm for code injection vulnerability#5080
Merged
Conversation
Contributor
Overall package sizeSelf size: 8.49 MB Dependency sizes| name | version | self size | total size | |------|---------|-----------|------------| | @datadog/libdatadog | 0.4.0 | 29.44 MB | 29.44 MB | | @datadog/native-appsec | 8.4.0 | 19.25 MB | 19.26 MB | | @datadog/native-iast-taint-tracking | 3.2.0 | 13.9 MB | 13.91 MB | | @datadog/pprof | 5.4.1 | 9.76 MB | 10.13 MB | | protobufjs | 7.2.5 | 2.77 MB | 5.16 MB | | @datadog/native-iast-rewriter | 2.6.1 | 2.59 MB | 2.73 MB | | @opentelemetry/core | 1.14.0 | 872.87 kB | 1.47 MB | | @datadog/native-metrics | 3.1.0 | 1.06 MB | 1.46 MB | | @opentelemetry/api | 1.8.0 | 1.21 MB | 1.21 MB | | import-in-the-middle | 1.11.2 | 112.74 kB | 826.22 kB | | source-map | 0.7.4 | 226 kB | 226 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | lru-cache | 7.18.3 | 133.92 kB | 133.92 kB | | pprof-format | 2.1.0 | 111.69 kB | 111.69 kB | | @datadog/sketches-js | 2.1.0 | 109.9 kB | 109.9 kB | | semver | 7.6.3 | 95.82 kB | 95.82 kB | | lodash.sortby | 4.7.0 | 75.76 kB | 75.76 kB | | ignore | 5.3.1 | 51.46 kB | 51.46 kB | | shell-quote | 1.8.1 | 44.96 kB | 44.96 kB | | istanbul-lib-coverage | 3.2.0 | 29.34 kB | 29.34 kB | | rfdc | 1.3.1 | 25.21 kB | 25.21 kB | | @isaacs/ttlcache | 1.4.1 | 25.2 kB | 25.2 kB | | tlhunter-sorted-set | 0.1.0 | 24.94 kB | 24.94 kB | | limiter | 1.1.5 | 23.17 kB | 23.17 kB | | dc-polyfill | 0.1.4 | 23.1 kB | 23.1 kB | | retry | 0.13.1 | 18.85 kB | 18.85 kB | | jest-docblock | 29.7.0 | 8.99 kB | 12.76 kB | | crypto-randomuuid | 1.0.0 | 11.18 kB | 11.18 kB | | path-to-regexp | 0.1.12 | 6.6 kB | 6.6 kB | | koalas | 1.0.2 | 6.47 kB | 6.47 kB | | module-details-from-path | 1.0.3 | 4.47 kB | 4.47 kB |🤖 This report was automatically generated by heaviest-objects-in-the-universe |
IlyasShabi
force-pushed
the
vm-instrumentation
branch
from
January 8, 2025 14:45
e1b4c14 to
0a30759
Compare
IlyasShabi
marked this pull request as ready for review
January 14, 2025 09:14
IlyasShabi
marked this pull request as draft
January 15, 2025 09:42
IlyasShabi
commented
Jan 15, 2025
| "test:appsec": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"", | ||
| "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec", | ||
| "test:appsec:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"", | ||
| "test:appsec:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" --experimental-vm-modules \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"", |
Contributor
Author
There was a problem hiding this comment.
The flag --experimental-vm-modules needs to be present on starts up, not during runtime
Contributor
Author
There was a problem hiding this comment.
Replaced by Integration test
IlyasShabi
marked this pull request as ready for review
January 15, 2025 14:42
IlyasShabi
marked this pull request as draft
January 15, 2025 19:07
IlyasShabi
marked this pull request as ready for review
January 16, 2025 11:00
uurien
reviewed
Jan 17, 2025
| cwd, | ||
| env: { | ||
| DD_TRACE_AGENT_PORT: agent.port, | ||
| DD_TRACE_DEBUG: 'true', |
Contributor
There was a problem hiding this comment.
can we remove this? this is probably adding some unnecessary data in test logs.
| DD_TRACE_AGENT_PORT: agent.port, | ||
| DD_TRACE_DEBUG: 'true', | ||
| APP_PORT: appPort, | ||
| DD_APPSEC_ENABLED: 'true', |
| super(...arguments) | ||
|
|
||
| if (sourceTextModuleStartChannel.hasSubscribers && sourceText) { | ||
| sourceTextModuleStartChannel.publish({ sourceText }) |
Contributor
There was a problem hiding this comment.
why has this its own channel, but vm.Script doesn't have it?
and why the key is called sourceText and not code like in datadog:vm:run-script:start.
We should try to unify the data send in similar events, to be able to have the same handler for the methods that are similar.
Contributor
Author
There was a problem hiding this comment.
I chose datadog:vm:run-script:start because the run* functions invoke Script behind the scenes, which represents the execution of a script
uurien
approved these changes
Jan 17, 2025
watson
pushed a commit
that referenced
this pull request
Jan 22, 2025
* Instrument vm for code injection vulnerability * simplify vm constructor instrumentation * support SourceTextModule class * add code injection integration test * instrument SourceTextModule only if it's enabled * unify channel arguments
Closed
watson
pushed a commit
that referenced
this pull request
Jan 22, 2025
* Instrument vm for code injection vulnerability * simplify vm constructor instrumentation * support SourceTextModule class * add code injection integration test * instrument SourceTextModule only if it's enabled * unify channel arguments
Merged
watson
pushed a commit
that referenced
this pull request
Jan 23, 2025
* Instrument vm for code injection vulnerability * simplify vm constructor instrumentation * support SourceTextModule class * add code injection integration test * instrument SourceTextModule only if it's enabled * unify channel arguments
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Support code injection vulnerability detection via the instrumentation of
node:vmpackageMotivation
Code injection can occur by using the
evalfunction or thevmpackage.Plugin Checklist
Additional Notes