Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-02-09 17:57:21 +03:00
Code Releases Activity

ldap: handle errors explicitly everywhere instead of simply dieing

Browse Source 
Most codepaths already have explicit error handling (by the means of
checking the return value), which is essential dead code due to setting
`onerror`.

As LDAP errors might get presented to users due to upcoming changes, the
error location should not be present in these error messages, thus
switch to explicit handling.

Only two calls were missing such explicit handling of errors, so these
are amended as appropriate. Further, some `die`s were missing newlines
at the end of the message, which - again - would cause the error
location to be included.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
This commit is contained in:
Christoph Heiss 2023-08-10 14:37:05 +02:00 committed by Wolfgang Bumiller
parent 4bb9bfe70b
commit 10de5bfc2a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/PVE/LDAP.pm
View File

@ -22,7 +22,6 @@ sub ldap_connect {
scheme => $scheme,
port => $port,
timeout => 10,
onerror => 'die',
);
my $hosts = [];
@ -41,7 +40,8 @@ sub ldap_connect {
my $ldap = Net::LDAP->new($hosts, %ldap_opts) || die "$@\n";
if ($start_tls) {
$ldap->start_tls(%$opts);
my $res = $ldap->start_tls(%$opts);
die $res->error . "\n" if $res->code;
}
return $ldap;
@ -73,6 +73,7 @@ sub get_user_dn {
filter => "$attr=$name",
attrs => ['dn']
);
die $result->error . "\n" if $result->code;
return undef if !$result->entries;
my @entries = $result->entries;
return $entries[0]->dn;
@ -93,7 +94,7 @@ sub auth_user_dn {
if ($code) {
return undef if $noerr;
die $err;
die "$err\n";
}
return 1;
@ -184,7 +185,7 @@ sub query_users {
$err = "LDAP user query unsuccessful" if !$err;
}
die $err if $err;
die "$err\n" if $err;
return $users;
}
@ -265,7 +266,7 @@ sub query_groups {
$err = "LDAP group query unsuccessful" if !$err;
}
die $err if $err;
die "$err\n" if $err;
return $groups;
}