update tower-http to 0.6

Author: agougougoua

Cargo.lock

@@ -1,12 +1,10 @@
-use std::{collections::HashSet, marker::PhantomData};
-
 use anyhow::{anyhow, Error};
 use headers::authorization::{Bearer, Credentials};
 use http::{header, Request, Response, StatusCode};
-use http_body::Body;
 use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
+use std::{collections::HashSet, marker::PhantomData};
 use tower_http::validate_request::ValidateRequest;
-
+// 添加这个导入
 use crate::claims::Claims;
 
 pub mod access;
@@ -33,14 +31,11 @@ impl Keys {
 pub struct ManyValidate<ResBody> {
     tokens: HashSet<String>,
     decoding: DecodingKey,
-    _ty: PhantomData<fn() -> ResBody>,
+    _ty: PhantomData<ResBody>,
 }
 
 impl<ResBody> ManyValidate<ResBody> {
-    pub fn new(secret: String, tokens: Vec<String>) -> Self
-    where
-        ResBody: Body + Default,
-    {
+    pub fn new(secret: String, tokens: Vec<String>) -> Self {
         Self {
             tokens: tokens.into_iter().collect(),
             decoding: DecodingKey::from_secret(secret.as_bytes()),
@@ -59,11 +54,10 @@ impl<ResBody> Clone for ManyValidate<ResBody> {
     }
 }
 
-impl<B, ResBody> ValidateRequest<B> for ManyValidate<ResBody>
-where
-    ResBody: Body + Default,
-{
-    type ResponseBody = ResBody;
+// 修改这个实现，添加必要的trait bounds
+impl<B: Default> ValidateRequest<B> for ManyValidate<B> {
+    // 添加关联类型
+    type ResponseBody = B;
 
     fn validate(&mut self, request: &mut Request<B>) -> Result<(), Response<Self::ResponseBody>> {
         if self.tokens.is_empty() {
@@ -74,10 +68,10 @@ where
             });
             return Ok(());
         }
-        (match request.headers().get(header::AUTHORIZATION) {
+
+        match request.headers().get(header::AUTHORIZATION) {
             Some(auth_header) => match Bearer::decode(auth_header) {
                 Some(bearer) if self.tokens.contains(bearer.token()) => {
-                    // Static token is max permissions
                     request.extensions_mut().insert(Claims {
                         id: ANY_ID.to_string(),
                         exp: 0,
@@ -91,18 +85,21 @@ where
                             request.extensions_mut().insert(token_data.claims);
                             Ok(())
                         }
-                        _ => Err(()),
+                        _ => Err(Response::builder()
+                            .status(StatusCode::UNAUTHORIZED)
+                            .body(B::default())
+                            .unwrap()),
                     }
                 }
-                _ => Err(()),
+                _ => Err(Response::builder()
+                    .status(StatusCode::UNAUTHORIZED)
+                    .body(B::default())
+                    .unwrap()),
             },
-            _ => Err(()),
-        })
-        .map_err(|_| {
-            Response::builder()
+            _ => Err(Response::builder()
                 .status(StatusCode::UNAUTHORIZED)
-                .body(ResBody::default())
-                .unwrap()
-        })
+                .body(B::default())
+                .unwrap()),
+        }
     }
 }

libs/auth/src/lib.rs

@@ -371,7 +371,7 @@ pub fn filter_sdp(
                     .retain(|fmt| fmt == &video_codec.payload_type.to_string());
                 media.attributes.retain(|attr| {
                     attr.key == "rtpmap"
-                        && attr.value.as_ref().map_or(false, |v| {
+                        && attr.value.as_ref().is_some_and(|v| {
                             v.starts_with(&video_codec.payload_type.to_string())
                         })
                 });
@@ -391,7 +391,7 @@ pub fn filter_sdp(
                     .retain(|fmt| fmt == &audio_codec.payload_type.to_string());
                 media.attributes.retain(|attr| {
                     attr.key == "rtpmap"
-                        && attr.value.as_ref().map_or(false, |v| {
+                        && attr.value.as_ref().is_some_and(|v| {
                             v.starts_with(&audio_codec.payload_type.to_string())
                         })
                 });
@@ -402,10 +402,10 @@ pub fn filter_sdp(
                 });
             }
         }
-
+    
         true
     });
-
+    
     session.attributes.retain(|attr| {
         !attr.key.starts_with("group")
             && !attr.key.starts_with("fingerprint")

libs/rtsp/src/lib.rs

@@ -10,9 +10,10 @@ use tracing::{error, info_span, Level};
 
 use auth::{access::access_middleware, ManyValidate};
 use error::AppError;
-
+// 在 use 声明中添加
 use crate::config::Config;
 use crate::route::{admin, session, whep, whip, AppState};
+use axum::body::Body;
 
 use stream::manager::Manager;
 
@@ -42,8 +43,11 @@ where
         stream_manager: Arc::new(Manager::new(cfg.clone()).await),
         config: cfg.clone(),
     };
-    let auth_layer =
-        ValidateRequestHeaderLayer::custom(ManyValidate::new(cfg.auth.secret, cfg.auth.tokens));
+    // 修改 auth_layer 的创建
+    let auth_layer = ValidateRequestHeaderLayer::custom(ManyValidate::<Body>::new(
+        cfg.auth.secret,
+        cfg.auth.tokens,
+    ));
     let app = Router::new()
         .merge(
             whip::route()

liveion/src/lib.rs

@@ -1,5 +1,10 @@
 use std::{future::Future, time::Duration};
 
+use crate::admin::{authorize, token};
+use crate::config::Config;
+use crate::store::{Node, NodeKind, Storage};
+use auth::{access::access_middleware, ManyValidate};
+use axum::body::Body;
 use axum::{extract::Request, middleware, response::IntoResponse, routing::post, Router};
 use http::{StatusCode, Uri};
 use tokio::net::TcpListener;
@@ -8,11 +13,6 @@ use tower_http::{
 };
 use tracing::{error, info, info_span};
 
-use crate::admin::{authorize, token};
-use crate::config::Config;
-use crate::store::{Node, NodeKind, Storage};
-use auth::{access::access_middleware, ManyValidate};
-
 #[cfg(feature = "webui")]
 #[derive(rust_embed::RustEmbed)]
 #[folder = "../assets/liveman/"]
@@ -145,8 +145,11 @@ where
         storage: store,
     };
 
-    let auth_layer =
-        ValidateRequestHeaderLayer::custom(ManyValidate::new(cfg.auth.secret, cfg.auth.tokens));
+    // 修改 auth_layer 的创建
+    let auth_layer = ValidateRequestHeaderLayer::custom(ManyValidate::<Body>::new(
+        cfg.auth.secret,
+        cfg.auth.tokens,
+    ));
     let app = Router::new()
         .merge(
             route::proxy::route()