diff --git a/README.md b/README.md index fd99a7c..f51fe9a 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,11 @@ Configuration values are as follows: |----|----|--------|-----------| |`bitwarden_url`|String||The root URL for accessing `bitwarden_rs`. Eg: `https://bw.example.com`| |`bitwarden_admin_token`|String||The value passed as `ADMIN_TOKEN` to `bitwarden_rs`| +|`bitwarden_root_cert_file`|String|Optional|Path to an additional der-encoded root certificate to trust. Eg. `root.cert`. If using Docker see `docker-compose.yml` for how to expose it. Defaults to `empty`| |`ldap_host`|String||The hostname or IP address for your ldap server| |`ldap_scheme`|String|Optional|The that should be used to connect. `ldap` or `ldaps`. This is set by default based on SSL settings| |`ldap_ssl`|Boolean|Optional|Indicates if SSL should be used. Defaults to `false`| +|`ldap_no_tls_verify`|Boolean|Optional|Indicates if certificate should be verified when using SSL. Defaults to `true`| |`ldap_port`|Integer|Optional|Port used to connect to the LDAP server. This will default to 389 or 636, depending on your SSL settings| |`ldap_bind_dn`|String||The dn for the bind user that will connect to LDAP. Eg. `cn=admin,dc=example,dc=org`| |`ldap_bind_password`|String||The password for the provided bind user.| diff --git a/docker-compose.yml b/docker-compose.yml index e604252..c80830c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: # dockerfile: Dockerfile.alpine volumes: - ./example.config.toml:/usr/src/bitwarden_rs_ldap/config.toml:ro + # ./root.cert:/usr/src/bitwarden_rs_ldap/root.cert:ro environment: RUST_BACKTRACE: 1 restart: always diff --git a/src/bw_admin.rs b/src/bw_admin.rs index e168a65..03fda93 100644 --- a/src/bw_admin.rs +++ b/src/bw_admin.rs @@ -5,6 +5,8 @@ use reqwest::Response; use serde::Deserialize; use std::collections::HashMap; use std::error::Error; +use std::fs::File; +use std::io::Read; use std::time::{Duration, Instant}; const COOKIE_LIFESPAN: Duration = Duration::from_secs(20 * 60); @@ -31,29 +33,50 @@ impl User { pub struct Client { url: String, admin_token: String, + root_cert_file: String, cookie: Option, cookie_created: Option, } impl Client { /// Create new instance of client - pub fn new(url: String, admin_token: String) -> Client { + pub fn new(url: String, admin_token: String, root_cert_file: String) -> Client { Client { url, admin_token, + root_cert_file, cookie: None, cookie_created: None, } } + fn get_root_cert(&self) -> reqwest::Certificate { + let mut buf = Vec::new(); + + // read a local binary DER encoded certificate + File::open(&self.root_cert_file) + .expect("Could not open root cert file") + .read_to_end(&mut buf) + .expect("Could not read root cert file"); + + return reqwest::Certificate::from_der(&buf).expect("Could not load der root cert file"); + } + + fn get_http_client(&self) -> reqwest::Client { + let mut client = reqwest::Client::builder().redirect(reqwest::RedirectPolicy::none()); + + if !&self.root_cert_file.is_empty() { + let cert = self.get_root_cert(); + client = client.add_root_certificate(cert); + } + + return client.build().unwrap(); + } + /// Authenticate client fn auth(&mut self) -> Response { let cookie_created = Instant::now(); - let client = reqwest::Client::builder() - // Avoid redirects because server will redirect to admin page after auth - .redirect(reqwest::RedirectPolicy::none()) - .build() - .unwrap(); + let client = self.get_http_client(); let result = client .post(format!("{}{}", &self.url, "/admin/").as_str()) .form(&[("token", &self.admin_token)]) @@ -102,7 +125,8 @@ impl Client { } Some(cookie) => { let url = format!("{}/admin{}", &self.url, path); - let request = reqwest::Client::new() + let client = self.get_http_client(); + let request = client .get(url.as_str()) .header(reqwest::header::COOKIE, cookie.clone()); let response = request.send().unwrap_or_else(|e| { @@ -126,7 +150,8 @@ impl Client { } Some(cookie) => { let url = format!("{}/admin{}", &self.url, path); - let request = reqwest::Client::new() + let client = self.get_http_client(); + let request = client .post(url.as_str()) .header("Cookie", cookie.clone()) .json(&json); diff --git a/src/config.rs b/src/config.rs index c63591c..eccc035 100644 --- a/src/config.rs +++ b/src/config.rs @@ -38,11 +38,13 @@ pub struct Config { // Bitwarden connection config bitwarden_url: String, bitwarden_admin_token: String, + bitwarden_root_cert_file: Option, // LDAP Connection config ldap_host: String, ldap_scheme: Option, ldap_ssl: Option, ldap_port: Option, + ldap_no_tls_verify: Option, // LDAP auth config ldap_bind_dn: String, ldap_bind_password: Pass, @@ -71,6 +73,13 @@ impl Config { self.bitwarden_admin_token.clone() } + pub fn get_bitwarden_root_cert_file(&self) -> String { + match &self.bitwarden_root_cert_file { + Some(bitwarden_root_cert_file) => bitwarden_root_cert_file.clone(), + None => String::new(), + } + } + pub fn get_ldap_url(&self) -> String { format!( "{}://{}:{}", @@ -101,6 +110,10 @@ impl Config { self.ldap_ssl.unwrap_or(false) } + pub fn get_ldap_no_tls_verify(&self) -> bool { + self.ldap_no_tls_verify.unwrap_or(false) + } + pub fn get_ldap_port(&self) -> u16 { match self.ldap_port { Some(ldap_port) => ldap_port, diff --git a/src/main.rs b/src/main.rs index 1be6919..74d9866 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,7 @@ use std::error::Error; use std::thread::sleep; use std::time::Duration; -use ldap3::{DerefAliases, LdapConn, Scope, SearchEntry, SearchOptions}; +use ldap3::{DerefAliases, LdapConn, LdapConnSettings, Scope, SearchEntry, SearchOptions}; mod bw_admin; mod config; @@ -15,6 +15,7 @@ fn main() { let mut client = bw_admin::Client::new( config.get_bitwarden_url().clone(), config.get_bitwarden_admin_token().clone(), + config.get_bitwarden_root_cert_file().clone(), ); if let Err(e) = invite_users(&config, &mut client, config.get_ldap_sync_loop()) { @@ -64,8 +65,10 @@ fn ldap_client( ldap_url: String, bind_dn: String, bind_pw: String, + no_tls_verify: bool, ) -> Result> { - let ldap = LdapConn::new(ldap_url.as_str())?; + let settings = LdapConnSettings::new().set_no_tls_verify(no_tls_verify); + let ldap = LdapConn::with_settings(settings, ldap_url.as_str())?; match ldap.simple_bind(bind_dn.as_str(), bind_pw.as_str()) { _ => {} }; @@ -79,6 +82,7 @@ fn search_entries(config: &config::Config) -> Result, Box