bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Respect Forwarded-For headers

Browse source
This commit is contained in:
Philipp Holzer 2022-06-23 22:42:35 +02:00
commit d441b90bda
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
11 changed files with 355 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

110
tests/src/App/RequestTest.php Normal file
View file

@ -0,0 +1,110 @@
<?php
namespace Friendica\Test\src\App;
use Friendica\App\Request;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Test\MockedTest;
class RequestTest extends MockedTest
{
public function dataServerArray(): array
{
return [
'default' => [
'server' => ['REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '',
'forwarded_for_headers' => '',
],
'assertion' => '1.2.3.4',
],
'proxy_1' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '1.2.3.4, 4.5.6.7', 'REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR',
],
'assertion' => '4.5.6.7',
],
'proxy_2' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '4.5.6.7, 1.2.3.4', 'REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR',
],
'assertion' => '4.5.6.7',
],
'proxy_CIDR_multiple_proxies' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '4.5.6.7, 1.2.3.4', 'REMOTE_ADDR' => '10.0.1.1'],
'config' => [
'trusted_proxies' => '10.0.0.0/16, 1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR',
],
'assertion' => '4.5.6.7',
],
'proxy_wrong_CIDR' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '4.5.6.7, 1.2.3.4', 'REMOTE_ADDR' => '10.1.0.1'],
'config' => [
'trusted_proxies' => '10.0.0.0/24, 1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR',
],
'assertion' => '10.1.0.1',
],
'proxy_3' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '1.2.3.4, 4.5.6.7', 'REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR',
],
'assertion' => '4.5.6.7',
],
'proxy_multiple_header_1' => [
'server' => ['HTTP_X_FORWARDED' => '1.2.3.4, 4.5.6.7', 'REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR, HTTP_X_FORWARDED',
],
'assertion' => '4.5.6.7',
],
'proxy_multiple_header_2' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '1.2.3.4', 'HTTP_X_FORWARDED' => '1.2.3.4, 4.5.6.7', 'REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => 'HTTP_X_FORWARDED_FOR, HTTP_X_FORWARDED',
],
'assertion' => '4.5.6.7',
],
'proxy_multiple_header_wrong' => [
'server' => ['HTTP_X_FORWARDED_FOR' => '1.2.3.4', 'HTTP_X_FORWARDED' => '1.2.3.4, 4.5.6.7', 'REMOTE_ADDR' => '1.2.3.4'],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => '',
],
'assertion' => '1.2.3.4',
],
'no_remote_addr' => [
'server' => [],
'config' => [
'trusted_proxies' => '1.2.3.4',
'forwarded_for_headers' => '',
],
'assertion' => '0.0.0.0',
],
];
}
/**
* @dataProvider dataServerArray
*/
public function testRemoteAddress(array $server, array $config, string $assertion)
{
$configClass = \Mockery::mock(IManageConfigValues::class);
$configClass->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn($config['trusted_proxies']);
$configClass->shouldReceive('get')->with('proxy', 'forwarded_for_headers')->andReturn($config['forwarded_for_headers']);
$request = new Request($configClass, $server);
self::assertEquals($assertion, $request->getRemoteAddress());
}
}

38
tests/src/Model/User/CookieTest.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Test\src\Model\User;
use Friendica\App\BaseURL;
use Friendica\App\Request;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Model\User\Cookie;
use Friendica\Test\MockedTest;
@ -35,13 +36,15 @@ class CookieTest extends MockedTest
/** @var MockInterface|BaseURL */
private $baseUrl;
const SERVER_ARRAY = ['REMOTE_ADDR' => '1.2.3.4'];
protected function setUp(): void
{
StaticCookie::clearStatic();
parent::setUp();
$this->config = \Mockery::mock(IManageConfigValues::class);
$this->config = \Mockery::mock(IManageConfigValues::class);
$this->baseUrl = \Mockery::mock(BaseURL::class);
}
@ -60,8 +63,11 @@ class CookieTest extends MockedTest
$this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
$this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn('1235')->once();
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
$this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
$cookie = new Cookie($this->config, $this->baseUrl);
$request = new Request($this->config,static::SERVER_ARRAY);
$cookie = new Cookie($request, $this->config, $this->baseUrl);
self::assertInstanceOf(Cookie::class, $cookie);
}
@ -124,8 +130,11 @@ class CookieTest extends MockedTest
$this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
$this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn('1235')->once();
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
$this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
$cookie = new Cookie($this->config, $this->baseUrl, [], $cookieData);
$request = new Request($this->config, static::SERVER_ARRAY);
$cookie = new Cookie($request, $this->config, $this->baseUrl, $cookieData);
self::assertInstanceOf(Cookie::class, $cookie);
if (isset($uid)) {
@ -182,8 +191,11 @@ class CookieTest extends MockedTest
$this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
$this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn($serverPrivateKey)->once();
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
$this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
$cookie = new Cookie($this->config, $this->baseUrl);
$request = new Request($this->config, static::SERVER_ARRAY);
$cookie = new Cookie($request, $this->config, $this->baseUrl);
self::assertInstanceOf(Cookie::class, $cookie);
self::assertEquals($assertTrue, $cookie->comparePrivateDataHash($assertHash, $password, $userPrivateKey));
@ -239,8 +251,13 @@ class CookieTest extends MockedTest
$this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
$this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn($serverKey)->once();
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
$this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
$this->config->shouldReceive('get')->with('proxy', 'forwarded_for_headers')->andReturn(Request::ORDERED_FORWARD_FOR_HEADER);
$cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray);
$request = new Request($this->config, $serverArray);
$cookie = new StaticCookie($request, $this->config, $this->baseUrl);
self::assertInstanceOf(Cookie::class, $cookie);
$cookie->setMultiple([
@ -261,8 +278,12 @@ class CookieTest extends MockedTest
$this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
$this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn($serverKey)->once();
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
$this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
$this->config->shouldReceive('get')->with('proxy', 'forwarded_for_headers')->andReturn(Request::ORDERED_FORWARD_FOR_HEADER);
$cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray);
$request = new Request($this->config, $serverArray);
$cookie = new StaticCookie($request, $this->config, $this->baseUrl, $serverArray);
self::assertInstanceOf(Cookie::class, $cookie);
$cookie->set('uid', $uid);
@ -283,8 +304,11 @@ class CookieTest extends MockedTest
$this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
$this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn(24)->once();
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
$this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
$cookie = new StaticCookie($this->config, $this->baseUrl);
$request = new Request($this->config, static::SERVER_ARRAY);
$cookie = new StaticCookie($request, $this->config, $this->baseUrl);
self::assertInstanceOf(Cookie::class, $cookie);
self::assertEquals('test', StaticCookie::$_COOKIE[Cookie::NAME]);