Merge pull request #3402 from CachetHQ/feature/remote-user-authenticate
Authenticate with REMOTE_USER
This commit is contained in:
@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Foundation\Providers;
|
|||||||
|
|
||||||
use CachetHQ\Cachet\Http\Middleware\Acceptable;
|
use CachetHQ\Cachet\Http\Middleware\Acceptable;
|
||||||
use CachetHQ\Cachet\Http\Middleware\Authenticate;
|
use CachetHQ\Cachet\Http\Middleware\Authenticate;
|
||||||
|
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
|
||||||
use CachetHQ\Cachet\Http\Middleware\Timezone;
|
use CachetHQ\Cachet\Http\Middleware\Timezone;
|
||||||
use CachetHQ\Cachet\Http\Middleware\VerifyCsrfToken;
|
use CachetHQ\Cachet\Http\Middleware\VerifyCsrfToken;
|
||||||
use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes;
|
use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes;
|
||||||
@@ -151,6 +152,7 @@ class RouteServiceProvider extends ServiceProvider
|
|||||||
|
|
||||||
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) {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ use CachetHQ\Cachet\Http\Middleware\CacheControl;
|
|||||||
use CachetHQ\Cachet\Http\Middleware\Localize;
|
use CachetHQ\Cachet\Http\Middleware\Localize;
|
||||||
use CachetHQ\Cachet\Http\Middleware\ReadyForUse;
|
use CachetHQ\Cachet\Http\Middleware\ReadyForUse;
|
||||||
use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated;
|
use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated;
|
||||||
|
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
|
||||||
use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted;
|
use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted;
|
||||||
use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured;
|
use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured;
|
||||||
use CachetHQ\Cachet\Http\Middleware\Throttler;
|
use CachetHQ\Cachet\Http\Middleware\Throttler;
|
||||||
@@ -45,17 +46,18 @@ class Kernel extends HttpKernel
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $routeMiddleware = [
|
protected $routeMiddleware = [
|
||||||
'admin' => Admin::class,
|
'admin' => Admin::class,
|
||||||
'can' => Authorize::class,
|
'auth.api' => ApiAuthentication::class,
|
||||||
'cors' => HandleCors::class,
|
'auth.remoteuser' => RemoteUserAuthenticate::class,
|
||||||
'cache' => CacheControl::class,
|
'auth' => Authenticate::class,
|
||||||
'auth' => Authenticate::class,
|
'cache' => CacheControl::class,
|
||||||
'auth.api' => ApiAuthentication::class,
|
'can' => Authorize::class,
|
||||||
'guest' => RedirectIfAuthenticated::class,
|
'cors' => HandleCors::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' => Throttler::class,
|
'subscribers' => SubscribersConfigured::class,
|
||||||
|
'throttle' => Throttler::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
53
app/Http/Middleware/RemoteUserAuthenticate.php
Normal file
53
app/Http/Middleware/RemoteUserAuthenticate.php
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of Cachet.
|
||||||
|
*
|
||||||
|
* (c) Alt Three Services Limited
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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