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

Jump to bottom

Avoid panic for invalid, non-base index URLs #4527

Merged
merged 1 commit into from
Jun 25, 2024
+4 −1
Merged

Avoid panic for invalid, non-base index URLs #4527

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: 3 additions & 0 deletions crates/uv-client/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ pub enum ErrorKind {
#[error("Expected a file URL, but received: {0}")]
NonFileUrl(Url),

#[error("Expected an index URL, but received non-base URL: {0}")]
CannotBeABase(Url),

#[error(transparent)]
DistInfo(#[from] install_wheel_rs::Error),

Expand Down
2 changes: 1 addition & 1 deletion crates/uv-client/src/registry_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ impl RegistryClient {
// Format the URL for PyPI.
let mut url: Url = index.clone().into();
url.path_segments_mut()
.unwrap()
.map_err(|()| ErrorKind::CannotBeABase(index.clone().into()))?
.pop_if_empty()
.push(package_name.as_ref())
// The URL *must* end in a trailing slash for proper relative path behavior
Expand Down
Loading