diff --git a/docker-compose_dev.yml b/docker-compose_dev.yml index ac3c228..93d4bf1 100644 --- a/docker-compose_dev.yml +++ b/docker-compose_dev.yml @@ -14,7 +14,7 @@ services: POSTGRES_USER: kalkutago POSTGRES_DB: kalkutago POSTGRES_HOST: database - secrets: [ postgres-password, cookie-secret ] + secrets: [ postgres-password ] depends_on: [ database ] expose: [ 8000 ] # ports: @@ -25,7 +25,6 @@ services: labels: traefik.enable: true traefik.http.routers.kalkutago_server.rule: 'Host(`kalkutago`) && PathPrefix(`/api`)' - database: image: postgres environment: @@ -66,8 +65,6 @@ services: secrets: postgres-password: file: ./server/postgres.pw - cookie-secret: - file: ./server/cookie-secret.pw networks: internal: diff --git a/docker-compose_prod.yml b/docker-compose_prod.yml index 71405e1..cb57656 100644 --- a/docker-compose_prod.yml +++ b/docker-compose_prod.yml @@ -32,8 +32,6 @@ services: secrets: postgres-password: file: ./server/postgres.pw - cookie-secret: - file: ./server/cookie-secret.pw networks: internal: diff --git a/server/Cargo.lock b/server/Cargo.lock index 8aa8a7d..59054fd 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -8,41 +8,6 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.7.6" @@ -177,19 +142,6 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" -[[package]] -name = "bcrypt" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df288bec72232f78c1ec5fe4e8f1d108aa0265476e93097593c803c8c02062a" -dependencies = [ - "base64 0.21.2", - "blowfish", - "getrandom", - "subtle", - "zeroize", -] - [[package]] name = "bigdecimal" version = "0.3.1" @@ -240,16 +192,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blowfish" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" -dependencies = [ - "byteorder", - "cipher", -] - [[package]] name = "borsh" version = "0.10.3" @@ -363,16 +305,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" version = "3.2.25" @@ -415,13 +347,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ - "aes-gcm", - "base64 0.21.2", - "hkdf", "percent-encoding", - "rand", - "sha2", - "subtle", "time 0.3.22", "version_check", ] @@ -467,19 +393,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "darling" version = "0.14.4" @@ -546,17 +462,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_deref" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "devise" version = "0.4.1" @@ -851,16 +756,6 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", -] - [[package]] name = "glob" version = "0.3.1" @@ -1094,15 +989,6 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" @@ -1163,10 +1049,8 @@ dependencies = [ name = "kalkutago-server" version = "0.1.0" dependencies = [ - "bcrypt", "chrono", "derive_builder", - "derive_deref", "either", "femme", "log", @@ -1365,12 +1249,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "os_str_bytes" version = "6.5.1" @@ -1501,18 +1379,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "polyval" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2833,16 +2699,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -3154,9 +3010,3 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zeroize" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/server/Cargo.toml b/server/Cargo.toml index f34bc6b..eddfb63 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -13,9 +13,7 @@ path = "src/main.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bcrypt = "0.14.0" chrono = "0.4.26" -derive_deref = "1.1.1" femme = "2.2.1" log = { version = "0.4.19", features = ["kv_unstable", "kv_unstable_serde"] } sea-orm-migration = "0.11.3" @@ -42,7 +40,7 @@ features = [ [dependencies.rocket] git = "https://github.com/SergioBenitez/Rocket" rev = "v0.5.0-rc.3" -features = ["json", "secrets"] +features = ["json"] [dependencies.serde] version = "1.0.163" diff --git a/server/src/api/auth.rs b/server/src/api/auth.rs deleted file mode 100644 index 6bb75e9..0000000 --- a/server/src/api/auth.rs +++ /dev/null @@ -1,83 +0,0 @@ -use derive_deref::Deref; -use log::warn; -use rocket::{ - http::{Cookie, CookieJar, Status}, - outcome::IntoOutcome, - request::{self, FromRequest}, - serde::json::Json, - Request, State, -}; -use sea_orm::{prelude::*, DatabaseConnection}; -use serde::Deserialize; - -use crate::{ - api::error::ApiResult, - entities::{prelude::*, *}, - error::Error, -}; - -#[derive(Clone, Deserialize)] -pub(super) struct LoginData { - name: String, - password: String, -} - -#[put("/", data = "", format = "application/json")] -pub(super) async fn login( - db: &State, - user_data: Json, - cookies: &CookieJar<'_>, -) -> ApiResult { - let users = User::find() - .filter(user::Column::Name.eq(&user_data.name)) - .all(db as &DatabaseConnection) - .await - .map_err(Error::from)?; - if users.len() > 1 { - warn!(count = users.len(), name = &user_data.name; "multiple entries found in database for user"); - } - let Some(user) = users.get(0) else { - return Ok(Status::Unauthorized); - }; - cookies.add_private(Cookie::new( - "user", - serde_json::to_string(&user).map_err(Error::from)?, - )); - Ok(Status::Ok) -} - -#[post("/", data = "", format = "application/json")] -pub(super) async fn sign_up( - db: &State, - user_data: Json, - cookies: &CookieJar<'_>, -) -> ApiResult<()> { - let user_data = user::ActiveModel::new(&user_data.name, &user_data.password)? - .insert(db as &DatabaseConnection) - .await - .map_err(Error::from)?; - cookies.add_private(Cookie::new( - "user", - serde_json::to_string(&user_data).map_err(Error::from)?, - )); - Ok(()) -} - -/// Authentication guard -#[derive(Deref)] -pub(super) struct Auth(user::Model); - -#[rocket::async_trait] -impl<'r> FromRequest<'r> for Auth { - type Error = (); - async fn from_request(request: &'r Request<'_>) -> request::Outcome { - let unauthorized = (Status::Unauthorized, ()); - let Some(user) = request.cookies().get_private("user") else { - return request::Outcome::Failure(unauthorized); - }; - serde_json::from_str(user.value()) - .ok() - .map(|user| Auth(user)) - .into_outcome(unauthorized) - } -} diff --git a/server/src/api/error.rs b/server/src/api/error.rs index 5689ed4..602ca1d 100644 --- a/server/src/api/error.rs +++ b/server/src/api/error.rs @@ -2,11 +2,11 @@ use crate::error::Error; #[derive(Responder)] #[response(status = 500, content_type = "json")] -pub struct ErrorResponder { +pub(crate) struct ErrorResponder { message: String, } -pub type ApiResult = Result; +pub(crate) type ApiResult = Result; // The following impl's are for easy conversion of error types. diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs index f4386a8..bec41f1 100644 --- a/server/src/api/mod.rs +++ b/server/src/api/mod.rs @@ -1,4 +1,3 @@ -mod auth; mod error; mod groups; #[cfg(feature = "unsafe_import")] @@ -9,13 +8,11 @@ pub(crate) mod update; use std::{ default::default, - env, fs, net::{IpAddr, Ipv4Addr}, }; use crate::error::Error; use rocket::{ - config::SecretKey, fs::{FileServer, NamedFile}, response::stream::EventStream, routes, Build, Config, Rocket, State, @@ -64,16 +61,6 @@ async fn spa_index_redirect() -> ApiResult { .map_err(Error::from)?) } -fn get_secret() -> [u8; 32] { - let path = - env::var("COOKIE_SECRET_FILE").unwrap_or_else(|_| "/run/secrets/cookie-secret".into()); - let file_contents = - fs::read(&path).unwrap_or_else(|err| panic!("failed to read from {path:?}: {err:?}")); - let mut data = [0u8; 32]; - data.copy_from_slice(&file_contents); - data -} - pub(crate) fn start_server(db: DatabaseConnection) -> Rocket { use groups::*; use ticks::*; @@ -82,7 +69,6 @@ pub(crate) fn start_server(db: DatabaseConnection) -> Rocket { let it = rocket::build() .configure(Config { address: IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), - secret_key: SecretKey::derive_from(&get_secret()), ..default() }) .register("/", catchers![spa_index_redirect]) @@ -112,7 +98,6 @@ pub(crate) fn start_server(db: DatabaseConnection) -> Rocket { "/api/v1/groups", routes![all_groups, group, insert_group, update_group, delete_group], ) - .mount("/api/v1/auth", routes![auth::login, auth::sign_up]) .mount("/", FileServer::from("/src/public")); #[cfg(feature = "unsafe_import")] diff --git a/server/src/api/tracks.rs b/server/src/api/tracks.rs index 7c59ca2..edfa616 100644 --- a/server/src/api/tracks.rs +++ b/server/src/api/tracks.rs @@ -1,72 +1,51 @@ -use std::convert::Infallible; -use std::default::default; - -use crate::api::auth::Auth; use crate::api::{self, error::ApiResult}; use crate::entities::{prelude::*, *}; use crate::error::Error; use either::Either::{self, Left, Right}; use rocket::http::Status; use rocket::{serde::json::Json, State}; -use sea_orm::{prelude::*, DatabaseConnection, IntoActiveModel, Statement, TryIntoModel}; +use sea_orm::{prelude::*, DatabaseConnection}; use tokio::sync::broadcast::Sender; use super::update::Update; -use super::ErrorResponder; #[get("/")] pub(super) async fn all_tracks( db: &State, - authorized_user: Auth, ) -> ApiResult>> { let db = db as &DatabaseConnection; - let tracks = authorized_user - .find_related(Tracks) - .all(db) - .await - .map_err(Error::from)?; + let tracks = Tracks::find().all(db).await.unwrap(); Ok(Json(tracks)) } -async fn get_track_check_user( - db: &DatabaseConnection, - track_id: i32, - user: &user::Model, -) -> Result, Either> { - if let Some(Some(user)) = user - .find_related(Tracks) - .filter(tracks::Column::Id.eq(track_id)) - .one(db) - .await - .transpose() - .map(|it| it.ok()) - { - Ok(Json(user)) - } else { - Err(Left(Status::NotFound)) - } -} - #[get("/")] pub(super) async fn track( db: &State, id: i32, - auth: Auth, ) -> Result, Either> { - get_track_check_user(db, id, &*auth).await + let db = db as &DatabaseConnection; + match Tracks::find_by_id(id).one(db).await { + Ok(Some(track)) => Ok(Json(track)), + Ok(None) => Err(Left(Status::NotFound)), + Err(err) => Err(Right(Error::from(err).into())), + } } #[get("//ticks")] pub(super) async fn ticks_for_track( db: &State, id: i32, - auth: Auth, ) -> Result>, Either> { let db = db as &DatabaseConnection; - let track = get_track_check_user(db, id, &*auth).await?; - let result = track.find_related(Ticks).all(db).await; - match result { - Ok(ticks) => Ok(Json(ticks)), + match Tracks::find_by_id(id).one(db).await { + Ok(Some(track)) => { + let result = track.find_related(Ticks).all(db).await; + match result { + Ok(ticks) => Ok(Json(ticks)), + Err(err) => Err(Right(Error::from(err).into())), + } + } + Ok(None) => Err(Left(Status::NotFound)), Err(err) => Err(Right(Error::from(err).into())), } } @@ -76,59 +55,13 @@ pub(super) async fn insert_track( db: &State, tx: &State>, track: Json, - auth: Auth, -) -> Result, Either> { - fn bad() -> Either { - Left(Status::BadRequest) - } - let track = track.0.as_object().ok_or_else(bad)?; - let Some(track_id) = db - .query_one(Statement::from_sql_and_values( - sea_orm::DatabaseBackend::Postgres, - "insert into $1 (user_id, track_id) values ( - $2, ( - insert into $3 ( - name, description, icon, enabled, multiple_entries_per_day, - color, order - ) values ( - $4, $5, $6, $7, $8, $9, $10, - ) returning id - ) - ) returning track_id;", - [ - user_tracks::Entity::default().table_name().into(), - auth.id.into(), - tracks::Entity::default().table_name().into(), - track.get("name").ok_or_else(bad)?.as_str().ok_or_else(bad)?.into(), - track - .get("description") - .ok_or_else(bad)? - .as_str() - .ok_or_else(bad)? - .into(), - track.get("icon").ok_or_else(bad)?.as_str().ok_or_else(bad)?.into(), - track.get("enabled").ok_or_else(bad)?.as_i64().into(), - track - .get("multiple_entries_per_day") - .ok_or_else(bad)? - .as_i64() - .into(), - track.get("color").ok_or_else(bad)?.as_i64().into(), - track.get("order").ok_or_else(bad)?.as_i64().into(), - ], - )) - .await - .map_err(|err| Right(Error::from(err).into()))? else { - return Err(Right("no value returned from track insertion query".into())); - }; - let track_id = track_id - .try_get_by_index(0) - .map_err(|err| Right(Error::from(err).into()))?; - let track = auth.authorized_track(track_id, db).await.ok_or_else(|| { - Right(format!("failed to fetch freshly inserted track with id {track_id}").into()) - })?; +) -> ApiResult> { + let track = track.0; + let db = db as &DatabaseConnection; + let model = tracks::ActiveModel::from_json(track).map_err(Error::from)?; + let track = model.insert(db).await.map_err(Error::from)?; tx.send(Update::track_added(track.clone())) - .map_err(|err| Right(Error::from(err).into()))?; + .map_err(Error::from)?; Ok(Json(track)) } @@ -136,21 +69,16 @@ pub(super) async fn insert_track( pub(super) async fn update_track( db: &State, tx: &State>, - track: Json, - authorized_user: Auth, -) -> Result, Either> { + track: Json, +) -> ApiResult> { let db = db as &DatabaseConnection; - let track = track.0; - if !authorized_user.is_authorized_for(track.id, db).await { - return Err(Left(Status::Forbidden)); - } - let track = track - .into_active_model() + let track = tracks::ActiveModel::from_json(track.0) + .map_err(Error::from)? .update(db) .await - .map_err(|err| Right(Error::from(err).into()))?; + .map_err(Error::from)?; tx.send(Update::track_changed(track.clone())) - .map_err(|err| Right(Error::from(err).into()))?; + .map_err(Error::from)?; Ok(Json(track)) } @@ -159,13 +87,11 @@ pub(super) async fn delete_track( db: &State, tx: &State>, id: i32, - authorized_user: Auth, ) -> ApiResult { let db = db as &DatabaseConnection; - let Some(track) = authorized_user.authorized_track(id, db).await else { + let Some(track) = Tracks::find_by_id(id).one(db).await.map_err(Error::from)? else { return Ok(Status::NotFound); }; - track.clone().delete(db).await.map_err(Error::from)?; tx.send(Update::track_removed(track)).map_err(Error::from)?; Ok(Status::Ok) } @@ -175,20 +101,15 @@ pub(super) async fn ticked( db: &State, tx: &State>, id: i32, - authorized_user: Auth, -) -> Result, Either> { - if !authorized_user.is_authorized_for(id, db).await { - return Err(Left(Status::Forbidden)); - } - +) -> ApiResult> { let tick = ticks::ActiveModel::now(id); let tick = tick .insert(db as &DatabaseConnection) .await - .map_err(|err| Right(Error::from(err).into()))? + .map_err(Error::from)? .to_owned(); tx.send(Update::tick_added(tick.clone())) - .map_err(|err| Right(Error::from(err).into()))?; + .map_err(Error::from)?; Ok(Json(tick)) } @@ -200,12 +121,7 @@ pub(super) async fn ticked_on_date( year: i32, month: u32, day: u32, - authorized_user: Auth, ) -> ApiResult, Status>> { - if !authorized_user.is_authorized_for(id, db).await { - return Ok(Right(Status::Forbidden)); - } - let Some(date) = Date::from_ymd_opt(year, month, day) else { return Ok(Right(Status::BadRequest)); }; @@ -225,14 +141,10 @@ pub(super) async fn clear_all_ticks( db: &State, tx: &State>, id: i32, - authorized_user: Auth, ) -> ApiResult>>> { let db = db as &DatabaseConnection; - let Some(track) = authorized_user.authorized_track(id, db).await else { - info!( - track_id = id, user_id = authorized_user.id; - "couldn't drop all ticks for track; track not found or user not authorized" - ); + let Some(track) = Tracks::find_by_id(id).one(db).await.map_err(Error::from)? else { + info!(track_id = id; "couldn't drop all ticks for track; track not found"); return Ok(Left(Status::NotFound)); }; let ticks = track @@ -255,12 +167,8 @@ pub(super) async fn clear_all_ticks_on_day( year: i32, month: u32, day: u32, - authorized_user: Auth, -) -> ApiResult>>> { +) -> ApiResult>> { let db = db as &DatabaseConnection; - if !authorized_user.is_authorized_for(id, db).await { - return Ok(Left(Status::Forbidden)); - } let ticks = Ticks::find() .filter(ticks::Column::TrackId.eq(id)) .filter(ticks::Column::Year.eq(year)) @@ -273,5 +181,5 @@ pub(super) async fn clear_all_ticks_on_day( tick.clone().delete(db).await.map_err(Error::from)?; Update::tick_cancelled(tick).send(&tx)?; } - Ok(Right(Json(ticks))) + Ok(Json(ticks)) } diff --git a/server/src/entities/mod.rs b/server/src/entities/mod.rs index 2facb82..7a309af 100644 --- a/server/src/entities/mod.rs +++ b/server/src/entities/mod.rs @@ -6,5 +6,3 @@ pub mod groups; pub mod ticks; pub mod track2_groups; pub mod tracks; -pub mod user; -pub mod user_tracks; diff --git a/server/src/entities/prelude.rs b/server/src/entities/prelude.rs index ee9de0e..796df22 100644 --- a/server/src/entities/prelude.rs +++ b/server/src/entities/prelude.rs @@ -4,5 +4,3 @@ pub use super::groups::Entity as Groups; pub use super::ticks::Entity as Ticks; pub use super::track2_groups::Entity as Track2Groups; pub use super::tracks::Entity as Tracks; -pub use super::user::Entity as User; -pub use super::user_tracks::Entity as UserTracks; diff --git a/server/src/entities/tracks.rs b/server/src/entities/tracks.rs index 4b1b7f3..de4cef4 100644 --- a/server/src/entities/tracks.rs +++ b/server/src/entities/tracks.rs @@ -24,8 +24,6 @@ pub enum Relation { Ticks, #[sea_orm(has_many = "super::track2_groups::Entity")] Track2Groups, - #[sea_orm(has_many = "super::user_tracks::Entity")] - UserTracks, } impl Related for Entity { @@ -40,19 +38,4 @@ impl Related for Entity { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserTracks.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - super::user_tracks::Relation::User.def() - } - fn via() -> Option { - Some(super::user_tracks::Relation::Tracks.def().rev()) - } -} - impl ActiveModelBehavior for ActiveModel {} diff --git a/server/src/entities/user.rs b/server/src/entities/user.rs deleted file mode 100644 index 0eae7c1..0000000 --- a/server/src/entities/user.rs +++ /dev/null @@ -1,99 +0,0 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 - -use std::default::default; - -use bcrypt::*; -// TODO Add option for argon2 https://docs.rs/argon2/latest/argon2/ -use either::Either::{self, Left, Right}; -use rocket::response::status::Unauthorized; -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -use crate::{ - api::ErrorResponder, - error::{self, Error}, -}; - -use super::tracks; - -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] -#[sea_orm(table_name = "user")] -pub struct Model { - #[sea_orm(primary_key)] - #[serde(skip_deserializing)] - pub id: i32, - pub name: String, - pub password_hash: String, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm(has_many = "super::user_tracks::Entity")] - UserTracks, -} -impl Related for Entity { - fn to() -> RelationDef { - Relation::UserTracks.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - super::user_tracks::Relation::Tracks.def() - } - - fn via() -> Option { - Some(super::user_tracks::Relation::User.def().rev()) - } -} - -impl ActiveModelBehavior for ActiveModel {} - -impl ActiveModel { - pub fn new(name: impl AsRef, password: impl AsRef) -> error::Result { - use sea_orm::ActiveValue::Set; - let name = Set(name.as_ref().to_string()); - let password_hash = Set(hash(password.as_ref(), DEFAULT_COST + 2)?); - Ok(Self { - name, - password_hash, - ..default() - }) - } -} - -impl Model { - pub fn check_password( - self, - password: String, - ) -> std::result::Result, ErrorResponder>> { - match verify(password, &self.password_hash) { - Ok(true) => Ok(self), - Ok(false) => Err(Left(Unauthorized(None))), - Err(err) => Err(Right(Error::from(err).into())), - } - } - - pub async fn authorized_track( - &self, - track_id: i32, - db: &DatabaseConnection, - ) -> Option { - self.find_related(super::prelude::Tracks) - .filter(tracks::Column::Id.eq(track_id)) - .one(db) - .await - .ok() - .flatten() - } - pub async fn is_authorized_for(&self, track_id: i32, db: &DatabaseConnection) -> bool { - self.authorized_track(track_id, db).await.is_some() - } - - pub async fn authorized_tracks(&self, db: &DatabaseConnection) -> Vec { - self.find_related(super::prelude::Tracks) - .all(db) - .await - .unwrap_or_default() - } -} diff --git a/server/src/entities/user_tracks.rs b/server/src/entities/user_tracks.rs deleted file mode 100644 index 45214d7..0000000 --- a/server/src/entities/user_tracks.rs +++ /dev/null @@ -1,46 +0,0 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 - -use sea_orm::entity::prelude::*; - -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)] -#[sea_orm(table_name = "user_tracks")] -pub struct Model { - #[sea_orm(primary_key)] - pub id: i32, - pub user_id: i32, - pub track_id: i32, -} - -#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm( - belongs_to = "super::tracks::Entity", - from = "Column::TrackId", - to = "super::tracks::Column::Id", - on_update = "NoAction", - on_delete = "NoAction" - )] - Tracks, - #[sea_orm( - belongs_to = "super::user::Entity", - from = "Column::UserId", - to = "super::user::Column::Id", - on_update = "NoAction", - on_delete = "NoAction" - )] - User, -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::Tracks.def() - } -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::User.def() - } -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/server/src/error.rs b/server/src/error.rs index a908650..fbf5c10 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -1,6 +1,5 @@ use std::string; -use bcrypt::BcryptError; use derive_builder::UninitializedFieldError; #[derive(Debug, thiserror::Error)] @@ -19,10 +18,6 @@ pub enum Error { Utf8(#[from] string::FromUtf8Error), #[error(transparent)] ChannelSendError(#[from] tokio::sync::broadcast::error::SendError), - #[error(transparent)] - Bcrypt(#[from] BcryptError), - #[error(transparent)] - SerdeJson(#[from] serde_json::Error), } pub type Result = std::result::Result; diff --git a/server/src/main.rs b/server/src/main.rs index d6aad4d..8959895 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1,4 +1,4 @@ -#![feature(default_free_fn, proc_macro_hygiene, decl_macro, never_type)] +#![feature(default_free_fn, proc_macro_hygiene, decl_macro)] #[macro_use] extern crate rocket; mod api; diff --git a/server/src/migrator/m20230626_083036_create_users_table.rs b/server/src/migrator/m20230626_083036_create_users_table.rs deleted file mode 100644 index 6c8e7b7..0000000 --- a/server/src/migrator/m20230626_083036_create_users_table.rs +++ /dev/null @@ -1,42 +0,0 @@ -use sea_orm_migration::prelude::*; - -#[derive(DeriveMigrationName)] -pub struct Migration; - -#[async_trait::async_trait] -impl MigrationTrait for Migration { - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .create_table( - Table::create() - .table(User::Table) - .if_not_exists() - .col( - ColumnDef::new(User::Id) - .integer() - .not_null() - .auto_increment() - .primary_key(), - ) - .col(ColumnDef::new(User::Name).string().not_null()) - .col(ColumnDef::new(User::PasswordHash).string().not_null()) - .to_owned(), - ) - .await - } - - async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .drop_table(Table::drop().table(User::Table).to_owned()) - .await - } -} - -/// Learn more at https://docs.rs/sea-query#iden -#[derive(Iden)] -pub(crate) enum User { - Table, - Id, - Name, - PasswordHash, -} diff --git a/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs b/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs deleted file mode 100644 index 186de49..0000000 --- a/server/src/migrator/m20230626_150551_associate_users_and_tracks.rs +++ /dev/null @@ -1,57 +0,0 @@ -use super::{ - m20230606_000001_create_tracks_table::Tracks, m20230626_083036_create_users_table::User, -}; -use sea_orm_migration::prelude::*; - -#[derive(DeriveMigrationName)] -pub struct Migration; - -#[async_trait::async_trait] -impl MigrationTrait for Migration { - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .create_table( - Table::create() - .table(UserTracks::Table) - .if_not_exists() - .col( - ColumnDef::new(UserTracks::Id) - .integer() - .not_null() - .primary_key() - .auto_increment(), - ) - .col(ColumnDef::new(UserTracks::UserId).integer().not_null()) - .col(ColumnDef::new(UserTracks::TrackId).integer().not_null()) - .foreign_key( - ForeignKey::create() - .name("fk-user_tracks-user_id") - .from(UserTracks::Table, UserTracks::UserId) - .to(User::Table, User::Id), - ) - .foreign_key( - ForeignKey::create() - .name("fk-user_tracks-track_id") - .from(UserTracks::Table, UserTracks::TrackId) - .to(Tracks::Table, Tracks::Id), - ) - .to_owned(), - ) - .await - } - - async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .drop_table(Table::drop().table(UserTracks::Table).to_owned()) - .await - } -} - -/// Learn more at https://docs.rs/sea-query#iden -#[derive(Iden)] -enum UserTracks { - Table, - Id, - UserId, - TrackId, -} diff --git a/server/src/migrator/mod.rs b/server/src/migrator/mod.rs index edf6a1f..473e061 100644 --- a/server/src/migrator/mod.rs +++ b/server/src/migrator/mod.rs @@ -2,8 +2,6 @@ mod m20230606_000001_create_tracks_table; mod m20230606_000002_create_ticks_table; mod m20230606_000003_create_groups_table; mod m20230606_000004_create_track2groups_table; -mod m20230626_083036_create_users_table; -mod m20230626_150551_associate_users_and_tracks; use sea_orm_migration::prelude::*; @@ -17,8 +15,6 @@ impl MigratorTrait for Migrator { Box::new(m20230606_000002_create_ticks_table::Migration), Box::new(m20230606_000003_create_groups_table::Migration), Box::new(m20230606_000004_create_track2groups_table::Migration), - Box::new(m20230626_083036_create_users_table::Migration), - Box::new(m20230626_150551_associate_users_and_tracks::Migration), ] } }