Skip to content

UriParser Fix for decoding files with open square bracket #562

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
japplis wants to merge 7 commits into
base: master
Choose a base branch
from
Open

UriParser Fix for decoding files with open square bracket #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
220bc15
Fixed incorrect uri decoding of file containing an open square bracket [
japplis May 29, 2024
514e58d
Fixed incorrect uri decoding of file containing an open square bracket [
japplis May 29, 2024
70104c6
Fixed incorrect uri decoding of file containing an open square bracket [
japplis May 30, 2024
2597054
Fixed incorrect uri decoding of file containing an open square bracket [
japplis May 30, 2024
d8e82b9
Merge branch 'master' into uri-parser-square-bracket-decode
japplis Jul 30, 2024
1188f26
UriParser Fix for decoding files with open square bracket
japplis Feb 4, 2025
e4257f9
Merge branch 'master' into uri-parser-square-bracket-decode
japplis Feb 4, 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
2 changes: 1 addition & 1 deletion commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static void decode(final StringBuilder buffer, final int offset, final in
boolean ipv6Host = false;
for (; count > 0; count--, index++) {
final char ch = buffer.charAt(index);
if (ch == '[') {
if (ch == '[' && buffer.substring(0, index).matches("\\w+://([^/]+@)?")) {
ipv6Host = true;
}
if (ch == ']') {
Expand Down
7 changes: 7 additions & 0 deletions commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ public void testIPv6CheckUriEncoding() throws FileSystemException {
UriParser.checkUriEncoding("http://[fe80::14b5:1204:5410:64ca%en1]:8080");
}

@Test
public void testBracketUriDecoding() throws FileSystemException {
assertEquals("http://[fe80::14b5:1204:5410:64ca%en1]:8080", UriParser.decode("http://[fe80::14b5:1204:5410:64ca%en1]:8080"));
assertEquals("http://username@[fe80::14b5:1204:5410:64ca%en1]:8080", UriParser.decode("http://username@[fe80::14b5:1204:5410:64ca%en1]:8080"));
assertEquals("file:/user/file [with brackets].txt", UriParser.decode("file:/user/file%20[with%20brackets].txt"));
}

@Test
public void testNormalScheme() {
assertEquals("ftp", UriParser.extractScheme(schemes, "ftp://user:pass@host/some/path/some:file"));
Expand Down