chore(deps): update rust crate axum to 0.6.17

fix: een probeersel
fix: yee
2023-04-29 14:01:48 +00:00 · 2023-04-29 15:54:32 +02:00 · 2023-04-29 15:49:39 +02:00 · 2023-04-29 15:49:04 +02:00 · 2023-04-29 15:47:39 +02:00 · 2023-04-29 15:42:39 +02:00
5 changed files with 59 additions and 68 deletions
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@ -0,0 +1,8 @@
+platform: 'linux/amd64'
+
+pipeline:
+  build:
+    image: 'rust:1.69-alpine3.16'
+    commands:
+      - apk add build-base
+      - cargo build 
--- a/Cargo.lock
+++ b/Cargo.lock
@ -87,9 +87,9 @@ dependencies = [

 [[package]]
 name = "base64"
-version = "0.13.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"

 [[package]]
 name = "bitflags"
@ -920,9 +920,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
 dependencies = [
 "autocfg",
 "bytes",
@ -934,14 +934,14 @@ dependencies = [
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
@ -950,9 +950,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.4"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
 "bytes",
 "futures-core",
@ -979,9 +979,9 @@ dependencies = [

 [[package]]
 name = "tower-http"
-version = "0.3.5"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
 dependencies = [
 "base64",
 "bitflags",
@ -1101,9 +1101,9 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"

 [[package]]
 name = "uuid"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
+checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
 dependencies = [
 "getrandom",
 ]
@ -1256,33 +1256,33 @@ dependencies = [

 [[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
 "windows-targets",
 ]

 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
 "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
 "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
+ "windows_x86_64_msvc 0.48.0",
 ]

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

 [[package]]
 name = "windows_aarch64_msvc"
@ -1298,9 +1298,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

 [[package]]
 name = "windows_i686_gnu"
@ -1316,9 +1316,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

 [[package]]
 name = "windows_i686_msvc"
@ -1334,9 +1334,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

 [[package]]
 name = "windows_x86_64_gnu"
@ -1352,15 +1352,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

 [[package]]
 name = "windows_x86_64_msvc"
@ -1376,9 +1376,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

 [[package]]
 name = "xattr"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -13,15 +13,15 @@ name = "site"
 [dependencies]
 axum = { version = "0.6.17" }
 hyper = { version = "0.14.21" }
-tokio = { version = "1.23.0", features = ["full"] }
+tokio = { version = "1.28.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-subscriber = {version = "0.3.16", features = ["env-filter"] }
-tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] }
+tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] }
 tar = "0.4.38"
 flate2 = "1.0.25"
-tokio-util = { version = "0.7.4", features = ["io"] }
+tokio-util = { version = "0.7.8", features = ["io"] }
 futures-util = "0.3.25"
-uuid = { version = "1.2.1", features = ["v4"] }
+uuid = { version = "1.3.2", features = ["v4"] }
 serde_json = "1.0.91"
 metrics = "0.20.1"
 metrics-exporter-prometheus = "0.11.0"
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM rust:1.64-alpine3.16 AS builder
+FROM rust:1.69-alpine3.16 AS builder

 ARG DI_VER=1.2.5

--- a/src/main.rs
+++ b/src/main.rs
@ -2,13 +2,14 @@ use std::{future::ready, net::SocketAddr};

 use axum::{
    extract::Extension,
-    http::StatusCode,
    middleware,
    response::Redirect,
-    routing::{any, get, get_service},
+    routing::{any, get},
    Router,
 };
-use tower_http::{auth::RequireAuthorizationLayer, services::ServeDir, trace::TraceLayer};
+use tower_http::{
+    services::ServeDir, trace::TraceLayer, validate_request::ValidateRequestHeaderLayer,
+};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};

 mod api;
@ -46,7 +47,7 @@ async fn main() {
        // Routes under /api path
        .nest(
            "/api",
-            api::router().layer(RequireAuthorizationLayer::bearer(&api_key)),
+            api::router().layer(ValidateRequestHeaderLayer::bearer(&api_key)),
        )
        .route("/metrics", get(move || ready(recorder_handle.render())));

@ -61,17 +62,7 @@ async fn main() {
    for (path, dir) in sites {
        let full_path = format!("{}/{}", static_dir, dir);

-        app = app.nest(
-            path,
-            get_service(ServeDir::new(full_path)).handle_error(
-                |error: std::io::Error| async move {
-                    (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        format!("Unhandled internal error: {}", error),
-                    )
-                },
-            ),
-        );
+        app = app.nest_service(path, ServeDir::new(full_path));
    }

    // Define some redirects
@ -90,18 +81,10 @@ async fn main() {

    app = app
        // The fallback option is to serve the actual static files
-        .fallback(
-            get_service(ServeDir::new(format!(
+        .fallback_service(ServeDir::new(format!(
            "{}/{}",
            static_dir, DEFAULT_STATIC_SITE
        )))
-            .handle_error(|error: std::io::Error| async move {
-                (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    format!("Unhandled internal error: {}", error),
-                )
-            }),
-        )
        .layer(middleware::from_fn(metrics::track_metrics))
        .layer(Extension(data_dir))
        .layer(TraceLayer::new_for_http());
Author	SHA1	Message	Date
Renovate Bot	3c2485c6b5	chore(deps): update rust crate axum to 0.6.17 ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details ci/woodpecker/push/build Pipeline was successful Details	2023-04-29 14:01:48 +00:00
Jef Roosens	1e83db744b	fix: een probeersel ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details ci/woodpecker/push/build Pipeline was successful Details	2023-04-29 15:54:32 +02:00
Jef Roosens	b79e34cb70	fix: yee ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details ci/woodpecker/push/build Pipeline failed Details	2023-04-29 15:49:39 +02:00
Jef Roosens	88741d81e6	fix: correct docker image ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/build Pipeline failed Details ci/woodpecker/push/lint Pipeline was successful Details	2023-04-29 15:49:04 +02:00
Jef Roosens	fe5c1dc22e	chore: update rust version ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/build Pipeline failed Details ci/woodpecker/push/lint Pipeline was successful Details	2023-04-29 15:47:39 +02:00
Jef Roosens	5fa892f5a3	fix: update code to work with newer versions	2023-04-29 15:42:39 +02:00
Jef Roosens	63d0b1fc86	Merge pull request 'Update Rust crate tokio-util to 0.7.8' (#102 ) from renovate/tokio-util-0.x into dev ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details Reviewed-on: #102	2023-04-29 15:13:40 +02:00
Jef Roosens	23ced36b82	Merge pull request 'Update Rust crate tokio to 1.28.0' (#103 ) from renovate/tokio-1.x into dev ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details Reviewed-on: #103	2023-04-29 15:13:08 +02:00
Jef Roosens	4a299c31dc	Merge pull request 'Update Rust crate tower-http to 0.4.0' (#104 ) from renovate/tower-http-0.x into dev ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details Reviewed-on: #104	2023-04-29 15:12:57 +02:00
Jef Roosens	e0fa0bb5ed	Merge pull request 'Update Rust crate uuid to 1.3.2' (#105 ) from renovate/uuid-1.x into dev ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details Reviewed-on: #105	2023-04-29 15:12:45 +02:00
Renovate Bot	cc4b84c9d4	Update Rust crate uuid to 1.3.2 ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details	2023-04-29 08:01:43 +00:00
Renovate Bot	2566345cce	Update Rust crate tokio to 1.28.0 ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details	2023-04-25 19:01:57 +00:00
Renovate Bot	dfd8b83788	Update Rust crate tokio-util to 0.7.8 ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details	2023-04-25 19:01:54 +00:00
Renovate Bot	887e18384f	Update Rust crate tower-http to 0.4.0 ci/woodpecker/push/deploy unknown status Details ci/woodpecker/push/lint Pipeline was successful Details	2023-03-25 01:04:29 +00:00