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 d613fa1e689f4cd308ba89d37d14831508d46002
parent adf40291e886b46f6241de5eb464057eac610ad3
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Wed, 17 Oct 2018 23:49:09 +0200

Merge pull request #225 from janost/sync-exclude-domains

Don't send Domains if excludeDomains=true on /sync
Diffstat:
Msrc/api/core/ciphers.rs | 12+++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs @@ -22,8 +22,14 @@ use auth::Headers; use CONFIG; -#[get("/sync")] -fn sync(headers: Headers, conn: DbConn) -> JsonResult { +#[derive(FromForm)] +#[allow(non_snake_case)] +struct SyncData { + excludeDomains: bool, +} + +#[get("/sync?<data>")] +fn sync(data: SyncData, headers: Headers, conn: DbConn) -> JsonResult { let user_json = headers.user.to_json(&conn); let folders = Folder::find_by_user(&headers.user.uuid, &conn); @@ -35,7 +41,7 @@ fn sync(headers: Headers, conn: DbConn) -> JsonResult { let ciphers = Cipher::find_by_user(&headers.user.uuid, &conn); let ciphers_json: Vec<Value> = ciphers.iter().map(|c| c.to_json(&headers.host, &headers.user.uuid, &conn)).collect(); - let domains_json = api::core::get_eq_domains(headers).unwrap().into_inner(); + let domains_json = if data.excludeDomains { Value::Null } else { api::core::get_eq_domains(headers).unwrap().into_inner() }; Ok(Json(json!({ "Profile": user_json,