Skip to content

fix: add guard against the ArrayIndexOutOfBoundsException in BaggageCodec… #7239

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: add guard against the ArrayIndexOutOfBoundsException in BaggageCodec… #7239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a446cb0
fix: guard against the ArrayIndexOutOfBoundsException in BaggageCodec…
rlacksgus97 Apr 2, 2025
c38b10a
test: add a test that assert on the result from malformed data in Bag…
rlacksgus97 Apr 21, 2025
dc1753c
Merge branch 'open-telemetry:main' into main
rlacksgus97 Apr 21, 2025
f9ef4ed
test: add test code for edge case in BaggageCodecTest
rlacksgus97 Apr 21, 2025
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
16 changes: 10 additions & 6 deletions api/all/src/main/java/io/opentelemetry/api/baggage/propagation/BaggageCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@ private static byte[] decode(byte[] bytes) {
for (int i = 0; i < bytes.length; i++) {
int b = bytes[i];
if (b == ESCAPE_CHAR) {
try {
int u = digit16(bytes[++i]);
int l = digit16(bytes[++i]);
buffer.write((char) ((u << 4) + l));
} catch (ArrayIndexOutOfBoundsException e) { // FIXME
throw new IllegalArgumentException("Invalid URL encoding: ", e);
if (i + 1 >= bytes.length) {
return buffer.toByteArray();
}
int u = digit16(bytes[++i]);

if (i + 1 >= bytes.length) {
return buffer.toByteArray();
}
int l = digit16(bytes[++i]);

buffer.write((char) ((u << 4) + l));
} else {
buffer.write(b);
}
Expand Down
7 changes: 3 additions & 4 deletions api/all/src/test/java/io/opentelemetry/api/baggage/propagation/BaggageCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.api.baggage.propagation;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -35,8 +34,8 @@ void shouldDecodePercentEncodedValues(String percentEncoded, String expectedDeco
}

@Test
void shouldThrowIfMalformedData() {
assertThatThrownBy(() -> BaggageCodec.decode("%1", StandardCharsets.UTF_8))
.isInstanceOf(IllegalArgumentException.class);
void shouldIgnoreIfMalformedData() {
assertThat(BaggageCodec.decode("%", StandardCharsets.UTF_8)).isEqualTo("");
assertThat(BaggageCodec.decode("%1", StandardCharsets.UTF_8)).isEqualTo("");
}
}
Loading