fix(deps): update rust crate actix-web to v4.10.2

2025-03-10 07:01:34 +00:00
8 changed files with 96 additions and 212 deletions
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -1,34 +1,28 @@
-name: docker
+name: Build and publish the docker image

 on:
  push:
-    branches:
-      - "main"
-    paths-ignore:
-      - "README.md"
-      - "LICENSE.txt"
-      - "docker-compose.example.yml"
-      - "ups.json"
+    branches: ["custom"]

 env:
  REGISTRY: git.ngn.tf
  IMAGE: ${{gitea.repository}}

 jobs:
-  docker:
+  build:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: "https://github.com/actions/checkout@v4"

      - name: Login to container repo
-        uses: docker/login-action@v1
+        uses: "https://github.com/docker/login-action@v1"
        with:
          registry: ${{env.REGISTRY}}
          username: ${{gitea.actor}}
          password: ${{secrets.PACKAGES_TOKEN}}

-      - name: Build docker image
+      - name: Build image
        run: |
          docker build . --tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest
          docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest
--- a/.gitea/workflows/ups.yml
+++ b/.gitea/workflows/ups.yml
@@ -1,25 +0,0 @@
-name: ups
-
-on:
-  schedule:
-    - cron: "@weekly"
-
-jobs:
-  ups:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt update -y
-          sudo apt install -y python3 python3-build python3-requests make
-
-      - name: Install ups
-        run: |
-          git clone https://git.ngn.tf/ngn/ups && cd ups
-          make && make install
-
-      - name: Run ups
-        run: PATH=~/.local/bin:$PATH ups-check
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,34 +19,11 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "actix-files"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be"
-dependencies = [
- "actix-http",
- "actix-service",
- "actix-utils",
- "actix-web",
- "bitflags 2.5.0",
- "bytes",
- "derive_more 0.99.18",
- "futures-core",
- "http-range",
- "log",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
- "v_htmlescape",
-]
-
 [[package]]
 name = "actix-http"
-version = "3.11.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dfe5c9e0004c623edc65391dfd51daa201e7e30ebd9c9bedf873048ec32bc2"
+checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9"
 dependencies = [
 "actix-codec",
 "actix-rt",
@@ -128,7 +105,7 @@ dependencies = [
 "actix-utils",
 "futures-core",
 "futures-util",
- "mio 0.8.11",
+ "mio",
 "socket2",
 "tokio",
 "tracing",
@@ -157,9 +134,9 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "4.6.0"
+version = "4.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32"
+checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d"
 dependencies = [
 "actix-codec",
 "actix-http",
@@ -170,15 +147,16 @@ dependencies = [
 "actix-service",
 "actix-utils",
 "actix-web-codegen",
- "ahash 0.8.11",
 "bytes",
 "bytestring",
 "cfg-if",
 "cookie",
- "derive_more 0.99.18",
+ "derive_more 2.0.1",
 "encoding_rs",
+ "foldhash",
 "futures-core",
 "futures-util",
+ "impl-more",
 "itoa",
 "language-tags",
 "log",
@@ -193,14 +171,15 @@ dependencies = [
 "smallvec",
 "socket2",
 "time",
+ "tracing",
 "url",
 ]

 [[package]]
 name = "actix-web-codegen"
-version = "4.2.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
+checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8"
 dependencies = [
 "actix-router",
 "proc-macro2",
@@ -246,19 +225,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom 0.2.15",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -386,9 +352,9 @@ dependencies = [

 [[package]]
 name = "brotli"
-version = "8.0.1"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -397,9 +363,9 @@ dependencies = [

 [[package]]
 name = "brotli-decompressor"
-version = "5.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
 dependencies = [
 "alloc-no-stdlib",
 "alloc-stdlib",
@@ -451,16 +417,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "windows-link",
+ "windows-targets 0.52.5",
 ]

 [[package]]
@@ -721,9 +687,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "foldhash"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"

 [[package]]
 name = "foreign-types"
@@ -880,14 +846,14 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
 "cfg-if",
 "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.5",
 ]

 [[package]]
@@ -980,7 +946,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.8",
+ "ahash",
 ]

 [[package]]
@@ -1038,12 +1004,6 @@ dependencies = [
 "pin-project-lite",
 ]

-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -1261,6 +1221,12 @@ dependencies = [
 "icu_properties",
 ]

+[[package]]
+name = "impl-more"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -1352,15 +1318,14 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"

 [[package]]
 name = "libmedium"
 version = "0.1.0"
 dependencies = [
- "actix-files",
 "actix-http",
 "actix-rt",
 "actix-web",
@@ -1454,16 +1419,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"

-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -1491,17 +1446,6 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "mio"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
-dependencies = [
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.12"
@@ -1837,20 +1781,15 @@ dependencies = [
 "proc-macro2",
 ]

-[[package]]
-name = "r-efi"
-version = "5.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
-
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
 "rand_chacha",
 "rand_core",
+ "zerocopy",
 ]

 [[package]]
@@ -1869,7 +1808,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.1",
 ]

 [[package]]
@@ -2206,9 +2145,9 @@ dependencies = [

 [[package]]
 name = "sha256"
-version = "1.6.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f880fc8562bdeb709793f00eb42a2ad0e672c4f883bbe59122b926eca935c8f6"
+checksum = "18278f6a914fa3070aa316493f7d2ddfb9ac86ebc06fa3b83bffda487e9065b0"
 dependencies = [
 "async-trait",
 "bytes",
@@ -2439,19 +2378,19 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.45.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
 "backtrace",
 "bytes",
 "libc",
- "mio 1.0.3",
+ "mio",
 "parking_lot 0.12.3",
 "pin-project-lite",
 "signal-hook-registry",
 "socket2",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -2534,9 +2473,21 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
 "log",
 "pin-project-lite",
+ "tracing-attributes",
 "tracing-core",
 ]

+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -2564,12 +2515,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"

-[[package]]
-name = "unicase"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -2614,12 +2559,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"

-[[package]]
-name = "v_htmlescape"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -2665,9 +2604,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
 dependencies = [
 "wit-bindgen-rt",
 ]
@@ -2788,12 +2727,6 @@ dependencies = [
 "windows-targets 0.52.5",
 ]

-[[package]]
-name = "windows-link"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -2954,9 +2887,9 @@ dependencies = [

 [[package]]
 name = "wit-bindgen-rt"
-version = "0.39.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
 "bitflags 2.5.0",
 ]
@@ -3008,18 +2941,18 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
 dependencies = [
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ version = "0.1.0"
 actix-http = "3.0.4"
 actix-rt = "2"
 actix-web = "4.0.1"
-actix-files = "0.6.6"
 bincode = "1.3.3"
 chrono = "0.4.23"
 config = "0.13"
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
-# libmedium - proxy for medium.com
+# [ngn.tf] | libmedium

-![](https://git.ngn.tf/ngn/libmedium/actions/workflows/docker.yml/badge.svg)
-![](https://git.ngn.tf/ngn/libmedium/actions/workflows/ups.yml/badge.svg)
+![](https://git.ngn.tf/ngn/libmedium/actions/workflows/build.yml/badge.svg)

-A fork of the [libmedium](https://github.com/realaravinth/libmedium) project,
-with my personal changes.
+A fork of the [libmedium](https://github.com/realaravinth/libmedium) project, with my personal changes.
--- a/src/data.rs
+++ b/src/data.rs
@@ -164,14 +164,14 @@ impl Data {
        }
    }

-    pub async fn get_post_light(&self, id: &str) -> Option<PostUrl> {
+    pub async fn get_post_light(&self, id: &str) -> PostUrl {
        match self.posts.get(id) {
            Ok(Some(v)) => {
                let cached: PostResp = bincode::deserialize(&v[..]).unwrap();
-                Some(PostUrl {
+                PostUrl {
                    slug: cached.unique_slug,
                    username: cached.creator.username,
-                })
+                }
            }
            _ => {
                let vars = get_post_light::Variables { id: id.to_owned() };
@@ -180,16 +180,10 @@ impl Data {
                let res = post_graphql::<GetPostLight, _>(&self.client, URL, vars)
                    .await
                    .unwrap();
-                if res.data.is_none() {
-                    None
-                } else {
-                    match res.data.expect("missing response data").post {
-                        None => None,
-                        Some(res) => Some(PostUrl {
-                            slug: res.unique_slug,
-                            username: res.creator.username,
-                        }),
-                    }
+                let res = res.data.expect("missing response data").post.unwrap();
+                PostUrl {
+                    slug: res.unique_slug,
+                    username: res.creator.username,
                }
            }
        }
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -158,33 +158,29 @@ async fn assets(path: web::Path<String>, data: AppData) -> impl Responder {

 #[actix_web_codegen_const_routes::get(path = "crate::V1_API_ROUTES.proxy.by_post_id")]
 async fn by_post_id(path: web::Path<String>, data: AppData) -> impl Responder {
-    match data.get_post_light(&path).await {
-        None => HttpResponse::NotFound().body("Post not found"),
-        Some(post_data) => HttpResponse::Found()
+    let post_data = data.get_post_light(&path).await;
+    HttpResponse::Found()
+        .append_header((
+            header::LOCATION,
+            crate::V1_API_ROUTES
+                .proxy
+                .get_page(&post_data.username, &post_data.slug),
+        ))
+        .finish()
+}
+
+#[actix_web_codegen_const_routes::get(path = "crate::V1_API_ROUTES.proxy.top_level_post")]
+async fn by_top_level_post(path: web::Path<String>, data: AppData) -> impl Responder {
+    if let Some(post_id) = path.split('-').last() {
+        let post_data = data.get_post_light(post_id).await;
+        HttpResponse::Found()
            .append_header((
                header::LOCATION,
                crate::V1_API_ROUTES
                    .proxy
                    .get_page(&post_data.username, &post_data.slug),
            ))
-            .finish(),
-    }
-}
-
-#[actix_web_codegen_const_routes::get(path = "crate::V1_API_ROUTES.proxy.top_level_post")]
-async fn by_top_level_post(path: web::Path<String>, data: AppData) -> impl Responder {
-    if let Some(post_id) = path.split('-').last() {
-        match data.get_post_light(post_id).await {
-            None => HttpResponse::NotFound().body("Post not found"),
-            Some(post_data) => HttpResponse::Found()
-                .append_header((
-                    header::LOCATION,
-                    crate::V1_API_ROUTES
-                        .proxy
-                        .get_page(&post_data.username, &post_data.slug),
-                ))
-                .finish(),
-        }
+            .finish()
    } else {
        HttpResponse::NotFound().body("Post not found, please file bug report")
    }
--- a/ups.json
+++ b/ups.json
@@ -1,5 +0,0 @@
-{
-  "upstream": "https://git.batsense.net/realaravinth/libmedium",
-  "provider": "gitea",
-  "commit": "c7154807884e1bb8228a7682c5a3dee9becf5ac4"
-}