vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit e7e0717f5b31a292aed9144f9df2b9b31d82c35c
parent 672e3273cd94577dfacddd1c441f003b4e2e0ad7
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Fri, 10 Aug 2018 22:20:44 +0200

Merge pull request #129 from krankur/beta

Implemented PUT for /two-factor/authenticator and /two-factor/disable #124
Diffstat:
Msrc/api/core/ciphers.rs | 66+++++-------------------------------------------------------------
Msrc/api/core/mod.rs | 3++-
Msrc/api/core/two_factor.rs | 18++++++++++++++++++
Msrc/db/models/attachment.rs | 6------
4 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs @@ -87,8 +87,6 @@ fn get_cipher_details(uuid: String, headers: Headers, conn: DbConn) -> JsonResul #[derive(Deserialize, Debug)] #[allow(non_snake_case)] struct CipherData { - // Id is optional as it is included only in bulk share - Id: Option<String>, // Folder id is not included in import FolderId: Option<String>, // TODO: Some of these might appear all the time, no need for Option @@ -334,65 +332,6 @@ struct ShareCipherData { fn post_cipher_share(uuid: String, data: JsonUpcase<ShareCipherData>, headers: Headers, conn: DbConn) -> JsonResult { let data: ShareCipherData = data.into_inner().data; - share_cipher_by_uuid(&uuid, data, &headers, &conn) -} - -#[put("/ciphers/<uuid>/share", data = "<data>")] -fn put_cipher_share(uuid: String, data: JsonUpcase<ShareCipherData>, headers: Headers, conn: DbConn) -> JsonResult { - let data: ShareCipherData = data.into_inner().data; - - share_cipher_by_uuid(&uuid, data, &headers, &conn) -} - -#[derive(Deserialize)] -#[allow(non_snake_case)] -struct ShareSelectedCipherData { - Ciphers: Vec<CipherData>, - CollectionIds: Vec<String> -} - -#[put("/ciphers/share", data = "<data>")] -fn put_cipher_share_seleted(data: JsonUpcase<ShareSelectedCipherData>, headers: Headers, conn: DbConn) -> EmptyResult { - let mut data: ShareSelectedCipherData = data.into_inner().data; - let mut cipher_ids: Vec<String> = Vec::new(); - - if data.Ciphers.len() == 0 { - err!("You must select at least one cipher.") - } - - if data.CollectionIds.len() == 0 { - err!("You must select at least one collection.") - } - - for cipher in data.Ciphers.iter() { - match cipher.Id { - Some(ref id) => cipher_ids.push(id.to_string()), - None => err!("Request missing ids field") - }; - } - - let attachments = Attachment::find_by_ciphers(cipher_ids, &conn); - - if attachments.len() > 0 { - err!("Ciphers should not have any attachments.") - } - - while let Some(cipher) = data.Ciphers.pop() { - let mut shared_cipher_data = ShareCipherData { - Cipher: cipher, - CollectionIds: data.CollectionIds.clone() - }; - - match shared_cipher_data.Cipher.Id.take() { - Some(id) => share_cipher_by_uuid(&id, shared_cipher_data , &headers, &conn)?, - None => err!("Request missing ids field") - }; - } - - Ok(()) -} - -fn share_cipher_by_uuid(uuid: &str, data: ShareCipherData, headers: &Headers, conn: &DbConn) -> JsonResult { let mut cipher = match Cipher::find_by_uuid(&uuid, &conn) { Some(cipher) => { if cipher.is_write_accessible_to_user(&headers.user.uuid, &conn) { @@ -426,6 +365,11 @@ fn share_cipher_by_uuid(uuid: &str, data: ShareCipherData, headers: &Headers, co } } +#[put("/ciphers/<uuid>/share", data = "<data>")] +fn put_cipher_share(uuid: String, data: JsonUpcase<ShareCipherData>, headers: Headers, conn: DbConn) -> JsonResult { + post_cipher_share(uuid, data, headers, conn) +} + #[post("/ciphers/<uuid>/attachment", format = "multipart/form-data", data = "<data>")] fn post_attachment(uuid: String, data: Data, content_type: &ContentType, headers: Headers, conn: DbConn) -> JsonResult { let cipher = match Cipher::find_by_uuid(&uuid, &conn) { diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs @@ -42,7 +42,6 @@ pub fn routes() -> Vec<Route> { post_cipher_admin, post_cipher_share, put_cipher_share, - put_cipher_share_seleted, post_cipher, put_cipher, delete_cipher_post, @@ -66,8 +65,10 @@ pub fn routes() -> Vec<Route> { get_recover, recover, disable_twofactor, + disable_twofactor_put, generate_authenticator, activate_authenticator, + activate_authenticator_put, generate_u2f, activate_u2f, diff --git a/src/api/core/two_factor.rs b/src/api/core/two_factor.rs @@ -112,6 +112,15 @@ fn disable_twofactor( }))) } +#[put("/two-factor/disable", data = "<data>")] +fn disable_twofactor_put( + data: JsonUpcase<DisableTwoFactorData>, + headers: Headers, + conn: DbConn, +) -> JsonResult { + disable_twofactor(data, headers, conn) +} + #[post("/two-factor/get-authenticator", data = "<data>")] fn generate_authenticator( data: JsonUpcase<PasswordData>, @@ -194,6 +203,15 @@ fn activate_authenticator( }))) } +#[put("/two-factor/authenticator", data = "<data>")] +fn activate_authenticator_put( + data: JsonUpcase<EnableAuthenticatorData>, + headers: Headers, + conn: DbConn, +) -> JsonResult { + activate_authenticator(data, headers, conn) +} + fn _generate_recover_code(user: &mut User, conn: &DbConn) { if user.totp_recover.is_none() { let totp_recover = BASE32.encode(&crypto::get_random(vec![0u8; 20])); diff --git a/src/db/models/attachment.rs b/src/db/models/attachment.rs @@ -111,10 +111,4 @@ impl Attachment { .filter(attachments::cipher_uuid.eq(cipher_uuid)) .load::<Self>(&**conn).expect("Error loading attachments") } - - pub fn find_by_ciphers(cipher_uuids: Vec<String>, conn: &DbConn) -> Vec<Self> { - attachments::table - .filter(attachments::cipher_uuid.eq_any(cipher_uuids)) - .load::<Self>(&**conn).expect("Error loading attachments") - } }