DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #11510 from sunflowerbofh/tmp-ldap

Browse source 
Fixed #11509 allow-ldap-anonymous-bind
This commit is contained in:
snipe 2022-08-22 16:32:07 -07:00 committed by GitHub
parent 3ac84eab58 8596c54d6a
commit 45f17fea8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Models/Ldap.php
View file

@ -169,6 +169,7 @@ class Ldap extends Model
{ {
$ldap_username = Setting::getSettings()->ldap_uname; $ldap_username = Setting::getSettings()->ldap_uname;
if ( $ldap_username ) {
// Lets return some nicer messages for users who donked their app key, and disable LDAP // Lets return some nicer messages for users who donked their app key, and disable LDAP
try { try {
$ldap_pass = \Crypt::decrypt(Setting::getSettings()->ldap_pword); $ldap_pass = \Crypt::decrypt(Setting::getSettings()->ldap_pword);
@ -184,8 +185,13 @@ class Ldap extends Model
// so I don't want to fix this right now. // so I don't want to fix this right now.
// this method MODIFIES STATE on the passed-in $connection and just returns true or false (or, in this case, undefined) // this method MODIFIES STATE on the passed-in $connection and just returns true or false (or, in this case, undefined)
// at the next refactor, this should be appropriately modified to be more consistent. // at the next refactor, this should be appropriately modified to be more consistent.
} else {
// LDAP should also work with anonymous bind (no dn, no password available)
if (! $ldapbind = @ldap_bind($connection )) {
throw new Exception('Could not bind to LDAP: '.ldap_error($connection));
}
}
} }
/** /**
* Parse and map LDAP attributes based on settings * Parse and map LDAP attributes based on settings