keep queries when doing lucky, :: or crate-name searches

src/web/releases.rs

@@ -561,11 +561,25 @@ pub fn search_handler(req: &mut Request) -> IronResult<Response> {
             return redirect_to_random_crate(req, &mut conn);
         }
 
-        let (krate, query) = match query.split_once("::") {
+        let (krate, mut query) = match query.split_once("::") {
             Some((krate, query)) => (krate.to_string(), format!("?search={query}")),
             None => (query.clone(), "".to_string()),
         };
 
+        for (k, v) in params
+            .iter()
+            .filter(|(k, _)| !matches!(k.as_ref(), "i-am-feeling-lucky" | "query"))
+        {
+            if query.is_empty() {
+                query.push('?');
+            } else {
+                query.push('&')
+            }
+            query.push_str(k);
+            query.push('=');
+            query.push_str(v);
+        }
+
         // since we never pass a version into `match_version` here, we'll never get
         // `MatchVersion::Exact`, so the distinction between `Exact` and `Semver` doesn't
         // matter
@@ -884,6 +898,21 @@ mod tests {
         })
     }
 
+    #[test]
+    fn search_coloncolon_path_redirects_to_crate_docs_and_keeps_query() {
+        wrapper(|env| {
+            let web = env.frontend();
+            env.fake_release().name("some_random_crate").create()?;
+
+            assert_redirect(
+                "/releases/search?query=some_random_crate::somepath&go_to_first=true",
+                "/some_random_crate/1.0.0/some_random_crate/?search=somepath&go_to_first=true",
+                web,
+            )?;
+            Ok(())
+        })
+    }
+
     #[test]
     fn search_result_passes_cratesio_pagination_links() {
         wrapper(|env| {

src/web/rustdoc.rs

@@ -46,12 +46,19 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
         permanent: bool,
         path_in_crate: Option<&str>,
     ) -> IronResult<Response> {
-        if let Some(query) = req.url.query() {
-            url_str.push('?');
-            url_str.push_str(query);
-        } else if let Some(path) = path_in_crate {
+        let mut question_mark = false;
+        if let Some(path) = path_in_crate {
             url_str.push_str("?search=");
             url_str.push_str(path);
+            question_mark = true;
+        }
+        if let Some(query) = req.url.query() {
+            if !question_mark {
+                url_str.push('?');
+            } else {
+                url_str.push('&');
+            }
+            url_str.push_str(query);
         }
         let url = ctry!(req, Url::parse(&url_str));
         let (status_code, max_age) = if permanent {
@@ -1776,6 +1783,11 @@ mod test {
                 "/some_random_crate/latest/some_random_crate/?search=some::path",
                 web,
             )?;
+            assert_redirect(
+                "/some_random_crate::some::path?go_to_first=true",
+                "/some_random_crate/latest/some_random_crate/?search=some::path&go_to_first=true",
+                web,
+            )?;
 
             assert_redirect(
                 "/std::some::path",