From ba0cb0aec131f88885b57665ab8a2cee88da75a6 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 11 Nov 2023 22:12:25 +0100 Subject: [PATCH 1/2] crates-io/compute-static: Add support for download URLs without placeholders --- .../crates-io/compute-static/Cargo.lock | 8 +++ .../crates-io/compute-static/Cargo.toml | 2 + .../crates-io/compute-static/src/main.rs | 56 +++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/terragrunt/modules/crates-io/compute-static/Cargo.lock b/terragrunt/modules/crates-io/compute-static/Cargo.lock index 9b4f5bf0c..3776a6108 100644 --- a/terragrunt/modules/crates-io/compute-static/Cargo.lock +++ b/terragrunt/modules/crates-io/compute-static/Cargo.lock @@ -58,6 +58,8 @@ dependencies = [ "fastly", "log", "log-fastly", + "once_cell", + "regex", "serde", "serde_json", "time", @@ -305,6 +307,12 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + [[package]] name = "opaque-debug" version = "0.3.0" diff --git a/terragrunt/modules/crates-io/compute-static/Cargo.toml b/terragrunt/modules/crates-io/compute-static/Cargo.toml index e807cdfca..0a59df182 100644 --- a/terragrunt/modules/crates-io/compute-static/Cargo.toml +++ b/terragrunt/modules/crates-io/compute-static/Cargo.toml @@ -19,6 +19,8 @@ derive_builder = "0.12.0" fastly = "0.9.1" log = "0.4.17" log-fastly = "0.9.1" +once_cell = "1.18.0" +regex = "1.7.1" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.92" time = { version = "0.3.17", features = ["serde-human-readable"] } diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs index 2116ea268..5a53df1c1 100644 --- a/terragrunt/modules/crates-io/compute-static/src/main.rs +++ b/terragrunt/modules/crates-io/compute-static/src/main.rs @@ -2,6 +2,8 @@ use fastly::http::{Method, StatusCode}; use fastly::{Error, Request, Response}; use log::{info, warn, LevelFilter}; use log_fastly::Logger; +use once_cell::sync::Lazy; +use regex::Regex; use serde_json::json; use time::OffsetDateTime; @@ -74,6 +76,7 @@ fn handle_request(config: &Config, mut request: Request) -> Result = Lazy::new(|| { + Regex::new(r"^/crates/(?P[^/]+)/(?P[^/]+)/download$").unwrap() + }); + + let url = request.get_url_mut(); + let path = url.path(); + + if let Some(captures) = RE.captures(path) { + let krate = captures.name("crate").unwrap().as_str(); + let version = captures.name("version").unwrap().as_str(); + let new_path = format!("/crates/{krate}/{krate}-{version}.crate"); + url.set_path(&new_path); + } +} + /// Redirect request to CloudFront /// /// As of early 2023, certain files are too large to be served through Fastly. One of those is the @@ -199,3 +224,34 @@ fn build_and_send_log(log_line: LogLineV1Builder, config: &Config) { } }; } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_rewrite_download_urls() { + fn test(url: &str, expected: &str) { + let mut request = Request::get(url); + rewrite_download_urls(&mut request); + assert_eq!(request.get_url_str(), expected); + } + + test( + "https://static.crates.io/unrelated", + "https://static.crates.io/unrelated", + ); + test( + "https://static.crates.io/crates/serde/serde-1.0.0.crate", + "https://static.crates.io/crates/serde/serde-1.0.0.crate", + ); + test( + "https://static.crates.io/crates/serde/1.0.0/download", + "https://static.crates.io/crates/serde/serde-1.0.0.crate", + ); + test( + "https://static.crates.io/crates/serde/1.0.0-alpha.1+foo-bar/download", + "https://static.crates.io/crates/serde/serde-1.0.0-alpha.1+foo-bar.crate", + ); + } +} From 2c6252ebf179363f4dc76019ba8b798f88deb639 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sat, 11 Nov 2023 21:55:38 +0100 Subject: [PATCH 2/2] crates-io/cloudfront-functions: Add support for download URLs without placeholders --- .../crates-io/cloudfront-functions/static-router.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/terragrunt/modules/crates-io/cloudfront-functions/static-router.js b/terragrunt/modules/crates-io/cloudfront-functions/static-router.js index 3293019b8..60ffb46da 100644 --- a/terragrunt/modules/crates-io/cloudfront-functions/static-router.js +++ b/terragrunt/modules/crates-io/cloudfront-functions/static-router.js @@ -7,5 +7,15 @@ function handler(event) { request.uri = request.uri.replace("+", "%2B"); } + // cargo versions before 1.24 don't support placeholders in the `dl` field + // of the index, so we need to rewrite the download URL to point to the + // crate file instead. + var match = request.uri.match(/^\/crates\/([^\/]+)\/([^\/]+)\/download$/); + if (match) { + var crate = match[1]; + var version = match[2]; + request.uri = `/crates/${crate}/${crate}-${version}.crate`; + } + return request; }