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

fix encoding of non-ascii characters #153

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix encoding of non-ascii characters #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc01f84
fix encoding of non-ascii characters
matt-phylum Dec 10, 2024
2e0589b
also handle small bytes
matt-phylum Dec 10, 2024
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
8 changes: 5 additions & 3 deletions src/main/java/com/github/packageurl/PackageURL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.Formatter;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
Expand Down Expand Up @@ -446,14 +447,15 @@ private static String uriEncode(String source, Charset charset) {
}

StringBuilder builder = new StringBuilder();
Formatter formatter = new Formatter(builder);
for (byte b : source.getBytes(charset)) {
if (isUnreserved(b)) {
builder.append((char) b);
}
else {
// Substitution: A '%' followed by the hexadecimal representation of the ASCII value of the replaced character
builder.append('%');
builder.append(Integer.toHexString(b).toUpperCase());
// Substitution: A '%' followed by the hexadecimal representation of the charset encoded byte value
formatter.format("%%%02X", b);
formatter.flush();
}
}
return builder.toString();
Expand Down