Escape + to %2B in response URLs

Author: Turbo87

src/tests/routes/crates/versions/download.rs

@@ -97,3 +97,21 @@ fn download_caches_version_id() {
     // Check download count against the new name, rather than rename it back to the original value
     downloads::assert_dl_count(&anon, "other/1.0.0", None, 2);
 }
+
+#[test]
+fn download_with_build_metadata() {
+    let (app, anon, user) = TestApp::init().with_user();
+    let user = user.as_model();
+
+    app.db(|conn| {
+        CrateBuilder::new("foo", user.id)
+            .version(VersionBuilder::new("1.0.0+bar"))
+            .expect_build(conn);
+    });
+
+    anon.get::<()>("/api/v1/crates/foo/1.0.0+bar/download")
+        .assert_redirect_ends_with("/crates/foo/foo-1.0.0%2Bbar.crate");
+
+    anon.get::<()>("/api/v1/crates/foo/1.0.0+bar/readme")
+        .assert_redirect_ends_with("/readmes/foo/foo-1.0.0%2Bbar.html");
+}

src/uploaders.rs

@@ -37,39 +37,43 @@ impl Uploader {
     ///
     /// The function doesn't check for the existence of the file.
     pub fn crate_location(&self, crate_name: &str, version: &str) -> String {
+        let version = version.replace('+', "%2B");
+
         match *self {
             Uploader::S3 {
                 ref bucket,
                 ref cdn,
                 ..
             } => {
-                let path = Uploader::crate_path(crate_name, version);
+                let path = Uploader::crate_path(crate_name, &version);
                 match *cdn {
                     Some(ref host) => format!("https://{host}/{path}"),
                     None => bucket.url(&path).unwrap(),
                 }
             }
-            Uploader::Local => format!("/{}", Uploader::crate_path(crate_name, version)),
+            Uploader::Local => format!("/{}", Uploader::crate_path(crate_name, &version)),
         }
     }
 
     /// Returns the URL of an uploaded crate's version readme.
     ///
     /// The function doesn't check for the existence of the file.
     pub fn readme_location(&self, crate_name: &str, version: &str) -> String {
+        let version = version.replace('+', "%2B");
+
         match *self {
             Uploader::S3 {
                 ref bucket,
                 ref cdn,
                 ..
             } => {
-                let path = Uploader::readme_path(crate_name, version);
+                let path = Uploader::readme_path(crate_name, &version);
                 match *cdn {
                     Some(ref host) => format!("https://{host}/{path}"),
                     None => bucket.url(&path).unwrap(),
                 }
             }
-            Uploader::Local => format!("/{}", Uploader::readme_path(crate_name, version)),
+            Uploader::Local => format!("/{}", Uploader::readme_path(crate_name, &version)),
         }
     }