DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix for 500-page on deactivated LDAP user trying to log in (#8774)

Browse source
This commit is contained in:
Brady Wetherington 2020-11-17 22:31:22 -08:00 committed by GitHub
parent 2ea805b7ed
commit 8457207c8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Services/LdapAd.php
View file

@ -146,9 +146,17 @@ class LdapAd extends LdapAdConfiguration
throw new Exception('Unable to find user in LDAP directory!'); throw new Exception('Unable to find user in LDAP directory!');
} }
return User::where('username', $username) $user = User::where('username', $username)
->whereNull('deleted_at')->where('ldap_import', '=', 1) ->whereNull('deleted_at')->where('ldap_import', '=', 1)
->where('activated', '=', '1')->first(); ->where('activated', '=', '1')->first();
/* Above, I could've just done ->firstOrFail() which would've been cleaner, but it would've been miserable to
troubleshoot if it ever came up (giving a really generic and untraceable error message)
*/
if (!$user) {
throw new Exception("User is either deleted, not activated (can't log in), not from LDAP, or can't be found in database");
}
return $user;
} }
/** /**