Skip to content

A free open source IT asset/license management system

Apply pint to Middleware directory

snipeec6caf9b5959
diff --git a/app/Http/Middleware/AssetCountForSidebar.php b/app/Http/Middleware/AssetCountForSidebar.php
index 58bee0d834..da63d66984 100644
--- a/app/Http/Middleware/AssetCountForSidebar.php
+++ b/app/Http/Middleware/AssetCountForSidebar.php
@@ -3,16 +3,17 @@
namespace App\Http\Middleware;
use App\Models\Asset;
-use Closure;
use App\Models\Setting;
+use Closure;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
+
class AssetCountForSidebar
{
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
diff --git a/app/Http/Middleware/CheckColorSettings.php b/app/Http/Middleware/CheckColorSettings.php
index 29dc53cc5f..5666088985 100644
--- a/app/Http/Middleware/CheckColorSettings.php
+++ b/app/Http/Middleware/CheckColorSettings.php
@@ -5,7 +5,7 @@ namespace App\Http\Middleware;
use App\Models\Setting;
use Closure;
use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
class CheckColorSettings
{
@@ -19,7 +19,6 @@ class CheckColorSettings
/**
* Create a new filter instance.
*
- * @param Guard $auth
* @return void
*/
public function __construct(Guard $auth)
@@ -30,8 +29,7 @@ class CheckColorSettings
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
@@ -42,14 +40,12 @@ class CheckColorSettings
$link_dark_color = '#89c9ed';
$link_light_color = '#3c8dbc';
-
if ($settings = Setting::getSettings()) {
$nav_color = $settings->nav_link_color;
$link_dark_color = $settings->link_dark_color;
$link_light_color = $settings->link_light_color;
}
-
// Override system settings
if ($request->user()) {
@@ -64,7 +60,6 @@ class CheckColorSettings
}
}
-
view()->share('nav_link_color', $nav_color);
view()->share('link_dark_color', $link_dark_color);
view()->share('link_light_color', $link_light_color);
diff --git a/app/Http/Middleware/CheckForDebug.php b/app/Http/Middleware/CheckForDebug.php
index 3bf919f1f2..7e2833cc52 100644
--- a/app/Http/Middleware/CheckForDebug.php
+++ b/app/Http/Middleware/CheckForDebug.php
@@ -2,16 +2,16 @@
namespace App\Http\Middleware;
-use Illuminate\Support\Facades\Auth;
use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
class CheckForDebug
{
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php
index 6cb593b5ff..2f8541f6d9 100644
--- a/app/Http/Middleware/CheckForSetup.php
+++ b/app/Http/Middleware/CheckForSetup.php
@@ -7,10 +7,9 @@ use Closure;
class CheckForSetup
{
-
protected $except = [
'_debugbar*',
- 'health'
+ 'health',
];
public function handle($request, Closure $next, $guard = null)
@@ -19,7 +18,7 @@ class CheckForSetup
/**
* Skip this middleware for the debugbar and health check
*/
- if ($request->is($this->except)) {
+ if ($request->is($this->except)) {
return $next($request);
}
diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.php
index b94423d205..1010e227c1 100644
--- a/app/Http/Middleware/CheckForTwoFactor.php
+++ b/app/Http/Middleware/CheckForTwoFactor.php
@@ -3,8 +3,9 @@
namespace App\Http\Middleware;
use App\Models\Setting;
-use Illuminate\Support\Facades\Auth;
use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
class CheckForTwoFactor
{
@@ -16,9 +17,7 @@ class CheckForTwoFactor
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- *
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
@@ -38,7 +37,7 @@ class CheckForTwoFactor
if ($settings = Setting::getSettings()) {
if (Auth::check() && ($settings->two_factor_enabled != '')) {
// This user is already 2fa-authed
- if ($request->session()->get('2fa_authed')==auth()->id()) {
+ if ($request->session()->get('2fa_authed') == auth()->id()) {
return $next($request);
}
diff --git a/app/Http/Middleware/CheckLocale.php b/app/Http/Middleware/CheckLocale.php
index 68a9c48c34..38bd758e82 100644
--- a/app/Http/Middleware/CheckLocale.php
+++ b/app/Http/Middleware/CheckLocale.php
@@ -2,10 +2,12 @@
namespace App\Http\Middleware;
+use App\Helpers\Helper;
use App\Models\Setting;
use Closure;
-use \App\Helpers\Helper;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
+
class CheckLocale
{
private function warn_legacy_locale($language, $source)
@@ -14,13 +16,12 @@ class CheckLocale
Log::warning("$source $language and should be updated to be ".Helper::mapLegacyLocale($language));
}
}
+
/**
* Handle the locale for the user, default to settings otherwise.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @param string|null $guard
- *
+ * @param Request $request
+ * @param string|null $guard
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
@@ -28,24 +29,25 @@ class CheckLocale
// Default app settings from config
$language = config('app.locale');
- $this->warn_legacy_locale($language, "APP_LOCALE in .env is set to");
+ $this->warn_legacy_locale($language, 'APP_LOCALE in .env is set to');
if ($settings = Setting::getSettings()) {
// User's preference
if (($request->user()) && ($request->user()->locale)) {
$language = $request->user()->locale;
- $this->warn_legacy_locale($language, "username ".$request->user()->username." (".$request->user()->id.") has a language");
+ $this->warn_legacy_locale($language, 'username '.$request->user()->username.' ('.$request->user()->id.') has a language');
- // App setting preference
+ // App setting preference
} elseif ($settings->locale != '') {
$language = $settings->locale;
- $this->warn_legacy_locale($language, "App Settings is set to");
+ $this->warn_legacy_locale($language, 'App Settings is set to');
}
}
-
+
app()->setLocale(Helper::mapLegacyLocale($language));
+
return $next($request);
}
}
diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php
index 3eda3e3144..1d4d03279d 100644
--- a/app/Http/Middleware/CheckPermissions.php
+++ b/app/Http/Middleware/CheckPermissions.php
@@ -3,6 +3,7 @@
namespace App\Http\Middleware;
use Closure;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Gate;
class CheckPermissions
@@ -13,8 +14,7 @@ class CheckPermissions
* The $section variable is passed via the route middleware,
* 'middleware' => [authorize:superadmin']
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @param string|null $section
* @return mixed
*/
diff --git a/app/Http/Middleware/CheckUserIsActivated.php b/app/Http/Middleware/CheckUserIsActivated.php
index 352e55a4d8..945cd906aa 100644
--- a/app/Http/Middleware/CheckUserIsActivated.php
+++ b/app/Http/Middleware/CheckUserIsActivated.php
@@ -4,6 +4,7 @@ namespace App\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class CheckUserIsActivated
@@ -18,7 +19,6 @@ class CheckUserIsActivated
/**
* Create a new filter instance.
*
- * @param Guard $auth
* @return void
*/
public function __construct(Guard $auth)
@@ -29,8 +29,7 @@ class CheckUserIsActivated
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
@@ -39,8 +38,9 @@ class CheckUserIsActivated
// If there is a user AND the user is NOT activated, send them to the login page
// This prevents people who still have active sessions logged in and their status gets toggled
// to inactive (aka unable to login)
- if (($request->user()) && (!$request->user()->isActivated())) {
+ if (($request->user()) && (! $request->user()->isActivated())) {
Auth::logout();
+
return redirect()->guest('login');
}
diff --git a/app/Http/Middleware/NoSessionStore.php b/app/Http/Middleware/NoSessionStore.php
index c445d4e7f8..9be45723d7 100644
--- a/app/Http/Middleware/NoSessionStore.php
+++ b/app/Http/Middleware/NoSessionStore.php
@@ -3,6 +3,7 @@
namespace App\Http\Middleware;
use Closure;
+use Illuminate\Http\Request;
class NoSessionStore
{
@@ -13,8 +14,7 @@ class NoSessionStore
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
diff --git a/app/Http/Middleware/PreventBackHistory.php b/app/Http/Middleware/PreventBackHistory.php
index 8533965b4f..429aea3f3c 100644
--- a/app/Http/Middleware/PreventBackHistory.php
+++ b/app/Http/Middleware/PreventBackHistory.php
@@ -3,28 +3,28 @@
namespace App\Http\Middleware;
use Closure;
+use Illuminate\Http\Request;
class PreventBackHistory
{
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
public function handle($request, Closure $next)
{
$headers = [
'Cache-Control' => 'no-cache, no-store, max-age=0, must-revalidate',
- 'Pragma' => 'no-cache',
- 'Expires' => 'Sun, 02 Jan 1990 00:00:00 GMT'
+ 'Pragma' => 'no-cache',
+ 'Expires' => 'Sun, 02 Jan 1990 00:00:00 GMT',
];
$response = $next($request);
- foreach($headers as $key => $value) {
+ foreach ($headers as $key => $value) {
$response->headers->set($key, $value);
}
return $response;
}
-}
\ No newline at end of file
+}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 92da8b1c1f..e39296ff0a 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -3,6 +3,7 @@
namespace App\Http\Middleware;
use Closure;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class RedirectIfAuthenticated
@@ -10,9 +11,8 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
- * @param string|null $guard
+ * @param Request $request
+ * @param string|null $guard
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php
index e740c76678..767d7fc1aa 100644
--- a/app/Http/Middleware/SecurityHeaders.php
+++ b/app/Http/Middleware/SecurityHeaders.php
@@ -3,14 +3,15 @@
namespace App\Http\Middleware;
use Closure;
+use Illuminate\Http\Request;
class SecurityHeaders
{
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
+ * @param Closure $next
* @return mixed
*/
@@ -88,11 +89,11 @@ class SecurityHeaders
$csp_policy[] = "object-src 'none'";
$csp_policy[] = "font-src 'self' data:";
$csp_policy[] = "img-src 'self' data: ".config('app.url').' '.config('app.additional_csp_urls').' '.env('PUBLIC_AWS_URL').' https://secure.gravatar.com http://gravatar.com maps.google.com maps.gstatic.com *.googleapis.com';
-
+
if (config('filesystems.disks.public.driver') == 's3') {
- $csp_policy[] = "img-src 'self' data: ".config('filesystems.disks.public.url');
+ $csp_policy[] = "img-src 'self' data: ".config('filesystems.disks.public.url');
}
- $csp_policy = join(';', $csp_policy);
+ $csp_policy = implode(';', $csp_policy);
$response->headers->set('Content-Security-Policy', $csp_policy);
}
diff --git a/app/Http/Middleware/SetAPIResponseHeaders.php b/app/Http/Middleware/SetAPIResponseHeaders.php
index ac277e785c..2ab1413c69 100644
--- a/app/Http/Middleware/SetAPIResponseHeaders.php
+++ b/app/Http/Middleware/SetAPIResponseHeaders.php
@@ -3,24 +3,21 @@
namespace App\Http\Middleware;
use Closure;
+use Illuminate\Http\Request;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Symfony\Component\HttpFoundation\Response;
class SetAPIResponseHeaders extends ThrottleRequests
{
-
/**
* Add the rate limit headers to the response.
*
* This extends the original ThrottleRequests middleware to add the 'X-RateLimit-Reset' and 'Retry-After' headers, even
* if the rate limit is not exceeded.
- * @param $maxAttempts
- * @param $remainingAttempts
- * @param $retryAfter
- * @param Response|null $response
+ *
* @return array|int[]
*/
- protected function getHeaders($maxAttempts, $remainingAttempts, $retryAfter = null, ?Response $response = null)
+ protected function getHeaders($maxAttempts, $remainingAttempts, $retryAfter = null, ?Response $response = null)
{
if ($response &&
! is_null($response->headers->get('X-RateLimit-Remaining')) &&
@@ -29,6 +26,7 @@ class SetAPIResponseHeaders extends ThrottleRequests
$headers['Retry-After'] = $retryAfter; // this is the only line we changed
$headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
$headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
+
return $headers;
}
@@ -46,13 +44,10 @@ class SetAPIResponseHeaders extends ThrottleRequests
return $headers;
}
-
-
/**
* Handle an incoming request.
*
- * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param Request $request
* @return mixed
*/
protected function handleRequest($request, Closure $next, array $limits)
@@ -78,5 +73,4 @@ class SetAPIResponseHeaders extends ThrottleRequests
return $response;
}
-
-}
\ No newline at end of file
+}