diff --git a/.woodpecker/build-and-publish.yml b/.woodpecker/build-and-publish.yml index 9836311..4e263a9 100644 --- a/.woodpecker/build-and-publish.yml +++ b/.woodpecker/build-and-publish.yml @@ -36,7 +36,7 @@ steps: - branch: main event: push - - name: container-build-and-publish (staging) + - name: container-build-and-publish-staging image: docker commands: - docker login --username radical --password $PASSWORD git.gorb.app diff --git a/Cargo.toml b/Cargo.toml index c1c71bc..cdbcc0f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,29 +20,28 @@ thiserror = "2.0.12" # CLI clap = { version = "4.5", features = ["derive"] } log = "0.4" -simple_logger = "5.0.0" # async -futures = "0.3" tokio = { version = "1.46", features = ["full"] } futures-util = "0.3.31" # Data (de)serialization serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -toml = "0.8" +toml = "0.9" +bytes = "1.10.1" # File Storage bindet = "0.3.2" bunny-api-tokio = { version = "0.4", features = ["edge_storage"], default-features = false } # Web Server -actix-web = "4.11" -actix-cors = "0.7.1" -actix-ws = "0.3.0" -actix-multipart = "0.7.2" +axum = { version = "0.8.4", features = ["multipart", "ws"] } +axum-extra = { version = "0.10.1", features = ["cookie", "typed-header"] } +tower-http = { version = "0.6.6", features = ["cors"] } +#socketioxide = { version = "0.17.2", features = ["state"] } url = { version = "2.5", features = ["serde"] } -tokio-tungstenite = { version = "0.27", features = ["native-tls", "url"] } +time = "0.3.41" # Database uuid = { version = "1.17", features = ["serde", "v7"] } @@ -60,5 +59,5 @@ regex = "1.11" random-string = "1.1" lettre = { version = "0.11", features = ["tokio1", "tokio1-native-tls"] } chrono = { version = "0.4.41", features = ["serde"] } - - +tracing-subscriber = "0.3.19" +rand = "0.9.1" diff --git a/migrations/2025-07-15-002434_increase_device_name_length/down.sql b/migrations/2025-07-15-002434_increase_device_name_length/down.sql new file mode 100644 index 0000000..4fe6628 --- /dev/null +++ b/migrations/2025-07-15-002434_increase_device_name_length/down.sql @@ -0,0 +1,2 @@ +-- This file should undo anything in `up.sql` +ALTER TABLE refresh_tokens ALTER COLUMN device_name TYPE varchar(16); \ No newline at end of file diff --git a/migrations/2025-07-15-002434_increase_device_name_length/up.sql b/migrations/2025-07-15-002434_increase_device_name_length/up.sql new file mode 100644 index 0000000..9d44298 --- /dev/null +++ b/migrations/2025-07-15-002434_increase_device_name_length/up.sql @@ -0,0 +1,2 @@ +-- Your SQL goes here +ALTER TABLE refresh_tokens ALTER COLUMN device_name TYPE varchar(64); \ No newline at end of file diff --git a/src/api/mod.rs b/src/api/mod.rs index 6d83e02..5aaa8a5 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -1,13 +1,16 @@ //! `/api` Contains the entire API -use actix_web::Scope; -use actix_web::web; +use std::sync::Arc; + +use axum::{Router, routing::get}; + +use crate::AppState; mod v1; mod versions; -pub fn web(path: &str) -> Scope { - web::scope(path.trim_end_matches('/')) - .service(v1::web()) - .service(versions::get) +pub fn router(path: &str, app_state: Arc) -> Router> { + Router::new() + .route(&format!("{path}/versions"), get(versions::versions)) + .nest(&format!("{path}/v1"), v1::router(app_state)) } diff --git a/src/api/v1/auth/devices.rs b/src/api/v1/auth/devices.rs index 532ad00..35fe957 100644 --- a/src/api/v1/auth/devices.rs +++ b/src/api/v1/auth/devices.rs @@ -1,16 +1,18 @@ //! `/api/v1/auth/devices` Returns list of logged in devices -use actix_web::{HttpRequest, HttpResponse, get, web}; +use std::sync::Arc; + +use axum::{Extension, Json, extract::State, http::StatusCode, response::IntoResponse}; use diesel::{ExpressionMethods, QueryDsl, Queryable, Selectable, SelectableHelper}; use diesel_async::RunQueryDsl; use serde::Serialize; +use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, schema::refresh_tokens::{self, dsl}, - utils::get_auth_header, }; #[derive(Serialize, Selectable, Queryable)] @@ -18,7 +20,7 @@ use crate::{ #[diesel(check_for_backend(diesel::pg::Pg))] struct Device { device_name: String, - created_at: i64 + created_at: i64, } /// `GET /api/v1/auth/devices` Returns list of logged in devices @@ -35,24 +37,15 @@ struct Device { /// /// ]); /// ``` -#[get("/devices")] pub async fn get( - req: HttpRequest, - data: web::Data, -) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { let devices: Vec = dsl::refresh_tokens .filter(dsl::uuid.eq(uuid)) .select(Device::as_select()) - .get_results(&mut conn) + .get_results(&mut app_state.pool.get().await?) .await?; - Ok(HttpResponse::Ok().json(devices)) + Ok((StatusCode::OK, Json(devices))) } diff --git a/src/api/v1/auth/login.rs b/src/api/v1/auth/login.rs index 2faaeb4..22cc838 100644 --- a/src/api/v1/auth/login.rs +++ b/src/api/v1/auth/login.rs @@ -1,39 +1,47 @@ -use std::time::{SystemTime, UNIX_EPOCH}; +use std::{ + sync::Arc, + time::{SystemTime, UNIX_EPOCH}, +}; -use actix_web::{HttpResponse, post, web}; use argon2::{PasswordHash, PasswordVerifier}; +use axum::{ + Json, + extract::State, + http::{HeaderValue, StatusCode}, + response::IntoResponse, +}; use diesel::{ExpressionMethods, QueryDsl, dsl::insert_into}; use diesel_async::RunQueryDsl; use serde::Deserialize; +use super::Response; use crate::{ - Data, + AppState, error::Error, schema::*, - utils::{PASSWORD_REGEX, generate_token, new_refresh_token_cookie, user_uuid_from_identifier}, + utils::{ + PASSWORD_REGEX, generate_device_name, generate_token, new_refresh_token_cookie, + user_uuid_from_identifier, + }, }; -use super::Response; - #[derive(Deserialize)] -struct LoginInformation { +pub struct LoginInformation { username: String, password: String, - device_name: String, } -#[post("/login")] pub async fn response( - login_information: web::Json, - data: web::Data, -) -> Result { + State(app_state): State>, + Json(login_information): Json, +) -> Result { if !PASSWORD_REGEX.is_match(&login_information.password) { - return Ok(HttpResponse::Forbidden().json(r#"{ "password_hashed": false }"#)); + return Err(Error::BadRequest("Bad password".to_string())); } use users::dsl; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let uuid = user_uuid_from_identifier(&mut conn, &login_information.username).await?; @@ -46,7 +54,7 @@ pub async fn response( let parsed_hash = PasswordHash::new(&database_password) .map_err(|e| Error::PasswordHashError(e.to_string()))?; - if data + if app_state .argon2 .verify_password(login_information.password.as_bytes(), &parsed_hash) .is_err() @@ -63,12 +71,14 @@ pub async fn response( use refresh_tokens::dsl as rdsl; + let device_name = generate_device_name(); + insert_into(refresh_tokens::table) .values(( rdsl::token.eq(&refresh_token), rdsl::uuid.eq(uuid), rdsl::created_at.eq(current_time), - rdsl::device_name.eq(&login_information.device_name), + rdsl::device_name.eq(&device_name), )) .execute(&mut conn) .await?; @@ -85,7 +95,21 @@ pub async fn response( .execute(&mut conn) .await?; - Ok(HttpResponse::Ok() - .cookie(new_refresh_token_cookie(&data.config, refresh_token)) - .json(Response { access_token })) + let mut response = ( + StatusCode::OK, + Json(Response { + access_token, + device_name, + }), + ) + .into_response(); + + response.headers_mut().append( + "Set-Cookie", + HeaderValue::from_str( + &new_refresh_token_cookie(&app_state.config, refresh_token).to_string(), + )?, + ); + + Ok(response) } diff --git a/src/api/v1/auth/logout.rs b/src/api/v1/auth/logout.rs index b805d91..977d452 100644 --- a/src/api/v1/auth/logout.rs +++ b/src/api/v1/auth/logout.rs @@ -1,9 +1,16 @@ -use actix_web::{HttpRequest, HttpResponse, get, web}; +use std::sync::Arc; + +use axum::{ + extract::State, + http::{HeaderValue, StatusCode}, + response::IntoResponse, +}; +use axum_extra::extract::CookieJar; use diesel::{ExpressionMethods, delete}; use diesel_async::RunQueryDsl; use crate::{ - Data, + AppState, error::Error, schema::refresh_tokens::{self, dsl}, }; @@ -20,28 +27,39 @@ use crate::{ /// /// 401 Unauthorized (no refresh token found) /// -#[get("/logout")] -pub async fn res(req: HttpRequest, data: web::Data) -> Result { - let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized( - "request has no refresh token".to_string(), - ))?; +pub async fn res( + State(app_state): State>, + jar: CookieJar, +) -> Result { + let mut refresh_token_cookie = jar + .get("refresh_token") + .ok_or(Error::Unauthorized( + "request has no refresh token".to_string(), + ))? + .to_owned(); - let refresh_token = String::from(refresh_token_cookie.value()); + let refresh_token = String::from(refresh_token_cookie.value_trimmed()); - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let deleted = delete(refresh_tokens::table) .filter(dsl::token.eq(refresh_token)) .execute(&mut conn) .await?; - refresh_token_cookie.make_removal(); + let mut response; if deleted == 0 { - return Ok(HttpResponse::NotFound() - .cookie(refresh_token_cookie) - .finish()); + response = StatusCode::NOT_FOUND.into_response(); + } else { + response = StatusCode::OK.into_response(); } - Ok(HttpResponse::Ok().cookie(refresh_token_cookie).finish()) + refresh_token_cookie.make_removal(); + response.headers_mut().append( + "Set-Cookie", + HeaderValue::from_str(&refresh_token_cookie.to_string())?, + ); + + Ok(response) } diff --git a/src/api/v1/auth/mod.rs b/src/api/v1/auth/mod.rs index 0e6b006..9a72f11 100644 --- a/src/api/v1/auth/mod.rs +++ b/src/api/v1/auth/mod.rs @@ -1,12 +1,25 @@ -use std::time::{SystemTime, UNIX_EPOCH}; +use std::{ + sync::Arc, + time::{SystemTime, UNIX_EPOCH}, +}; -use actix_web::{Scope, web}; +use axum::{ + Router, + extract::{Request, State}, + middleware::{Next, from_fn_with_state}, + response::IntoResponse, + routing::{delete, get, post}, +}; +use axum_extra::{ + TypedHeader, + headers::{Authorization, authorization::Bearer}, +}; use diesel::{ExpressionMethods, QueryDsl}; use diesel_async::RunQueryDsl; use serde::Serialize; use uuid::Uuid; -use crate::{Conn, error::Error, schema::access_tokens::dsl}; +use crate::{AppState, Conn, error::Error, schema::access_tokens::dsl}; mod devices; mod login; @@ -18,22 +31,27 @@ mod revoke; mod verify_email; #[derive(Serialize)] -struct Response { +pub struct Response { access_token: String, + device_name: String, } -pub fn web() -> Scope { - web::scope("/auth") - .service(register::res) - .service(login::response) - .service(logout::res) - .service(refresh::res) - .service(revoke::res) - .service(verify_email::get) - .service(verify_email::post) - .service(reset_password::get) - .service(reset_password::post) - .service(devices::get) +pub fn router(app_state: Arc) -> Router> { + let router_with_auth = Router::new() + .route("/verify-email", get(verify_email::get)) + .route("/verify-email", post(verify_email::post)) + .route("/revoke", post(revoke::post)) + .route("/devices", get(devices::get)) + .layer(from_fn_with_state(app_state, CurrentUser::check_auth_layer)); + + Router::new() + .route("/register", post(register::post)) + .route("/login", post(login::response)) + .route("/logout", delete(logout::res)) + .route("/refresh", post(refresh::post)) + .route("/reset-password", get(reset_password::get)) + .route("/reset-password", post(reset_password::post)) + .merge(router_with_auth) } pub async fn check_access_token(access_token: &str, conn: &mut Conn) -> Result { @@ -60,3 +78,21 @@ pub async fn check_access_token(access_token: &str, conn: &mut Conn) -> Result(pub Uuid); + +impl CurrentUser { + pub async fn check_auth_layer( + State(app_state): State>, + TypedHeader(auth): TypedHeader>, + mut req: Request, + next: Next, + ) -> Result { + let current_user = + CurrentUser(check_access_token(auth.token(), &mut app_state.pool.get().await?).await?); + + req.extensions_mut().insert(current_user); + Ok(next.run(req).await) + } +} diff --git a/src/api/v1/auth/refresh.rs b/src/api/v1/auth/refresh.rs index abd9a34..4b96226 100644 --- a/src/api/v1/auth/refresh.rs +++ b/src/api/v1/auth/refresh.rs @@ -1,11 +1,21 @@ -use actix_web::{HttpRequest, HttpResponse, post, web}; +use axum::{ + Json, + extract::State, + http::{HeaderValue, StatusCode}, + response::IntoResponse, +}; +use axum_extra::extract::CookieJar; use diesel::{ExpressionMethods, QueryDsl, delete, update}; use diesel_async::RunQueryDsl; use log::error; -use std::time::{SystemTime, UNIX_EPOCH}; +use std::{ + sync::Arc, + time::{SystemTime, UNIX_EPOCH}, +}; +use super::Response; use crate::{ - Data, + AppState, error::Error, schema::{ access_tokens::{self, dsl}, @@ -14,19 +24,22 @@ use crate::{ utils::{generate_token, new_refresh_token_cookie}, }; -use super::Response; +pub async fn post( + State(app_state): State>, + jar: CookieJar, +) -> Result { + let mut refresh_token_cookie = jar + .get("refresh_token") + .ok_or(Error::Unauthorized( + "request has no refresh token".to_string(), + ))? + .to_owned(); -#[post("/refresh")] -pub async fn res(req: HttpRequest, data: web::Data) -> Result { - let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized( - "request has no refresh token".to_string(), - ))?; - - let mut refresh_token = String::from(refresh_token_cookie.value()); + let mut refresh_token = String::from(refresh_token_cookie.value_trimmed()); let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; if let Ok(created_at) = rdsl::refresh_tokens .filter(rdsl::token.eq(&refresh_token)) @@ -45,14 +58,19 @@ pub async fn res(req: HttpRequest, data: web::Data) -> Result 1987200 { let new_refresh_token = generate_token::<32>()?; @@ -63,11 +81,13 @@ pub async fn res(req: HttpRequest, data: web::Data) -> Result(&mut conn) .await { - Ok(_) => { + Ok(existing_device_name) => { refresh_token = new_refresh_token; + device_name = existing_device_name; } Err(error) => { error!("{error}"); @@ -86,14 +106,33 @@ pub async fn res(req: HttpRequest, data: web::Data) -> Result, - data: web::Data, -) -> Result { - if !data.config.instance.registration { +pub async fn post( + State(app_state): State>, + Json(account_information): Json, +) -> Result { + if !app_state.config.instance.registration { return Err(Error::Forbidden( "registration is disabled on this instance".to_string(), )); @@ -78,36 +77,48 @@ pub async fn res( let uuid = Uuid::now_v7(); if !EMAIL_REGEX.is_match(&account_information.email) { - return Ok(HttpResponse::Forbidden().json(ResponseError { - email_valid: false, - ..Default::default() - })); + return Ok(( + StatusCode::FORBIDDEN, + Json(ResponseError { + email_valid: false, + ..Default::default() + }), + ) + .into_response()); } if !USERNAME_REGEX.is_match(&account_information.identifier) || account_information.identifier.len() < 3 || account_information.identifier.len() > 32 { - return Ok(HttpResponse::Forbidden().json(ResponseError { - gorb_id_valid: false, - ..Default::default() - })); + return Ok(( + StatusCode::FORBIDDEN, + Json(ResponseError { + gorb_id_valid: false, + ..Default::default() + }), + ) + .into_response()); } if !PASSWORD_REGEX.is_match(&account_information.password) { - return Ok(HttpResponse::Forbidden().json(ResponseError { - password_hashed: false, - ..Default::default() - })); + return Ok(( + StatusCode::FORBIDDEN, + Json(ResponseError { + password_strength: false, + ..Default::default() + }), + ) + .into_response()); } let salt = SaltString::generate(&mut OsRng); - if let Ok(hashed_password) = data + if let Ok(hashed_password) = app_state .argon2 .hash_password(account_information.password.as_bytes(), &salt) { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; // TODO: Check security of this implementation insert_into(users::table) @@ -125,12 +136,14 @@ pub async fn res( let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64; + let device_name = generate_device_name(); + insert_into(refresh_tokens::table) .values(( rdsl::token.eq(&refresh_token), rdsl::uuid.eq(uuid), rdsl::created_at.eq(current_time), - rdsl::device_name.eq(&account_information.device_name), + rdsl::device_name.eq(&device_name), )) .execute(&mut conn) .await?; @@ -145,14 +158,28 @@ pub async fn res( .execute(&mut conn) .await?; - if let Some(initial_guild) = data.config.instance.initial_guild { - Member::new(&data, uuid, initial_guild).await?; + if let Some(initial_guild) = app_state.config.instance.initial_guild { + Member::new(&app_state, uuid, initial_guild).await?; } - return Ok(HttpResponse::Ok() - .cookie(new_refresh_token_cookie(&data.config, refresh_token)) - .json(Response { access_token })); + let mut response = ( + StatusCode::OK, + Json(Response { + access_token, + device_name, + }), + ) + .into_response(); + + response.headers_mut().append( + "Set-Cookie", + HeaderValue::from_str( + &new_refresh_token_cookie(&app_state.config, refresh_token).to_string(), + )?, + ); + + return Ok(response); } - Ok(HttpResponse::InternalServerError().finish()) + Ok(StatusCode::INTERNAL_SERVER_ERROR.into_response()) } diff --git a/src/api/v1/auth/reset_password.rs b/src/api/v1/auth/reset_password.rs index 9a4497f..bac465c 100644 --- a/src/api/v1/auth/reset_password.rs +++ b/src/api/v1/auth/reset_password.rs @@ -1,13 +1,20 @@ //! `/api/v1/auth/reset-password` Endpoints for resetting user password -use actix_web::{HttpResponse, get, post, web}; +use std::sync::Arc; + +use axum::{ + Json, + extract::{Query, State}, + http::StatusCode, + response::IntoResponse, +}; use chrono::{Duration, Utc}; use serde::Deserialize; -use crate::{Data, error::Error, objects::PasswordResetToken}; +use crate::{AppState, error::Error, objects::PasswordResetToken}; #[derive(Deserialize)] -struct Query { +pub struct QueryParams { identifier: String, } @@ -20,17 +27,22 @@ struct Query { /// /// ### Responses /// 200 Email sent +/// /// 429 Too Many Requests +/// /// 404 Not found +/// /// 400 Bad request /// -#[get("/reset-password")] -pub async fn get(query: web::Query, data: web::Data) -> Result { +pub async fn get( + State(app_state): State>, + query: Query, +) -> Result { if let Ok(password_reset_token) = - PasswordResetToken::get_with_identifier(&data, query.identifier.clone()).await + PasswordResetToken::get_with_identifier(&app_state, query.identifier.clone()).await { if Utc::now().signed_duration_since(password_reset_token.created_at) > Duration::hours(1) { - password_reset_token.delete(&data).await?; + password_reset_token.delete(&app_state).await?; } else { return Err(Error::TooManyRequests( "Please allow 1 hour before sending a new email".to_string(), @@ -38,13 +50,13 @@ pub async fn get(query: web::Query, data: web::Data) -> Result, - data: web::Data, -) -> Result { - let password_reset_token = PasswordResetToken::get(&data, reset_password.token.clone()).await?; + State(app_state): State>, + reset_password: Json, +) -> Result { + let password_reset_token = + PasswordResetToken::get(&app_state, reset_password.token.clone()).await?; password_reset_token - .set_password(&data, reset_password.password.clone()) + .set_password(&app_state, reset_password.password.clone()) .await?; - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } diff --git a/src/api/v1/auth/revoke.rs b/src/api/v1/auth/revoke.rs index 2e95884..90b96ae 100644 --- a/src/api/v1/auth/revoke.rs +++ b/src/api/v1/auth/revoke.rs @@ -1,38 +1,35 @@ -use actix_web::{HttpRequest, HttpResponse, post, web}; +use std::sync::Arc; + use argon2::{PasswordHash, PasswordVerifier}; +use axum::{Extension, Json, extract::State, http::StatusCode, response::IntoResponse}; use diesel::{ExpressionMethods, QueryDsl, delete}; use diesel_async::RunQueryDsl; use serde::Deserialize; +use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, - schema::refresh_tokens::{self, dsl as rdsl}, - schema::users::dsl as udsl, - utils::get_auth_header, + schema::{ + refresh_tokens::{self, dsl as rdsl}, + users::dsl as udsl, + }, }; #[derive(Deserialize)] -struct RevokeRequest { +pub struct RevokeRequest { password: String, device_name: String, } // TODO: Should maybe be a delete request? -#[post("/revoke")] -pub async fn res( - req: HttpRequest, - revoke_request: web::Json, - data: web::Data, -) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; +pub async fn post( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, + Json(revoke_request): Json, +) -> Result { + let mut conn = app_state.pool.get().await?; let database_password: String = udsl::users .filter(udsl::uuid.eq(uuid)) @@ -43,7 +40,7 @@ pub async fn res( let hashed_password = PasswordHash::new(&database_password) .map_err(|e| Error::PasswordHashError(e.to_string()))?; - if data + if app_state .argon2 .verify_password(revoke_request.password.as_bytes(), &hashed_password) .is_err() @@ -59,5 +56,5 @@ pub async fn res( .execute(&mut conn) .await?; - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } diff --git a/src/api/v1/auth/verify_email.rs b/src/api/v1/auth/verify_email.rs index 6b895aa..0801768 100644 --- a/src/api/v1/auth/verify_email.rs +++ b/src/api/v1/auth/verify_email.rs @@ -1,19 +1,26 @@ //! `/api/v1/auth/verify-email` Endpoints for verifying user emails -use actix_web::{HttpRequest, HttpResponse, get, post, web}; +use std::sync::Arc; + +use axum::{ + Extension, + extract::{Query, State}, + http::StatusCode, + response::IntoResponse, +}; use chrono::{Duration, Utc}; use serde::Deserialize; +use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{EmailToken, Me}, - utils::get_auth_header, }; #[derive(Deserialize)] -struct Query { +pub struct QueryParams { token: String, } @@ -35,37 +42,30 @@ struct Query { /// /// 401 Unauthorized /// -#[get("/verify-email")] pub async fn get( - req: HttpRequest, - query: web::Query, - data: web::Data, -) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; + State(app_state): State>, + Query(query): Query, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + let mut conn = app_state.pool.get().await?; let me = Me::get(&mut conn, uuid).await?; if me.email_verified { - return Ok(HttpResponse::NoContent().finish()); + return Ok(StatusCode::NO_CONTENT); } - let email_token = EmailToken::get(&data, me.uuid).await?; + let email_token = EmailToken::get(&app_state, me.uuid).await?; if query.token != email_token.token { - return Ok(HttpResponse::Unauthorized().finish()); + return Ok(StatusCode::UNAUTHORIZED); } me.verify_email(&mut conn).await?; - email_token.delete(&data).await?; + email_token.delete(&app_state).await?; - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } /// `POST /api/v1/auth/verify-email` Sends user verification email @@ -81,25 +81,19 @@ pub async fn get( /// /// 401 Unauthorized /// -#[post("/verify-email")] -pub async fn post(req: HttpRequest, data: web::Data) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - let me = Me::get(&mut conn, uuid).await?; +pub async fn post( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; if me.email_verified { - return Ok(HttpResponse::NoContent().finish()); + return Ok(StatusCode::NO_CONTENT); } - if let Ok(email_token) = EmailToken::get(&data, me.uuid).await { + if let Ok(email_token) = EmailToken::get(&app_state, me.uuid).await { if Utc::now().signed_duration_since(email_token.created_at) > Duration::hours(1) { - email_token.delete(&data).await?; + email_token.delete(&app_state).await?; } else { return Err(Error::TooManyRequests( "Please allow 1 hour before sending a new email".to_string(), @@ -107,7 +101,7 @@ pub async fn post(req: HttpRequest, data: web::Data) -> Result Scope { - web::scope("/channels") - .service(uuid::get) - .service(uuid::delete) - .service(uuid::patch) - .service(uuid::messages::get) - .service(uuid::socket::ws) +pub fn router(app_state: Arc) -> Router> { + let router_with_auth = Router::new() + .route("/{uuid}", get(uuid::get)) + .route("/{uuid}", delete(uuid::delete)) + .route("/{uuid}", patch(uuid::patch)) + .route("/{uuid}/messages", get(uuid::messages::get)) + .layer(from_fn_with_state(app_state, CurrentUser::check_auth_layer)); + + Router::new() + .route("/{uuid}/socket", any(uuid::socket::ws)) + .merge(router_with_auth) } diff --git a/src/api/v1/channels/uuid/messages.rs b/src/api/v1/channels/uuid/messages.rs index 9fdea0b..b8f0ad6 100644 --- a/src/api/v1/channels/uuid/messages.rs +++ b/src/api/v1/channels/uuid/messages.rs @@ -1,18 +1,25 @@ //! `/api/v1/channels/{uuid}/messages` Endpoints related to channel messages +use std::sync::Arc; + use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Channel, Member}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; use ::uuid::Uuid; -use actix_web::{HttpRequest, HttpResponse, get, web}; +use axum::{ + Extension, Json, + extract::{Path, Query, State}, + http::StatusCode, + response::IntoResponse, +}; use serde::Deserialize; #[derive(Deserialize)] -struct MessageRequest { +pub struct MessageRequest { amount: i64, offset: i64, } @@ -47,32 +54,21 @@ struct MessageRequest { /// }); /// ``` /// -#[get("/{uuid}/messages")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - message_request: web::Query, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(channel_uuid): Path, + Query(message_request): Query, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; + let channel = Channel::fetch_one(&app_state, channel_uuid).await?; - let channel_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let channel = Channel::fetch_one(&data, channel_uuid).await?; - - Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; + Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid).await?; let messages = channel - .fetch_messages(&data, message_request.amount, message_request.offset) + .fetch_messages(&app_state, message_request.amount, message_request.offset) .await?; - Ok(HttpResponse::Ok().json(messages)) + Ok((StatusCode::OK, Json(messages))) } diff --git a/src/api/v1/channels/uuid/mod.rs b/src/api/v1/channels/uuid/mod.rs index fff2ef0..373742e 100644 --- a/src/api/v1/channels/uuid/mod.rs +++ b/src/api/v1/channels/uuid/mod.rs @@ -3,75 +3,63 @@ pub mod messages; pub mod socket; +use std::sync::Arc; + use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Channel, Member, Permissions}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; -use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web}; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; + use serde::Deserialize; use uuid::Uuid; -#[get("/{uuid}")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(channel_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; + let channel = Channel::fetch_one(&app_state, channel_uuid).await?; - let channel_uuid = path.into_inner().0; + Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid).await?; - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let channel = Channel::fetch_one(&data, channel_uuid).await?; - - Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; - - Ok(HttpResponse::Ok().json(channel)) + Ok((StatusCode::OK, Json(channel))) } -#[delete("/{uuid}")] pub async fn delete( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(channel_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; + let channel = Channel::fetch_one(&app_state, channel_uuid).await?; - let channel_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let channel = Channel::fetch_one(&data, channel_uuid).await?; - - let member = Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; + let member = + Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid) + .await?; member - .check_permission(&data, Permissions::ManageChannel) + .check_permission(&app_state, Permissions::ManageChannel) .await?; - channel.delete(&data).await?; + channel.delete(&app_state).await?; - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } #[derive(Deserialize)] -struct NewInfo { +pub struct NewInfo { name: Option, description: Option, is_above: Option, @@ -108,48 +96,39 @@ struct NewInfo { /// }); /// ``` /// NOTE: UUIDs in this response are made using `uuidgen`, UUIDs made by the actual backend will be UUIDv7 and have extractable timestamps -#[patch("/{uuid}")] pub async fn patch( - req: HttpRequest, - path: web::Path<(Uuid,)>, - new_info: web::Json, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(channel_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, + Json(new_info): Json, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; + let mut channel = Channel::fetch_one(&app_state, channel_uuid).await?; - let channel_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let mut channel = Channel::fetch_one(&data, channel_uuid).await?; - - let member = Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; + let member = + Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid) + .await?; member - .check_permission(&data, Permissions::ManageChannel) + .check_permission(&app_state, Permissions::ManageChannel) .await?; if let Some(new_name) = &new_info.name { - channel.set_name(&data, new_name.to_string()).await?; + channel.set_name(&app_state, new_name.to_string()).await?; } if let Some(new_description) = &new_info.description { channel - .set_description(&data, new_description.to_string()) + .set_description(&app_state, new_description.to_string()) .await?; } if let Some(new_is_above) = &new_info.is_above { channel - .set_description(&data, new_is_above.to_string()) + .set_description(&app_state, new_is_above.to_string()) .await?; } - Ok(HttpResponse::Ok().json(channel)) + Ok((StatusCode::OK, Json(channel))) } diff --git a/src/api/v1/channels/uuid/socket.rs b/src/api/v1/channels/uuid/socket.rs index 7233f39..dd020e3 100644 --- a/src/api/v1/channels/uuid/socket.rs +++ b/src/api/v1/channels/uuid/socket.rs @@ -1,18 +1,20 @@ -use actix_web::{ - Error, HttpRequest, HttpResponse, get, - http::header::{HeaderValue, SEC_WEBSOCKET_PROTOCOL}, - rt, web, +use std::sync::Arc; + +use axum::{ + extract::{Path, State, WebSocketUpgrade, ws::Message}, + http::HeaderMap, + response::IntoResponse, }; -use actix_ws::AggregatedMessage; -use futures_util::StreamExt as _; +use futures_util::{SinkExt, StreamExt}; use serde::Deserialize; use uuid::Uuid; use crate::{ - Data, + AppState, api::v1::auth::check_access_token, + error::Error, objects::{Channel, Member}, - utils::{get_ws_protocol_header, global_checks}, + utils::global_checks, }; #[derive(Deserialize)] @@ -21,100 +23,114 @@ struct MessageBody { reply_to: Option, } -#[get("/{uuid}/socket")] pub async fn ws( - req: HttpRequest, - path: web::Path<(Uuid,)>, - stream: web::Payload, - data: web::Data, -) -> Result { - // Get all headers - let headers = req.headers(); - + ws: WebSocketUpgrade, + State(app_state): State>, + Path(channel_uuid): Path, + headers: HeaderMap, +) -> Result { // Retrieve auth header - let auth_header = get_ws_protocol_header(headers)?; + let auth_token = headers.get(axum::http::header::SEC_WEBSOCKET_PROTOCOL); - // Get uuid from path - let channel_uuid = path.into_inner().0; + if auth_token.is_none() { + return Err(Error::Unauthorized( + "No authorization header provided".to_string(), + )); + } - let mut conn = data.pool.get().await.map_err(crate::error::Error::from)?; + let auth_raw = auth_token.unwrap().to_str()?; + + let mut auth = auth_raw.split_whitespace(); + + let response_proto = auth.next(); + + let auth_value = auth.next(); + + if response_proto.is_none() { + return Err(Error::BadRequest( + "Sec-WebSocket-Protocol header is empty".to_string(), + )); + } else if response_proto.is_some_and(|rp| rp != "Authorization,") { + return Err(Error::BadRequest( + "First protocol should be Authorization".to_string(), + )); + } + + if auth_value.is_none() { + return Err(Error::BadRequest("No token provided".to_string())); + } + + let auth_header = auth_value.unwrap(); + + let mut conn = app_state + .pool + .get() + .await + .map_err(crate::error::Error::from)?; // Authorize client using auth header let uuid = check_access_token(auth_header, &mut conn).await?; - global_checks(&data, uuid).await?; + global_checks(&app_state, uuid).await?; - let channel = Channel::fetch_one(&data, channel_uuid).await?; + let channel = Channel::fetch_one(&app_state, channel_uuid).await?; Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; - let (mut res, mut session_1, stream) = actix_ws::handle(&req, stream)?; - - let mut stream = stream - .aggregate_continuations() - // aggregate continuation frames up to 1MiB - .max_continuation_size(2_usize.pow(20)); - - let mut pubsub = data + let mut pubsub = app_state .cache_pool .get_async_pubsub() .await .map_err(crate::error::Error::from)?; - let mut session_2 = session_1.clone(); + let mut res = ws.on_upgrade(async move |socket| { + let (mut sender, mut receiver) = socket.split(); - rt::spawn(async move { - pubsub.subscribe(channel_uuid.to_string()).await?; - while let Some(msg) = pubsub.on_message().next().await { - let payload: String = msg.get_payload()?; - session_1.text(payload).await?; - } + tokio::spawn(async move { + pubsub.subscribe(channel_uuid.to_string()).await?; + while let Some(msg) = pubsub.on_message().next().await { + let payload: String = msg.get_payload()?; + sender.send(payload.into()).await?; + } - Ok::<(), crate::error::Error>(()) - }); - - // start task but don't wait for it - rt::spawn(async move { - // receive messages from websocket - while let Some(msg) = stream.next().await { - match msg { - Ok(AggregatedMessage::Text(text)) => { - let mut conn = data.cache_pool.get_multiplexed_tokio_connection().await?; + Ok::<(), crate::error::Error>(()) + }); + tokio::spawn(async move { + while let Some(msg) = receiver.next().await { + if let Ok(Message::Text(text)) = msg { let message_body: MessageBody = serde_json::from_str(&text)?; let message = channel - .new_message(&data, uuid, message_body.message, message_body.reply_to) + .new_message( + &app_state, + uuid, + message_body.message, + message_body.reply_to, + ) .await?; redis::cmd("PUBLISH") .arg(&[channel_uuid.to_string(), serde_json::to_string(&message)?]) - .exec_async(&mut conn) + .exec_async( + &mut app_state + .cache_pool + .get_multiplexed_tokio_connection() + .await?, + ) .await?; } - - Ok(AggregatedMessage::Binary(bin)) => { - // echo binary message - session_2.binary(bin).await?; - } - - Ok(AggregatedMessage::Ping(msg)) => { - // respond to PING frame with PONG frame - session_2.pong(&msg).await?; - } - - _ => {} } - } - Ok::<(), crate::error::Error>(()) + Ok::<(), crate::error::Error>(()) + }); }); let headers = res.headers_mut(); headers.append( - SEC_WEBSOCKET_PROTOCOL, - HeaderValue::from_str("Authorization")?, + axum::http::header::SEC_WEBSOCKET_PROTOCOL, + "Authorization".parse()?, ); // respond immediately with response connected to WS session diff --git a/src/api/v1/guilds/mod.rs b/src/api/v1/guilds/mod.rs index ada5dc8..8118522 100644 --- a/src/api/v1/guilds/mod.rs +++ b/src/api/v1/guilds/mod.rs @@ -1,28 +1,37 @@ //! `/api/v1/guilds` Guild related endpoints -use actix_web::{HttpRequest, HttpResponse, Scope, get, post, web}; +use std::sync::Arc; + +use ::uuid::Uuid; +use axum::{ + Extension, Json, Router, + extract::State, + http::StatusCode, + response::IntoResponse, + routing::{get, post}, +}; use serde::Deserialize; mod uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Guild, StartAmountQuery}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; #[derive(Deserialize)] -struct GuildInfo { +pub struct GuildInfo { name: String, } -pub fn web() -> Scope { - web::scope("/guilds") - .service(post) - .service(get) - .service(uuid::web()) +pub fn router() -> Router> { + Router::new() + .route("/", post(new)) + .route("/", get(get_guilds)) + .nest("/{uuid}", uuid::router()) } /// `POST /api/v1/guilds` Creates a new guild @@ -49,23 +58,19 @@ pub fn web() -> Scope { /// }); /// ``` /// NOTE: UUIDs in this response are made using `uuidgen`, UUIDs made by the actual backend will be UUIDv7 and have extractable timestamps -#[post("")] -pub async fn post( - req: HttpRequest, - guild_info: web::Json, - data: web::Data, -) -> Result { - let headers = req.headers(); +pub async fn new( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, + Json(guild_info): Json, +) -> Result { + let guild = Guild::new( + &mut app_state.pool.get().await?, + guild_info.name.clone(), + uuid, + ) + .await?; - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - let guild = Guild::new(&mut conn, guild_info.name.clone(), uuid).await?; - - Ok(HttpResponse::Ok().json(guild)) + Ok((StatusCode::OK, Json(guild))) } /// `GET /api/v1/servers` Fetches all guilds @@ -115,25 +120,17 @@ pub async fn post( /// ]); /// ``` /// NOTE: UUIDs in this response are made using `uuidgen`, UUIDs made by the actual backend will be UUIDv7 and have extractable timestamps -#[get("")] -pub async fn get( - req: HttpRequest, - request_query: web::Query, - data: web::Data, -) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - +pub async fn get_guilds( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, + Json(request_query): Json, +) -> Result { let start = request_query.start.unwrap_or(0); - let amount = request_query.amount.unwrap_or(10); - let uuid = check_access_token(auth_header, &mut data.pool.get().await?).await?; + global_checks(&app_state, uuid).await?; - global_checks(&data, uuid).await?; + let guilds = Guild::fetch_amount(&app_state.pool, start, amount).await?; - let guilds = Guild::fetch_amount(&data.pool, start, amount).await?; - - Ok(HttpResponse::Ok().json(guilds)) + Ok((StatusCode::OK, Json(guilds))) } diff --git a/src/api/v1/guilds/uuid/channels.rs b/src/api/v1/guilds/uuid/channels.rs index b9f91cb..836982d 100644 --- a/src/api/v1/guilds/uuid/channels.rs +++ b/src/api/v1/guilds/uuid/channels.rs @@ -1,92 +1,81 @@ -use crate::{ - Data, - api::v1::auth::check_access_token, - error::Error, - objects::{Channel, Member, Permissions}, - utils::{get_auth_header, global_checks, order_by_is_above}, -}; +use std::sync::Arc; + use ::uuid::Uuid; -use actix_web::{HttpRequest, HttpResponse, get, post, web}; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; use serde::Deserialize; +use crate::{ + AppState, + api::v1::auth::CurrentUser, + error::Error, + objects::{Channel, Member, Permissions}, + utils::{global_checks, order_by_is_above}, +}; + #[derive(Deserialize)] -struct ChannelInfo { +pub struct ChannelInfo { name: String, description: Option, } -#[get("{uuid}/channels")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; + Member::check_membership(&mut app_state.pool.get().await?, uuid, guild_uuid).await?; - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - Member::check_membership(&mut conn, uuid, guild_uuid).await?; - - if let Ok(cache_hit) = data.get_cache_key(format!("{guild_uuid}_channels")).await { - return Ok(HttpResponse::Ok() - .content_type("application/json") - .body(cache_hit)); + if let Ok(cache_hit) = app_state + .get_cache_key(format!("{guild_uuid}_channels")) + .await + { + return Ok((StatusCode::OK, Json(cache_hit)).into_response()); } - let channels = Channel::fetch_all(&data.pool, guild_uuid).await?; + let channels = Channel::fetch_all(&app_state.pool, guild_uuid).await?; let channels_ordered = order_by_is_above(channels).await?; - data.set_cache_key( - format!("{guild_uuid}_channels"), - channels_ordered.clone(), - 1800, - ) - .await?; + app_state + .set_cache_key( + format!("{guild_uuid}_channels"), + channels_ordered.clone(), + 1800, + ) + .await?; - Ok(HttpResponse::Ok().json(channels_ordered)) + Ok((StatusCode::OK, Json(channels_ordered)).into_response()) } -#[post("{uuid}/channels")] pub async fn create( - req: HttpRequest, - channel_info: web::Json, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, + Json(channel_info): Json, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; + let member = + Member::check_membership(&mut app_state.pool.get().await?, uuid, guild_uuid).await?; member - .check_permission(&data, Permissions::ManageChannel) + .check_permission(&app_state, Permissions::ManageChannel) .await?; let channel = Channel::new( - data.clone(), + &app_state, guild_uuid, channel_info.name.clone(), channel_info.description.clone(), ) .await?; - Ok(HttpResponse::Ok().json(channel)) + Ok((StatusCode::OK, Json(channel))) } diff --git a/src/api/v1/guilds/uuid/icon.rs b/src/api/v1/guilds/uuid/icon.rs deleted file mode 100644 index 600ccba..0000000 --- a/src/api/v1/guilds/uuid/icon.rs +++ /dev/null @@ -1,62 +0,0 @@ -//! `/api/v1/guilds/{uuid}/icon` icon related endpoints, will probably be replaced by a multipart post to above endpoint - -use actix_web::{HttpRequest, HttpResponse, put, web}; -use futures_util::StreamExt as _; -use uuid::Uuid; - -use crate::{ - Data, - api::v1::auth::check_access_token, - error::Error, - objects::{Guild, Member, Permissions}, - utils::{get_auth_header, global_checks}, -}; - -/// `PUT /api/v1/guilds/{uuid}/icon` Icon upload -/// -/// requires auth: no -/// -/// put request expects a file and nothing else -#[put("{uuid}/icon")] -pub async fn upload( - req: HttpRequest, - path: web::Path<(Uuid,)>, - mut payload: web::Payload, - data: web::Data, -) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; - - member - .check_permission(&data, Permissions::ManageGuild) - .await?; - - let mut guild = Guild::fetch_one(&mut conn, guild_uuid).await?; - - let mut bytes = web::BytesMut::new(); - while let Some(item) = payload.next().await { - bytes.extend_from_slice(&item?); - } - - guild - .set_icon( - &data.bunny_storage, - &mut conn, - data.config.bunny.cdn_url.clone(), - bytes, - ) - .await?; - - Ok(HttpResponse::Ok().finish()) -} diff --git a/src/api/v1/guilds/uuid/invites/mod.rs b/src/api/v1/guilds/uuid/invites/mod.rs index f1c62bc..649fc16 100644 --- a/src/api/v1/guilds/uuid/invites/mod.rs +++ b/src/api/v1/guilds/uuid/invites/mod.rs @@ -1,37 +1,35 @@ -use actix_web::{HttpRequest, HttpResponse, get, post, web}; +use std::sync::Arc; + +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; use serde::Deserialize; use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Guild, Member, Permissions}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; #[derive(Deserialize)] -struct InviteRequest { +pub struct InviteRequest { custom_id: Option, } -#[get("{uuid}/invites")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; Member::check_membership(&mut conn, uuid, guild_uuid).await?; @@ -39,32 +37,23 @@ pub async fn get( let invites = guild.get_invites(&mut conn).await?; - Ok(HttpResponse::Ok().json(invites)) + Ok((StatusCode::OK, Json(invites))) } -#[post("{uuid}/invites")] pub async fn create( - req: HttpRequest, - path: web::Path<(Uuid,)>, - invite_request: web::Json, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, + Json(invite_request): Json, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; member - .check_permission(&data, Permissions::CreateInvite) + .check_permission(&app_state, Permissions::CreateInvite) .await?; let guild = Guild::fetch_one(&mut conn, guild_uuid).await?; @@ -73,5 +62,5 @@ pub async fn create( .create_invite(&mut conn, uuid, invite_request.custom_id.clone()) .await?; - Ok(HttpResponse::Ok().json(invite)) + Ok((StatusCode::OK, Json(invite))) } diff --git a/src/api/v1/guilds/uuid/members.rs b/src/api/v1/guilds/uuid/members.rs index 0afc2c5..3ae10f7 100644 --- a/src/api/v1/guilds/uuid/members.rs +++ b/src/api/v1/guilds/uuid/members.rs @@ -1,36 +1,35 @@ +use std::sync::Arc; + +use ::uuid::Uuid; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; + use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Me, Member}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; -use ::uuid::Uuid; -use actix_web::{HttpRequest, HttpResponse, get, web}; -#[get("{uuid}/members")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; Member::check_membership(&mut conn, uuid, guild_uuid).await?; let me = Me::get(&mut conn, uuid).await?; - let members = Member::fetch_all(&data, &me, guild_uuid).await?; + let members = Member::fetch_all(&app_state, &me, guild_uuid).await?; - Ok(HttpResponse::Ok().json(members)) + Ok((StatusCode::OK, Json(members))) } diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs index 4c88d7a..52f0b64 100644 --- a/src/api/v1/guilds/uuid/mod.rs +++ b/src/api/v1/guilds/uuid/mod.rs @@ -1,40 +1,47 @@ //! `/api/v1/guilds/{uuid}` Specific server endpoints -use actix_web::{HttpRequest, HttpResponse, Scope, get, web}; +use std::sync::Arc; + +use axum::{ + Extension, Json, Router, + extract::{Multipart, Path, State}, + http::StatusCode, + response::IntoResponse, + routing::{get, patch, post}, +}; +use bytes::Bytes; use uuid::Uuid; mod channels; -mod icon; mod invites; mod members; mod roles; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, - objects::{Guild, Member}, - utils::{get_auth_header, global_checks}, + objects::{Guild, Member, Permissions}, + utils::global_checks, }; -pub fn web() -> Scope { - web::scope("") +pub fn router() -> Router> { + Router::new() // Servers - .service(get) + .route("/", get(get_guild)) + .route("/", patch(edit)) // Channels - .service(channels::get) - .service(channels::create) + .route("/channels", get(channels::get)) + .route("/channels", post(channels::create)) // Roles - .service(roles::get) - .service(roles::create) - .service(roles::uuid::get) + .route("/roles", get(roles::get)) + .route("/roles", post(roles::create)) + .route("/roles/{role_uuid}", get(roles::uuid::get)) // Invites - .service(invites::get) - .service(invites::create) - // Icon - .service(icon::upload) + .route("/invites", get(invites::get)) + .route("/invites", post(invites::create)) // Members - .service(members::get) + .route("/members", get(members::get)) } /// `GET /api/v1/guilds/{uuid}` DESCRIPTION @@ -70,27 +77,65 @@ pub fn web() -> Scope { /// "member_count": 20 /// }); /// ``` -#[get("/{uuid}")] -pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); +pub async fn get_guild( + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; Member::check_membership(&mut conn, uuid, guild_uuid).await?; let guild = Guild::fetch_one(&mut conn, guild_uuid).await?; - Ok(HttpResponse::Ok().json(guild)) + Ok((StatusCode::OK, Json(guild))) +} + +/// `PATCH /api/v1/guilds/{uuid}` change guild settings +/// +/// requires auth: yes +pub async fn edit( + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, + mut multipart: Multipart, +) -> Result { + global_checks(&app_state, uuid).await?; + + let mut conn = app_state.pool.get().await?; + + let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; + + member + .check_permission(&app_state, Permissions::ManageGuild) + .await?; + + let mut guild = Guild::fetch_one(&mut conn, guild_uuid).await?; + + let mut icon: Option = None; + + while let Some(field) = multipart.next_field().await.unwrap() { + let name = field + .name() + .ok_or(Error::BadRequest("Field has no name".to_string()))?; + + if name == "icon" { + icon = Some(field.bytes().await?); + } + } + + if let Some(icon) = icon { + guild + .set_icon( + &app_state.bunny_storage, + &mut conn, + app_state.config.bunny.cdn_url.clone(), + icon, + ) + .await?; + } + + Ok(StatusCode::OK) } diff --git a/src/api/v1/guilds/uuid/roles/mod.rs b/src/api/v1/guilds/uuid/roles/mod.rs index 0fcc5b3..820ef0d 100644 --- a/src/api/v1/guilds/uuid/roles/mod.rs +++ b/src/api/v1/guilds/uuid/roles/mod.rs @@ -1,82 +1,72 @@ +use std::sync::Arc; + use ::uuid::Uuid; -use actix_web::{HttpRequest, HttpResponse, get, post, web}; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; use serde::Deserialize; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Member, Permissions, Role}, - utils::{get_auth_header, global_checks, order_by_is_above}, + utils::{global_checks, order_by_is_above}, }; pub mod uuid; #[derive(Deserialize)] -struct RoleInfo { +pub struct RoleInfo { name: String, } -#[get("{uuid}/roles")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; + let mut conn = app_state.pool.get().await?; Member::check_membership(&mut conn, uuid, guild_uuid).await?; - if let Ok(cache_hit) = data.get_cache_key(format!("{guild_uuid}_roles")).await { - return Ok(HttpResponse::Ok() - .content_type("application/json") - .body(cache_hit)); + if let Ok(cache_hit) = app_state.get_cache_key(format!("{guild_uuid}_roles")).await { + return Ok((StatusCode::OK, Json(cache_hit)).into_response()); } let roles = Role::fetch_all(&mut conn, guild_uuid).await?; let roles_ordered = order_by_is_above(roles).await?; - data.set_cache_key(format!("{guild_uuid}_roles"), roles_ordered.clone(), 1800) + app_state + .set_cache_key(format!("{guild_uuid}_roles"), roles_ordered.clone(), 1800) .await?; - Ok(HttpResponse::Ok().json(roles_ordered)) + Ok((StatusCode::OK, Json(roles_ordered)).into_response()) } -#[post("{uuid}/roles")] pub async fn create( - req: HttpRequest, - role_info: web::Json, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, + Json(role_info): Json, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let guild_uuid = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; member - .check_permission(&data, Permissions::ManageRole) + .check_permission(&app_state, Permissions::ManageRole) .await?; let role = Role::new(&mut conn, guild_uuid, role_info.name.clone()).await?; - Ok(HttpResponse::Ok().json(role)) + Ok((StatusCode::OK, Json(role)).into_response()) } diff --git a/src/api/v1/guilds/uuid/roles/uuid.rs b/src/api/v1/guilds/uuid/roles/uuid.rs index bd747d8..06193a1 100644 --- a/src/api/v1/guilds/uuid/roles/uuid.rs +++ b/src/api/v1/guilds/uuid/roles/uuid.rs @@ -1,43 +1,41 @@ +use std::sync::Arc; + +use ::uuid::Uuid; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; + use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Member, Role}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; -use ::uuid::Uuid; -use actix_web::{HttpRequest, HttpResponse, get, web}; -#[get("{uuid}/roles/{role_uuid}")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid, Uuid)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path((guild_uuid, role_uuid)): Path<(Uuid, Uuid)>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let (guild_uuid, role_uuid) = path.into_inner(); - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; Member::check_membership(&mut conn, uuid, guild_uuid).await?; - if let Ok(cache_hit) = data.get_cache_key(format!("{role_uuid}")).await { - return Ok(HttpResponse::Ok() - .content_type("application/json") - .body(cache_hit)); + if let Ok(cache_hit) = app_state.get_cache_key(format!("{role_uuid}")).await { + return Ok((StatusCode::OK, Json(cache_hit)).into_response()); } let role = Role::fetch_one(&mut conn, role_uuid).await?; - data.set_cache_key(format!("{role_uuid}"), role.clone(), 60) + app_state + .set_cache_key(format!("{role_uuid}"), role.clone(), 60) .await?; - Ok(HttpResponse::Ok().json(role)) + Ok((StatusCode::OK, Json(role)).into_response()) } diff --git a/src/api/v1/invites/id.rs b/src/api/v1/invites/id.rs index 22e2868..72ceea4 100644 --- a/src/api/v1/invites/id.rs +++ b/src/api/v1/invites/id.rs @@ -1,49 +1,48 @@ -use actix_web::{HttpRequest, HttpResponse, get, post, web}; +use std::sync::Arc; + +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; +use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Guild, Invite, Member}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; -#[get("{id}")] -pub async fn get(path: web::Path<(String,)>, data: web::Data) -> Result { - let mut conn = data.pool.get().await?; - - let invite_id = path.into_inner().0; +pub async fn get( + State(app_state): State>, + Path(invite_id): Path, +) -> Result { + let mut conn = app_state.pool.get().await?; let invite = Invite::fetch_one(&mut conn, invite_id).await?; let guild = Guild::fetch_one(&mut conn, invite.guild_uuid).await?; - Ok(HttpResponse::Ok().json(guild)) + Ok((StatusCode::OK, Json(guild))) } -#[post("{id}")] pub async fn join( - req: HttpRequest, - path: web::Path<(String,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(invite_id): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let invite_id = path.into_inner().0; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; let invite = Invite::fetch_one(&mut conn, invite_id).await?; let guild = Guild::fetch_one(&mut conn, invite.guild_uuid).await?; - Member::new(&data, uuid, guild.uuid).await?; + Member::new(&app_state, uuid, guild.uuid).await?; - Ok(HttpResponse::Ok().json(guild)) + Ok((StatusCode::OK, Json(guild))) } diff --git a/src/api/v1/invites/mod.rs b/src/api/v1/invites/mod.rs index 3714a83..50fb707 100644 --- a/src/api/v1/invites/mod.rs +++ b/src/api/v1/invites/mod.rs @@ -1,7 +1,16 @@ -use actix_web::{Scope, web}; +use std::sync::Arc; + +use axum::{ + Router, + routing::{get, post}, +}; + +use crate::AppState; mod id; -pub fn web() -> Scope { - web::scope("/invites").service(id::get).service(id::join) +pub fn router() -> Router> { + Router::new() + .route("/{id}", get(id::get)) + .route("/{id}", post(id::join)) } diff --git a/src/api/v1/me/friends/mod.rs b/src/api/v1/me/friends/mod.rs index 8de0a5d..a56f8d4 100644 --- a/src/api/v1/me/friends/mod.rs +++ b/src/api/v1/me/friends/mod.rs @@ -1,38 +1,35 @@ -use actix_web::{HttpRequest, HttpResponse, get, post, web}; +use std::sync::Arc; + +use ::uuid::Uuid; +use axum::{Extension, Json, extract::State, http::StatusCode, response::IntoResponse}; use serde::Deserialize; pub mod uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::Me, - utils::{get_auth_header, global_checks, user_uuid_from_username} + utils::{global_checks, user_uuid_from_username}, }; /// Returns a list of users that are your friends -#[get("/friends")] -pub async fn get(req: HttpRequest, data: web::Data) -> Result { - let headers = req.headers(); +pub async fn get( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; + let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; - let mut conn = data.pool.get().await?; + let friends = me.get_friends(&app_state).await?; - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let me = Me::get(&mut conn, uuid).await?; - - let friends = me.get_friends(&data).await?; - - Ok(HttpResponse::Ok().json(friends)) + Ok((StatusCode::OK, Json(friends))) } #[derive(Deserialize)] -struct UserReq { +pub struct UserReq { username: String, } @@ -55,26 +52,19 @@ struct UserReq { /// /// 400 Bad Request (usually means users are already friends) /// -#[post("/friends")] pub async fn post( - req: HttpRequest, - json: web::Json, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, + Json(user_request): Json, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; let me = Me::get(&mut conn, uuid).await?; - let target_uuid = user_uuid_from_username(&mut conn, &json.username).await?; + let target_uuid = user_uuid_from_username(&mut conn, &user_request.username).await?; me.add_friend(&mut conn, target_uuid).await?; - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } diff --git a/src/api/v1/me/friends/uuid.rs b/src/api/v1/me/friends/uuid.rs index 34bfeff..5367435 100644 --- a/src/api/v1/me/friends/uuid.rs +++ b/src/api/v1/me/friends/uuid.rs @@ -1,33 +1,29 @@ -use actix_web::{HttpRequest, HttpResponse, delete, web}; +use std::sync::Arc; + +use axum::{ + Extension, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, - error::Error, - objects::Me, - utils::{get_auth_header, global_checks}, + AppState, api::v1::auth::CurrentUser, error::Error, objects::Me, utils::global_checks, }; -#[delete("/friends/{uuid}")] pub async fn delete( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(friend_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; let me = Me::get(&mut conn, uuid).await?; - me.remove_friend(&mut conn, path.0).await?; + me.remove_friend(&mut conn, friend_uuid).await?; - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } diff --git a/src/api/v1/me/guilds.rs b/src/api/v1/me/guilds.rs index 71cfca4..88dfad9 100644 --- a/src/api/v1/me/guilds.rs +++ b/src/api/v1/me/guilds.rs @@ -1,13 +1,12 @@ //! `/api/v1/me/guilds` Contains endpoint related to guild memberships -use actix_web::{HttpRequest, HttpResponse, get, web}; +use std::sync::Arc; + +use axum::{Extension, Json, extract::State, http::StatusCode, response::IntoResponse}; +use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, - error::Error, - objects::Me, - utils::{get_auth_header, global_checks}, + AppState, api::v1::auth::CurrentUser, error::Error, objects::Me, utils::global_checks, }; /// `GET /api/v1/me/guilds` Returns all guild memberships in a list @@ -55,21 +54,17 @@ use crate::{ /// ]); /// ``` /// NOTE: UUIDs in this response are made using `uuidgen`, UUIDs made by the actual backend will be UUIDv7 and have extractable timestamps -#[get("/guilds")] -pub async fn get(req: HttpRequest, data: web::Data) -> Result { - let headers = req.headers(); +pub async fn get( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; + let mut conn = app_state.pool.get().await?; let me = Me::get(&mut conn, uuid).await?; let memberships = me.fetch_memberships(&mut conn).await?; - Ok(HttpResponse::Ok().json(memberships)) + Ok((StatusCode::OK, Json(memberships))) } diff --git a/src/api/v1/me/mod.rs b/src/api/v1/me/mod.rs index f667ca4..e167d14 100644 --- a/src/api/v1/me/mod.rs +++ b/src/api/v1/me/mod.rs @@ -1,108 +1,109 @@ -use actix_multipart::form::{MultipartForm, json::Json as MpJson, tempfile::TempFile}; -use actix_web::{HttpRequest, HttpResponse, Scope, get, patch, web}; +use std::sync::Arc; + +use axum::{ + Extension, Json, Router, + extract::{DefaultBodyLimit, Multipart, State}, + http::StatusCode, + response::IntoResponse, + routing::{delete, get, patch, post}, +}; +use bytes::Bytes; use serde::Deserialize; +use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, - error::Error, - objects::Me, - utils::{get_auth_header, global_checks}, + AppState, api::v1::auth::CurrentUser, error::Error, objects::Me, utils::global_checks, }; mod friends; mod guilds; -pub fn web() -> Scope { - web::scope("/me") - .service(get) - .service(update) - .service(guilds::get) - .service(friends::get) - .service(friends::post) - .service(friends::uuid::delete) +pub fn router() -> Router> { + Router::new() + .route("/", get(get_me)) + .route( + "/", + patch(update).layer(DefaultBodyLimit::max( + 100 * 1024 * 1024, /* limit is in bytes */ + )), + ) + .route("/guilds", get(guilds::get)) + .route("/friends", get(friends::get)) + .route("/friends", post(friends::post)) + .route("/friends/{uuid}", delete(friends::uuid::delete)) } -#[get("")] -pub async fn get(req: HttpRequest, data: web::Data) -> Result { - let headers = req.headers(); +pub async fn get_me( + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; - let auth_header = get_auth_header(headers)?; - - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - let me = Me::get(&mut conn, uuid).await?; - - Ok(HttpResponse::Ok().json(me)) + Ok((StatusCode::OK, Json(me))) } -#[derive(Debug, Deserialize, Clone)] +#[derive(Default, Debug, Deserialize, Clone)] struct NewInfo { username: Option, display_name: Option, - //password: Option, will probably be handled through a reset password link email: Option, pronouns: Option, about: Option, } -#[derive(Debug, MultipartForm)] -struct UploadForm { - #[multipart(limit = "100MB")] - avatar: Option, - json: MpJson, -} - -#[patch("")] pub async fn update( - req: HttpRequest, - MultipartForm(form): MultipartForm, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Extension(CurrentUser(uuid)): Extension>, + mut multipart: Multipart, +) -> Result { + let mut json_raw: Option = None; + let mut avatar: Option = None; - let auth_header = get_auth_header(headers)?; + while let Some(field) = multipart.next_field().await.unwrap() { + let name = field + .name() + .ok_or(Error::BadRequest("Field has no name".to_string()))?; - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - if form.avatar.is_some() || form.json.username.is_some() || form.json.display_name.is_some() { - global_checks(&data, uuid).await?; + if name == "avatar" { + avatar = Some(field.bytes().await?); + } else if name == "json" { + json_raw = Some(serde_json::from_str(&field.text().await?)?) + } } - let mut me = Me::get(&mut conn, uuid).await?; + let json = json_raw.unwrap_or_default(); - if let Some(avatar) = form.avatar { - let bytes = tokio::fs::read(avatar.file).await?; + if avatar.is_some() || json.username.is_some() || json.display_name.is_some() { + global_checks(&app_state, uuid).await?; + } - let byte_slice: &[u8] = &bytes; + let mut me = Me::get(&mut app_state.pool.get().await?, uuid).await?; - me.set_avatar(&data, data.config.bunny.cdn_url.clone(), byte_slice.into()) + if let Some(avatar) = avatar { + me.set_avatar(&app_state, app_state.config.bunny.cdn_url.clone(), avatar) .await?; } - if let Some(username) = &form.json.username { - me.set_username(&data, username.clone()).await?; + if let Some(username) = &json.username { + me.set_username(&app_state, username.clone()).await?; } - if let Some(display_name) = &form.json.display_name { - me.set_display_name(&data, display_name.clone()).await?; + if let Some(display_name) = &json.display_name { + me.set_display_name(&app_state, display_name.clone()) + .await?; } - if let Some(email) = &form.json.email { - me.set_email(&data, email.clone()).await?; + if let Some(email) = &json.email { + me.set_email(&app_state, email.clone()).await?; } - if let Some(pronouns) = &form.json.pronouns { - me.set_pronouns(&data, pronouns.clone()).await?; + if let Some(pronouns) = &json.pronouns { + me.set_pronouns(&app_state, pronouns.clone()).await?; } - if let Some(about) = &form.json.about { - me.set_about(&data, about.clone()).await?; + if let Some(about) = &json.about { + me.set_about(&app_state, about.clone()).await?; } - Ok(HttpResponse::Ok().finish()) + Ok(StatusCode::OK) } diff --git a/src/api/v1/mod.rs b/src/api/v1/mod.rs index 6c2df0b..860944c 100644 --- a/src/api/v1/mod.rs +++ b/src/api/v1/mod.rs @@ -1,6 +1,10 @@ //! `/api/v1` Contains version 1 of the api -use actix_web::{Scope, web}; +use std::sync::Arc; + +use axum::{Router, middleware::from_fn_with_state, routing::get}; + +use crate::{AppState, api::v1::auth::CurrentUser}; mod auth; mod channels; @@ -10,13 +14,20 @@ mod me; mod stats; mod users; -pub fn web() -> Scope { - web::scope("/v1") - .service(stats::res) - .service(auth::web()) - .service(users::web()) - .service(channels::web()) - .service(guilds::web()) - .service(invites::web()) - .service(me::web()) +pub fn router(app_state: Arc) -> Router> { + let router_with_auth = Router::new() + .nest("/users", users::router()) + .nest("/guilds", guilds::router()) + .nest("/invites", invites::router()) + .nest("/me", me::router()) + .layer(from_fn_with_state( + app_state.clone(), + CurrentUser::check_auth_layer, + )); + + Router::new() + .route("/stats", get(stats::res)) + .nest("/auth", auth::router(app_state.clone())) + .nest("/channels", channels::router(app_state)) + .merge(router_with_auth) } diff --git a/src/api/v1/stats.rs b/src/api/v1/stats.rs index 760ec71..17c5df6 100644 --- a/src/api/v1/stats.rs +++ b/src/api/v1/stats.rs @@ -1,13 +1,17 @@ //! `/api/v1/stats` Returns stats about the server +use std::sync::Arc; use std::time::SystemTime; -use actix_web::{HttpResponse, get, web}; +use axum::Json; +use axum::extract::State; +use axum::http::StatusCode; +use axum::response::IntoResponse; use diesel::QueryDsl; use diesel_async::RunQueryDsl; use serde::Serialize; -use crate::Data; +use crate::AppState; use crate::error::Error; use crate::schema::users::dsl::{users, uuid}; @@ -39,27 +43,26 @@ struct Response { /// "build_number": "39d01bb" /// }); /// ``` -#[get("/stats")] -pub async fn res(data: web::Data) -> Result { +pub async fn res(State(app_state): State>) -> Result { let accounts: i64 = users .select(uuid) .count() - .get_result(&mut data.pool.get().await?) + .get_result(&mut app_state.pool.get().await?) .await?; let response = Response { // TODO: Get number of accounts from db accounts, uptime: SystemTime::now() - .duration_since(data.start_time) + .duration_since(app_state.start_time) .expect("Seriously why dont you have time??") .as_secs(), version: String::from(VERSION.unwrap_or("UNKNOWN")), - registration_enabled: data.config.instance.registration, - email_verification_required: data.config.instance.require_email_verification, + registration_enabled: app_state.config.instance.registration, + email_verification_required: app_state.config.instance.require_email_verification, // TODO: Get build number from git hash or remove this from the spec build_number: String::from(GIT_SHORT_HASH), }; - Ok(HttpResponse::Ok().json(response)) + Ok((StatusCode::OK, Json(response))) } diff --git a/src/api/v1/users/mod.rs b/src/api/v1/users/mod.rs index 334fd5f..a4b93ce 100644 --- a/src/api/v1/users/mod.rs +++ b/src/api/v1/users/mod.rs @@ -1,19 +1,30 @@ //! `/api/v1/users` Contains endpoints related to all users -use actix_web::{HttpRequest, HttpResponse, Scope, get, web}; +use std::sync::Arc; + +use ::uuid::Uuid; +use axum::{ + Extension, Json, Router, + extract::{Query, State}, + http::StatusCode, + response::IntoResponse, + routing::get, +}; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{StartAmountQuery, User}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; mod uuid; -pub fn web() -> Scope { - web::scope("/users").service(get).service(uuid::get) +pub fn router() -> Router> { + Router::new() + .route("/", get(users)) + .route("/{uuid}", get(uuid::get)) } /// `GET /api/v1/users` Returns all users on this instance @@ -46,31 +57,22 @@ pub fn web() -> Scope { /// ]); /// ``` /// NOTE: UUIDs in this response are made using `uuidgen`, UUIDs made by the actual backend will be UUIDv7 and have extractable timestamps -#[get("")] -pub async fn get( - req: HttpRequest, - request_query: web::Query, - data: web::Data, -) -> Result { - let headers = req.headers(); - - let auth_header = get_auth_header(headers)?; - +pub async fn users( + State(app_state): State>, + Query(request_query): Query, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { let start = request_query.start.unwrap_or(0); let amount = request_query.amount.unwrap_or(10); if amount > 100 { - return Ok(HttpResponse::BadRequest().finish()); + return Ok(StatusCode::BAD_REQUEST.into_response()); } - let mut conn = data.pool.get().await?; + global_checks(&app_state, uuid).await?; - let uuid = check_access_token(auth_header, &mut conn).await?; + let users = User::fetch_amount(&mut app_state.pool.get().await?, start, amount).await?; - global_checks(&data, uuid).await?; - - let users = User::fetch_amount(&mut conn, start, amount).await?; - - Ok(HttpResponse::Ok().json(users)) + Ok((StatusCode::OK, Json(users)).into_response()) } diff --git a/src/api/v1/users/uuid.rs b/src/api/v1/users/uuid.rs index 5d36b75..cee6df0 100644 --- a/src/api/v1/users/uuid.rs +++ b/src/api/v1/users/uuid.rs @@ -1,14 +1,21 @@ //! `/api/v1/users/{uuid}` Specific user endpoints -use actix_web::{HttpRequest, HttpResponse, get, web}; +use std::sync::Arc; + +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; use uuid::Uuid; use crate::{ - Data, - api::v1::auth::check_access_token, + AppState, + api::v1::auth::CurrentUser, error::Error, objects::{Me, User}, - utils::{get_auth_header, global_checks}, + utils::global_checks, }; /// `GET /api/v1/users/{uuid}` Returns user with the given UUID @@ -27,27 +34,16 @@ use crate::{ /// }); /// ``` /// NOTE: UUIDs in this response are made using `uuidgen`, UUIDs made by the actual backend will be UUIDv7 and have extractable timestamps -#[get("/{uuid}")] pub async fn get( - req: HttpRequest, - path: web::Path<(Uuid,)>, - data: web::Data, -) -> Result { - let headers = req.headers(); + State(app_state): State>, + Path(user_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; - let user_uuid = path.into_inner().0; + let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; - let auth_header = get_auth_header(headers)?; + let user = User::fetch_one_with_friendship(&app_state, &me, user_uuid).await?; - let mut conn = data.pool.get().await?; - - let uuid = check_access_token(auth_header, &mut conn).await?; - - global_checks(&data, uuid).await?; - - let me = Me::get(&mut conn, uuid).await?; - - let user = User::fetch_one_with_friendship(&data, &me, user_uuid).await?; - - Ok(HttpResponse::Ok().json(user)) + Ok((StatusCode::OK, Json(user))) } diff --git a/src/api/versions.rs b/src/api/versions.rs index 0c3e106..3c9576b 100644 --- a/src/api/versions.rs +++ b/src/api/versions.rs @@ -1,5 +1,5 @@ //! `/api/v1/versions` Returns info about api versions -use actix_web::{HttpResponse, Responder, get}; +use axum::{Json, http::StatusCode, response::IntoResponse}; use serde::Serialize; #[derive(Serialize)] @@ -24,13 +24,12 @@ struct UnstableFeatures; /// ] /// }); /// ``` -#[get("/versions")] -pub async fn get() -> impl Responder { +pub async fn versions() -> impl IntoResponse { let response = Response { unstable_features: UnstableFeatures, // TODO: Find a way to dynamically update this possibly? versions: vec![String::from("1")], }; - HttpResponse::Ok().json(response) + (StatusCode::OK, Json(response)) } diff --git a/src/error.rs b/src/error.rs index 35b533d..d6f7a12 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,12 +1,16 @@ use std::{io, time::SystemTimeError}; -use actix_web::{ - HttpResponse, - error::{PayloadError, ResponseError}, +use axum::{ + Json, + extract::{ + multipart::MultipartError, + rejection::{JsonRejection, QueryRejection}, + }, http::{ StatusCode, - header::{ContentType, ToStrError}, + header::{InvalidHeaderValue, ToStrError}, }, + response::IntoResponse, }; use bunny_api_tokio::error::Error as BunnyError; use deadpool::managed::{BuildError, PoolError}; @@ -54,9 +58,13 @@ pub enum Error { #[error(transparent)] UrlParseError(#[from] url::ParseError), #[error(transparent)] - PayloadError(#[from] PayloadError), + JsonRejection(#[from] JsonRejection), #[error(transparent)] - WsClosed(#[from] actix_ws::Closed), + QueryRejection(#[from] QueryRejection), + #[error(transparent)] + MultipartError(#[from] MultipartError), + #[error(transparent)] + InvalidHeaderValue(#[from] InvalidHeaderValue), #[error(transparent)] EmailError(#[from] EmailError), #[error(transparent)] @@ -75,28 +83,45 @@ pub enum Error { TooManyRequests(String), #[error("{0}")] InternalServerError(String), + // TODO: remove when doing socket.io + #[error(transparent)] + AxumError(#[from] axum::Error), } -impl ResponseError for Error { - fn error_response(&self) -> HttpResponse { +impl IntoResponse for Error { + fn into_response(self) -> axum::response::Response { + let error = match self { + Error::SqlError(DieselError::NotFound) => { + (StatusCode::NOT_FOUND, Json(WebError::new(self.to_string()))) + } + Error::BunnyError(BunnyError::NotFound(_)) => { + (StatusCode::NOT_FOUND, Json(WebError::new(self.to_string()))) + } + Error::BadRequest(_) => ( + StatusCode::BAD_REQUEST, + Json(WebError::new(self.to_string())), + ), + Error::Unauthorized(_) => ( + StatusCode::UNAUTHORIZED, + Json(WebError::new(self.to_string())), + ), + Error::Forbidden(_) => (StatusCode::FORBIDDEN, Json(WebError::new(self.to_string()))), + Error::TooManyRequests(_) => ( + StatusCode::TOO_MANY_REQUESTS, + Json(WebError::new(self.to_string())), + ), + _ => ( + StatusCode::INTERNAL_SERVER_ERROR, + Json(WebError::new(self.to_string())), + ), + }; + + let (code, _) = error; + debug!("{self:?}"); - error!("{}: {}", self.status_code(), self); + error!("{code}: {self}"); - HttpResponse::build(self.status_code()) - .insert_header(ContentType::json()) - .json(WebError::new(self.to_string())) - } - - fn status_code(&self) -> StatusCode { - match *self { - Error::SqlError(DieselError::NotFound) => StatusCode::NOT_FOUND, - Error::BunnyError(BunnyError::NotFound(_)) => StatusCode::NOT_FOUND, - Error::BadRequest(_) => StatusCode::BAD_REQUEST, - Error::Unauthorized(_) => StatusCode::UNAUTHORIZED, - Error::Forbidden(_) => StatusCode::FORBIDDEN, - Error::TooManyRequests(_) => StatusCode::TOO_MANY_REQUESTS, - _ => StatusCode::INTERNAL_SERVER_ERROR, - } + error.into_response() } } diff --git a/src/main.rs b/src/main.rs index 248289a..13e661d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,16 +1,17 @@ -use actix_cors::Cors; -use actix_web::{App, HttpServer, web}; use argon2::Argon2; +use axum::{ + Router, + http::{Method, header}, +}; use clap::Parser; +use config::{Config, ConfigBuilder}; use diesel_async::pooled_connection::AsyncDieselConnectionManager; use diesel_async::pooled_connection::deadpool::Pool; +use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations}; use error::Error; use objects::MailClient; -use simple_logger::SimpleLogger; -use std::time::SystemTime; -mod config; -use config::{Config, ConfigBuilder}; -use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations}; +use std::{sync::Arc, time::SystemTime}; +use tower_http::cors::{AllowOrigin, CorsLayer}; pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!(); @@ -18,10 +19,13 @@ type Conn = deadpool::managed::Object>; mod api; +mod config; pub mod error; pub mod objects; pub mod schema; +//mod socket; pub mod utils; +mod wordlist; #[derive(Parser, Debug)] #[command(version, about, long_about = None)] @@ -31,7 +35,7 @@ struct Args { } #[derive(Clone)] -pub struct Data { +pub struct AppState { pub pool: deadpool::managed::Pool< AsyncDieselConnectionManager, Conn, @@ -46,12 +50,8 @@ pub struct Data { #[tokio::main] async fn main() -> Result<(), Error> { - SimpleLogger::new() - .with_level(log::LevelFilter::Info) - .with_colors(true) - .env() - .init() - .unwrap(); + tracing_subscriber::fmt::init(); + let args = Args::parse(); let config = ConfigBuilder::load(args.config).await?.build(); @@ -112,7 +112,7 @@ async fn main() -> Result<(), Error> { ) */ - let data = Data { + let app_state = Arc::new(AppState { pool, cache_pool, config, @@ -121,42 +121,56 @@ async fn main() -> Result<(), Error> { start_time: SystemTime::now(), bunny_storage, mail_client, - }; + }); - HttpServer::new(move || { - // Set CORS headers - let cors = Cors::default() - /* - Set Allowed-Control-Allow-Origin header to whatever - the request's Origin header is. Must be done like this - rather than setting it to "*" due to CORS not allowing - sending of credentials (cookies) with wildcard origin. - */ - .allowed_origin_fn(|_origin, _req_head| true) - /* - Allows any request method in CORS preflight requests. - This will be restricted to only ones actually in use later. - */ - .allow_any_method() - /* - Allows any header(s) in request in CORS preflight requests. - This wll be restricted to only ones actually in use later. - */ - .allow_any_header() - /* - Allows browser to include cookies in requests. - This is needed for receiving the secure HttpOnly refresh_token cookie. - */ - .supports_credentials(); + let cors = CorsLayer::new() + // Allow any origin (equivalent to allowed_origin_fn returning true) + .allow_origin(AllowOrigin::predicate(|_origin, _request_head| true)) + .allow_methods(vec![ + Method::GET, + Method::POST, + Method::PUT, + Method::DELETE, + Method::HEAD, + Method::OPTIONS, + Method::CONNECT, + Method::PATCH, + Method::TRACE, + ]) + .allow_headers(vec![ + header::ACCEPT, + header::ACCEPT_LANGUAGE, + header::AUTHORIZATION, + header::CONTENT_LANGUAGE, + header::CONTENT_TYPE, + header::ORIGIN, + header::ACCEPT, + header::COOKIE, + "x-requested-with".parse().unwrap(), + ]) + // Allow credentials + .allow_credentials(true); - App::new() - .app_data(web::Data::new(data.clone())) - .wrap(cors) - .service(api::web(data.config.web.backend_url.path())) - }) - .bind((web.ip, web.port))? - .run() - .await?; + /*let (socket_io, io) = SocketIo::builder() + .with_state(app_state.clone()) + .build_layer(); + + io.ns("/", socket::on_connect); + */ + // build our application with a route + let app = Router::new() + // `GET /` goes to `root` + .merge(api::router( + web.backend_url.path().trim_end_matches("/"), + app_state.clone(), + )) + .with_state(app_state) + //.layer(socket_io) + .layer(cors); + + // run our app with hyper, listening globally on port 3000 + let listener = tokio::net::TcpListener::bind(web.ip + ":" + &web.port.to_string()).await?; + axum::serve(listener, app).await?; Ok(()) } diff --git a/src/objects/channel.rs b/src/objects/channel.rs index 1192c69..cacb153 100644 --- a/src/objects/channel.rs +++ b/src/objects/channel.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - Conn, Data, + AppState, Conn, error::Error, schema::{channel_permissions, channels, messages}, utils::{CHANNEL_REGEX, order_by_is_above}, @@ -102,15 +102,15 @@ impl Channel { c.clone().build(&mut conn).await }); - futures::future::try_join_all(channel_futures).await + futures_util::future::try_join_all(channel_futures).await } - pub async fn fetch_one(data: &Data, channel_uuid: Uuid) -> Result { - if let Ok(cache_hit) = data.get_cache_key(channel_uuid.to_string()).await { + pub async fn fetch_one(app_state: &AppState, channel_uuid: Uuid) -> Result { + if let Ok(cache_hit) = app_state.get_cache_key(channel_uuid.to_string()).await { return Ok(serde_json::from_str(&cache_hit)?); } - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use channels::dsl; let channel_builder: ChannelBuilder = dsl::channels @@ -121,14 +121,15 @@ impl Channel { let channel = channel_builder.build(&mut conn).await?; - data.set_cache_key(channel_uuid.to_string(), channel.clone(), 60) + app_state + .set_cache_key(channel_uuid.to_string(), channel.clone(), 60) .await?; Ok(channel) } pub async fn new( - data: actix_web::web::Data, + app_state: &AppState, guild_uuid: Uuid, name: String, description: Option, @@ -137,11 +138,11 @@ impl Channel { return Err(Error::BadRequest("Channel name is invalid".to_string())); } - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let channel_uuid = Uuid::now_v7(); - let channels = Self::fetch_all(&data.pool, guild_uuid).await?; + let channels = Self::fetch_all(&app_state.pool, guild_uuid).await?; let channels_ordered = order_by_is_above(channels).await?; @@ -179,22 +180,25 @@ impl Channel { permissions: vec![], }; - data.set_cache_key(channel_uuid.to_string(), channel.clone(), 1800) + app_state + .set_cache_key(channel_uuid.to_string(), channel.clone(), 1800) .await?; - if data + if app_state .get_cache_key(format!("{guild_uuid}_channels")) .await .is_ok() { - data.del_cache_key(format!("{guild_uuid}_channels")).await?; + app_state + .del_cache_key(format!("{guild_uuid}_channels")) + .await?; } Ok(channel) } - pub async fn delete(self, data: &Data) -> Result<(), Error> { - let mut conn = data.pool.get().await?; + pub async fn delete(self, app_state: &AppState) -> Result<(), Error> { + let mut conn = app_state.pool.get().await?; use channels::dsl; match update(channels::table) @@ -224,16 +228,17 @@ impl Channel { Err(e) => Err(e), }?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await?; + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await?; } - if data + if app_state .get_cache_key(format!("{}_channels", self.guild_uuid)) .await .is_ok() { - data.del_cache_key(format!("{}_channels", self.guild_uuid)) + app_state + .del_cache_key(format!("{}_channels", self.guild_uuid)) .await?; } @@ -242,11 +247,11 @@ impl Channel { pub async fn fetch_messages( &self, - data: &Data, + app_state: &AppState, amount: i64, offset: i64, ) -> Result, Error> { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use messages::dsl; let messages: Vec = load_or_empty( @@ -260,14 +265,14 @@ impl Channel { .await, )?; - let message_futures = messages.iter().map(async move |b| b.build(data).await); + let message_futures = messages.iter().map(async move |b| b.build(app_state).await); - futures::future::try_join_all(message_futures).await + futures_util::future::try_join_all(message_futures).await } pub async fn new_message( &self, - data: &Data, + app_state: &AppState, user_uuid: Uuid, message: String, reply_to: Option, @@ -282,22 +287,22 @@ impl Channel { reply_to, }; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; insert_into(messages::table) .values(message.clone()) .execute(&mut conn) .await?; - message.build(data).await + message.build(app_state).await } - pub async fn set_name(&mut self, data: &Data, new_name: String) -> Result<(), Error> { + pub async fn set_name(&mut self, app_state: &AppState, new_name: String) -> Result<(), Error> { if !CHANNEL_REGEX.is_match(&new_name) { return Err(Error::BadRequest("Channel name is invalid".to_string())); } - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use channels::dsl; update(channels::table) @@ -313,10 +318,10 @@ impl Channel { pub async fn set_description( &mut self, - data: &Data, + app_state: &AppState, new_description: String, ) -> Result<(), Error> { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use channels::dsl; update(channels::table) @@ -330,8 +335,12 @@ impl Channel { Ok(()) } - pub async fn move_channel(&mut self, data: &Data, new_is_above: Uuid) -> Result<(), Error> { - let mut conn = data.pool.get().await?; + pub async fn move_channel( + &mut self, + app_state: &AppState, + new_is_above: Uuid, + ) -> Result<(), Error> { + let mut conn = app_state.pool.get().await?; use channels::dsl; let old_above_uuid: Option = match dsl::channels diff --git a/src/objects/email_token.rs b/src/objects/email_token.rs index bfd1ef5..64d2fdb 100644 --- a/src/objects/email_token.rs +++ b/src/objects/email_token.rs @@ -3,7 +3,7 @@ use lettre::message::MultiPart; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::{Data, error::Error, utils::generate_token}; +use crate::{AppState, error::Error, utils::generate_token}; use super::Me; @@ -15,9 +15,9 @@ pub struct EmailToken { } impl EmailToken { - pub async fn get(data: &Data, user_uuid: Uuid) -> Result { + pub async fn get(app_state: &AppState, user_uuid: Uuid) -> Result { let email_token = serde_json::from_str( - &data + &app_state .get_cache_key(format!("{user_uuid}_email_verify")) .await?, )?; @@ -26,7 +26,7 @@ impl EmailToken { } #[allow(clippy::new_ret_no_self)] - pub async fn new(data: &Data, me: Me) -> Result<(), Error> { + pub async fn new(app_state: &AppState, me: Me) -> Result<(), Error> { let token = generate_token::<32>()?; let email_token = EmailToken { @@ -36,30 +36,32 @@ impl EmailToken { created_at: Utc::now(), }; - data.set_cache_key(format!("{}_email_verify", me.uuid), email_token, 86400) + app_state + .set_cache_key(format!("{}_email_verify", me.uuid), email_token, 86400) .await?; - let mut verify_endpoint = data.config.web.frontend_url.join("verify-email")?; + let mut verify_endpoint = app_state.config.web.frontend_url.join("verify-email")?; verify_endpoint.set_query(Some(&format!("token={token}"))); - let email = data + let email = app_state .mail_client .message_builder() .to(me.email.parse()?) - .subject(format!("{} E-mail Verification", data.config.instance.name)) + .subject(format!("{} E-mail Verification", app_state.config.instance.name)) .multipart(MultiPart::alternative_plain_html( - format!("Verify your {} account\n\nHello, {}!\nThanks for creating a new account on Gorb.\nThe final step to create your account is to verify your email address by visiting the page, within 24 hours.\n\n{}\n\nIf you didn't ask to verify this address, you can safely ignore this email\n\nThanks, The gorb team.", data.config.instance.name, me.username, verify_endpoint), - format!(r#"

Verify your {} Account

Hello, {}!

Thanks for creating a new account on Gorb.

The final step to create your account is to verify your email address by clicking the button below, within 24 hours.

VERIFY ACCOUNT

If you didn't ask to verify this address, you can safely ignore this email.

Thanks
The gorb team.

"#, data.config.instance.name, me.username, verify_endpoint) + format!("Verify your {} account\n\nHello, {}!\nThanks for creating a new account on Gorb.\nThe final step to create your account is to verify your email address by visiting the page, within 24 hours.\n\n{}\n\nIf you didn't ask to verify this address, you can safely ignore this email\n\nThanks, The gorb team.", app_state.config.instance.name, me.username, verify_endpoint), + format!(r#"

Verify your {} Account

Hello, {}!

Thanks for creating a new account on Gorb.

The final step to create your account is to verify your email address by clicking the button below, within 24 hours.

VERIFY ACCOUNT

If you didn't ask to verify this address, you can safely ignore this email.

Thanks
The gorb team.

"#, app_state.config.instance.name, me.username, verify_endpoint) ))?; - data.mail_client.send_mail(email).await?; + app_state.mail_client.send_mail(email).await?; Ok(()) } - pub async fn delete(&self, data: &Data) -> Result<(), Error> { - data.del_cache_key(format!("{}_email_verify", self.user_uuid)) + pub async fn delete(&self, app_state: &AppState) -> Result<(), Error> { + app_state + .del_cache_key(format!("{}_email_verify", self.user_uuid)) .await?; Ok(()) diff --git a/src/objects/guild.rs b/src/objects/guild.rs index aa01f54..9514e49 100644 --- a/src/objects/guild.rs +++ b/src/objects/guild.rs @@ -1,4 +1,4 @@ -use actix_web::web::BytesMut; +use axum::body::Bytes; use diesel::{ ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, update, @@ -96,7 +96,7 @@ impl Guild { }); // Execute all futures concurrently and collect results - futures::future::try_join_all(guild_futures).await + futures_util::future::try_join_all(guild_futures).await } pub async fn new(conn: &mut Conn, name: String, owner_uuid: Uuid) -> Result { @@ -191,7 +191,7 @@ impl Guild { bunny_storage: &bunny_api_tokio::EdgeStorageClient, conn: &mut Conn, cdn_url: Url, - icon: BytesMut, + icon: Bytes, ) -> Result<(), Error> { let icon_clone = icon.clone(); let image_type = task::spawn_blocking(move || image_check(icon_clone)).await??; @@ -204,7 +204,7 @@ impl Guild { let path = format!("icons/{}/{}.{}", self.uuid, Uuid::now_v7(), image_type); - bunny_storage.upload(path.clone(), icon.into()).await?; + bunny_storage.upload(path.clone(), icon).await?; let icon_url = cdn_url.join(&path)?; diff --git a/src/objects/me.rs b/src/objects/me.rs index 37951ab..a0b399d 100644 --- a/src/objects/me.rs +++ b/src/objects/me.rs @@ -1,4 +1,4 @@ -use actix_web::web::BytesMut; +use axum::body::Bytes; use diesel::{ ExpressionMethods, QueryDsl, Queryable, Selectable, SelectableHelper, delete, insert_into, update, @@ -10,7 +10,7 @@ use url::Url; use uuid::Uuid; use crate::{ - Conn, Data, + AppState, Conn, error::Error, objects::{Friend, FriendRequest, User}, schema::{friend_requests, friends, guild_members, guilds, users}, @@ -75,28 +75,26 @@ impl Me { pub async fn set_avatar( &mut self, - data: &Data, + app_state: &AppState, cdn_url: Url, - avatar: BytesMut, + avatar: Bytes, ) -> Result<(), Error> { let avatar_clone = avatar.clone(); let image_type = task::spawn_blocking(move || image_check(avatar_clone)).await??; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; if let Some(avatar) = &self.avatar { let avatar_url: Url = avatar.parse()?; let relative_url = avatar_url.path().trim_start_matches('/'); - data.bunny_storage.delete(relative_url).await?; + app_state.bunny_storage.delete(relative_url).await?; } let path = format!("avatar/{}/{}.{}", self.uuid, Uuid::now_v7(), image_type); - data.bunny_storage - .upload(path.clone(), avatar.into()) - .await?; + app_state.bunny_storage.upload(path.clone(), avatar).await?; let avatar_url = cdn_url.join(&path)?; @@ -107,8 +105,8 @@ impl Me { .execute(&mut conn) .await?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await? + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await? } self.avatar = Some(avatar_url.to_string()); @@ -127,7 +125,11 @@ impl Me { Ok(()) } - pub async fn set_username(&mut self, data: &Data, new_username: String) -> Result<(), Error> { + pub async fn set_username( + &mut self, + app_state: &AppState, + new_username: String, + ) -> Result<(), Error> { if !USERNAME_REGEX.is_match(&new_username) || new_username.len() < 3 || new_username.len() > 32 @@ -135,7 +137,7 @@ impl Me { return Err(Error::BadRequest("Invalid username".to_string())); } - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use users::dsl; update(users::table) @@ -144,8 +146,8 @@ impl Me { .execute(&mut conn) .await?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await? + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await? } self.username = new_username; @@ -155,10 +157,10 @@ impl Me { pub async fn set_display_name( &mut self, - data: &Data, + app_state: &AppState, new_display_name: String, ) -> Result<(), Error> { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let new_display_name_option = if new_display_name.is_empty() { None @@ -173,8 +175,8 @@ impl Me { .execute(&mut conn) .await?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await? + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await? } self.display_name = new_display_name_option; @@ -182,12 +184,16 @@ impl Me { Ok(()) } - pub async fn set_email(&mut self, data: &Data, new_email: String) -> Result<(), Error> { + pub async fn set_email( + &mut self, + app_state: &AppState, + new_email: String, + ) -> Result<(), Error> { if !EMAIL_REGEX.is_match(&new_email) { return Err(Error::BadRequest("Invalid username".to_string())); } - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use users::dsl; update(users::table) @@ -199,8 +205,8 @@ impl Me { .execute(&mut conn) .await?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await? + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await? } self.email = new_email; @@ -208,8 +214,12 @@ impl Me { Ok(()) } - pub async fn set_pronouns(&mut self, data: &Data, new_pronouns: String) -> Result<(), Error> { - let mut conn = data.pool.get().await?; + pub async fn set_pronouns( + &mut self, + app_state: &AppState, + new_pronouns: String, + ) -> Result<(), Error> { + let mut conn = app_state.pool.get().await?; use users::dsl; update(users::table) @@ -218,15 +228,19 @@ impl Me { .execute(&mut conn) .await?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await? + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await? } Ok(()) } - pub async fn set_about(&mut self, data: &Data, new_about: String) -> Result<(), Error> { - let mut conn = data.pool.get().await?; + pub async fn set_about( + &mut self, + app_state: &AppState, + new_about: String, + ) -> Result<(), Error> { + let mut conn = app_state.pool.get().await?; use users::dsl; update(users::table) @@ -235,8 +249,8 @@ impl Me { .execute(&mut conn) .await?; - if data.get_cache_key(self.uuid.to_string()).await.is_ok() { - data.del_cache_key(self.uuid.to_string()).await? + if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { + app_state.del_cache_key(self.uuid.to_string()).await? } Ok(()) @@ -352,10 +366,10 @@ impl Me { Ok(()) } - pub async fn get_friends(&self, data: &Data) -> Result, Error> { + pub async fn get_friends(&self, app_state: &AppState) -> Result, Error> { use friends::dsl; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let friends1 = load_or_empty( dsl::friends @@ -374,16 +388,16 @@ impl Me { )?; let friend_futures = friends1.iter().map(async move |friend| { - User::fetch_one_with_friendship(data, self, friend.uuid2).await + User::fetch_one_with_friendship(app_state, self, friend.uuid2).await }); - let mut friends = futures::future::try_join_all(friend_futures).await?; + let mut friends = futures_util::future::try_join_all(friend_futures).await?; let friend_futures = friends2.iter().map(async move |friend| { - User::fetch_one_with_friendship(data, self, friend.uuid1).await + User::fetch_one_with_friendship(app_state, self, friend.uuid1).await }); - friends.append(&mut futures::future::try_join_all(friend_futures).await?); + friends.append(&mut futures_util::future::try_join_all(friend_futures).await?); Ok(friends) } diff --git a/src/objects/member.rs b/src/objects/member.rs index c2a71d9..50b76b0 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - Conn, Data, + AppState, Conn, error::Error, objects::{Me, Permissions, Role}, schema::guild_members, @@ -26,13 +26,13 @@ pub struct MemberBuilder { } impl MemberBuilder { - pub async fn build(&self, data: &Data, me: Option<&Me>) -> Result { + pub async fn build(&self, app_state: &AppState, me: Option<&Me>) -> Result { let user; if let Some(me) = me { - user = User::fetch_one_with_friendship(data, me, self.user_uuid).await?; + user = User::fetch_one_with_friendship(app_state, me, self.user_uuid).await?; } else { - user = User::fetch_one(data, self.user_uuid).await?; + user = User::fetch_one(app_state, self.user_uuid).await?; } Ok(Member { @@ -47,11 +47,11 @@ impl MemberBuilder { pub async fn check_permission( &self, - data: &Data, + app_state: &AppState, permission: Permissions, ) -> Result<(), Error> { if !self.is_owner { - let roles = Role::fetch_from_member(data, self.uuid).await?; + let roles = Role::fetch_from_member(app_state, self.uuid).await?; let allowed = roles.iter().any(|r| r.permissions & permission as i64 != 0); if !allowed { return Err(Error::Forbidden("Not allowed".to_string())); @@ -101,12 +101,12 @@ impl Member { } pub async fn fetch_one( - data: &Data, + app_state: &AppState, me: &Me, user_uuid: Uuid, guild_uuid: Uuid, ) -> Result { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use guild_members::dsl; let member: MemberBuilder = dsl::guild_members @@ -116,11 +116,15 @@ impl Member { .get_result(&mut conn) .await?; - member.build(data, Some(me)).await + member.build(app_state, Some(me)).await } - pub async fn fetch_all(data: &Data, me: &Me, guild_uuid: Uuid) -> Result, Error> { - let mut conn = data.pool.get().await?; + pub async fn fetch_all( + app_state: &AppState, + me: &Me, + guild_uuid: Uuid, + ) -> Result, Error> { + let mut conn = app_state.pool.get().await?; use guild_members::dsl; let member_builders: Vec = load_or_empty( @@ -134,14 +138,18 @@ impl Member { let mut members = vec![]; for builder in member_builders { - members.push(builder.build(&data, Some(me)).await?); + members.push(builder.build(app_state, Some(me)).await?); } Ok(members) } - pub async fn new(data: &Data, user_uuid: Uuid, guild_uuid: Uuid) -> Result { - let mut conn = data.pool.get().await?; + pub async fn new( + app_state: &AppState, + user_uuid: Uuid, + guild_uuid: Uuid, + ) -> Result { + let mut conn = app_state.pool.get().await?; let member_uuid = Uuid::now_v7(); @@ -158,6 +166,6 @@ impl Member { .execute(&mut conn) .await?; - member.build(data, None).await + member.build(app_state, None).await } } diff --git a/src/objects/message.rs b/src/objects/message.rs index a887541..caff969 100644 --- a/src/objects/message.rs +++ b/src/objects/message.rs @@ -2,7 +2,7 @@ use diesel::{Insertable, Queryable, Selectable}; use serde::Serialize; use uuid::Uuid; -use crate::{Data, error::Error, schema::messages}; +use crate::{AppState, error::Error, schema::messages}; use super::User; @@ -18,8 +18,8 @@ pub struct MessageBuilder { } impl MessageBuilder { - pub async fn build(&self, data: &Data) -> Result { - let user = User::fetch_one(data, self.user_uuid).await?; + pub async fn build(&self, app_state: &AppState) -> Result { + let user = User::fetch_one(app_state, self.user_uuid).await?; Ok(Message { uuid: self.uuid, diff --git a/src/objects/mod.rs b/src/objects/mod.rs index 9974410..4af16d8 100644 --- a/src/objects/mod.rs +++ b/src/objects/mod.rs @@ -42,6 +42,37 @@ pub trait HasUuid { pub trait HasIsAbove { fn is_above(&self) -> Option<&Uuid>; } +/* +pub trait Cookies { + fn cookies(&self) -> CookieJar; + fn cookie>(&self, cookie: T) -> Option; +} + +impl Cookies for Request { + fn cookies(&self) -> CookieJar { + let cookies = self.headers() + .get(axum::http::header::COOKIE) + .and_then(|value| value.to_str().ok()) + .map(|s| Cookie::split_parse(s.to_string())) + .and_then(|c| c.collect::, cookie::ParseError>>().ok()) + .unwrap_or(vec![]); + + let mut cookie_jar = CookieJar::new(); + + for cookie in cookies { + cookie_jar.add(cookie) + } + + cookie_jar + } + + fn cookie>(&self, cookie: T) -> Option { + self.cookies() + .get(cookie.as_ref()) + .and_then(|c| Some(c.to_owned())) + } +} +*/ fn load_or_empty( query_result: Result, diesel::result::Error>, diff --git a/src/objects/password_reset_token.rs b/src/objects/password_reset_token.rs index 7f714ef..04ff43c 100644 --- a/src/objects/password_reset_token.rs +++ b/src/objects/password_reset_token.rs @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - Data, + AppState, error::Error, schema::users, utils::{PASSWORD_REGEX, generate_token, global_checks, user_uuid_from_identifier}, @@ -24,10 +24,11 @@ pub struct PasswordResetToken { } impl PasswordResetToken { - pub async fn get(data: &Data, token: String) -> Result { - let user_uuid: Uuid = serde_json::from_str(&data.get_cache_key(token.to_string()).await?)?; + pub async fn get(app_state: &AppState, token: String) -> Result { + let user_uuid: Uuid = + serde_json::from_str(&app_state.get_cache_key(token.to_string()).await?)?; let password_reset_token = serde_json::from_str( - &data + &app_state .get_cache_key(format!("{user_uuid}_password_reset")) .await?, )?; @@ -36,15 +37,15 @@ impl PasswordResetToken { } pub async fn get_with_identifier( - data: &Data, + app_state: &AppState, identifier: String, ) -> Result { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let user_uuid = user_uuid_from_identifier(&mut conn, &identifier).await?; let password_reset_token = serde_json::from_str( - &data + &app_state .get_cache_key(format!("{user_uuid}_password_reset")) .await?, )?; @@ -53,14 +54,14 @@ impl PasswordResetToken { } #[allow(clippy::new_ret_no_self)] - pub async fn new(data: &Data, identifier: String) -> Result<(), Error> { + pub async fn new(app_state: &AppState, identifier: String) -> Result<(), Error> { let token = generate_token::<32>()?; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; let user_uuid = user_uuid_from_identifier(&mut conn, &identifier).await?; - global_checks(data, user_uuid).await?; + global_checks(app_state, user_uuid).await?; use users::dsl as udsl; let (username, email_address): (String, String) = udsl::users @@ -75,34 +76,37 @@ impl PasswordResetToken { created_at: Utc::now(), }; - data.set_cache_key( - format!("{user_uuid}_password_reset"), - password_reset_token, - 86400, - ) - .await?; - data.set_cache_key(token.clone(), user_uuid, 86400).await?; + app_state + .set_cache_key( + format!("{user_uuid}_password_reset"), + password_reset_token, + 86400, + ) + .await?; + app_state + .set_cache_key(token.clone(), user_uuid, 86400) + .await?; - let mut reset_endpoint = data.config.web.frontend_url.join("reset-password")?; + let mut reset_endpoint = app_state.config.web.frontend_url.join("reset-password")?; reset_endpoint.set_query(Some(&format!("token={token}"))); - let email = data + let email = app_state .mail_client .message_builder() .to(email_address.parse()?) - .subject(format!("{} Password Reset", data.config.instance.name)) + .subject(format!("{} Password Reset", app_state.config.instance.name)) .multipart(MultiPart::alternative_plain_html( - format!("{} Password Reset\n\nHello, {}!\nSomeone requested a password reset for your Gorb account.\nClick the button below within 24 hours to reset your password.\n\n{}\n\nIf you didn't request a password reset, don't worry, your account is safe and you can safely ignore this email.\n\nThanks, The gorb team.", data.config.instance.name, username, reset_endpoint), - format!(r#"

{} Password Reset

Hello, {}!

Someone requested a password reset for your Gorb account.

Click the button below within 24 hours to reset your password.

RESET PASSWORD

If you didn't request a password reset, don't worry, your account is safe and you can safely ignore this email.

Thanks
The gorb team.

"#, data.config.instance.name, username, reset_endpoint) + format!("{} Password Reset\n\nHello, {}!\nSomeone requested a password reset for your Gorb account.\nClick the button below within 24 hours to reset your password.\n\n{}\n\nIf you didn't request a password reset, don't worry, your account is safe and you can safely ignore this email.\n\nThanks, The gorb team.", app_state.config.instance.name, username, reset_endpoint), + format!(r#"

{} Password Reset

Hello, {}!

Someone requested a password reset for your Gorb account.

Click the button below within 24 hours to reset your password.

RESET PASSWORD

If you didn't request a password reset, don't worry, your account is safe and you can safely ignore this email.

Thanks
The gorb team.

"#, app_state.config.instance.name, username, reset_endpoint) ))?; - data.mail_client.send_mail(email).await?; + app_state.mail_client.send_mail(email).await?; Ok(()) } - pub async fn set_password(&self, data: &Data, password: String) -> Result<(), Error> { + pub async fn set_password(&self, app_state: &AppState, password: String) -> Result<(), Error> { if !PASSWORD_REGEX.is_match(&password) { return Err(Error::BadRequest( "Please provide a valid password".to_string(), @@ -111,12 +115,12 @@ impl PasswordResetToken { let salt = SaltString::generate(&mut OsRng); - let hashed_password = data + let hashed_password = app_state .argon2 .hash_password(password.as_bytes(), &salt) .map_err(|e| Error::PasswordHashError(e.to_string()))?; - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use users::dsl; update(users::table) @@ -131,27 +135,28 @@ impl PasswordResetToken { .get_result(&mut conn) .await?; - let login_page = data.config.web.frontend_url.join("login")?; + let login_page = app_state.config.web.frontend_url.join("login")?; - let email = data + let email = app_state .mail_client .message_builder() .to(email_address.parse()?) - .subject(format!("Your {} Password has been Reset", data.config.instance.name)) + .subject(format!("Your {} Password has been Reset", app_state.config.instance.name)) .multipart(MultiPart::alternative_plain_html( - format!("{} Password Reset Confirmation\n\nHello, {}!\nYour password has been successfully reset for your Gorb account.\nIf you did not initiate this change, please click the link below to reset your password immediately.\n\n{}\n\nThanks, The gorb team.", data.config.instance.name, username, login_page), - format!(r#"

{} Password Reset Confirmation

Hello, {}!

Your password has been successfully reset for your Gorb account.

If you did not initiate this change, please click the button below to reset your password immediately.

RESET PASSWORD

Thanks
The gorb team.

"#, data.config.instance.name, username, login_page) + format!("{} Password Reset Confirmation\n\nHello, {}!\nYour password has been successfully reset for your Gorb account.\nIf you did not initiate this change, please click the link below to reset your password immediately.\n\n{}\n\nThanks, The gorb team.", app_state.config.instance.name, username, login_page), + format!(r#"

{} Password Reset Confirmation

Hello, {}!

Your password has been successfully reset for your Gorb account.

If you did not initiate this change, please click the button below to reset your password immediately.

RESET PASSWORD

Thanks
The gorb team.

"#, app_state.config.instance.name, username, login_page) ))?; - data.mail_client.send_mail(email).await?; + app_state.mail_client.send_mail(email).await?; - self.delete(data).await + self.delete(app_state).await } - pub async fn delete(&self, data: &Data) -> Result<(), Error> { - data.del_cache_key(format!("{}_password_reset", &self.user_uuid)) + pub async fn delete(&self, app_state: &AppState) -> Result<(), Error> { + app_state + .del_cache_key(format!("{}_password_reset", &self.user_uuid)) .await?; - data.del_cache_key(self.token.to_string()).await?; + app_state.del_cache_key(self.token.to_string()).await?; Ok(()) } diff --git a/src/objects/role.rs b/src/objects/role.rs index 68e9c27..ea70686 100644 --- a/src/objects/role.rs +++ b/src/objects/role.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - Conn, Data, + AppState, Conn, error::Error, schema::{role_members, roles}, utils::order_by_is_above, @@ -74,12 +74,18 @@ impl Role { Ok(roles) } - pub async fn fetch_from_member(data: &Data, member_uuid: Uuid) -> Result, Error> { - if let Ok(roles) = data.get_cache_key(format!("{member_uuid}_roles")).await { + pub async fn fetch_from_member( + app_state: &AppState, + member_uuid: Uuid, + ) -> Result, Error> { + if let Ok(roles) = app_state + .get_cache_key(format!("{member_uuid}_roles")) + .await + { return Ok(serde_json::from_str(&roles)?); } - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; use role_members::dsl; let role_memberships: Vec = load_or_empty( @@ -96,7 +102,8 @@ impl Role { roles.push(membership.fetch_role(&mut conn).await?); } - data.set_cache_key(format!("{member_uuid}_roles"), roles.clone(), 300) + app_state + .set_cache_key(format!("{member_uuid}_roles"), roles.clone(), 300) .await?; Ok(roles) diff --git a/src/objects/user.rs b/src/objects/user.rs index 8e42351..c1f164d 100644 --- a/src/objects/user.rs +++ b/src/objects/user.rs @@ -4,7 +4,7 @@ use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::{Conn, Data, error::Error, objects::Me, schema::users}; +use crate::{AppState, Conn, error::Error, objects::Me, schema::users}; use super::load_or_empty; @@ -46,10 +46,10 @@ pub struct User { } impl User { - pub async fn fetch_one(data: &Data, user_uuid: Uuid) -> Result { - let mut conn = data.pool.get().await?; + pub async fn fetch_one(app_state: &AppState, user_uuid: Uuid) -> Result { + let mut conn = app_state.pool.get().await?; - if let Ok(cache_hit) = data.get_cache_key(user_uuid.to_string()).await { + if let Ok(cache_hit) = app_state.get_cache_key(user_uuid.to_string()).await { return Ok(serde_json::from_str(&cache_hit)?); } @@ -62,20 +62,21 @@ impl User { let user = user_builder.build(); - data.set_cache_key(user_uuid.to_string(), user.clone(), 1800) + app_state + .set_cache_key(user_uuid.to_string(), user.clone(), 1800) .await?; Ok(user) } pub async fn fetch_one_with_friendship( - data: &Data, + app_state: &AppState, me: &Me, user_uuid: Uuid, ) -> Result { - let mut conn = data.pool.get().await?; + let mut conn = app_state.pool.get().await?; - let mut user = Self::fetch_one(data, user_uuid).await?; + let mut user = Self::fetch_one(app_state, user_uuid).await?; if let Some(friend) = me.friends_with(&mut conn, user_uuid).await? { user.friends_since = Some(friend.accepted_at); diff --git a/src/schema.rs b/src/schema.rs index 2693b02..4095dcd 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -103,7 +103,7 @@ diesel::table! { token -> Varchar, uuid -> Uuid, created_at -> Int8, - #[max_length = 16] + #[max_length = 64] device_name -> Varchar, } } diff --git a/src/socket.rs b/src/socket.rs new file mode 100644 index 0000000..3fcae32 --- /dev/null +++ b/src/socket.rs @@ -0,0 +1,28 @@ +use std::sync::Arc; + +use log::info; +use rmpv::Value; +use socketioxide::extract::{AckSender, Data, SocketRef, State}; + +use crate::AppState; + +pub async fn on_connect( + State(_app_state): State>, + socket: SocketRef, + Data(data): Data, +) { + socket.emit("auth", &data).ok(); + + socket.on("message", async |socket: SocketRef, Data::(data)| { + info!("{data}"); + socket.emit("message-back", &data).ok(); + }); + + socket.on( + "message-with-ack", + async |Data::(data), ack: AckSender| { + info!("{data}"); + ack.send(&data).ok(); + }, + ); +} diff --git a/src/utils.rs b/src/utils.rs index 072143f..e1df906 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,10 +1,8 @@ +use rand::seq::IndexedRandom; use std::sync::LazyLock; -use actix_web::{ - cookie::{Cookie, SameSite, time::Duration}, - http::header::HeaderMap, - web::BytesMut, -}; +use axum::body::Bytes; +use axum_extra::extract::cookie::{Cookie, SameSite}; use bindet::FileType; use diesel::{ExpressionMethods, QueryDsl}; use diesel_async::RunQueryDsl; @@ -13,14 +11,16 @@ use hex::encode; use redis::RedisError; use regex::Regex; use serde::Serialize; +use time::Duration; use uuid::Uuid; use crate::{ - Conn, Data, + AppState, Conn, config::Config, error::Error, objects::{HasIsAbove, HasUuid}, schema::users, + wordlist::{ADJECTIVES, ANIMALS}, }; pub static EMAIL_REGEX: LazyLock = LazyLock::new(|| { @@ -33,86 +33,16 @@ pub static USERNAME_REGEX: LazyLock = pub static CHANNEL_REGEX: LazyLock = LazyLock::new(|| Regex::new(r"^[a-z0-9_.-]+$").unwrap()); -// Password is expected to be hashed using SHA3-384 pub static PASSWORD_REGEX: LazyLock = LazyLock::new(|| Regex::new(r"[0-9a-f]{96}").unwrap()); -pub fn get_auth_header(headers: &HeaderMap) -> Result<&str, Error> { - let auth_token = headers.get(actix_web::http::header::AUTHORIZATION); - - if auth_token.is_none() { - return Err(Error::Unauthorized( - "No authorization header provided".to_string(), - )); - } - - let auth_raw = auth_token.unwrap().to_str()?; - - let mut auth = auth_raw.split_whitespace(); - - let auth_type = auth.next(); - - let auth_value = auth.next(); - - if auth_type.is_none() { - return Err(Error::BadRequest( - "Authorization header is empty".to_string(), - )); - } else if auth_type.is_some_and(|at| at != "Bearer") { - return Err(Error::BadRequest( - "Only token auth is supported".to_string(), - )); - } - - if auth_value.is_none() { - return Err(Error::BadRequest("No token provided".to_string())); - } - - Ok(auth_value.unwrap()) -} - -pub fn get_ws_protocol_header(headers: &HeaderMap) -> Result<&str, Error> { - let auth_token = headers.get(actix_web::http::header::SEC_WEBSOCKET_PROTOCOL); - - if auth_token.is_none() { - return Err(Error::Unauthorized( - "No authorization header provided".to_string(), - )); - } - - let auth_raw = auth_token.unwrap().to_str()?; - - let mut auth = auth_raw.split_whitespace(); - - let response_proto = auth.next(); - - let auth_value = auth.next(); - - if response_proto.is_none() { - return Err(Error::BadRequest( - "Sec-WebSocket-Protocol header is empty".to_string(), - )); - } else if response_proto.is_some_and(|rp| rp != "Authorization,") { - return Err(Error::BadRequest( - "First protocol should be Authorization".to_string(), - )); - } - - if auth_value.is_none() { - return Err(Error::BadRequest("No token provided".to_string())); - } - - Ok(auth_value.unwrap()) -} - -pub fn new_refresh_token_cookie(config: &Config, refresh_token: String) -> Cookie<'static> { - Cookie::build("refresh_token", refresh_token) +pub fn new_refresh_token_cookie(config: &Config, refresh_token: String) -> Cookie { + Cookie::build(("refresh_token", refresh_token)) .http_only(true) .secure(true) .same_site(SameSite::None) - //.domain(config.web.backend_url.domain().unwrap().to_string()) .path(config.web.backend_url.path().to_string()) .max_age(Duration::days(30)) - .finish() + .build() } pub fn generate_token() -> Result { @@ -121,7 +51,7 @@ pub fn generate_token() -> Result { Ok(encode(buf)) } -pub fn image_check(icon: BytesMut) -> Result { +pub fn image_check(icon: Bytes) -> Result { let buf = std::io::Cursor::new(icon); let detect = bindet::detect(buf).map_err(|e| e.kind()); @@ -168,10 +98,7 @@ pub async fn user_uuid_from_identifier( } } -pub async fn user_uuid_from_username( - conn: &mut Conn, - username: &String, -) -> Result { +pub async fn user_uuid_from_username(conn: &mut Conn, username: &String) -> Result { if USERNAME_REGEX.is_match(username) { use users::dsl; let user_uuid = dsl::users @@ -188,9 +115,9 @@ pub async fn user_uuid_from_username( } } -pub async fn global_checks(data: &Data, user_uuid: Uuid) -> Result<(), Error> { - if data.config.instance.require_email_verification { - let mut conn = data.pool.get().await?; +pub async fn global_checks(app_state: &AppState, user_uuid: Uuid) -> Result<(), Error> { + if app_state.config.instance.require_email_verification { + let mut conn = app_state.pool.get().await?; use users::dsl; let email_verified: bool = dsl::users @@ -234,7 +161,7 @@ where Ok(ordered) } -impl Data { +impl AppState { pub async fn set_cache_key( &self, key: String, @@ -282,3 +209,12 @@ impl Data { .await } } + +pub fn generate_device_name() -> String { + let mut rng = rand::rng(); + + let adjective = ADJECTIVES.choose(&mut rng).unwrap(); + let animal = ANIMALS.choose(&mut rng).unwrap(); + + [*adjective, *animal].join(" ") +} diff --git a/src/wordlist.rs b/src/wordlist.rs new file mode 100644 index 0000000..1227c1f --- /dev/null +++ b/src/wordlist.rs @@ -0,0 +1,993 @@ +pub const ANIMALS: [&str; 223] = [ + "Aardvark", + "Albatross", + "Alligator", + "Alpaca", + "Ant", + "Anteater", + "Antelope", + "Ape", + "Armadillo", + "Donkey", + "Baboon", + "Badger", + "Barracuda", + "Bat", + "Bear", + "Beaver", + "Bee", + "Bison", + "Boar", + "Buffalo", + "Butterfly", + "Camel", + "Capybara", + "Caribou", + "Cassowary", + "Cat", + "Caterpillar", + "Cattle", + "Chamois", + "Cheetah", + "Chicken", + "Chimpanzee", + "Chinchilla", + "Chough", + "Clam", + "Cobra", + "Cockroach", + "Cod", + "Cormorant", + "Coyote", + "Crab", + "Crane", + "Crocodile", + "Crow", + "Curlew", + "Deer", + "Dinosaur", + "Dog", + "Dogfish", + "Dolphin", + "Dotterel", + "Dove", + "Dragonfly", + "Duck", + "Dugong", + "Dunlin", + "Eagle", + "Echidna", + "Eel", + "Eland", + "Elephant", + "Elk", + "Emu", + "Falcon", + "Ferret", + "Finch", + "Fish", + "Flamingo", + "Fly", + "Fox", + "Frog", + "Gaur", + "Gazelle", + "Gerbil", + "Giraffe", + "Gnat", + "Gnu", + "Goat", + "Goldfinch", + "Goldfish", + "Goose", + "Gorilla", + "Goshawk", + "Grasshopper", + "Grouse", + "Guanaco", + "Gull", + "Hamster", + "Hare", + "Hawk", + "Hedgehog", + "Heron", + "Herring", + "Hippopotamus", + "Hornet", + "Horse", + "Hummingbird", + "Hyena", + "Ibex", + "Ibis", + "Jackal", + "Jaguar", + "Jay", + "Jellyfish", + "Kangaroo", + "Kingfisher", + "Koala", + "Kookabura", + "Kouprey", + "Kudu", + "Lapwing", + "Lark", + "Lemur", + "Leopard", + "Lion", + "Llama", + "Lobster", + "Locust", + "Loris", + "Louse", + "Lyrebird", + "Magpie", + "Mallard", + "Manatee", + "Mandrill", + "Mantis", + "Marten", + "Meerkat", + "Mink", + "Mole", + "Mongoose", + "Monkey", + "Moose", + "Mosquito", + "Mouse", + "Mule", + "Narwhal", + "Newt", + "Nightingale", + "Octopus", + "Okapi", + "Opossum", + "Oryx", + "Ostrich", + "Otter", + "Owl", + "Oyster", + "Panther", + "Parrot", + "Partridge", + "Peafowl", + "Pelican", + "Penguin", + "Pheasant", + "Pig", + "Pigeon", + "Pony", + "Porcupine", + "Porpoise", + "Quail", + "Quelea", + "Quetzal", + "Rabbit", + "Raccoon", + "Rail", + "Ram", + "Rat", + "Raven", + "Red Deer", + "Red Panda", + "Reindeer", + "Rhinoceros", + "Rook", + "Salamander", + "Salmon", + "Sand Dollar", + "Sandpiper", + "Sardine", + "Scorpion", + "Seahorse", + "Seal", + "Shark", + "Sheep", + "Shrew", + "Skunk", + "Snail", + "Snake", + "Sparrow", + "Spider", + "Spoonbill", + "Squid", + "Squirrel", + "Starling", + "Stingray", + "Stinkbug", + "Stork", + "Swallow", + "Swan", + "Tapir", + "Tarsier", + "Termite", + "Tiger", + "Toad", + "Trout", + "Turkey", + "Turtle", + "Viper", + "Vulture", + "Wallaby", + "Walrus", + "Wasp", + "Weasel", + "Whale", + "Wildcat", + "Wolf", + "Wolverine", + "Wombat", + "Woodcock", + "Woodpecker", + "Worm", + "Wren", + "Yak", + "Zebra", +]; + +pub const ADJECTIVES: [&str; 765] = [ + "Other", + "Such", + "First", + "Many", + "New", + "More", + "Same", + "Own", + "Good", + "Different", + "Great", + "Long", + "High", + "Social", + "Little", + "Much", + "Important", + "Small", + "Most", + "Large", + "Old", + "Few", + "General", + "Second", + "Public", + "Last", + "Several", + "Early", + "Certain", + "Economic", + "Least", + "Common", + "Present", + "Next", + "Local", + "Best", + "Particular", + "Young", + "Various", + "Necessary", + "Whole", + "Only", + "True", + "Able", + "Major", + "Full", + "Low", + "Available", + "Real", + "Similar", + "Total", + "Special", + "Less", + "Short", + "Specific", + "Single", + "Self", + "National", + "Individual", + "Clear", + "Personal", + "Higher", + "Better", + "Third", + "Natural", + "Greater", + "Open", + "Difficult", + "Current", + "Further", + "Main", + "Physical", + "Foreign", + "Lower", + "Strong", + "Private", + "Likely", + "International", + "Significant", + "Late", + "Basic", + "Hard", + "Modern", + "Simple", + "Normal", + "Sure", + "Central", + "Original", + "Effective", + "Following", + "Direct", + "Final", + "Cultural", + "Big", + "Recent", + "Complete", + "Financial", + "Positive", + "Primary", + "Appropriate", + "Legal", + "European", + "Equal", + "Larger", + "Average", + "Historical", + "Critical", + "Wide", + "Traditional", + "Additional", + "Active", + "Complex", + "Former", + "Independent", + "Entire", + "Actual", + "Close", + "Constant", + "Previous", + "Easy", + "Serious", + "Potential", + "Fine", + "Industrial", + "Subject", + "Future", + "Internal", + "Initial", + "Well", + "Essential", + "Dark", + "Popular", + "Successful", + "Standard", + "Year", + "Past", + "Ready", + "Professional", + "Wrong", + "Very", + "Proper", + "Separate", + "Heavy", + "Civil", + "Responsible", + "Considerable", + "Light", + "Cold", + "Above", + "Older", + "Practical", + "External", + "Sufficient", + "Interesting", + "Upper", + "Scientific", + "Key", + "Annual", + "Limited", + "Smaller", + "Southern", + "Earlier", + "Commercial", + "Powerful", + "Later", + "Like", + "Clinical", + "Ancient", + "Educational", + "Typical", + "Technical", + "Environmental", + "Formal", + "Aware", + "Beautiful", + "Variable", + "Obvious", + "Secondary", + "Enough", + "Urban", + "Regular", + "Relevant", + "Greatest", + "Spiritual", + "Time", + "Double", + "Happy", + "Term", + "Multiple", + "Dependent", + "Correct", + "Northern", + "Middle", + "Rural", + "Official", + "Fundamental", + "Numerous", + "Overall", + "Usual", + "Native", + "Regional", + "Highest", + "North", + "Agricultural", + "Literary", + "Broad", + "Perfect", + "Experimental", + "Fourth", + "Global", + "Ordinary", + "Related", + "Apparent", + "Daily", + "Principal", + "Contemporary", + "Severe", + "Reasonable", + "Subsequent", + "Worth", + "Longer", + "Emotional", + "Intellectual", + "Unique", + "Pure", + "Familiar", + "American", + "Solid", + "Brief", + "Famous", + "Fresh", + "Day", + "Corresponding", + "Characteristic", + "Maximum", + "Detailed", + "Outside", + "Theoretical", + "Fair", + "Opposite", + "Capable", + "Visual", + "Interested", + "Joint", + "Adequate", + "Based", + "Substantial", + "Unable", + "Structural", + "Soft", + "False", + "Largest", + "Inner", + "Mean", + "Extensive", + "Excellent", + "Rapid", + "Absolute", + "Consistent", + "Continuous", + "Administrative", + "Strange", + "Willing", + "Alternative", + "Slow", + "Distinct", + "Safe", + "Permanent", + "Front", + "Corporate", + "Academic", + "Thin", + "Nineteenth", + "Universal", + "Functional", + "Unknown", + "Careful", + "Narrow", + "Evident", + "Sound", + "Classical", + "Minor", + "Weak", + "Suitable", + "Chief", + "Extreme", + "Yellow", + "Warm", + "Mixed", + "Flat", + "Huge", + "Vast", + "Stable", + "Valuable", + "Rare", + "Visible", + "Sensitive", + "Mechanical", + "State", + "Radical", + "Extra", + "Superior", + "Conventional", + "Thick", + "Dominant", + "Post", + "Collective", + "Younger", + "Efficient", + "Linear", + "Organic", + "Oral", + "Century", + "Creative", + "Vertical", + "Dynamic", + "Empty", + "Minimum", + "Cognitive", + "Logical", + "Afraid", + "Equivalent", + "Quick", + "Near", + "Concrete", + "Mass", + "Acute", + "Sharp", + "Easier", + "Quiet", + "Adult", + "Accurate", + "Ideal", + "Partial", + "Bright", + "Identical", + "Conservative", + "Magnetic", + "Frequent", + "Electronic", + "Fixed", + "Square", + "Cross", + "Clean", + "Back", + "Organizational", + "Constitutional", + "Genetic", + "Ultimate", + "Secret", + "Vital", + "Dramatic", + "Objective", + "Round", + "Alive", + "Straight", + "Unusual", + "Rational", + "Electric", + "Mutual", + "Class", + "Competitive", + "Revolutionary", + "Statistical", + "Random", + "Musical", + "Crucial", + "Racial", + "Sudden", + "Acid", + "Content", + "Temporary", + "Line", + "Remarkable", + "Exact", + "Valid", + "Helpful", + "Nice", + "Comprehensive", + "United", + "Level", + "Fifth", + "Nervous", + "Expensive", + "Prominent", + "Healthy", + "Liquid", + "Institutional", + "Silent", + "Sweet", + "Strategic", + "Molecular", + "Comparative", + "Called", + "Electrical", + "Raw", + "Acceptable", + "Scale", + "Violent", + "All", + "Desirable", + "Tall", + "Steady", + "Wonderful", + "Sub", + "Distant", + "Progressive", + "Enormous", + "Horizontal", + "And", + "Intense", + "Smooth", + "Applicable", + "Over", + "Animal", + "Abstract", + "Wise", + "Worst", + "Gold", + "Precise", + "Legislative", + "Remote", + "Technological", + "Outer", + "Uniform", + "Slight", + "Attractive", + "Evil", + "Tiny", + "Royal", + "Angry", + "Advanced", + "Friendly", + "Dear", + "Busy", + "Spatial", + "Rough", + "Primitive", + "Judicial", + "Systematic", + "Lateral", + "Sorry", + "Plain", + "Off", + "Comfortable", + "Definite", + "Massive", + "Firm", + "Widespread", + "Prior", + "Twentieth", + "Mathematical", + "Verbal", + "Marginal", + "Excessive", + "Stronger", + "Gross", + "World", + "Productive", + "Wider", + "Glad", + "Linguistic", + "Patient", + "Symbolic", + "Earliest", + "Plastic", + "Type", + "Prime", + "Eighteenth", + "Blind", + "Neutral", + "Guilty", + "Hand", + "Extraordinary", + "Metal", + "Surprising", + "Fellow", + "York", + "Grand", + "Thermal", + "Artificial", + "Five", + "Lowest", + "Genuine", + "Dimensional", + "Optical", + "Unlikely", + "Developmental", + "Reliable", + "Executive", + "Comparable", + "Satisfactory", + "Golden", + "Diverse", + "Preliminary", + "Wooden", + "Noble", + "Part", + "Striking", + "Cool", + "Classic", + "Elderly", + "Four", + "Temporal", + "Indirect", + "Romantic", + "Intermediate", + "Differential", + "Passive", + "Life", + "Voluntary", + "Out", + "Adjacent", + "Behavioral", + "Exclusive", + "Closed", + "Inherent", + "Inevitable", + "Complicated", + "Quantitative", + "Respective", + "Artistic", + "Probable", + "Anxious", + "Informal", + "Strict", + "Fiscal", + "Ideological", + "Profound", + "Extended", + "Eternal", + "Known", + "Infinite", + "Proud", + "Honest", + "Peculiar", + "Absent", + "Pleasant", + "Optimal", + "Renal", + "Static", + "Outstanding", + "Presidential", + "Digital", + "Integrated", + "Legitimate", + "Curious", + "Aggressive", + "Deeper", + "Elementary", + "History", + "Surgical", + "Occasional", + "Flexible", + "Convenient", + "Solar", + "Atomic", + "Isolated", + "Latest", + "Sad", + "Conceptual", + "Underlying", + "Everyday", + "Cost", + "Intensive", + "Odd", + "Subjective", + "Mid", + "Worthy", + "Pale", + "Meaningful", + "Therapeutic", + "Making", + "Circular", + "Realistic", + "Multi", + "Child", + "Sophisticated", + "Down", + "Leading", + "Intelligent", + "Governmental", + "Numerical", + "Minimal", + "Diagnostic", + "Indigenous", + "Aesthetic", + "Distinctive", + "Operational", + "Sole", + "Material", + "Fast", + "Bitter", + "Broader", + "Brilliant", + "Peripheral", + "Rigid", + "Automatic", + "Lesser", + "Routine", + "Favorable", + "Cooperative", + "Cardiac", + "Arbitrary", + "Loose", + "Favorite", + "Subtle", + "Uncertain", + "Hostile", + "Monthly", + "Naval", + "Physiological", + "Historic", + "Developed", + "Skilled", + "Anterior", + "Pro", + "Gentle", + "Loud", + "Pulmonary", + "Innocent", + "Provincial", + "Mild", + "Page", + "Specialized", + "Bare", + "Excess", + "Inter", + "Shaped", + "Theological", + "Sensory", + "The", + "Stress", + "Novel", + "Working", + "Shorter", + "Secular", + "Geographical", + "Intimate", + "Liable", + "Selective", + "Influential", + "Modest", + "Successive", + "Continued", + "Water", + "Expert", + "Municipal", + "Marine", + "Thirty", + "Adverse", + "Wacky", + "Closer", + "Virtual", + "Peaceful", + "Mobile", + "Sixth", + "Immune", + "Coastal", + "Representative", + "Lead", + "Forward", + "Faithful", + "Crystal", + "Protective", + "Elaborate", + "Tremendous", + "Welcoming", + "Abnormal", + "Grateful", + "Proportional", + "Dual", + "Operative", + "Precious", + "Sympathetic", + "Accessible", + "Lovely", + "Spinal", + "Even", + "Marked", + "Observed", + "Point", + "Mature", + "Competent", + "Residential", + "Impressive", + "Unexpected", + "Nearby", + "Unnecessary", + "Generous", + "Cerebral", + "Unpublished", + "Delicate", + "Analytical", + "Tropical", + "Statutory", + "Cell", + "Weekly", + "End", + "Online", + "Beneficial", + "Aged", + "Tough", + "Eager", + "Ongoing", + "Silver", + "Persistent", + "Calm", + "Nearest", + "Hidden", + "Magic", + "Pretty", + "Wealthy", + "Exciting", + "Decisive", + "Confident", + "Invisible", + "Notable", + "Medium", + "Manual", + "Select", + "Thorough", + "Causal", + "Giant", + "Bigger", + "Pink", + "Improved", + "Immense", + "Hour", + "Intact", + "Grade", + "Dense", + "Hungry", + "Biggest", + "Abundant", + "Handsome", + "Retail", + "Insufficient", + "Irregular", + "Intrinsic", + "Residual", + "Follow", + "Fluid", + "Mysterious", + "Descriptive", + "Elastic", + "Destructive", + "Architectural", + "Synthetic", + "Continental", + "Evolutionary", + "Lucky", + "Bold", + "Funny", + "Peak", + "Smallest", + "Reluctant", + "Suspicious", + "Smart", + "Mighty", + "Brave", + "Humble", + "Vocal", + "Obscure", + "Innovative", +];