fix: remove dead middleware
Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
parent
81d995cfc7
commit
a88d04e764
@ -21,7 +21,6 @@
|
||||
|
||||
namespace App\Http;
|
||||
|
||||
use App\Http\Middleware\APIAuthenticationMiddleware;
|
||||
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
||||
|
||||
class Kernel extends HttpKernel
|
||||
@ -61,7 +60,6 @@ class Kernel extends HttpKernel
|
||||
'api' => [
|
||||
'throttle:60,1',
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
APIAuthenticationMiddleware::class
|
||||
],
|
||||
];
|
||||
|
||||
|
@ -1,65 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\ApiKey;
|
||||
use App\Facades\JSON;
|
||||
use Carbon\Carbon;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class APIAuthenticationMiddleware
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
$key = $request->bearerToken();
|
||||
|
||||
if (!is_null($key))
|
||||
{
|
||||
// we have a valid discriminator
|
||||
$discriminator = Str::before($key, '.');
|
||||
$loneKey = Str::after($key, '.');
|
||||
|
||||
$keyRecord = ApiKey::where('discriminator', $discriminator)->first();
|
||||
|
||||
if ($keyRecord && Hash::check($loneKey, $keyRecord->secret) && $keyRecord->status == 'active')
|
||||
{
|
||||
$keyRecord->last_used = Carbon::now();
|
||||
$keyRecord->save();
|
||||
|
||||
Log::info('Recording API call, see context', [
|
||||
'uri' => $request->url(),
|
||||
'name' => Route::currentRouteName(),
|
||||
'discriminator' => $discriminator,
|
||||
'ip' => $request->ip()
|
||||
]);
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
return JSON::setResponseType('error')
|
||||
->setStatus('authfail')
|
||||
->setMessage('Invalid / Revoked API key.')
|
||||
->setCode(401)
|
||||
->build();
|
||||
}
|
||||
|
||||
return JSON::setResponseType('error')
|
||||
->setStatus('malformed_key')
|
||||
->setMessage('Missing or malformed API key.')
|
||||
->setCode(400)
|
||||
->build();
|
||||
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user