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

Increase IAST propagation to StringBuffer append #8082

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Increase IAST propagation to StringBuffer append #8082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...ava-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public static CharSequence afterInit(
@CallSite.After("java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.StringBuffer)")
@CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)")
@CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.CharSequence)")
@CallSite.After("java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.StringBuffer)")
@Nonnull
public static CharSequence afterAppend(
@CallSite.This @Nonnull final CharSequence self,
Expand All @@ -59,6 +60,8 @@ public static CharSequence afterAppend(

@CallSite.After(
"java.lang.StringBuilder java.lang.StringBuilder.append(java.lang.CharSequence, int, int)")
@CallSite.After(
"java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.CharSequence, int, int)")
@Nonnull
public static CharSequence afterAppendWithSubstring(
@CallSite.This @Nonnull final CharSequence self,
Expand Down
19 changes: 10 additions & 9 deletions .../src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ class StringBuilderCallSiteTest extends AgentTestRunner {
0 * _

where:
suite | target | param | expected
new TestStringBuilderSuite() | new StringBuilder('Hello ') | 23.5F | 'Hello 23.5'
new TestStringBuilderSuite() | new StringBuilder('Hello ') | new StringBuffer('World!') | 'Hello World!'
new TestStringBuilderSuite() | new StringBuilder('Hello ') | 'World!' | 'Hello World!'
new TestStringBufferSuite() | new StringBuffer('Hello ') | 23.5F | 'Hello 23.5'
new TestStringBufferSuite() | new StringBuffer('Hello ') | new StringBuilder('World!') | 'Hello World!'
new TestStringBufferSuite() | new StringBuffer('Hello ') | 'World!' | 'Hello World!'
suite | target | param | expected
new TestStringBuilderSuite() | sb('Hello ') | 23.5F | 'Hello 23.5'
new TestStringBuilderSuite() | sb('Hello ') | sbf('World!') | 'Hello World!'
new TestStringBuilderSuite() | sb('Hello ') | 'World!' | 'Hello World!'
new TestStringBufferSuite() | sbf('Hello ') | 23.5F | 'Hello 23.5'
new TestStringBufferSuite() | sbf('Hello ') | sbf('World!') | 'Hello World!'
new TestStringBufferSuite() | sbf('Hello ') | 'World!' | 'Hello World!'
}

void 'test string builder append object throwing exceptions'() {
Expand Down Expand Up @@ -104,8 +104,9 @@ class StringBuilderCallSiteTest extends AgentTestRunner {
0 * _

where:
suite | target | param | start | end | expected
new TestStringBuilderSuite() | new StringBuilder('Hello ') | 'World!' | 0 | 5 | 'Hello World'
suite | target | param | start | end | expected
new TestStringBuilderSuite() | sb('Hello ') | 'World!' | 0 | 5 | 'Hello World'
new TestStringBufferSuite() | sbf('Hello ') | 'World!' | 0 | 5 | 'Hello World'
}

void 'test string builder toString call site'() {
Expand Down
Loading