Skip to content

fix wrong server error in rustdoc-redirector-handler #3159

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
syphar merged 1 commit into from
Jan 23, 2026
Merged

fix wrong server error in rustdoc-redirector-handler #3159

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
42 changes: 36 additions & 6 deletions crates/bin/docs_rs_web/src/handlers/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ pub(crate) async fn rustdoc_redirector_handler(
RawQuery(original_query): RawQuery,
) -> AxumResult<impl IntoResponse> {
fn redirect_to_doc(
original_uri: Option<&EscapedURI>,
original_uri: &Uri,
url: EscapedURI,
cache_policy: CachePolicy,
path_in_crate: Option<&str>,
Expand All @@ -208,10 +208,10 @@ pub(crate) async fn rustdoc_redirector_handler(
url
};

if let Some(original_uri) = original_uri
&& original_uri.path() == url.path()
if original_uri.path() == url.path()
&& (url.authority().is_none()
|| url.authority() == Some(&Authority::from_static("docs.rs")))
&& url.fragment().is_none()
{
return Err(anyhow!(
"infinite redirect detected, \noriginal_uri = {}, redirect_url = {}",
Expand All @@ -225,6 +225,9 @@ pub(crate) async fn rustdoc_redirector_handler(
Ok(axum_cached_redirect(url, cache_policy)?)
}

dbg!(&params);
dbg!(&original_uri);

// edge case 1:
// global static assets for older builds are served from the root, which ends up
// in this handler as `params.name`.
Expand Down Expand Up @@ -269,7 +272,7 @@ pub(crate) async fn rustdoc_redirector_handler(
let target_uri =
EscapedURI::from_uri(description.href.clone()).append_raw_query(original_query);
return redirect_to_doc(
Some(&original_uri.into()),
&original_uri,
target_uri,
CachePolicy::ForeverInCdnAndStaleInBrowser(crate_name.into()),
path_in_crate.as_deref(),
Expand All @@ -285,7 +288,7 @@ pub(crate) async fn rustdoc_redirector_handler(
target: params.target,
path: None,
},
original_uri,
original_uri.clone(),
matched_path,
)
.map_err(AxumNope::BadRequest)?
Expand Down Expand Up @@ -356,9 +359,11 @@ pub(crate) async fn rustdoc_redirector_handler(
.await;
}

dbg!(&params);

if matched_release.rustdoc_status() {
Ok(redirect_to_doc(
params.original_uri(),
&original_uri,
params.rustdoc_url().append_raw_query(original_query),
if matched_release.is_latest_url() {
CachePolicy::ForeverInCdn(params.name().into())
Expand Down Expand Up @@ -3344,6 +3349,31 @@ mod test {
});
}

#[tokio::test(flavor = "multi_thread")]
async fn test_redirect_with_encoded_slash() -> Result<()> {
let env = TestEnvironment::new().await?;

env.fake_release()
.await
.name("minidumper")
.version("0.1.0")
.archive_storage(true)
.create()
.await?;

let web = env.web_app().await;

web.assert_redirect_cached_unchecked(
"/minidumper/latest/%23%3c%2f%73%63%72%69%70%74%3e%3c%74%65%73%74%65%3e",
"/minidumper/latest/%23%3C/script%3E%3Cteste%3E",
CachePolicy::ForeverInCdn(KrateName::from_str("minidumper").unwrap().into()),
env.config(),
)
.await?;

Ok(())
}

#[test_case("/crate/dummy/0.1/json", "/crate/dummy/0.1.0/json")]
#[tokio::test(flavor = "multi_thread")]
async fn json_download_semver_redirect(path: &str, expected_redirect: &str) -> Result<()> {
Expand Down
Loading