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

Fixes potential login issue if password syncing is set to true

Browse source
This commit is contained in:
snipe 2016-11-30 20:39:43 -08:00
parent 820d37cabb
commit 6c366eb112
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Auth/AuthController.php
View file

@ -124,16 +124,18 @@ class AuthController extends Controller
return redirect()->back()->withInput()->withErrors($validator);
}
$user = null;
// Should we even check for LDAP users?
if (Setting::getSettings()->ldap_enabled=='1') {
LOG::debug("LDAP is enabled.");
try {
$user = $this->login_via_ldap($request);
Auth::login($user, true);
// If the user was unable to login via LDAP, log the error and let them fall through to
// local authentication.
} catch (\Exception $e) {
if(Setting::getSettings()->ldap_pw_sync!='1') {
return redirect()->back()->withInput()->with('error',$e->getMessage());
}
LOG::error("There was an error authenticating the LDAP user: ".$e->getMessage());
}
}