From: Stefan Sterz <s.sterz@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox 1/4] ldap: remove support for unauthenticated binds
Date: Mon, 26 Jun 2023 11:39:13 +0200 [thread overview]
Message-ID: <20230626093916.701659-2-s.sterz@proxmox.com> (raw)
In-Reply-To: <20230626093916.701659-1-s.sterz@proxmox.com>
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>
---
proxmox-ldap/src/lib.rs | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/proxmox-ldap/src/lib.rs b/proxmox-ldap/src/lib.rs
index 7c735b8..cdc4c9d 100644
--- a/proxmox-ldap/src/lib.rs
+++ b/proxmox-ldap/src/lib.rs
@@ -6,7 +6,7 @@ use std::{
time::Duration,
};
-use anyhow::{bail, Error};
+use anyhow::{bail, format_err, Error};
use ldap3::adapters::{Adapter, EntriesOnly, PagedResults};
use ldap3::{Ldap, LdapConnAsync, LdapConnSettings, LdapResult, Scope, SearchEntry};
use native_tls::{Certificate, TlsConnector, TlsConnectorBuilder};
@@ -119,7 +119,11 @@ impl Connection {
let mut ldap = self.create_connection().await?;
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()?;
}
@@ -254,7 +258,11 @@ impl Connection {
let mut ldap = self.create_connection().await?;
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 user_dn = self.do_search_user_dn(username, &mut ldap).await;
--
2.39.2
next prev parent reply other threads:[~2023-06-26 9:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 9:39 [pbs-devel] [PATCH proxmox(-backup), widget-toolkit 0/4] improve ldap configuration handling Stefan Sterz
2023-06-26 9:39 ` Stefan Sterz [this message]
2023-06-26 13:00 ` [pbs-devel] applied: [PATCH proxmox 1/4] ldap: remove support for unauthenticated binds Wolfgang Bumiller
2023-06-26 9:39 ` [pbs-devel] [PATCH proxmox 2/4] ldap: add check_connection function Stefan Sterz
2023-06-26 12:23 ` Lukas Wagner
2023-06-26 12:24 ` Stefan Sterz
2023-06-26 12:57 ` Wolfgang Bumiller
2023-06-26 9:39 ` [pbs-devel] [PATCH proxmox-backup 3/4] access: ldap check connection on creation and change Stefan Sterz
2023-06-26 12:36 ` Lukas Wagner
2023-06-26 12:40 ` Stefan Sterz
2023-06-26 12:59 ` Wolfgang Bumiller
2023-06-26 13:17 ` Stefan Sterz
2023-06-26 9:39 ` [pbs-devel] [PATCH widget-toolkit 4/4] window: ldap auth edit forbid specifying a bind_dn without a password Stefan Sterz
2023-06-26 13:04 ` [pbs-devel] applied: " Wolfgang Bumiller
2023-06-26 18:30 ` [pbs-devel] " Thomas Lamprecht
2023-06-27 7:23 ` Stefan Sterz
2023-06-26 12:39 ` [pbs-devel] [PATCH proxmox(-backup), widget-toolkit 0/4] improve ldap configuration handling Lukas Wagner
2023-06-26 12:46 ` Stefan Hanreich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230626093916.701659-2-s.sterz@proxmox.com \
--to=s.sterz@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox