Kieran/route96
1
0
Fork 0
mirror of https://github.com/v0l/route96.git synced 2025-06-16 08:18:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whitelist / better duplicate file response

Browse Source
This commit is contained in:
kieran
2024-05-14 10:58:21 +01:00
parent 1a27f19e50
commit f16e7acadb
5 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/routes/blossom.rs
View File

@ -1,3 +1,5 @@
use std::fs;
use chrono::Utc;
use log::error;
use nostr::prelude::hex;
@ -105,6 +107,12 @@ async fn upload(
.content_type
.unwrap_or("application/octet-stream".to_string());
// check whitelist
if let Some(wl) = &settings.whitelist {
if !wl.contains(&auth.event.pubkey.to_hex()) {
return BlossomResponse::error("Not on whitelist");
}
}
match fs
.put(data.open(ByteUnit::from(settings.max_upload_bytes)), &mime_type, false)
.await
@ -126,7 +134,15 @@ async fn upload(
created: Utc::now(),
};
if let Err(e) = db.add_file(&f).await {
error!("{:?}", e);
error!("{}", e.to_string());
let _ = fs::remove_file(blob.path);
if let Some(dbe) = e.as_database_error() {
if let Some(c) = dbe.code() {
if c == "23000" {
return BlossomResponse::error("File already exists");
}
}
}
BlossomResponse::error(format!("Error saving file (db): {}", e))
} else {
BlossomResponse::BlobDescriptor(Json(BlobDescriptor::from_upload(
@ -136,7 +152,7 @@ async fn upload(
}
}
Err(e) => {
error!("{:?}", e);
error!("{}", e.to_string());
BlossomResponse::error(format!("Error saving file (disk): {}", e))
}
}