Kieran/route96
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: HEAD /media

Browse Source
This commit is contained in:
kieran 2024-12-08 22:16:19 +00:00
parent a113056817
commit 5a0c0e6e37
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
1 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/routes/blossom.rs
View File

@ -59,7 +59,14 @@ impl BlobDescriptor {
#[cfg(feature = "media-compression")] #[cfg(feature = "media-compression")]
pub fn blossom_routes() -> Vec<Route> { pub fn blossom_routes() -> Vec<Route> {
routes![delete_blob, upload, list_files, upload_head, upload_media] routes![
delete_blob,
upload,
list_files,
upload_head,
upload_media,
head_media
]
} }
#[cfg(not(feature = "media-compression"))] #[cfg(not(feature = "media-compression"))]
@ -175,7 +182,42 @@ async fn list_files(
} }
#[rocket::head("/upload")] #[rocket::head("/upload")]
async fn upload_head(auth: BlossomAuth, settings: &State<Settings>) -> BlossomHead { fn upload_head(auth: BlossomAuth, settings: &State<Settings>) -> BlossomHead {
check_head(auth, settings)
}
#[rocket::put("/upload", data = "<data>")]
async fn upload(
auth: BlossomAuth,
fs: &State<FileStore>,
db: &State<Database>,
settings: &State<Settings>,
webhook: &State<Option<Webhook>>,
data: Data<'_>,
) -> BlossomResponse {
process_upload("upload", false, auth, fs, db, settings, webhook, data).await
}
#[cfg(feature = "media-compression")]
#[rocket::head("/media")]
fn head_media(auth: BlossomAuth, settings: &State<Settings>) -> BlossomHead {
check_head(auth, settings)
}
#[cfg(feature = "media-compression")]
#[rocket::put("/media", data = "<data>")]
async fn upload_media(
auth: BlossomAuth,
fs: &State<FileStore>,
db: &State<Database>,
settings: &State<Settings>,
webhook: &State<Option<Webhook>>,
data: Data<'_>,
) -> BlossomResponse {
process_upload("media", true, auth, fs, db, settings, webhook, data).await
}
fn check_head(auth: BlossomAuth, settings: &State<Settings>) -> BlossomHead {
if !check_method(&auth.event, "upload") { if !check_method(&auth.event, "upload") {
return BlossomHead { return BlossomHead {
msg: Some("Invalid auth method tag"), msg: Some("Invalid auth method tag"),
@ -218,31 +260,6 @@ async fn upload_head(auth: BlossomAuth, settings: &State<Settings>) -> BlossomHe
BlossomHead { msg: None } BlossomHead { msg: None }
} }
#[rocket::put("/upload", data = "<data>")]
async fn upload(
auth: BlossomAuth,
fs: &State<FileStore>,
db: &State<Database>,
settings: &State<Settings>,
webhook: &State<Option<Webhook>>,
data: Data<'_>,
) -> BlossomResponse {
process_upload("upload", false, auth, fs, db, settings, webhook, data).await
}
#[cfg(feature = "media-compression")]
#[rocket::put("/media", data = "<data>")]
async fn upload_media(
auth: BlossomAuth,
fs: &State<FileStore>,
db: &State<Database>,
settings: &State<Settings>,
webhook: &State<Option<Webhook>>,
data: Data<'_>,
) -> BlossomResponse {
process_upload("media", true, auth, fs, db, settings, webhook, data).await
}
async fn process_upload( async fn process_upload(
method: &str, method: &str,
compress: bool, compress: bool,