fix: handle query params in blob URL regex (#1582)

* fix: handle query params in blob URL regex

Fixes #1580

containerd adds ?ns=<registry> query parameter when using registry
mirrors. The blob URL regex was capturing this parameter as part of
the digest, causing parse failures and breaking P2P distribution.

Changed regex from:
  r"^(.*)://(.*)/v2/(.*)/blobs/(.*)$"
to:
  r"^(.*)://(.*)/v2/(.*)/blobs/([^?]+)(?:\?.*)?$"

This excludes query parameters from the digest capture group.

* test: add test case for blob URL with query parameters

Signed-off-by: Gaius <gaius.qi@gmail.com>

* chore(dependencies): update dragonfly-client versions to 1.1.17

Signed-off-by: Gaius <gaius.qi@gmail.com>

---------

Signed-off-by: Gaius <gaius.qi@gmail.com>
Co-authored-by: Ngô Quang Hòa <hoanq3@vng.com.vn>
Co-authored-by: Gaius <gaius.qi@gmail.com>

Author: 3 people

Cargo.lock

@@ -13,7 +13,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.1.16"
+version = "1.1.17"
 authors = ["The Dragonfly Developers"]
 homepage = "https://d7y.io/"
 repository = "https://github.com/dragonflyoss/client.git"
@@ -23,14 +23,14 @@ readme = "README.md"
 edition = "2021"
 
 [workspace.dependencies]
-dragonfly-client = { path = "dragonfly-client", version = "1.1.16" }
-dragonfly-client-core = { path = "dragonfly-client-core", version = "1.1.16" }
-dragonfly-client-config = { path = "dragonfly-client-config", version = "1.1.16" }
-dragonfly-client-storage = { path = "dragonfly-client-storage", version = "1.1.16" }
-dragonfly-client-backend = { path = "dragonfly-client-backend", version = "1.1.16" }
-dragonfly-client-metric = { path = "dragonfly-client-metric", version = "1.1.16" }
-dragonfly-client-util = { path = "dragonfly-client-util", version = "1.1.16" }
-dragonfly-client-init = { path = "dragonfly-client-init", version = "1.1.16" }
+dragonfly-client = { path = "dragonfly-client", version = "1.1.17" }
+dragonfly-client-core = { path = "dragonfly-client-core", version = "1.1.17" }
+dragonfly-client-config = { path = "dragonfly-client-config", version = "1.1.17" }
+dragonfly-client-storage = { path = "dragonfly-client-storage", version = "1.1.17" }
+dragonfly-client-backend = { path = "dragonfly-client-backend", version = "1.1.17" }
+dragonfly-client-metric = { path = "dragonfly-client-metric", version = "1.1.17" }
+dragonfly-client-util = { path = "dragonfly-client-util", version = "1.1.17" }
+dragonfly-client-init = { path = "dragonfly-client-init", version = "1.1.17" }
 dragonfly-api = "=2.2.8"
 thiserror = "2.0"
 futures = "0.3.31"

Cargo.toml

@@ -29,7 +29,7 @@ pub const SEPARATOR: &str = ":";
 
 lazy_static! {
     /// BLOB_URL_REGEX is the regex for oci blob url, e.g. http(s)://<registry>/v2/<repository>/blobs/<digest>.
-    static ref BLOB_URL_REGEX: Regex = Regex::new(r"^(.*)://(.*)/v2/(.*)/blobs/(.*)$").unwrap();
+    static ref BLOB_URL_REGEX: Regex = Regex::new(r"^(.*)://(.*)/v2/(.*)/blobs/([^?]+)(?:\?.*)?$").unwrap();
 }
 
 /// is_blob_url checks if the url is an oci blob url.
@@ -262,6 +262,26 @@ mod tests {
             "b2c366cce7e68013d5441c6326d5a3e1b12aeb5ed58564d0fd3fa089bc29cb6e"
         );
 
+        let url = "https://index.docker.io/v2/library/alpine/blobs/sha256:b2c366cce7e68013d5441c6326d5a3e1b12aeb5ed58564d0fd3fa089bc29cb6e?ns=docker.io";
+        let digest = Digest::extract_from_blob_url(url);
+        assert!(digest.is_some());
+        let digest = digest.unwrap();
+        assert_eq!(digest.algorithm(), Algorithm::Sha256);
+        assert_eq!(
+            digest.encoded(),
+            "b2c366cce7e68013d5441c6326d5a3e1b12aeb5ed58564d0fd3fa089bc29cb6e"
+        );
+
+        let url = "http://localhost:5000/v2/myrepo/blobs/sha256:b2c366cce7e68013d5441c6326d5a3e1b12aeb5ed58564d0fd3fa089bc29cb6e?id=12345";
+        let digest = Digest::extract_from_blob_url(url);
+        assert!(digest.is_some());
+        let digest = digest.unwrap();
+        assert_eq!(digest.algorithm(), Algorithm::Sha256);
+        assert_eq!(
+            digest.encoded(),
+            "b2c366cce7e68013d5441c6326d5a3e1b12aeb5ed58564d0fd3fa089bc29cb6e"
+        );
+
         let invalid_urls = vec![
             "http://registry.example.com/blobs/sha256:abc",
             "http://registry.example.com/v2/repo/manifests/sha256:abc",