Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-01 05:44:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

adaptions :-)

Browse source
This commit is contained in:
Philipp 2022-06-23 23:01:09 +02:00
parent 12ba37e8d2
commit 5bf5b5e6c9
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/App/Request.php
View file

@ -32,8 +32,13 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
*/
class Request
{
/** @var string the default possible headers, which could contain the client IP */
const ORDERED_FORWARD_FOR_HEADER = 'HTTP_X_FORWARDED_FOR';
/**
* A comma separated list of default headers that could contain the client IP in a proxy request
* Beware: This list is ordered
*
* @var string
*/
const DEFAULT_FORWARD_FOR_HEADER = 'HTTP_X_FORWARDED_FOR';
/** @var string The remote IP address of the current request */
protected $remoteAddress;
@ -108,7 +113,7 @@ class Request
* specified in this header will be returned instead.
*
* @param IManageConfigValues $config
* @param array $server
* @param array $server The $_SERVER array
*
* @return string
*/
@ -118,7 +123,7 @@ class Request
$trustedProxies = preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', $config->get('proxy', 'trusted_proxies', ''));
if (\is_array($trustedProxies) && $this->isTrustedProxy($trustedProxies, $remoteAddress)) {
$forwardedForHeaders = preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', $config->get('proxy', 'forwarded_for_headers')) ?? static::ORDERED_FORWARD_FOR_HEADER;
$forwardedForHeaders = preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', $config->get('proxy', 'forwarded_for_headers', static::DEFAULT_FORWARD_FOR_HEADER));
foreach ($forwardedForHeaders as $header) {
if (isset($server[$header])) {