mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix up ldap-authorizer, create non-existent users (#9192)

Browse Source 
* First attempt at ldap-auth fixes

* no, guest, so it is not allowed.

* cast to int

* don't count on Session

* return full user

* Specific error for guest not allowed.

* fix up external auth user creation

* fix check

* Fix user level missing
Simplify middleware

* use guard if configured
This commit is contained in:
Tony Murray
2018-09-12 12:51:24 -05:00
committed by GitHub
parent 31e931d8ee
commit 588b115d66
3 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Middleware/LegacyExternalAuth.php
View File

@@ -19,24 +19,16 @@ class LegacyExternalAuth
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle($request, Closure $next, $guard = null)
{
if (!Auth::check() && LegacyAuth::get()->authIsExternal()) {
try {
$username = LegacyAuth::get()->getExternalUsername();
$password = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
if (!Auth::guard($guard)->check() && LegacyAuth::get()->authIsExternal()) {
$credentials = [
'username' => LegacyAuth::get()->getExternalUsername(),
'password' => isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''
];
if (LegacyAuth::get()->authenticate($username, $password)) {
$user_id = User::thisAuth()->where('username', $username)->value('user_id');
Auth::loginUsingId($user_id);
}
} catch (AuthenticationException $e) {
$message = $e->getMessage();
Log::critical('HTTP Auth Error: ' . $message);
if (!Config::get('auth.debug', false)) {
$message = '';
}
if (!Auth::guard($guard)->attempt($credentials)) {
$message = ''; // no debug info for now...
// force user to failure page
return response(view('auth.external-auth-failed')->with('message', $message));