mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 21:35:00 +00:00
Add DisplaySafeUrl
newtype to prevent leaking of credentials by default (#13560)
Prior to this PR, there were numerous places where uv would leak credentials in logs. We had a way to mask credentials by calling methods or a recently-added `redact_url` function, but this was not secure by default. There were a number of other types (like `GitUrl`) that would leak credentials on display. This PR adds a `DisplaySafeUrl` newtype to prevent leaking credentials when logging by default. It takes a maximalist approach, replacing the use of `Url` almost everywhere. This includes when first parsing config files, when storing URLs in types like `GitUrl`, and also when storing URLs in types that in practice will never contain credentials (like `DirectorySourceUrl`). The idea is to make it easy for developers to do the right thing and for the compiler to support this (and to minimize ever having to manually convert back and forth). Displaying credentials now requires an active step. Note that despite this maximalist approach, the use of the newtype should be zero cost. One conspicuous place this PR does not use `DisplaySafeUrl` is in the `uv-auth` crate. That would require new clones since there are calls to `request.url()` that return a `&Url`. One option would have been to make `DisplaySafeUrl` wrap a `Cow`, but this would lead to lifetime annotations all over the codebase. I've created a separate PR based on this one (#13576) that updates `uv-auth` to use `DisplaySafeUrl` with one new clone. We can discuss the tradeoffs there. Most of this PR just replaces `Url` with `DisplaySafeUrl`. The core is `uv_redacted/lib.rs`, where the newtype is implemented. To make it easier to review the rest, here are some points of note: * `DisplaySafeUrl` has a `Display` implementation that masks credentials. Currently, it will still display the username when there is both a username and password. If we think is the wrong choice, it can now be changed in one place. * `DisplaySafeUrl` has a `remove_credentials()` method and also a `.to_string_with_credentials()` method. This allows us to use it in a variety of scenarios. * `IndexUrl::redacted()` was renamed to `IndexUrl::removed_credentials()` to make it clearer that we are not masking. * We convert from a `DisplaySafeUrl` to a `Url` when calling `reqwest` methods like `.get()` and `.head()`. * We convert from a `DisplaySafeUrl` to a `Url` when creating a `uv_auth::Index`. That is because, as mentioned above, I will be updating the `uv_auth` crate to use this newtype in a separate PR. * A number of tests (e.g., in `pip_install.rs`) that formerly used filters to mask tokens in the test output no longer need those filters since tokens in URLs are now masked automatically. * The one place we are still knowingly writing credentials to `pyproject.toml` is when a URL with credentials is passed to `uv add` with `--raw`. Since displaying credentials is no longer automatic, I have added a `to_string_with_credentials()` method to the `Pep508Url` trait. This is used when `--raw` is passed. Adding it to that trait is a bit weird, but it's the simplest way to achieve the goal. I'm open to suggestions on how to improve this, but note that because of the way we're using generic bounds, it's not as simple as just creating a separate trait for that method.
This commit is contained in:
parent
b80cafd5e8
commit
c19a294a48
100 changed files with 1266 additions and 2249 deletions
|
@ -1,10 +1,9 @@
|
|||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, LazyLock, RwLock};
|
||||
use tracing::trace;
|
||||
use url::Url;
|
||||
use uv_auth::Credentials;
|
||||
use uv_cache_key::RepositoryUrl;
|
||||
use uv_redacted::redacted_url;
|
||||
use uv_redacted::DisplaySafeUrl;
|
||||
|
||||
/// Global authentication cache for a uv invocation.
|
||||
///
|
||||
|
@ -30,9 +29,9 @@ impl GitStore {
|
|||
/// Populate the global authentication store with credentials on a Git URL, if there are any.
|
||||
///
|
||||
/// Returns `true` if the store was updated.
|
||||
pub fn store_credentials_from_url(url: &Url) -> bool {
|
||||
pub fn store_credentials_from_url(url: &DisplaySafeUrl) -> bool {
|
||||
if let Some(credentials) = Credentials::from_url(url) {
|
||||
trace!("Caching credentials for {}", redacted_url(url));
|
||||
trace!("Caching credentials for {url}");
|
||||
GIT_STORE.insert(RepositoryUrl::new(url), credentials);
|
||||
true
|
||||
} else {
|
||||
|
|
|
@ -16,6 +16,7 @@ use url::Url;
|
|||
|
||||
use uv_fs::Simplified;
|
||||
use uv_git_types::{GitHubRepository, GitOid, GitReference};
|
||||
use uv_redacted::DisplaySafeUrl;
|
||||
use uv_static::EnvVars;
|
||||
use uv_version::version;
|
||||
|
||||
|
@ -132,7 +133,7 @@ impl Display for ReferenceOrOid<'_> {
|
|||
#[derive(PartialEq, Clone, Debug)]
|
||||
pub(crate) struct GitRemote {
|
||||
/// URL to a remote repository.
|
||||
url: Url,
|
||||
url: DisplaySafeUrl,
|
||||
}
|
||||
|
||||
/// A local clone of a remote repository's database. Multiple [`GitCheckout`]s
|
||||
|
@ -205,12 +206,12 @@ impl GitRepository {
|
|||
|
||||
impl GitRemote {
|
||||
/// Creates an instance for a remote repository URL.
|
||||
pub(crate) fn new(url: &Url) -> Self {
|
||||
pub(crate) fn new(url: &DisplaySafeUrl) -> Self {
|
||||
Self { url: url.clone() }
|
||||
}
|
||||
|
||||
/// Gets the remote repository URL.
|
||||
pub(crate) fn url(&self) -> &Url {
|
||||
pub(crate) fn url(&self) -> &DisplaySafeUrl {
|
||||
&self.url
|
||||
}
|
||||
|
||||
|
|
|
@ -9,11 +9,10 @@ use std::sync::Arc;
|
|||
use anyhow::Result;
|
||||
use reqwest_middleware::ClientWithMiddleware;
|
||||
use tracing::{debug, instrument};
|
||||
use url::Url;
|
||||
|
||||
use uv_cache_key::{RepositoryUrl, cache_digest};
|
||||
use uv_git_types::GitUrl;
|
||||
use uv_redacted::redacted_url;
|
||||
use uv_redacted::DisplaySafeUrl;
|
||||
|
||||
use crate::GIT_STORE;
|
||||
use crate::git::GitRemote;
|
||||
|
@ -101,10 +100,7 @@ impl GitSource {
|
|||
// situation that we have a locked revision but the database
|
||||
// doesn't have it.
|
||||
(locked_rev, db) => {
|
||||
debug!(
|
||||
"Updating Git source `{}`",
|
||||
redacted_url(self.git.repository())
|
||||
);
|
||||
debug!("Updating Git source `{}`", self.git.repository());
|
||||
|
||||
// Report the checkout operation to the reporter.
|
||||
let task = self.reporter.as_ref().map(|reporter| {
|
||||
|
@ -181,8 +177,8 @@ impl Fetch {
|
|||
|
||||
pub trait Reporter: Send + Sync {
|
||||
/// Callback to invoke when a repository checkout begins.
|
||||
fn on_checkout_start(&self, url: &Url, rev: &str) -> usize;
|
||||
fn on_checkout_start(&self, url: &DisplaySafeUrl, rev: &str) -> usize;
|
||||
|
||||
/// Callback to invoke when a repository checkout completes.
|
||||
fn on_checkout_complete(&self, url: &Url, rev: &str, index: usize);
|
||||
fn on_checkout_complete(&self, url: &DisplaySafeUrl, rev: &str, index: usize);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue