Compare commits
2 Commits
a3e4ac2b2e
...
e92cebfad7
Author | SHA1 | Date | |
---|---|---|---|
e92cebfad7 | |||
9e3b9527d3 |
8
Cargo.lock
generated
8
Cargo.lock
generated
@ -321,9 +321,9 @@ checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.12"
|
||||
version = "1.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7"
|
||||
checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
"libc",
|
||||
@ -1051,9 +1051,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.155"
|
||||
version = "0.2.156"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
|
@ -48,6 +48,7 @@ tower = { version = "0.4" }
|
||||
tower-http = { version = "0.5", features = [
|
||||
"compression-full",
|
||||
"sensitive-headers",
|
||||
"timeout",
|
||||
"trace",
|
||||
"util",
|
||||
] }
|
||||
|
@ -9,7 +9,7 @@ pub async fn delete(
|
||||
Query(params): Query<Params>,
|
||||
State(state): State<AppState>,
|
||||
claims: Claims,
|
||||
) -> GeneralResult<StatusCode> {
|
||||
) -> GeneralResult<EmptyResponse> {
|
||||
db::file::get_permissions(params.file_id, claims.user_id, &state.pool)
|
||||
.await
|
||||
.can_write_guard()?;
|
||||
@ -24,5 +24,5 @@ pub async fn delete(
|
||||
.await
|
||||
.handle_internal("Error deleting the file")?;
|
||||
|
||||
Ok(StatusCode::NO_CONTENT)
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ pub async fn modify(
|
||||
State(state): State<AppState>,
|
||||
claims: Claims,
|
||||
mut multipart: Multipart,
|
||||
) -> GeneralResult<StatusCode> {
|
||||
) -> GeneralResult<EmptyResponse> {
|
||||
db::file::get_permissions(params.file_id, claims.user_id, &state.pool)
|
||||
.await
|
||||
.can_write_guard()?;
|
||||
@ -52,5 +52,5 @@ pub async fn modify(
|
||||
.await
|
||||
.handle_internal("Error updating the file")?;
|
||||
|
||||
Ok(StatusCode::NO_CONTENT)
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
@ -36,9 +36,19 @@ async fn create_file(
|
||||
pool: &Pool,
|
||||
) -> anyhow::Result<Uuid> {
|
||||
let (file_id, file) = storage.create().await?;
|
||||
let (hash, size) = crate::FileStorage::write_to_file(file, field).await?;
|
||||
db::file::insert(file_id, parent_folder, file_name, size, hash, pool).await?;
|
||||
Ok(file_id)
|
||||
let result = async {
|
||||
let (hash, size) = crate::FileStorage::write_to_file(file, field).await?;
|
||||
db::file::insert(file_id, parent_folder, file_name, size, hash, pool).await?;
|
||||
anyhow::Result::Ok(())
|
||||
}
|
||||
.await;
|
||||
match result {
|
||||
Ok(()) => Ok(file_id),
|
||||
Err(err) => {
|
||||
let _ = storage.delete(file_id).await;
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn parse_field(
|
||||
|
@ -9,7 +9,7 @@ pub async fn delete(
|
||||
State(state): State<AppState>,
|
||||
claims: Claims,
|
||||
Query(params): Query<Params>,
|
||||
) -> GeneralResult<()> {
|
||||
) -> GeneralResult<EmptyResponse> {
|
||||
let root = db::folder::get_root(claims.user_id, &state.pool)
|
||||
.await
|
||||
.handle_internal("Error getting the root folder")?;
|
||||
@ -31,5 +31,7 @@ pub async fn delete(
|
||||
Ok(())
|
||||
})
|
||||
.await
|
||||
.handle_internal("Error deleting the fodler")
|
||||
.handle_internal("Error deleting the fodler")?;
|
||||
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
@ -10,7 +10,7 @@ pub async fn delete(
|
||||
State(pool): State<Pool>,
|
||||
claims: Claims,
|
||||
Query(params): Query<Params>,
|
||||
) -> GeneralResult<StatusCode> {
|
||||
) -> GeneralResult<EmptyResponse> {
|
||||
if params.user_id != claims.user_id {
|
||||
db::folder::get_permissions(params.folder_id, claims.user_id, &pool)
|
||||
.await
|
||||
@ -21,5 +21,5 @@ pub async fn delete(
|
||||
.await
|
||||
.handle_internal("Error deleting the permissions")?;
|
||||
|
||||
Ok(StatusCode::NO_CONTENT)
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
@ -11,7 +11,7 @@ pub async fn set(
|
||||
claims: Claims,
|
||||
State(pool): State<Pool>,
|
||||
Json(params): Json<Params>,
|
||||
) -> GeneralResult<StatusCode> {
|
||||
) -> GeneralResult<EmptyResponse> {
|
||||
let root = db::folder::get_root(claims.user_id, &pool)
|
||||
.await
|
||||
.handle_internal("Error getting the root folder")?;
|
||||
@ -53,5 +53,5 @@ pub async fn set(
|
||||
.await
|
||||
.handle_internal("Error writing to the database")?;
|
||||
|
||||
Ok(StatusCode::NO_CONTENT)
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
@ -1,14 +1,19 @@
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::prelude::*;
|
||||
|
||||
pub async fn delete(
|
||||
State(AppState { pool, ref storage }): State<AppState>,
|
||||
claims: Claims,
|
||||
) -> GeneralResult<()> {
|
||||
) -> GeneralResult<EmptyResponse> {
|
||||
tokio::time::sleep(Duration::from_secs(100)).await;
|
||||
db::users::delete_user(claims.user_id, &pool)
|
||||
.try_for_each_concurrent(5, |file_id| async move {
|
||||
let _ = storage.delete(file_id).await;
|
||||
Ok(())
|
||||
})
|
||||
.await
|
||||
.handle_internal("Error deleting the user")
|
||||
.handle_internal("Error deleting the user")?;
|
||||
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ impl FileStorage {
|
||||
|
||||
let mut reader = StreamReader::new(stream);
|
||||
let mut writer = BufWriter::with_capacity(BUF_CAP, file);
|
||||
tokio::io::copy_buf(&mut reader, &mut writer).await?;
|
||||
tokio::io::copy(&mut reader, &mut writer).await?;
|
||||
writer.flush().await?;
|
||||
|
||||
let hash = hash.finalize().to_vec();
|
||||
|
59
src/main.rs
59
src/main.rs
@ -4,21 +4,16 @@ mod endpoints;
|
||||
mod errors;
|
||||
mod file_storage;
|
||||
mod prelude;
|
||||
mod util;
|
||||
|
||||
use std::{env, net::Ipv4Addr};
|
||||
|
||||
use auth::HashedBytes;
|
||||
use axum::{
|
||||
extract::{DefaultBodyLimit, FromRef},
|
||||
routing::post,
|
||||
Router,
|
||||
};
|
||||
use axum::Router;
|
||||
use file_storage::FileStorage;
|
||||
use tokio::{net::TcpListener, signal};
|
||||
|
||||
type Pool = sqlx::postgres::PgPool;
|
||||
|
||||
#[derive(Clone, FromRef)]
|
||||
#[derive(Clone, axum::extract::FromRef)]
|
||||
struct AppState {
|
||||
pool: Pool,
|
||||
storage: FileStorage,
|
||||
@ -33,8 +28,8 @@ async fn create_test_users(pool: &Pool) -> anyhow::Result<()> {
|
||||
if count > 0 {
|
||||
return Ok(());
|
||||
}
|
||||
let hash1 = HashedBytes::hash_bytes(b"Password1").as_bytes();
|
||||
let hash2 = HashedBytes::hash_bytes(b"Password2").as_bytes();
|
||||
let hash1 = auth::HashedBytes::hash_bytes(b"Password1").as_bytes();
|
||||
let hash2 = auth::HashedBytes::hash_bytes(b"Password2").as_bytes();
|
||||
|
||||
tokio::try_join!(
|
||||
db::users::create_user("Test1", "test1@example.com", &hash1, pool),
|
||||
@ -94,7 +89,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
|
||||
let router = app(state);
|
||||
let addr = (Ipv4Addr::UNSPECIFIED, 3000);
|
||||
let listener = TcpListener::bind(addr).await?;
|
||||
let listener = tokio::net::TcpListener::bind(addr).await?;
|
||||
|
||||
axum::serve(listener, router)
|
||||
.with_graceful_shutdown(shutdown_signal())
|
||||
@ -104,6 +99,8 @@ async fn main() -> anyhow::Result<()> {
|
||||
}
|
||||
|
||||
async fn shutdown_signal() {
|
||||
use tokio::signal;
|
||||
|
||||
let ctrl_c = async {
|
||||
signal::ctrl_c()
|
||||
.await
|
||||
@ -129,13 +126,19 @@ async fn shutdown_signal() {
|
||||
}
|
||||
|
||||
fn app(state: AppState) -> Router {
|
||||
use axum::{http::header, routing::get};
|
||||
use axum::{
|
||||
extract::DefaultBodyLimit,
|
||||
handler::Handler as _,
|
||||
http::header,
|
||||
routing::{get, post},
|
||||
};
|
||||
use endpoints::{
|
||||
file, folder,
|
||||
permissions::{self, get_top_level::get_top_level},
|
||||
users,
|
||||
};
|
||||
use tower_http::{
|
||||
timeout::TimeoutLayer,
|
||||
trace::{MakeSpan, TraceLayer},
|
||||
ServiceBuilderExt as _,
|
||||
};
|
||||
@ -157,21 +160,24 @@ fn app(state: AppState) -> Router {
|
||||
}
|
||||
|
||||
const TEN_GIBIBYTES: usize = 10 * 1024 * 1024 * 1024;
|
||||
let middleware = tower::ServiceBuilder::new()
|
||||
.layer(DefaultBodyLimit::max(TEN_GIBIBYTES))
|
||||
let body_limit = DefaultBodyLimit::max(TEN_GIBIBYTES);
|
||||
|
||||
let timeout = TimeoutLayer::new(std::time::Duration::from_secs(10));
|
||||
|
||||
let common_middleware = tower::ServiceBuilder::new()
|
||||
.sensitive_headers([header::AUTHORIZATION, header::COOKIE])
|
||||
.layer(TraceLayer::new_for_http().make_span_with(SpanMaker))
|
||||
.compression();
|
||||
|
||||
// Build route service
|
||||
Router::new()
|
||||
.route(
|
||||
"/files",
|
||||
get(file::download::download)
|
||||
.post(file::upload::upload)
|
||||
.delete(file::delete::delete)
|
||||
.patch(file::modify::modify),
|
||||
)
|
||||
let file_router = Router::new().route(
|
||||
"/",
|
||||
get(file::download::download)
|
||||
.post(file::upload::upload.layer(body_limit.clone()))
|
||||
.delete(file::delete::delete.layer(timeout))
|
||||
.patch(file::modify::modify.layer(body_limit.clone())),
|
||||
);
|
||||
|
||||
let general_router = Router::new()
|
||||
.route(
|
||||
"/folders",
|
||||
get(folder::list::list)
|
||||
@ -199,6 +205,11 @@ fn app(state: AppState) -> Router {
|
||||
.route("/users/search", get(users::search::search))
|
||||
.route("/users/register", post(users::register::register))
|
||||
.route("/users/authorize", post(users::login::login))
|
||||
.layer(middleware)
|
||||
.layer(timeout);
|
||||
|
||||
Router::new()
|
||||
.nest("/files", file_router)
|
||||
.nest("/", general_router)
|
||||
.layer(common_middleware)
|
||||
.with_state(state)
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ pub(crate) use crate::{
|
||||
auth::Claims,
|
||||
db::{self, permissions::PermissionExt as _},
|
||||
errors::{ErrorHandlingExt as _, GeneralError, GeneralResult, ItemNotFoundExt as _},
|
||||
util::EmptyResponse,
|
||||
AppState, Pool,
|
||||
};
|
||||
pub use axum::{
|
||||
|
11
src/util.rs
Normal file
11
src/util.rs
Normal file
@ -0,0 +1,11 @@
|
||||
use axum::response::IntoResponse;
|
||||
|
||||
use crate::prelude::*;
|
||||
|
||||
pub struct EmptyResponse;
|
||||
|
||||
impl IntoResponse for EmptyResponse {
|
||||
fn into_response(self) -> axum::response::Response {
|
||||
StatusCode::NO_CONTENT.into_response()
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user