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

possible fix for basic auth

Browse source
This commit is contained in:
Chris 2018-10-17 09:41:20 +01:00
parent e0064504e7
commit cdafbab7b1
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -23,4 +23,5 @@ yarn-error.log
.Spotlight-V100 .Spotlight-V100
.TemporaryItems .TemporaryItems
.Trashes .Trashes
.VolumeIcon.icns .VolumeIcon.icns
storage/app/public/avatars/*

37
app/Providers/AppServiceProvider.php
View file

@ -65,7 +65,27 @@ class AppServiceProvider extends ServiceProvider
$view->with('alt_bg', $alt_bg ); $view->with('alt_bg', $alt_bg );
$view->with('allusers', $allusers ); $view->with('allusers', $allusers );
$view->with('current_user', $current_user ); $view->with('current_user', $current_user );
if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
}
if(!\Auth::check()) {
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
$credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
if (\Auth::attempt($credentials)) {
// Authentication passed...
$user = \Auth::user();
\Session::put('current_user', $user);
//session(['current_user' => $user]);
}
}
}
}); });
@ -76,21 +96,6 @@ class AppServiceProvider extends ServiceProvider
if(env('APP_URL') != 'http://localhost') { if(env('APP_URL') != 'http://localhost') {
\URL::forceRootUrl(env('APP_URL')); \URL::forceRootUrl(env('APP_URL'));
} }
if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
}
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
$credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
if (\Auth::attempt($credentials)) {
// Authentication passed...
$user = \Auth::user();
\Session::put('current_user', $user);
//session(['current_user' => $user]);
}
}
} }