From 98bae4a0a195eaf611f43669e3cdcfd3ac76a374 Mon Sep 17 00:00:00 2001
From: "Shane A. Faulkner" <contact@shanefaulkner.com>
Date: Wed, 18 Jul 2018 15:35:45 -0500
Subject: [PATCH] Cleanup and working with 2 or less attachments
---
src/api/core/ciphers.rs | 47 +++++++++++------------------------------
1 file changed, 12 insertions(+), 35 deletions(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
index 30aab620..ec1227bf 100644
--- a/src/api/core/ciphers.rs
+++ b/src/api/core/ciphers.rs
@@ -422,17 +422,7 @@ fn post_attachment_admin(uuid: String, data: Data, content_type: &ContentType, h
#[post("/ciphers/<uuid>/attachment/<attachment_id>/share", format = "multipart/form-data", data = "<data>")]
fn post_attachment_share(uuid: String, attachment_id: String, data: Data, content_type: &ContentType, headers: Headers, conn: DbConn) -> JsonResult {
-
- let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
- Some(cipher) => cipher,
- None => err!("Cipher doesn't exist")
- };
-
- if !cipher.is_write_accessible_to_user(&headers.user.uuid, &conn) {
- err!("Cipher is not write accessible")
- };
-
- try!(_delete_cipher_attachment_by_uuid(&uuid, &attachment_id, &conn));
+ _delete_cipher_attachment_by_id(&uuid, &attachment_id, &headers, &conn)?;
post_attachment(uuid, data, content_type, headers, conn)
}
@@ -448,29 +438,7 @@ fn delete_attachment_post(uuid: String, attachment_id: String, headers: Headers,
#[delete("/ciphers/<uuid>/attachment/<attachment_id>")]
fn delete_attachment(uuid: String, attachment_id: String, headers: Headers, conn: DbConn) -> EmptyResult {
- let attachment = match Attachment::find_by_id(&attachment_id, &conn) {
- Some(attachment) => attachment,
- None => err!("Attachment doesn't exist")
- };
-
- if attachment.cipher_uuid != uuid {
- err!("Attachment from other cipher")
- }
-
- let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
- Some(cipher) => cipher,
- None => err!("Cipher doesn't exist")
- };
-
- if !cipher.is_write_accessible_to_user(&headers.user.uuid, &conn) {
- err!("Cipher cannot be deleted by user")
- }
-
- // Delete attachment
- match attachment.delete(&conn) {
- Ok(()) => Ok(()),
- Err(_) => err!("Deleting attachement failed")
- }
+ _delete_cipher_attachment_by_id(&uuid, &attachment_id, &headers, &conn)
}
#[post("/ciphers/<uuid>/delete")]
@@ -605,7 +573,7 @@ fn _delete_cipher_by_uuid(uuid: &str, headers: &Headers, conn: &DbConn) -> Empty
}
}
-fn _delete_cipher_attachment_by_uuid(uuid: &str, attachment_id: &str, conn: &DbConn) -> EmptyResult {
+fn _delete_cipher_attachment_by_id(uuid: &str, attachment_id: &str, headers: &Headers, conn: &DbConn) -> EmptyResult {
let attachment = match Attachment::find_by_id(&attachment_id, &conn) {
Some(attachment) => attachment,
None => err!("Attachment doesn't exist")
@@ -615,6 +583,15 @@ fn _delete_cipher_attachment_by_uuid(uuid: &str, attachment_id: &str, conn: &DbC
err!("Attachment from other cipher")
}
+ let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
+ Some(cipher) => cipher,
+ None => err!("Cipher doesn't exist")
+ };
+
+ if !cipher.is_write_accessible_to_user(&headers.user.uuid, &conn) {
+ err!("Cipher cannot be deleted by user")
+ }
+
// Delete attachment
match attachment.delete(&conn) {
Ok(()) => Ok(()),