Add support for authentication via REMOTE_USER
This commit is contained in:
@@ -28,6 +28,7 @@ use Illuminate\Routing\Middleware\SubstituteBindings;
|
|||||||
use Illuminate\Routing\Router;
|
use Illuminate\Routing\Router;
|
||||||
use Illuminate\Session\Middleware\StartSession;
|
use Illuminate\Session\Middleware\StartSession;
|
||||||
use Illuminate\View\Middleware\ShareErrorsFromSession;
|
use Illuminate\View\Middleware\ShareErrorsFromSession;
|
||||||
|
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the route service provider.
|
* This is the route service provider.
|
||||||
@@ -149,9 +150,10 @@ class RouteServiceProvider extends ServiceProvider
|
|||||||
VerifyCsrfToken::class,
|
VerifyCsrfToken::class,
|
||||||
SubstituteBindings::class,
|
SubstituteBindings::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) {
|
if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) {
|
||||||
$middleware[] = Authenticate::class;
|
$middleware[] = Authenticate::class;
|
||||||
|
$middleware[] = RemoteUserAuthenticate::class;
|
||||||
}
|
}
|
||||||
|
|
||||||
$router->group(['middleware' => $middleware], function (Router $router) use ($routes) {
|
$router->group(['middleware' => $middleware], function (Router $router) use ($routes) {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ use CachetHQ\Cachet\Http\Middleware\TrustProxies;
|
|||||||
use Illuminate\Auth\Middleware\Authorize;
|
use Illuminate\Auth\Middleware\Authorize;
|
||||||
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
||||||
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
|
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
|
||||||
|
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
|
||||||
|
|
||||||
class Kernel extends HttpKernel
|
class Kernel extends HttpKernel
|
||||||
{
|
{
|
||||||
@@ -43,15 +44,16 @@ class Kernel extends HttpKernel
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $routeMiddleware = [
|
protected $routeMiddleware = [
|
||||||
'admin' => Admin::class,
|
'admin' => Admin::class,
|
||||||
'can' => Authorize::class,
|
'can' => Authorize::class,
|
||||||
'auth' => Authenticate::class,
|
'auth' => Authenticate::class,
|
||||||
'auth.api' => ApiAuthentication::class,
|
'auth.api' => ApiAuthentication::class,
|
||||||
'guest' => RedirectIfAuthenticated::class,
|
'auth.remoteuser' => RemoteUserAuthenticate::class,
|
||||||
'localize' => Localize::class,
|
'guest' => RedirectIfAuthenticated::class,
|
||||||
'ready' => ReadyForUse::class,
|
'localize' => Localize::class,
|
||||||
'setup' => SetupAlreadyCompleted::class,
|
'ready' => ReadyForUse::class,
|
||||||
'subscribers' => SubscribersConfigured::class,
|
'setup' => SetupAlreadyCompleted::class,
|
||||||
'throttle' => ThrottlingMiddleware::class,
|
'subscribers' => SubscribersConfigured::class,
|
||||||
|
'throttle' => ThrottlingMiddleware::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
44
app/Http/Middleware/RemoteUserAuthenticate.php
Normal file
44
app/Http/Middleware/RemoteUserAuthenticate.php
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace CachetHQ\Cachet\Http\Middleware;
|
||||||
|
|
||||||
|
use CachetHQ\Cachet\Models\User;
|
||||||
|
use Closure;
|
||||||
|
use Illuminate\Contracts\Auth\Guard;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class RemoteUserAuthenticate
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Create a new remote user authenticate instance.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Contracts\Auth\Guard $auth
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct(Guard $auth)
|
||||||
|
{
|
||||||
|
$this->auth = $auth;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle an incoming request.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
* @param \Closure $next
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function handle(Request $request, Closure $next)
|
||||||
|
{
|
||||||
|
if ($remoteUser = $request->server('REMOTE_USER')) {
|
||||||
|
$user = User::where('email', '=', $remoteUser)->first();
|
||||||
|
|
||||||
|
if ($user instanceof User && $this->auth->guest()) {
|
||||||
|
$this->auth->login($user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $next($request);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user