From dd98fe860b33f8e34c161f49e3f6b07908d1dc3e Mon Sep 17 00:00:00 2001 From: Fabian Thies Date: Tue, 3 Aug 2021 17:33:59 +0200 Subject: [PATCH 1/3] Send create, update and delete notifications for `Send`s in the correct format. Add endpoints to get all sends or a specific send by its uuid. --- src/api/core/sends.rs | 38 +++++++++++++++++++++++++++++++++----- src/api/notifications.rs | 19 ++++++++++++++++++- src/db/models/send.rs | 11 +++++++---- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/src/api/core/sends.rs b/src/api/core/sends.rs index df8b2d3c..0379deb5 100644 --- a/src/api/core/sends.rs +++ b/src/api/core/sends.rs @@ -18,6 +18,8 @@ const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer availab pub fn routes() -> Vec { routes![ + get_sends, + get_send, post_send, post_send_file, post_access, @@ -128,6 +130,32 @@ fn create_send(data: SendData, user_uuid: String) -> ApiResult { Ok(send) } +#[get("/sends")] +fn get_sends(headers: Headers, conn: DbConn) -> Json { + let sends = Send::find_by_user(&headers.user.uuid, &conn); + let sends_json: Vec = sends.iter().map(|s| s.to_json()).collect(); + + Json(json!({ + "Data": sends_json, + "Object": "list", + "ContinuationToken": null + })) +} + +#[get("/sends/")] +fn get_send(uuid: String, headers: Headers, conn: DbConn) -> JsonResult { + let send = match Send::find_by_uuid(&uuid, &conn) { + Some(send) => send, + None => err!("Send not found"), + }; + + if send.user_uuid.as_ref() != Some(&headers.user.uuid) { + err!("Send is not owned by user") + } + + Ok(Json(send.to_json())) +} + #[post("/sends", data = "")] fn post_send(data: JsonUpcase, headers: Headers, conn: DbConn, nt: Notify) -> JsonResult { enforce_disable_send_policy(&headers, &conn)?; @@ -141,7 +169,7 @@ fn post_send(data: JsonUpcase, headers: Headers, conn: DbConn, nt: Not let mut send = create_send(data, headers.user.uuid.clone())?; send.save(&conn)?; - nt.send_user_update(UpdateType::SyncSendCreate, &headers.user); + nt.send_send_update(UpdateType::SyncSendCreate, &send, &send.update_users_revision(&conn)); Ok(Json(send.to_json())) } @@ -225,7 +253,7 @@ fn post_send_file(data: Data, content_type: &ContentType, headers: Headers, conn // Save the changes in the database send.save(&conn)?; - nt.send_user_update(UpdateType::SyncSendCreate, &headers.user); + nt.send_send_update(UpdateType::SyncSendUpdate, &send, &send.update_users_revision(&conn)); Ok(Json(send.to_json())) } @@ -397,7 +425,7 @@ fn put_send(id: String, data: JsonUpcase, headers: Headers, conn: DbCo } send.save(&conn)?; - nt.send_user_update(UpdateType::SyncSendUpdate, &headers.user); + nt.send_send_update(UpdateType::SyncSendUpdate, &send, &send.update_users_revision(&conn)); Ok(Json(send.to_json())) } @@ -414,7 +442,7 @@ fn delete_send(id: String, headers: Headers, conn: DbConn, nt: Notify) -> EmptyR } send.delete(&conn)?; - nt.send_user_update(UpdateType::SyncSendDelete, &headers.user); + nt.send_send_update(UpdateType::SyncSendDelete, &send, &send.update_users_revision(&conn)); Ok(()) } @@ -434,7 +462,7 @@ fn put_remove_password(id: String, headers: Headers, conn: DbConn, nt: Notify) - send.set_password(None); send.save(&conn)?; - nt.send_user_update(UpdateType::SyncSendUpdate, &headers.user); + nt.send_send_update(UpdateType::SyncSendUpdate, &send, &send.update_users_revision(&conn)); Ok(Json(send.to_json())) } diff --git a/src/api/notifications.rs b/src/api/notifications.rs index e184d528..e7b4a1e6 100644 --- a/src/api/notifications.rs +++ b/src/api/notifications.rs @@ -65,7 +65,7 @@ use chashmap::CHashMap; use chrono::NaiveDateTime; use serde_json::from_str; -use crate::db::models::{Cipher, Folder, User}; +use crate::db::models::{Cipher, Folder, User, Send}; use rmpv::Value; @@ -335,6 +335,23 @@ impl WebSocketUsers { self.send_update(uuid, &data).ok(); } } + + pub fn send_send_update(&self, ut: UpdateType, send: &Send, user_uuids: &[String]) { + let user_uuid = convert_option(send.user_uuid.clone()); + + let data = create_update( + vec![ + ("Id".into(), send.uuid.clone().into()), + ("UserId".into(), user_uuid), + ("RevisionDate".into(), serialize_date(send.revision_date)), + ], + ut, + ); + + for uuid in user_uuids { + self.send_update(uuid, &data).ok(); + } + } } /* Message Structure diff --git a/src/db/models/send.rs b/src/db/models/send.rs index 1fae40c8..05d366e4 100644 --- a/src/db/models/send.rs +++ b/src/db/models/send.rs @@ -232,15 +232,18 @@ impl Send { } } - pub fn update_users_revision(&self, conn: &DbConn) { - match &self.user_uuid { - Some(user_uuid) => { + pub fn update_users_revision(&self, conn: &DbConn) -> Vec { + let mut user_uuids = Vec::new(); + match self.user_uuid { + Some(ref user_uuid) => { User::update_uuid_revision(user_uuid, conn); + user_uuids.push(user_uuid.clone()) } None => { // Belongs to Organization, not implemented } - } + }; + user_uuids } pub fn delete_all_by_user(user_uuid: &str, conn: &DbConn) -> EmptyResult { From 42ba817a4c423457a014f13cec3faba994770b21 Mon Sep 17 00:00:00 2001 From: Fabian Thies Date: Wed, 4 Aug 2021 13:25:41 +0200 Subject: [PATCH 2/3] Fix errors that occurred in the nightly build --- src/api/core/sends.rs | 4 ++-- src/db/models/send.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/core/sends.rs b/src/api/core/sends.rs index 0379deb5..aa4fd792 100644 --- a/src/api/core/sends.rs +++ b/src/api/core/sends.rs @@ -167,7 +167,7 @@ fn post_send(data: JsonUpcase, headers: Headers, conn: DbConn, nt: Not err!("File sends should use /api/sends/file") } - let mut send = create_send(data, headers.user.uuid.clone())?; + let mut send = create_send(data, headers.user.uuid)?; send.save(&conn)?; nt.send_send_update(UpdateType::SyncSendCreate, &send, &send.update_users_revision(&conn)); @@ -210,7 +210,7 @@ fn post_send_file(data: Data, content_type: &ContentType, headers: Headers, conn }; // Create the Send - let mut send = create_send(data.data, headers.user.uuid.clone())?; + let mut send = create_send(data.data, headers.user.uuid)?; let file_id = crate::crypto::generate_send_id(); if send.atype != SendType::File as i32 { diff --git a/src/db/models/send.rs b/src/db/models/send.rs index 05d366e4..9cfb7b1e 100644 --- a/src/db/models/send.rs +++ b/src/db/models/send.rs @@ -234,8 +234,8 @@ impl Send { pub fn update_users_revision(&self, conn: &DbConn) -> Vec { let mut user_uuids = Vec::new(); - match self.user_uuid { - Some(ref user_uuid) => { + match &self.user_uuid { + Some(user_uuid) => { User::update_uuid_revision(user_uuid, conn); user_uuids.push(user_uuid.clone()) } From 1f0f64d961cd8839bcd5be6336f68d44b40aaa21 Mon Sep 17 00:00:00 2001 From: Fabian Thies Date: Wed, 4 Aug 2021 16:56:43 +0200 Subject: [PATCH 3/3] Sort the imports in notifications.rs alphabetically --- src/api/notifications.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/notifications.rs b/src/api/notifications.rs index e7b4a1e6..56985070 100644 --- a/src/api/notifications.rs +++ b/src/api/notifications.rs @@ -65,7 +65,7 @@ use chashmap::CHashMap; use chrono::NaiveDateTime; use serde_json::from_str; -use crate::db::models::{Cipher, Folder, User, Send}; +use crate::db::models::{Cipher, Folder, Send, User}; use rmpv::Value;