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

Replace deprecated HEADER_X_FORWARDED_ALL constant

Browse source
This commit is contained in:
Shift 2023-01-05 17:02:13 +00:00
parent daff0fc566
commit a57c063e6b
No known key found for this signature in database
GPG key ID: 5A96F038425C5A1C
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Middleware/TrustProxies.php
View file

@ -2,7 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware; use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class TrustProxies extends Middleware class TrustProxies extends Middleware
@ -10,7 +10,7 @@ class TrustProxies extends Middleware
/** /**
* The trusted proxies for this application. * The trusted proxies for this application.
* *
* @var array|string|null * @var array<int, string>|string|null
*/ */
protected $proxies; protected $proxies;
@ -19,5 +19,10 @@ class TrustProxies extends Middleware
* *
* @var int * @var int
*/ */
protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB; protected $headers =
Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
} }

4
config/trustedproxy.php
View file

@ -1,5 +1,7 @@
<?php <?php
use Illuminate\Http\Request;
return [ return [
/* /*
* Set trusted proxy IP addresses. * Set trusted proxy IP addresses.
@ -50,5 +52,5 @@ return [
* The following are Symfony defaults, found in * The following are Symfony defaults, found in
* \Symfony\Component\HttpFoundation\Request::$trustedHeaders * \Symfony\Component\HttpFoundation\Request::$trustedHeaders
*/ */
'headers' => \Illuminate\Http\Request::HEADER_X_FORWARDED_ALL, 'headers' => \Illuminate\Http\Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB,
]; ];