fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Don't convert Cloudflare IP if CF-Worker header is set

Browse source
This commit is contained in:
Kijin Sung 2025-02-13 22:43:46 +09:00
parent 00db2ab402
commit 08d6db7657
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/filters/IpFilter.php
View file

@ -135,7 +135,7 @@ class IpFilter
*/ */
public static function getCloudFlareRealIP() public static function getCloudFlareRealIP()
{ {
if (!isset($_SERVER['HTTP_CF_CONNECTING_IP'])) if (!isset($_SERVER['HTTP_CF_CONNECTING_IP']) || isset($_SERVER['HTTP_CF_WORKER']))
{ {
return false; return false;
} }

9
tests/unit/framework/filters/IpFilterTest.php
View file

@ -80,5 +80,14 @@ class IpFilterTest extends \Codeception\Test\Unit
$_SERVER['REMOTE_ADDR'] = '192.168.10.1'; $_SERVER['REMOTE_ADDR'] = '192.168.10.1';
$this->assertFalse(Rhymix\Framework\Filters\IpFilter::getCloudFlareRealIP()); $this->assertFalse(Rhymix\Framework\Filters\IpFilter::getCloudFlareRealIP());
$this->assertEquals('192.168.10.1', $_SERVER['REMOTE_ADDR']); $this->assertEquals('192.168.10.1', $_SERVER['REMOTE_ADDR']);
$_SERVER['HTTP_CF_CONNECTING_IP'] = '192.168.134.241';
$_SERVER['HTTP_CF_WORKER'] = 'anything';
$_SERVER['REMOTE_ADDR'] = '108.162.192.121';
$this->assertFalse(Rhymix\Framework\Filters\IpFilter::getCloudFlareRealIP());
$this->assertEquals('108.162.192.121', $_SERVER['REMOTE_ADDR']);
unset($_SERVER['HTTP_CF_CONNECTING_IP']);
unset($_SERVER['HTTP_CF_WORKER']);
} }
} }