Page MenuHomePhorge
Files F117761561

D5505.1775214738.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D5505.1775214738.diff
View Options

diff --git a/src/app/Http/Kernel.php b/src/app/Http/Kernel.php
--- a/src/app/Http/Kernel.php
+++ b/src/app/Http/Kernel.php
@@ -22,7 +22,6 @@
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
use Illuminate\Http\Middleware\SetCacheHeaders;
-use Illuminate\Http\Response;
use Illuminate\Routing\Middleware\SubstituteBindings;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Routing\Middleware\ValidateSignature;
@@ -99,17 +98,4 @@
'allowedHosts' => AllowedHosts::class,
'regularHosts' => RegularHosts::class,
];
-
- /**
- * Handle an incoming HTTP request.
- *
- * @param \Illuminate\Http\Request $request HTTP Request object
- *
- * @return Response
- */
- public function handle($request)
- {
- // Overwrite the http request object
- return parent::handle(Request::createFrom($request));
- }
}
diff --git a/src/app/Http/Middleware/TrustProxies.php b/src/app/Http/Middleware/TrustProxies.php
--- a/src/app/Http/Middleware/TrustProxies.php
+++ b/src/app/Http/Middleware/TrustProxies.php
@@ -17,4 +17,21 @@
| Request::HEADER_X_FORWARDED_PORT
| Request::HEADER_X_FORWARDED_PROTO
| Request::HEADER_X_FORWARDED_AWS_ELB;
+
+ /**
+ * Handle an incoming request.
+ *
+ * @return mixed
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+ */
+ public function handle(Request $request, \Closure $next)
+ {
+ // Use X-Client-IP if specified
+ if ($client_ip = $request->headers->get('X-Client-IP')) {
+ $request->headers->set('X-Forwarded-For', $client_ip);
+ }
+
+ return parent::handle($request, $next);
+ }
}
diff --git a/src/app/Http/Request.php b/src/app/Http/Request.php
deleted file mode 100644
--- a/src/app/Http/Request.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http;
-
-use Illuminate\Http\Request as LaravelRequest;
-
-class Request extends LaravelRequest
-{
- /**
- * Get the client IP address.
- *
- * @return string|null
- */
- public function ip()
- {
- if (($client_ip = $this->headers->get('X-Client-IP')) && $this->isFromTrustedProxy()) {
- return $client_ip;
- }
-
- return parent::ip();
- }
-}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 11:12 AM (3 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18823781
Default Alt Text
D5505.1775214738.diff (2 KB)

Event Timeline