gorb/backend
4
0
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

feat: move image check to utils.rs

Browse source
This commit is contained in:
Radical 2025-05-23 20:32:43 +02:00
parent 149b81973d
commit 81f7527c79
2 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/structs.rs
View file

@ -5,9 +5,8 @@ use diesel_async::{pooled_connection::AsyncDieselConnectionManager, RunQueryDsl}
use tokio::task; use tokio::task;
use url::Url; use url::Url;
use actix_web::web::BytesMut; use actix_web::web::BytesMut;
use bindet::FileType;
use crate::{error::Error, Conn, Data, schema::*}; use crate::{error::Error, schema::*, utils::image_check, Conn, Data};
fn load_or_empty<T>(query_result: Result<Vec<T>, diesel::result::Error>) -> Result<Vec<T>, diesel::result::Error> { fn load_or_empty<T>(query_result: Result<Vec<T>, diesel::result::Error>) -> Result<Vec<T>, diesel::result::Error> {
match query_result { match query_result {
@ -256,7 +255,7 @@ impl GuildBuilder {
uuid: self.uuid, uuid: self.uuid,
name: self.name, name: self.name,
description: self.description, description: self.description,
icon: self.icon, icon: self.icon.and_then(|i| i.parse().ok()),
owner_uuid: self.owner_uuid, owner_uuid: self.owner_uuid,
roles: roles, roles: roles,
member_count: member_count, member_count: member_count,
@ -269,7 +268,7 @@ pub struct Guild {
pub uuid: Uuid, pub uuid: Uuid,
name: String, name: String,
description: Option<String>, description: Option<String>,
icon: Option<String>, icon: Option<Url>,
owner_uuid: Uuid, owner_uuid: Uuid,
pub roles: Vec<Role>, pub roles: Vec<Role>,
member_count: i64, member_count: i64,
@ -410,29 +409,13 @@ impl Guild {
// FIXME: Horrible security // FIXME: Horrible security
pub async fn set_icon(&mut self, bunny_cdn: &bunny_api_tokio::Client, conn: &mut Conn, cdn_url: Url, icon: BytesMut) -> Result<(), Error> { pub async fn set_icon(&mut self, bunny_cdn: &bunny_api_tokio::Client, conn: &mut Conn, cdn_url: Url, icon: BytesMut) -> Result<(), Error> {
let ico = icon.clone(); let icon_clone = icon.clone();
let image_type = task::spawn_blocking(move || image_check(icon_clone)).await??;
let image_type = task::spawn_blocking(move || {
let buf = std::io::Cursor::new(ico.to_vec());
let detect = bindet::detect(buf).map_err(|e| e.kind());
if let Ok(Some(file_type)) = detect {
if file_type.likely_to_be == vec![FileType::Jpg] {
return String::from("jpg")
} else if file_type.likely_to_be == vec![FileType::Png] {
return String::from("png")
}
}
String::from("unknown")
}).await?;
if image_type == "unknown" {
return Err(Error::BadRequest("Not an image".to_string()))
}
if let Some(icon) = &self.icon { if let Some(icon) = &self.icon {
let relative_url = icon.trim_start_matches("https://cdn.gorb.app/"); let relative_url = icon
.path()
.trim_start_matches('/');
bunny_cdn.storage.delete(relative_url).await?; bunny_cdn.storage.delete(relative_url).await?;
} }
@ -450,7 +433,7 @@ impl Guild {
.execute(conn) .execute(conn)
.await?; .await?;
self.icon = Some(icon_url.to_string()); self.icon = Some(icon_url);
Ok(()) Ok(())
} }

21
src/utils.rs
View file

@ -1,7 +1,8 @@
use actix_web::{ use actix_web::{
cookie::{Cookie, SameSite, time::Duration}, cookie::{time::Duration, Cookie, SameSite},
http::header::HeaderMap, http::header::HeaderMap, web::BytesMut,
}; };
use bindet::FileType;
use getrandom::fill; use getrandom::fill;
use hex::encode; use hex::encode;
use redis::RedisError; use redis::RedisError;
@ -59,6 +60,22 @@ pub fn generate_refresh_token() -> Result<String, getrandom::Error> {
Ok(encode(buf)) Ok(encode(buf))
} }
pub fn image_check(icon: BytesMut) -> Result<String, Error> {
let buf = std::io::Cursor::new(icon);
let detect = bindet::detect(buf).map_err(|e| e.kind());
if let Ok(Some(file_type)) = detect {
if file_type.likely_to_be == vec![FileType::Jpg] {
return Ok(String::from("jpg"))
} else if file_type.likely_to_be == vec![FileType::Png] {
return Ok(String::from("png"))
}
}
Err(Error::BadRequest("Uploaded file is not an image".to_string()))
}
impl Data { impl Data {
pub async fn set_cache_key( pub async fn set_cache_key(
&self, &self,