Skip to content

Align W3CHeaderParser decoding with RFC 3986 #50650

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
nosan wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

Align W3CHeaderParser decoding with RFC 3986 #50650

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: 1 addition & 2 deletions ...y/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/W3CHeaderParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.springframework.boot.opentelemetry.autoconfigure;

import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -71,7 +70,7 @@ private static String percentDecode(String value) {
if (value.indexOf('%') == -1) {
return value;
}
return URLDecoder.decode(value, StandardCharsets.UTF_8);
return StringUtils.uriDecode(value, StandardCharsets.UTF_8);
}

}
6 changes: 4 additions & 2 deletions .../test/java/org/springframework/boot/opentelemetry/autoconfigure/W3CHeaderParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ void shouldHandleWhitespaceAroundDelimiters() {

@Test
void shouldPercentDecodeValues() {
Map<String, String> result = W3CHeaderParser.parse("serverNode=DF%2028,userId=Am%C3%A9lie");
assertThat(result).containsExactly(Map.entry("serverNode", "DF 28"), Map.entry("userId", "Amélie"));
Map<String, String> result = W3CHeaderParser
.parse("serverNode=DF%2028,userId=Am%C3%A9lie,application=%20spring+boot%20");
assertThat(result).containsExactly(Map.entry("serverNode", "DF 28"), Map.entry("userId", "Amélie"),
Map.entry("application", " spring+boot "));
}

@Test
Expand Down
Loading