fix: regex, LazyLock, etc. (#82)

Author: definfo

Cargo.lock

@@ -21,7 +21,6 @@ bytes = "1.11"
 figment = { version = "0.10", features = ["toml"] }
 futures = "0.3"
 futures-util = "0.3"
-lazy_static = "1.4"
 percent-encoding = "2.1"
 prometheus = "0.14"
 regex = "1"

Cargo.toml

@@ -29,7 +29,7 @@ enum UploadPayload {
 }
 
 impl UploadPayload {
-    fn content_length(&self) -> u64 {
+    const fn content_length(&self) -> u64 {
         match self {
             Self::Memory(bytes) => bytes.len() as u64,
             Self::File { content_length, .. } => *content_length,
@@ -40,11 +40,11 @@ impl UploadPayload {
 /// Global unique file id counter.
 static FILE_ID: AtomicUsize = AtomicUsize::new(0);
 
-fn max_download_size(config: &Config) -> u64 {
+const fn max_download_size(config: &Config) -> u64 {
     config.ignore_threshold_mb.saturating_mul(BYTES_PER_MB)
 }
 
-fn file_threshold(config: &Config) -> u64 {
+const fn file_threshold(config: &Config) -> u64 {
     config.file_threshold_mb.saturating_mul(BYTES_PER_MB)
 }
 

src/artifacts.rs

@@ -1,7 +1,7 @@
 use actix_web::http::{Method, Uri};
 use actix_web::{HttpResponse, Route, guard, web};
-use lazy_static::lazy_static;
 use regex::Regex;
+use std::sync::LazyLock;
 
 use crate::error::Result;
 use crate::intel_path::IntelPath;
@@ -100,15 +100,23 @@ pub fn rust_static_allow(_config: &Config, path: &str) -> bool {
     true
 }
 
-pub fn wheels_allow(_config: &Config, path: &str) -> bool {
+pub fn wheel_allow_legacy(_config: &Config, path: &str) -> bool {
     path.ends_with(".whl") || path.ends_with(".html")
 }
 
+pub fn wheels_allow(_config: &Config, path: &str) -> bool {
+    if let Some((wheel_path, sha256)) = path.split_once("#sha256=") {
+        return wheel_path.ends_with(".whl")
+            && sha256.len() == 64
+            && sha256.chars().all(|c| c.is_ascii_hexdigit());
+    }
+
+    wheel_allow_legacy(_config, path)
+}
+
 pub fn github_release_allow(config: &Config, path: &str) -> bool {
-    lazy_static! {
-        static ref REGEX: Regex =
-            Regex::new("^[^/]*/[^/]*/releases/download/[^/]*/[^/]*$").unwrap();
-    };
+    static REGEX: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new("^[^/]+/[^/]+/releases/download/[^/]+/[^/]+$").unwrap());
 
     if !config
         .github_release
@@ -123,10 +131,9 @@ pub fn github_release_allow(config: &Config, path: &str) -> bool {
 }
 
 pub fn sjtug_internal_allow(_config: &Config, path: &str) -> bool {
-    lazy_static! {
-        static ref REGEX: Regex =
-            Regex::new("^[^/]*/releases/download/[^/]*/[^/]*.(tar.gz|zip)$").unwrap();
-    };
+    static REGEX: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new("^[^/]*/releases/download/[^/]*/[^/]*[.](tar[.]gz|zip)$").unwrap()
+    });
 
     REGEX.is_match(path)
 }
@@ -738,6 +745,28 @@ mod tests {
         assert!(!flutter_allow(&config, "flutter/coverage/lcov.info"));
     }
 
+    #[test]
+    fn test_wheels_allow() {
+        let config = Config::default();
+        assert!(wheels_allow(&config, "torch_stable.html"));
+        assert!(wheels_allow(
+            &config,
+            "torch-2.0.0-cp311-cp311-manylinux.whl"
+        ));
+        assert!(!wheels_allow(
+            &config,
+            "torch-2.0.0-cp311-cp311-manylinux.whl#sha256=0123456789abcdef",
+        ));
+        assert!(wheels_allow(
+            &config,
+            "cpu/torch-2.11.0%2Bcpu-cp314-cp314t-manylinux_2_28_x86_64.whl",
+        ));
+        assert!(wheels_allow(
+            &config,
+            "cu130/torch-2.11.0%2Bcu130-cp314-cp314t-manylinux_2_28_x86_64.whl",
+        ));
+    }
+
     #[test]
     fn test_task_override() {
         let mut task = Task {

src/repos.rs

@@ -15,7 +15,7 @@ fn s3_region(s3_config: &S3Config) -> Region {
 /// Creates an authenticated S3 client.
 ///
 /// The default credential provider is used.
-async fn get_s3_client(s3_config: &S3Config) -> S3Client {
+fn get_s3_client(s3_config: &S3Config) -> S3Client {
     let s3_builder = aws_sdk_s3::Config::builder()
         .region(s3_region(s3_config))
         .endpoint_url(s3_config.endpoint.clone())
@@ -47,7 +47,7 @@ pub async fn stream_to_s3(
     stream: aws_sdk_s3::primitives::ByteStream,
     s3_config: &S3Config,
 ) -> Result<aws_sdk_s3::operation::put_object::PutObjectOutput> {
-    let s3_client = get_s3_client(s3_config).await;
+    let s3_client = get_s3_client(s3_config);
 
     Ok(s3_client
         .put_object()
@@ -62,7 +62,7 @@ pub async fn stream_to_s3(
 /// Check whether authenticated S3 storage is available.
 pub async fn check_s3(s3_config: &S3Config) -> Result<()> {
     timeout(Duration::from_secs(1), async move {
-        let s3_client = get_s3_client(s3_config).await;
+        let s3_client = get_s3_client(s3_config);
 
         // s3_client
         //     .list_objects()