konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

ldap: remove support for unauthenticated binds

Browse Source 
by using the default empty string if no password was provided,
unauthenticated binds were possible. to bring pbs in-line with pve,
switch to throwing an error in this case instead. however, this will
break any pre-existing setup that relied on this behavior.

Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
This commit is contained in:
Stefan Sterz 2023-06-26 11:39:13 +02:00 committed by Wolfgang Bumiller
parent 962ce920a0
commit 599a6a49da
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proxmox-ldap/src/lib.rs
View File

@ -6,7 +6,7 @@ use std::{
time::Duration, time::Duration,
}; };
use anyhow::{bail, Error}; use anyhow::{bail, format_err, Error};
use ldap3::adapters::{Adapter, EntriesOnly, PagedResults}; use ldap3::adapters::{Adapter, EntriesOnly, PagedResults};
use ldap3::{Ldap, LdapConnAsync, LdapConnSettings, LdapResult, Scope, SearchEntry}; use ldap3::{Ldap, LdapConnAsync, LdapConnSettings, LdapResult, Scope, SearchEntry};
use native_tls::{Certificate, TlsConnector, TlsConnectorBuilder}; use native_tls::{Certificate, TlsConnector, TlsConnectorBuilder};
@ -119,7 +119,11 @@ impl Connection {
let mut ldap = self.create_connection().await?; let mut ldap = self.create_connection().await?;
if let Some(bind_dn) = self.config.bind_dn.as_deref() { if let Some(bind_dn) = self.config.bind_dn.as_deref() {
let password = self.config.bind_password.as_deref().unwrap_or_default(); let password = self
.config
.bind_password
.as_deref()
.ok_or_else(|| format_err!("Missing bind password for {bind_dn}"))?;
let _: LdapResult = ldap.simple_bind(bind_dn, password).await?.success()?; let _: LdapResult = ldap.simple_bind(bind_dn, password).await?.success()?;
} }
@ -254,7 +258,11 @@ impl Connection {
let mut ldap = self.create_connection().await?; let mut ldap = self.create_connection().await?;
if let Some(bind_dn) = self.config.bind_dn.as_deref() { if let Some(bind_dn) = self.config.bind_dn.as_deref() {
let password = self.config.bind_password.as_deref().unwrap_or_default(); let password = self
.config
.bind_password
.as_deref()
.ok_or_else(|| format_err!("Missing bind password for {bind_dn}"))?;
let _: LdapResult = ldap.simple_bind(bind_dn, password).await?.success()?; let _: LdapResult = ldap.simple_bind(bind_dn, password).await?.success()?;
let user_dn = self.do_search_user_dn(username, &mut ldap).await; let user_dn = self.do_search_user_dn(username, &mut ldap).await;