0ct0pu5/Heimdall
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from vincentbitter/remote_user-login

Browse source 
Fix auto-login using REMOTE_USER variable
This commit is contained in:
KodeStar 2020-01-06 08:44:06 +00:00 • committed by GitHub
commit e7a6ac5a75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions

9
app/Providers/AppServiceProvider.php
View file

@ -72,7 +72,8 @@ class AppServiceProvider extends ServiceProvider
explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
}
if(!\Auth::check()) {
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])
&& !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
$credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
if (\Auth::attempt($credentials, true)) {
@ -84,8 +85,10 @@ class AppServiceProvider extends ServiceProvider
}
elseif(isset($_SERVER['REMOTE_USER']) && !empty($_SERVER['REMOTE_USER'])) {
$user = User::where('username', $_SERVER['REMOTE_USER'])->first();
\Auth::login($user, true);
session(['current_user' => $user]);
if ($user) {
\Auth::login($user, true);
session(['current_user' => $user]);
}
}
}