Skip to content

fix: introduce 2nd encode set to handle encoded slashes in names #29

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

Merged
ctron merged 2 commits into from
Dec 2, 2025
Merged

fix: introduce 2nd encode set to handle encoded slashes in names #29

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0be276
fix: introduce 2nd encode set to handle encoded slashes in names
jcrossley3 Nov 28, 2025
9f9b644
fix: clippy
jcrossley3 Dec 1, 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
19 changes: 14 additions & 5 deletions src/purl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ const ENCODE_SET: &AsciiSet = &percent_encoding::CONTROLS
.add(b'?')
.add(b'{')
.add(b'}')
// .add(b'/')
// .add(b':')
.add(b';')
.add(b'=')
.add(b'+')
Expand All @@ -38,6 +36,8 @@ const ENCODE_SET: &AsciiSet = &percent_encoding::CONTROLS
.add(b'^')
.add(b'|');

const NAME_ENCODE_SET: &AsciiSet = &ENCODE_SET.add(b'/');

/// A Package URL.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
Expand Down Expand Up @@ -301,13 +301,13 @@ impl Display for PackageUrl<'_> {

// Namespace: percent-encode each component
if let Some(ref ns) = self.namespace {
for component in ns.split('/').map(|s| s.encode(ENCODE_SET)) {
for component in ns.split('/').map(|s| s.encode(NAME_ENCODE_SET)) {
component.fmt(f).and(f.write_str("/"))?;
}
}

// Name: percent-encode the name
self.name.encode(ENCODE_SET).fmt(f)?;
self.name.encode(NAME_ENCODE_SET).fmt(f)?;

// Version: percent-encode the version
if let Some(ref v) = self.version {
Expand Down Expand Up @@ -393,11 +393,20 @@ mod tests {

#[test]
fn test_percent_encoding_idempotent() {
let orig = "pkg:brew/openssl%[email protected]";
let orig = "pkg:brew/open%2Fssl%[email protected]";
let round_trip = orig.parse::<PackageUrl>().unwrap().to_string();
assert_eq!(orig, round_trip);
}

#[test]
fn test_percent_encoded_name() {
let raw_purl = "pkg:type/name/space/first%2Fname";
let purl = PackageUrl::from_str(raw_purl).unwrap();
assert_eq!(purl.ty(), "type");
assert_eq!(purl.namespace(), Some("name/space"));
assert_eq!(purl.name(), "first/name");
}

#[test]
fn test_percent_encoding_qualifier() {
let mut purl = "pkg:deb/ubuntu/gnome-calculator@1:41.1-2ubuntu2"
Expand Down
Loading