vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-11-14 17:26:48 +00:00
Code Issues Releases Wiki Activity

Added some comments and add a few expects

Browse Source
This commit is contained in:
Ian 2019-02-14 19:00:21 -08:00
parent 80a2e4bd13
commit 94f26c59c6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ldap.rs
View File

@ -17,6 +17,7 @@ use crate::db::models::{Invitation, User};
use crate::db::DbConn; use crate::db::DbConn;
use crate::CONFIG; use crate::CONFIG;
/// Generates invites for all users in LDAP who don't yet have an account or invite.
fn invite_from_results(conn: DbConn, results: Vec<SearchEntry>) -> Result<(), Box<Error>> { fn invite_from_results(conn: DbConn, results: Vec<SearchEntry>) -> Result<(), Box<Error>> {
let mail_field = CONFIG.ldap_mail_field(); let mail_field = CONFIG.ldap_mail_field();
for ldap_user in results { for ldap_user in results {
@ -40,6 +41,7 @@ fn invite_from_results(conn: DbConn, results: Vec<SearchEntry>) -> Result<(), Bo
Ok(()) Ok(())
} }
/// Initializes an LdapConnAsync client using provided configuration
fn new_ldap_client_async(handle: &Handle) -> Result<LdapConnAsync, Box<Error>> { fn new_ldap_client_async(handle: &Handle) -> Result<LdapConnAsync, Box<Error>> {
let scheme = if CONFIG.ldap_ssl() { "ldaps" } else { "ldap" }; let scheme = if CONFIG.ldap_ssl() { "ldaps" } else { "ldap" };
let host = CONFIG.ldap_host().unwrap(); let host = CONFIG.ldap_host().unwrap();
@ -52,6 +54,7 @@ fn new_ldap_client_async(handle: &Handle) -> Result<LdapConnAsync, Box<Error>> {
Ok(ldap) Ok(ldap)
} }
/// Given syncs users from LDAP
fn ldap_sync(handle: &Handle) -> Result<(), Box<Error>> { fn ldap_sync(handle: &Handle) -> Result<(), Box<Error>> {
let handle = handle.clone(); let handle = handle.clone();
@ -84,7 +87,7 @@ fn ldap_sync(handle: &Handle) -> Result<(), Box<Error>> {
} }
let conn = db::get_dbconn().expect("Can't reach database"); let conn = db::get_dbconn().expect("Can't reach database");
// Can't figure out how to use this result // Can't figure out how to use this result
invite_from_results(conn, entries); invite_from_results(conn, entries).expect("Could not invite users");
Ok(()) Ok(())
}) })
.map_err(|e| panic!("Error searching: {:?}", e)); .map_err(|e| panic!("Error searching: {:?}", e));
@ -94,6 +97,7 @@ fn ldap_sync(handle: &Handle) -> Result<(), Box<Error>> {
Ok(()) Ok(())
} }
/// Starts a new thread with event loop to sync LDAP users
pub fn start_ldap_sync() -> Result<(), Box<Error>> { pub fn start_ldap_sync() -> Result<(), Box<Error>> {
thread::spawn(move || { thread::spawn(move || {
let mut core = Core::new().expect("Could not create core"); let mut core = Core::new().expect("Could not create core");
@ -105,10 +109,10 @@ pub fn start_ldap_sync() -> Result<(), Box<Error>> {
let task = Interval::new(now, Duration::from_secs(sync_interval)) let task = Interval::new(now, Duration::from_secs(sync_interval))
.for_each(|_| { .for_each(|_| {
// Can't figure out how to get this error handled // Can't figure out how to get this error handled
ldap_sync(&handle); ldap_sync(&handle).expect("Failed to sync from LDAP");
Ok(()) Ok(())
}) })
.map_err(|e| panic!("interval errored: {:?}", e)); .map_err(|e| panic!("LDAP sync interval errored: {:?}", e));
core.run(task) core.run(task)
}); });