geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-15 18:23:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

[FEATURE] Optimised Request::getIp method

Browse Source 
- Added unit-tests for Request::getIp
- Optimised existing RequestTest unit-tests.
This commit is contained in:
Simon Sessingø
2021-03-25 14:18:56 +01:00
parent 11313a31dc
commit cf6750aaf3
2 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Pecee/Http/Request.php
View File

@@ -220,22 +220,16 @@ class Request
*/
public function getIp(bool $safe = false): ?string
{
$client_header = null;
if(!$safe){
$client_header = $this->getHeader(
$headers = ['remote-addr'];
if($safe === false) {
$headers = array_merge($headers, [
'http-cf-connecting-ip',
$this->getHeader(
'http-client-ip',
$this->getHeader(
'http-x-forwarded-for',
$this->getHeader('remote-addr')
)
)
);
'http-client-ip',
'http-x-forwarded-for',
]);
}
if($client_header === null)
$client_header = $this->getHeader('remote-addr');
return filter_var($client_header, FILTER_VALIDATE_IP) ? $client_header : null;
return $this->getFirstHeader($headers);
}
/**

62
tests/Pecee/SimpleRouter/RequestTest.php
View File

@@ -9,28 +9,74 @@ require_once 'Dummy/Handler/ExceptionHandler.php';
class RequestTest extends \PHPUnit\Framework\TestCase
{
public function testContentTypeParse()
protected function testHeader($name, $value, callable $callback)
{
global $_SERVER;
$contentType = 'application/x-www-form-urlencoded';
$_SERVER['content_type'] = $contentType;
$_SERVER[$name] = $value;
$router = TestRouter::router();
$router->reset();
$request = $router->getRequest();
$this->assertEquals($contentType, $request->getContentType());
$callback($request);
// Test special content-types
// Reset everything
$_SERVER[$name] = null;
$router->reset();
}
$_SERVER['content_type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
public function testContentTypeParse()
{
global $_SERVER;
$this->assertEquals($contentType, $request->getContentType());
// Test normal content-type
$contentType = 'application/x-www-form-urlencoded';
$this->testHeader('content_type', $contentType, function(\Pecee\Http\Request $request) use($contentType) {
$this->assertEquals($contentType, $request->getContentType());
});
// Test special content-type with encoding
$contentTypeWithEncoding = 'application/x-www-form-urlencoded; charset=UTF-8';
$this->testHeader('content_type', $contentTypeWithEncoding, function(\Pecee\Http\Request $request) use($contentType) {
$this->assertEquals($contentType, $request->getContentType());
});
}
public function testGetIp()
{
$ip = '1.1.1.1';
$this->testHeader('remote_addr', $ip, function(\Pecee\Http\Request $request) use($ip) {
$this->assertEquals($ip, $request->getIp());
});
$ip = '2.2.2.2';
$this->testHeader('http-cf-connecting-ip', $ip, function(\Pecee\Http\Request $request) use($ip) {
$this->assertEquals($ip, $request->getIp());
});
$ip = '3.3.3.3';
$this->testHeader('http-client-ip', $ip, function(\Pecee\Http\Request $request) use($ip) {
$this->assertEquals($ip, $request->getIp());
});
$ip = '4.4.4.4';
$this->testHeader('http-x-forwarded-for', $ip, function(\Pecee\Http\Request $request) use($ip) {
$this->assertEquals($ip, $request->getIp());
});
// Test safe
$ip = '5.5.5.5';
$this->testHeader('http-x-forwarded-for', $ip, function(\Pecee\Http\Request $request) {
$this->assertEquals(null, $request->getIp(true));
});
$router->reset();
}
// TODO: implement more test-cases