refactor: reorganize handlers into separate files
This commit is contained in:
parent
59b0e29f0d
commit
3a9508e8b6
GPG Key ID:
1D8F8FAF2294D6EA
67
src/handlers/data.rs
Normal file
67
src/handlers/data.rs
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
use axum::extract::{Query, State};
|
||||||
|
use http::{
|
||||||
|
header::{AUTHORIZATION, CACHE_CONTROL, RANGE},
|
||||||
|
Request, Response,
|
||||||
|
};
|
||||||
|
use hyper::Body;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
error::AppError,
|
||||||
|
utils::{extract_password_from_basic_auth, remove_token_from_query},
|
||||||
|
AppState,
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::{Auth, AUDIO_CACHE_HEADER};
|
||||||
|
|
||||||
|
pub(crate) async fn get_music(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
Query(query): Query<Auth>,
|
||||||
|
req: Request<Body>,
|
||||||
|
) -> Result<Response<Body>, AppError> {
|
||||||
|
http(State(app), Query(query), req).await.map(|mut resp| {
|
||||||
|
if resp.status().is_success() {
|
||||||
|
// add cache header
|
||||||
|
resp.headers_mut()
|
||||||
|
.insert(CACHE_CONTROL, AUDIO_CACHE_HEADER.clone());
|
||||||
|
}
|
||||||
|
resp
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) async fn http(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
Query(auth): Query<Auth>,
|
||||||
|
req: Request<Body>,
|
||||||
|
) -> Result<Response<Body>, AppError> {
|
||||||
|
let maybe_token = auth.token.or_else(|| {
|
||||||
|
req.headers()
|
||||||
|
.get(AUTHORIZATION)
|
||||||
|
.and_then(|h| h.to_str().ok())
|
||||||
|
.and_then(|auth| extract_password_from_basic_auth(auth).ok())
|
||||||
|
});
|
||||||
|
app.verify_token(maybe_token).await?;
|
||||||
|
|
||||||
|
// remove token from query
|
||||||
|
let path = req.uri().path();
|
||||||
|
let query_map = remove_token_from_query(req.uri().query());
|
||||||
|
let has_query = !query_map.is_empty();
|
||||||
|
let query = has_query
|
||||||
|
.then(|| serde_qs::to_string(&query_map).unwrap())
|
||||||
|
.unwrap_or_else(String::new);
|
||||||
|
let query_prefix = has_query.then_some("?").unwrap_or("");
|
||||||
|
|
||||||
|
let mut request = Request::new(Body::empty());
|
||||||
|
if let Some(range) = req.headers().get(RANGE).cloned() {
|
||||||
|
request.headers_mut().insert(RANGE, range);
|
||||||
|
}
|
||||||
|
|
||||||
|
tracing::debug!(
|
||||||
|
"proxying request to {}:{} with headers {:?}",
|
||||||
|
app.musikcubed_address,
|
||||||
|
app.musikcubed_http_port,
|
||||||
|
req.headers()
|
||||||
|
);
|
||||||
|
|
||||||
|
app.make_musikcubed_request(format!("{path}{query_prefix}{query}"), request)
|
||||||
|
.await
|
||||||
|
}
|
||||||
28
src/handlers/internal.rs
Normal file
28
src/handlers/internal.rs
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
use axum::{extract::State, response::IntoResponse};
|
||||||
|
use http::StatusCode;
|
||||||
|
|
||||||
|
use crate::{error::AppError, AppState};
|
||||||
|
|
||||||
|
pub(crate) async fn revoke_all_tokens(State(app): State<AppState>) -> impl IntoResponse {
|
||||||
|
app.tokens.revoke_all().await;
|
||||||
|
tokio::spawn(async move {
|
||||||
|
if let Err(err) = app.tokens.write(&app.tokens_path).await {
|
||||||
|
tracing::error!("couldn't write tokens file: {err}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
StatusCode::OK
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) async fn generate_token(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
) -> Result<axum::response::Response, AppError> {
|
||||||
|
// generate token
|
||||||
|
let token = app.tokens.generate().await?;
|
||||||
|
// start task to write tokens
|
||||||
|
tokio::spawn(async move {
|
||||||
|
if let Err(err) = app.tokens.write(&app.tokens_path).await {
|
||||||
|
tracing::error!("couldn't write tokens file: {err}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
Ok(token.into_response())
|
||||||
|
}
|
||||||
@ -1,267 +1,28 @@
|
|||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use super::AppError;
|
|
||||||
use async_tungstenite::{
|
use async_tungstenite::{
|
||||||
tokio::TokioAdapter, tungstenite::Message as TungsteniteMessage, WebSocketStream,
|
tokio::TokioAdapter, tungstenite::Message as TungsteniteMessage, WebSocketStream,
|
||||||
};
|
};
|
||||||
use axum::{
|
use axum::{
|
||||||
extract::{
|
extract::{
|
||||||
ws::{Message as AxumMessage, WebSocket, WebSocketUpgrade},
|
ws::{Message as AxumMessage, WebSocket},
|
||||||
Path, Query, State,
|
State, WebSocketUpgrade,
|
||||||
},
|
},
|
||||||
headers::UserAgent,
|
headers::UserAgent,
|
||||||
response::IntoResponse,
|
response::IntoResponse,
|
||||||
routing::{get, post},
|
TypedHeader,
|
||||||
Router, TypedHeader,
|
|
||||||
};
|
};
|
||||||
use base64::Engine;
|
|
||||||
use futures::{SinkExt, StreamExt};
|
use futures::{SinkExt, StreamExt};
|
||||||
use http::{
|
|
||||||
header::{AUTHORIZATION, CACHE_CONTROL, CONTENT_TYPE, RANGE},
|
|
||||||
HeaderName, HeaderValue, Method, Request, Response, StatusCode,
|
|
||||||
};
|
|
||||||
use hyper::Body;
|
|
||||||
use serde::Deserialize;
|
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
use tower_http::{
|
|
||||||
cors::CorsLayer,
|
|
||||||
request_id::{MakeRequestUuid, SetRequestIdLayer},
|
|
||||||
sensitive_headers::SetSensitiveRequestHeadersLayer,
|
|
||||||
trace::TraceLayer,
|
|
||||||
};
|
|
||||||
use tracing::{Instrument, Span};
|
use tracing::{Instrument, Span};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
api::WsApiMessage,
|
api::WsApiMessage,
|
||||||
utils::{axum_msg_to_tungstenite, tungstenite_msg_to_axum, QueryDisplay, WsError},
|
error::AppError,
|
||||||
AppState, B64,
|
utils::{axum_msg_to_tungstenite, tungstenite_msg_to_axum, WsError},
|
||||||
|
AppState,
|
||||||
};
|
};
|
||||||
|
|
||||||
const AUDIO_CACHE_HEADER: HeaderValue = HeaderValue::from_static("private, max-age=604800");
|
pub(crate) async fn metadata_ws(
|
||||||
const REQUEST_ID: HeaderName = HeaderName::from_static("x-request-id");
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct Auth {
|
|
||||||
#[serde(default)]
|
|
||||||
token: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_password_from_basic_auth(auth: &str) -> Result<String, AppError> {
|
|
||||||
let decoded = B64.decode(auth.trim_start_matches("Basic "))?;
|
|
||||||
let auth = String::from_utf8(decoded)?;
|
|
||||||
Ok(auth.trim_start_matches("default:").to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn remove_token_from_query(query: Option<&str>) -> HashMap<String, String> {
|
|
||||||
let mut query_map: HashMap<String, String> = query
|
|
||||||
.and_then(|v| serde_qs::from_str(v).ok())
|
|
||||||
.unwrap_or_else(HashMap::new);
|
|
||||||
query_map.remove("token");
|
|
||||||
query_map
|
|
||||||
}
|
|
||||||
|
|
||||||
fn make_span_trace<B>(req: &Request<B>) -> Span {
|
|
||||||
let query_map = remove_token_from_query(req.uri().query());
|
|
||||||
|
|
||||||
let request_id = req
|
|
||||||
.headers()
|
|
||||||
.get(REQUEST_ID)
|
|
||||||
.and_then(|v| v.to_str().ok())
|
|
||||||
.unwrap_or("no id set");
|
|
||||||
|
|
||||||
if query_map.is_empty() {
|
|
||||||
tracing::debug_span!(
|
|
||||||
"request",
|
|
||||||
path = %req.uri().path(),
|
|
||||||
id = %request_id,
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
let query_display = QueryDisplay::new(query_map);
|
|
||||||
tracing::debug_span!(
|
|
||||||
"request",
|
|
||||||
path = %req.uri().path(),
|
|
||||||
query = %query_display,
|
|
||||||
id = %request_id,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(super) async fn handler(state: AppState) -> Result<(Router, Router), AppError> {
|
|
||||||
let internal_router = Router::new()
|
|
||||||
.route("/token/generate", get(generate_token))
|
|
||||||
.route("/token/revoke_all", post(revoke_all_tokens))
|
|
||||||
.with_state(state.clone());
|
|
||||||
|
|
||||||
let trace_layer = TraceLayer::new_for_http()
|
|
||||||
.make_span_with(make_span_trace)
|
|
||||||
.on_request(|req: &Request<Body>, _span: &Span| {
|
|
||||||
tracing::debug!(
|
|
||||||
"started processing request {} on {:?}",
|
|
||||||
req.method(),
|
|
||||||
req.version(),
|
|
||||||
)
|
|
||||||
});
|
|
||||||
let cors_layer = CorsLayer::new()
|
|
||||||
.allow_origin(tower_http::cors::Any)
|
|
||||||
.allow_headers([CONTENT_TYPE, CACHE_CONTROL, REQUEST_ID])
|
|
||||||
.allow_methods([Method::GET]);
|
|
||||||
let sensitive_header_layer = SetSensitiveRequestHeadersLayer::new([AUTHORIZATION]);
|
|
||||||
let request_id_layer = SetRequestIdLayer::new(REQUEST_ID.clone(), MakeRequestUuid);
|
|
||||||
|
|
||||||
let router = Router::new()
|
|
||||||
.route("/token/generate_for_music/:id", get(generate_scoped_token))
|
|
||||||
.route("/thumbnail/:id", get(http))
|
|
||||||
.route("/audio/external_id/:id", get(get_music))
|
|
||||||
.route("/share/audio/:token", get(get_scoped_music_file))
|
|
||||||
.route("/share/thumbnail/:token", get(get_scoped_music_thumbnail))
|
|
||||||
.route("/share/info/:token", get(get_scoped_music_info))
|
|
||||||
.route("/", get(metadata_ws))
|
|
||||||
.layer(trace_layer)
|
|
||||||
.layer(sensitive_header_layer)
|
|
||||||
.layer(cors_layer)
|
|
||||||
.layer(request_id_layer)
|
|
||||||
.with_state(state);
|
|
||||||
|
|
||||||
Ok((router, internal_router))
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn revoke_all_tokens(State(app): State<AppState>) -> impl IntoResponse {
|
|
||||||
app.tokens.revoke_all().await;
|
|
||||||
tokio::spawn(async move {
|
|
||||||
if let Err(err) = app.tokens.write(&app.tokens_path).await {
|
|
||||||
tracing::error!("couldn't write tokens file: {err}");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
StatusCode::OK
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn generate_token(State(app): State<AppState>) -> Result<axum::response::Response, AppError> {
|
|
||||||
// generate token
|
|
||||||
let token = app.tokens.generate().await?;
|
|
||||||
// start task to write tokens
|
|
||||||
tokio::spawn(async move {
|
|
||||||
if let Err(err) = app.tokens.write(&app.tokens_path).await {
|
|
||||||
tracing::error!("couldn't write tokens file: {err}");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
Ok(token.into_response())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn generate_scoped_token(
|
|
||||||
State(app): State<AppState>,
|
|
||||||
Query(query): Query<Auth>,
|
|
||||||
Path(music_id): Path<String>,
|
|
||||||
) -> Result<axum::response::Response, AppError> {
|
|
||||||
app.verify_token(query.token).await?;
|
|
||||||
|
|
||||||
// generate token
|
|
||||||
let token = app.scoped_tokens.generate_for_id(music_id).await;
|
|
||||||
Ok(token.into_response())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_scoped_music_info(
|
|
||||||
State(app): State<AppState>,
|
|
||||||
Path(token): Path<String>,
|
|
||||||
) -> Result<impl IntoResponse, AppError> {
|
|
||||||
let music_id = app.verify_scoped_token(token).await?;
|
|
||||||
let Some(info) = app.music_info.get(music_id).await else {
|
|
||||||
return Err("music id not found".into());
|
|
||||||
};
|
|
||||||
Ok(serde_json::to_string(&info).unwrap())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_scoped_music_thumbnail(
|
|
||||||
State(app): State<AppState>,
|
|
||||||
Path(token): Path<String>,
|
|
||||||
) -> Result<Response<Body>, AppError> {
|
|
||||||
let music_id = app.verify_scoped_token(token).await?;
|
|
||||||
let Some(info) = app.music_info.get(music_id).await else {
|
|
||||||
return Err("music id not found".into());
|
|
||||||
};
|
|
||||||
app.make_musikcubed_request(
|
|
||||||
format!("thumbnail/{}", info.thumbnail_id),
|
|
||||||
Request::new(Body::empty()),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_scoped_music_file(
|
|
||||||
State(app): State<AppState>,
|
|
||||||
Path(token): Path<String>,
|
|
||||||
request: Request<Body>,
|
|
||||||
) -> Result<Response<Body>, AppError> {
|
|
||||||
let music_id = app.verify_scoped_token(token).await?;
|
|
||||||
let mut req = Request::new(Body::empty());
|
|
||||||
// proxy any range headers
|
|
||||||
if let Some(range) = request.headers().get(RANGE).cloned() {
|
|
||||||
req.headers_mut().insert(RANGE, range);
|
|
||||||
}
|
|
||||||
let mut resp = app
|
|
||||||
.make_musikcubed_request(format!("audio/external_id/{music_id}"), req)
|
|
||||||
.await?;
|
|
||||||
if resp.status().is_success() {
|
|
||||||
// add cache header
|
|
||||||
resp.headers_mut()
|
|
||||||
.insert(CACHE_CONTROL, AUDIO_CACHE_HEADER.clone());
|
|
||||||
}
|
|
||||||
Ok(resp)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_music(
|
|
||||||
State(app): State<AppState>,
|
|
||||||
Query(query): Query<Auth>,
|
|
||||||
req: Request<Body>,
|
|
||||||
) -> Result<Response<Body>, AppError> {
|
|
||||||
http(State(app), Query(query), req).await.map(|mut resp| {
|
|
||||||
if resp.status().is_success() {
|
|
||||||
// add cache header
|
|
||||||
resp.headers_mut()
|
|
||||||
.insert(CACHE_CONTROL, AUDIO_CACHE_HEADER.clone());
|
|
||||||
}
|
|
||||||
resp
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn http(
|
|
||||||
State(app): State<AppState>,
|
|
||||||
Query(auth): Query<Auth>,
|
|
||||||
req: Request<Body>,
|
|
||||||
) -> Result<Response<Body>, AppError> {
|
|
||||||
let maybe_token = auth.token.or_else(|| {
|
|
||||||
req.headers()
|
|
||||||
.get(AUTHORIZATION)
|
|
||||||
.and_then(|h| h.to_str().ok())
|
|
||||||
.and_then(|auth| extract_password_from_basic_auth(auth).ok())
|
|
||||||
});
|
|
||||||
app.verify_token(maybe_token).await?;
|
|
||||||
|
|
||||||
// remove token from query
|
|
||||||
let path = req.uri().path();
|
|
||||||
let query_map = remove_token_from_query(req.uri().query());
|
|
||||||
let has_query = !query_map.is_empty();
|
|
||||||
let query = has_query
|
|
||||||
.then(|| serde_qs::to_string(&query_map).unwrap())
|
|
||||||
.unwrap_or_else(String::new);
|
|
||||||
let query_prefix = has_query.then_some("?").unwrap_or("");
|
|
||||||
|
|
||||||
let mut request = Request::new(Body::empty());
|
|
||||||
if let Some(range) = req.headers().get(RANGE).cloned() {
|
|
||||||
request.headers_mut().insert(RANGE, range);
|
|
||||||
}
|
|
||||||
|
|
||||||
tracing::debug!(
|
|
||||||
"proxying request to {}:{} with headers {:?}",
|
|
||||||
app.musikcubed_address,
|
|
||||||
app.musikcubed_http_port,
|
|
||||||
req.headers()
|
|
||||||
);
|
|
||||||
|
|
||||||
app.make_musikcubed_request(format!("{path}{query_prefix}{query}"), request)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn metadata_ws(
|
|
||||||
State(app): State<AppState>,
|
State(app): State<AppState>,
|
||||||
TypedHeader(user_agent): TypedHeader<UserAgent>,
|
TypedHeader(user_agent): TypedHeader<UserAgent>,
|
||||||
ws: WebSocketUpgrade,
|
ws: WebSocketUpgrade,
|
||||||
@ -296,7 +57,7 @@ async fn metadata_ws(
|
|||||||
Ok(upgrade)
|
Ok(upgrade)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn handle_metadata_socket(
|
pub(crate) async fn handle_metadata_socket(
|
||||||
mut server_socket: WebSocketStream<TokioAdapter<TcpStream>>,
|
mut server_socket: WebSocketStream<TokioAdapter<TcpStream>>,
|
||||||
mut client_socket: WebSocket,
|
mut client_socket: WebSocket,
|
||||||
app: AppState,
|
app: AppState,
|
||||||
21
src/handlers/mod.rs
Normal file
21
src/handlers/mod.rs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
use ::http::HeaderValue;
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
pub(crate) mod data;
|
||||||
|
pub(crate) mod internal;
|
||||||
|
pub(crate) mod metadata;
|
||||||
|
pub(crate) mod share;
|
||||||
|
|
||||||
|
pub(crate) const AUDIO_CACHE_HEADER: HeaderValue =
|
||||||
|
HeaderValue::from_static("private, max-age=604800");
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub(crate) struct Auth {
|
||||||
|
#[serde(default)]
|
||||||
|
token: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) use self::data::*;
|
||||||
|
pub(crate) use internal::*;
|
||||||
|
pub(crate) use metadata::*;
|
||||||
|
pub(crate) use share::*;
|
||||||
73
src/handlers/share.rs
Normal file
73
src/handlers/share.rs
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
use axum::{
|
||||||
|
extract::{Path, Query, State},
|
||||||
|
response::IntoResponse,
|
||||||
|
};
|
||||||
|
use http::{
|
||||||
|
header::{CACHE_CONTROL, RANGE},
|
||||||
|
Request, Response,
|
||||||
|
};
|
||||||
|
use hyper::Body;
|
||||||
|
|
||||||
|
use crate::{error::AppError, AppState};
|
||||||
|
|
||||||
|
use super::{Auth, AUDIO_CACHE_HEADER};
|
||||||
|
|
||||||
|
pub(crate) async fn generate_scoped_token(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
Query(query): Query<Auth>,
|
||||||
|
Path(music_id): Path<String>,
|
||||||
|
) -> Result<impl IntoResponse, AppError> {
|
||||||
|
app.verify_token(query.token).await?;
|
||||||
|
|
||||||
|
// generate token
|
||||||
|
let token = app.scoped_tokens.generate_for_id(music_id).await;
|
||||||
|
Ok(token)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) async fn get_scoped_music_info(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
Path(token): Path<String>,
|
||||||
|
) -> Result<impl IntoResponse, AppError> {
|
||||||
|
let music_id = app.verify_scoped_token(token).await?;
|
||||||
|
let Some(info) = app.music_info.get(music_id).await else {
|
||||||
|
return Err("music id not found".into());
|
||||||
|
};
|
||||||
|
Ok(serde_json::to_string(&info).unwrap())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) async fn get_scoped_music_thumbnail(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
Path(token): Path<String>,
|
||||||
|
) -> Result<Response<Body>, AppError> {
|
||||||
|
let music_id = app.verify_scoped_token(token).await?;
|
||||||
|
let Some(info) = app.music_info.get(music_id).await else {
|
||||||
|
return Err("music id not found".into());
|
||||||
|
};
|
||||||
|
app.make_musikcubed_request(
|
||||||
|
format!("thumbnail/{}", info.thumbnail_id),
|
||||||
|
Request::new(Body::empty()),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) async fn get_scoped_music_file(
|
||||||
|
State(app): State<AppState>,
|
||||||
|
Path(token): Path<String>,
|
||||||
|
request: Request<Body>,
|
||||||
|
) -> Result<Response<Body>, AppError> {
|
||||||
|
let music_id = app.verify_scoped_token(token).await?;
|
||||||
|
let mut req = Request::new(Body::empty());
|
||||||
|
// proxy any range headers
|
||||||
|
if let Some(range) = request.headers().get(RANGE).cloned() {
|
||||||
|
req.headers_mut().insert(RANGE, range);
|
||||||
|
}
|
||||||
|
let mut resp = app
|
||||||
|
.make_musikcubed_request(format!("audio/external_id/{music_id}"), req)
|
||||||
|
.await?;
|
||||||
|
if resp.status().is_success() {
|
||||||
|
// add cache header
|
||||||
|
resp.headers_mut()
|
||||||
|
.insert(CACHE_CONTROL, AUDIO_CACHE_HEADER.clone());
|
||||||
|
}
|
||||||
|
Ok(resp)
|
||||||
|
}
|
||||||
@ -20,7 +20,8 @@ use crate::{
|
|||||||
|
|
||||||
mod api;
|
mod api;
|
||||||
mod error;
|
mod error;
|
||||||
mod handler;
|
mod handlers;
|
||||||
|
mod router;
|
||||||
mod token;
|
mod token;
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
@ -60,7 +61,7 @@ async fn app() -> Result<(), AppError> {
|
|||||||
let internal_port: u16 = get_conf("INTERNAL_PORT")?.parse()?;
|
let internal_port: u16 = get_conf("INTERNAL_PORT")?.parse()?;
|
||||||
|
|
||||||
let state = AppState::new(AppStateInternal::new(public_port).await?);
|
let state = AppState::new(AppStateInternal::new(public_port).await?);
|
||||||
let (public_router, internal_router) = handler::handler(state).await?;
|
let (public_router, internal_router) = router::handler(state).await?;
|
||||||
|
|
||||||
let internal_make_service = internal_router.into_make_service();
|
let internal_make_service = internal_router.into_make_service();
|
||||||
let internal_task = tokio::spawn(
|
let internal_task = tokio::spawn(
|
||||||
|
|||||||
96
src/router.rs
Normal file
96
src/router.rs
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
use super::AppError;
|
||||||
|
use axum::{
|
||||||
|
routing::{get, post},
|
||||||
|
Router,
|
||||||
|
};
|
||||||
|
use http::{
|
||||||
|
header::{AUTHORIZATION, CACHE_CONTROL, CONTENT_TYPE},
|
||||||
|
HeaderName, Method, Request,
|
||||||
|
};
|
||||||
|
use hyper::Body;
|
||||||
|
use tower_http::{
|
||||||
|
cors::CorsLayer,
|
||||||
|
request_id::{MakeRequestUuid, SetRequestIdLayer},
|
||||||
|
sensitive_headers::SetSensitiveRequestHeadersLayer,
|
||||||
|
trace::TraceLayer,
|
||||||
|
};
|
||||||
|
use tracing::Span;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
handlers,
|
||||||
|
utils::{remove_token_from_query, QueryDisplay},
|
||||||
|
AppState,
|
||||||
|
};
|
||||||
|
|
||||||
|
const REQUEST_ID: HeaderName = HeaderName::from_static("x-request-id");
|
||||||
|
|
||||||
|
fn make_span_trace<B>(req: &Request<B>) -> Span {
|
||||||
|
let query_map = remove_token_from_query(req.uri().query());
|
||||||
|
|
||||||
|
let request_id = req
|
||||||
|
.headers()
|
||||||
|
.get(REQUEST_ID)
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.unwrap_or("no id set");
|
||||||
|
|
||||||
|
if query_map.is_empty() {
|
||||||
|
tracing::debug_span!(
|
||||||
|
"request",
|
||||||
|
path = %req.uri().path(),
|
||||||
|
id = %request_id,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
let query_display = QueryDisplay::new(query_map);
|
||||||
|
tracing::debug_span!(
|
||||||
|
"request",
|
||||||
|
path = %req.uri().path(),
|
||||||
|
query = %query_display,
|
||||||
|
id = %request_id,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(super) async fn handler(state: AppState) -> Result<(Router, Router), AppError> {
|
||||||
|
let internal_router = Router::new()
|
||||||
|
.route("/token/generate", get(handlers::generate_token))
|
||||||
|
.route("/token/revoke_all", post(handlers::revoke_all_tokens))
|
||||||
|
.with_state(state.clone());
|
||||||
|
|
||||||
|
let trace_layer = TraceLayer::new_for_http()
|
||||||
|
.make_span_with(make_span_trace)
|
||||||
|
.on_request(|req: &Request<Body>, _span: &Span| {
|
||||||
|
tracing::debug!(
|
||||||
|
"started processing request {} on {:?}",
|
||||||
|
req.method(),
|
||||||
|
req.version(),
|
||||||
|
)
|
||||||
|
});
|
||||||
|
let cors_layer = CorsLayer::new()
|
||||||
|
.allow_origin(tower_http::cors::Any)
|
||||||
|
.allow_headers([CONTENT_TYPE, CACHE_CONTROL, REQUEST_ID])
|
||||||
|
.allow_methods([Method::GET]);
|
||||||
|
let sensitive_header_layer = SetSensitiveRequestHeadersLayer::new([AUTHORIZATION]);
|
||||||
|
let request_id_layer = SetRequestIdLayer::new(REQUEST_ID.clone(), MakeRequestUuid);
|
||||||
|
|
||||||
|
let router = Router::new()
|
||||||
|
.route(
|
||||||
|
"/token/generate_for_music/:id",
|
||||||
|
get(handlers::generate_scoped_token),
|
||||||
|
)
|
||||||
|
.route("/thumbnail/:id", get(handlers::http))
|
||||||
|
.route("/audio/external_id/:id", get(handlers::get_music))
|
||||||
|
.route("/share/audio/:token", get(handlers::get_scoped_music_file))
|
||||||
|
.route(
|
||||||
|
"/share/thumbnail/:token",
|
||||||
|
get(handlers::get_scoped_music_thumbnail),
|
||||||
|
)
|
||||||
|
.route("/share/info/:token", get(handlers::get_scoped_music_info))
|
||||||
|
.route("/", get(handlers::metadata_ws))
|
||||||
|
.layer(trace_layer)
|
||||||
|
.layer(sensitive_header_layer)
|
||||||
|
.layer(cors_layer)
|
||||||
|
.layer(request_id_layer)
|
||||||
|
.with_state(state);
|
||||||
|
|
||||||
|
Ok((router, internal_router))
|
||||||
|
}
|
||||||
17
src/utils.rs
17
src/utils.rs
@ -8,6 +8,9 @@ use axum::{
|
|||||||
extract::ws::{CloseFrame as AxumCloseFrame, Message as AxumMessage},
|
extract::ws::{CloseFrame as AxumCloseFrame, Message as AxumMessage},
|
||||||
Error as AxumError,
|
Error as AxumError,
|
||||||
};
|
};
|
||||||
|
use base64::Engine;
|
||||||
|
|
||||||
|
use crate::{error::AppError, B64};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) enum WsError {
|
pub(crate) enum WsError {
|
||||||
@ -196,3 +199,17 @@ impl Display for QueryDisplay {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn extract_password_from_basic_auth(auth: &str) -> Result<String, AppError> {
|
||||||
|
let decoded = B64.decode(auth.trim_start_matches("Basic "))?;
|
||||||
|
let auth = String::from_utf8(decoded)?;
|
||||||
|
Ok(auth.trim_start_matches("default:").to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn remove_token_from_query(query: Option<&str>) -> HashMap<String, String> {
|
||||||
|
let mut query_map: HashMap<String, String> = query
|
||||||
|
.and_then(|v| serde_qs::from_str(v).ok())
|
||||||
|
.unwrap_or_else(HashMap::new);
|
||||||
|
query_map.remove("token");
|
||||||
|
query_map
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user