From 874f5c34bdb2272f3cac1ceef13edea22b6e263d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 26 Apr 2019 22:08:26 +0200 Subject: [PATCH] Formatting --- src/api/admin.rs | 2 +- src/api/core/ciphers.rs | 12 +++++++++--- src/api/core/two_factor.rs | 5 +---- src/crypto.rs | 4 ++-- src/mail.rs | 2 +- src/main.rs | 7 ++++--- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/api/admin.rs b/src/api/admin.rs index a38b5603..680c8804 100644 --- a/src/api/admin.rs +++ b/src/api/admin.rs @@ -158,7 +158,7 @@ fn invite_user(data: Json, _token: AdminToken, conn: DbConn) -> Empt } #[get("/users")] -fn get_users(_token: AdminToken, conn: DbConn) ->JsonResult { +fn get_users(_token: AdminToken, conn: DbConn) -> JsonResult { let users = User::get_all(&conn); let users_json: Vec = users.iter().map(|u| u.to_json(&conn)).collect(); diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index 709c9ef0..f44ad513 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -877,7 +877,13 @@ struct OrganizationId { } #[post("/ciphers/purge?", data = "")] -fn delete_all(organization: Option>, data: JsonUpcase, headers: Headers, conn: DbConn, nt: Notify) -> EmptyResult { +fn delete_all( + organization: Option>, + data: JsonUpcase, + headers: Headers, + conn: DbConn, + nt: Notify, +) -> EmptyResult { let data: PasswordData = data.into_inner().data; let password_hash = data.MasterPasswordHash; @@ -903,7 +909,7 @@ fn delete_all(organization: Option>, data: JsonUpcase { // No organization ID in query params, purging user vault // Delete ciphers and their attachments @@ -919,7 +925,7 @@ fn delete_all(organization: Option>, data: JsonUpcase None, } - } fn msg(s: &str) -> Self { Self { @@ -762,7 +761,6 @@ impl DuoData { } } - enum DuoStatus { Global(DuoData), // Using the global duo config User(DuoData), // Using the user's config @@ -912,7 +910,6 @@ const APP_PREFIX: &str = "APP"; use chrono::Utc; - fn get_user_duo_data(uuid: &str, conn: &DbConn) -> DuoStatus { let type_ = TwoFactorType::Duo as i32; @@ -940,7 +937,7 @@ fn get_user_duo_data(uuid: &str, conn: &DbConn) -> DuoStatus { fn get_duo_keys_email(email: &str, conn: &DbConn) -> ApiResult<(String, String, String, String)> { let data = User::find_by_mail(email, &conn) .and_then(|u| get_user_duo_data(&u.uuid, &conn).data()) - .or_else(|| DuoData::global()) + .or_else(DuoData::global) .map_res("Can't fetch Duo keys")?; Ok((data.ik, data.sk, CONFIG.get_duo_akey(), data.host)) diff --git a/src/crypto.rs b/src/crypto.rs index e55e461b..968f9eb9 100644 --- a/src/crypto.rs +++ b/src/crypto.rs @@ -2,7 +2,7 @@ // PBKDF2 derivation // -use ring::{digest, pbkdf2, hmac}; +use ring::{digest, hmac, pbkdf2}; static DIGEST_ALG: &digest::Algorithm = &digest::SHA256; const OUTPUT_LEN: usize = digest::SHA256_OUTPUT_LEN; @@ -22,7 +22,7 @@ pub fn verify_password_hash(secret: &[u8], salt: &[u8], previous: &[u8], iterati // // HMAC // -pub fn hmac_sign(key: &str, data:&str) -> String { +pub fn hmac_sign(key: &str, data: &str) -> String { use data_encoding::HEXLOWER; let key = hmac::SigningKey::new(&digest::SHA1, key.as_bytes()); diff --git a/src/mail.rs b/src/mail.rs index 7c4ee324..b122f489 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -1,7 +1,7 @@ use lettre::smtp::authentication::Credentials; use lettre::smtp::ConnectionReuseParameters; use lettre::{ClientSecurity, ClientTlsParameters, SmtpClient, SmtpTransport, Transport}; -use lettre_email::{EmailBuilder,PartBuilder,MimeMultipartType}; +use lettre_email::{EmailBuilder, MimeMultipartType, PartBuilder}; use native_tls::{Protocol, TlsConnector}; use quoted_printable::encode_to_str; diff --git a/src/main.rs b/src/main.rs index 42565b64..0d6c36ea 100644 --- a/src/main.rs +++ b/src/main.rs @@ -90,9 +90,10 @@ fn init_logging() -> Result<(), fern::InitError> { if let Some(log_file) = CONFIG.log_file() { logger = logger.chain(fern::log_file(log_file)?); } - - #[cfg(not(windows))] { - if cfg!(feature="enable_syslog") || CONFIG.use_syslog() { + + #[cfg(not(windows))] + { + if cfg!(feature = "enable_syslog") || CONFIG.use_syslog() { logger = chain_syslog(logger); } }