Skip to content

Commit ec3c657

Browse files
author
Inbal Tako
committed
Fix ip extraction function
1 parent 0b921d9 commit ec3c657

6 files changed

Lines changed: 5 additions & 9 deletions

File tree

.phpunit.result.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C:37:"PHPUnit\Runner\DefaultTestResultCache":5417:{a:2:{s:7:"defects";a:36:{s:30:"AgentTest::testApiKeyException";i:4;s:18:"ApiTest::testTrack";i:4;s:19:"ApiTest::testVerify";i:4;s:44:"ConfigurationManagerTest::testReadConfigFile";i:3;s:50:"ConfigurationManagerTest::testEnvironmentVariables";i:4;s:43:"ConfigurationManagerTest::testDefaultParams";i:3;s:58:"ConfigurationManagerTest::testEnvironmentVariablesOverride";i:4;s:34:"EventManagerTest::testEventOptions";i:4;s:32:"EventManagerTest::testBuildEvent";i:4;s:30:"EventManagerTest::testSendSync";i:4;s:34:"EventManagerTest::testSendFailSync";i:4;s:38:"EventManagerTest::testAsyncShouldRetry";i:4;s:31:"EventManagerTest::testSendAsync";i:4;s:62:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderIpv6";i:3;s:70:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderMultipleIpv4";i:3;s:68:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderMultipleIpv4";i:3;s:59:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderIpv6";i:3;s:67:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderMultipleIpv4";i:3;s:58:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderIpv6";i:3;s:66:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderMultipleIpv4";i:3;s:56:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderIpv6";i:3;s:64:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderMultipleIpv4";i:3;s:61:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderIpv6";i:3;s:69:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderMultipleIpv4";i:3;s:65:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderIpv6";i:3;s:73:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderMultipleIpv4";i:3;s:59:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderIpv6";i:3;s:67:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderMultipleIpv4";i:3;s:58:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderIpv6";i:3;s:66:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderMultipleIpv4";i:3;s:52:"RequestUtilsTest::testIpExtractionUsingViaHeaderIpv6";i:3;s:60:"RequestUtilsTest::testIpExtractionUsingViaHeaderMultipleIpv4";i:3;s:62:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderIpv6";i:3;s:70:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderMultipleIpv4";i:3;s:60:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderIpv6";i:3;s:60:"RequestUtilsTest::testExtractionPriorityWithoutXForwardedFor";i:3;}s:5:"times";a:45:{s:30:"AgentTest::testApiKeyException";d:0.021;s:18:"ApiTest::testTrack";d:0.02;s:31:"ApiTest::testTrackCustomContext";d:0.012;s:19:"ApiTest::testVerify";d:0.013;s:44:"ConfigurationManagerTest::testReadConfigFile";d:0.002;s:41:"ConfigurationManagerTest::testUnknownKeys";d:0.001;s:41:"ConfigurationManagerTest::testInvalidFile";d:0.001;s:48:"ConfigurationManagerTest::testInvalidFileEntries";d:0.001;s:40:"ConfigurationManagerTest::testLoadConfig";d:0.003;s:50:"ConfigurationManagerTest::testEnvironmentVariables";d:0.004;s:43:"ConfigurationManagerTest::testDefaultParams";d:0.004;s:58:"ConfigurationManagerTest::testEnvironmentVariablesOverride";d:0.003;s:34:"EventManagerTest::testEventOptions";d:0.003;s:32:"EventManagerTest::testBuildEvent";d:0.008;s:30:"EventManagerTest::testSendSync";d:0.012;s:34:"EventManagerTest::testSendFailSync";d:0.012;s:38:"EventManagerTest::testAsyncShouldRetry";d:0.012;s:31:"EventManagerTest::testSendAsync";d:0.01;s:42:"RequestUtilsTest::testProxyHeadersWithIpv4";d:0.001;s:42:"RequestUtilsTest::testProxyHeadersWithIpv6";d:0.001;s:53:"RequestUtilsTest::testProxyHeadersWithMultipleHeaders";d:0.001;s:62:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderIpv6";d:0.001;s:70:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderMultipleIpv4";d:0.001;s:60:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderIpv6";d:0.001;s:68:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderMultipleIpv4";d:0.002;s:59:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderIpv6";d:0.001;s:67:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderMultipleIpv4";d:0.002;s:58:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderIpv6";d:0.002;s:66:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderMultipleIpv4";d:0.001;s:56:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderIpv6";d:0.001;s:64:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderMultipleIpv4";d:0.002;s:61:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderIpv6";d:0.002;s:69:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderMultipleIpv4";d:0.002;s:65:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderIpv6";d:0.002;s:73:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderMultipleIpv4";d:0.002;s:59:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderIpv6";d:0.001;s:67:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderMultipleIpv4";d:0.001;s:58:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderIpv6";d:0.001;s:66:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderMultipleIpv4";d:0.001;s:52:"RequestUtilsTest::testIpExtractionUsingViaHeaderIpv6";d:0.001;s:60:"RequestUtilsTest::testIpExtractionUsingViaHeaderMultipleIpv4";d:0.001;s:62:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderIpv6";d:0.001;s:70:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderMultipleIpv4";d:0.001;s:57:"RequestUtilsTest::testExtractionPriorityWithXForwardedFor";d:0.001;s:60:"RequestUtilsTest::testExtractionPriorityWithoutXForwardedFor";d:0.001;}}}
1+
C:37:"PHPUnit\Runner\DefaultTestResultCache":5419:{a:2:{s:7:"defects";a:36:{s:30:"AgentTest::testApiKeyException";i:4;s:18:"ApiTest::testTrack";i:4;s:19:"ApiTest::testVerify";i:4;s:44:"ConfigurationManagerTest::testReadConfigFile";i:3;s:50:"ConfigurationManagerTest::testEnvironmentVariables";i:4;s:43:"ConfigurationManagerTest::testDefaultParams";i:3;s:58:"ConfigurationManagerTest::testEnvironmentVariablesOverride";i:4;s:34:"EventManagerTest::testEventOptions";i:4;s:32:"EventManagerTest::testBuildEvent";i:4;s:30:"EventManagerTest::testSendSync";i:4;s:34:"EventManagerTest::testSendFailSync";i:4;s:38:"EventManagerTest::testAsyncShouldRetry";i:4;s:31:"EventManagerTest::testSendAsync";i:4;s:62:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderIpv6";i:3;s:70:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderMultipleIpv4";i:3;s:68:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderMultipleIpv4";i:3;s:59:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderIpv6";i:3;s:67:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderMultipleIpv4";i:3;s:58:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderIpv6";i:3;s:66:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderMultipleIpv4";i:3;s:56:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderIpv6";i:3;s:64:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderMultipleIpv4";i:3;s:61:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderIpv6";i:3;s:69:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderMultipleIpv4";i:3;s:65:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderIpv6";i:3;s:73:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderMultipleIpv4";i:3;s:59:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderIpv6";i:3;s:67:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderMultipleIpv4";i:3;s:58:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderIpv6";i:3;s:66:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderMultipleIpv4";i:3;s:52:"RequestUtilsTest::testIpExtractionUsingViaHeaderIpv6";i:3;s:60:"RequestUtilsTest::testIpExtractionUsingViaHeaderMultipleIpv4";i:3;s:62:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderIpv6";i:3;s:70:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderMultipleIpv4";i:3;s:60:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderIpv6";i:3;s:60:"RequestUtilsTest::testExtractionPriorityWithoutXForwardedFor";i:3;}s:5:"times";a:45:{s:30:"AgentTest::testApiKeyException";d:0.026;s:18:"ApiTest::testTrack";d:0.025;s:31:"ApiTest::testTrackCustomContext";d:0.011;s:19:"ApiTest::testVerify";d:0.013;s:44:"ConfigurationManagerTest::testReadConfigFile";d:0.003;s:41:"ConfigurationManagerTest::testUnknownKeys";d:0.002;s:41:"ConfigurationManagerTest::testInvalidFile";d:0.001;s:48:"ConfigurationManagerTest::testInvalidFileEntries";d:0.001;s:40:"ConfigurationManagerTest::testLoadConfig";d:0.002;s:50:"ConfigurationManagerTest::testEnvironmentVariables";d:0.003;s:43:"ConfigurationManagerTest::testDefaultParams";d:0.004;s:58:"ConfigurationManagerTest::testEnvironmentVariablesOverride";d:0.003;s:34:"EventManagerTest::testEventOptions";d:0.003;s:32:"EventManagerTest::testBuildEvent";d:0.008;s:30:"EventManagerTest::testSendSync";d:0.013;s:34:"EventManagerTest::testSendFailSync";d:0.014;s:38:"EventManagerTest::testAsyncShouldRetry";d:0.013;s:31:"EventManagerTest::testSendAsync";d:0.012;s:42:"RequestUtilsTest::testProxyHeadersWithIpv4";d:0.001;s:42:"RequestUtilsTest::testProxyHeadersWithIpv6";d:0.001;s:53:"RequestUtilsTest::testProxyHeadersWithMultipleHeaders";d:0.001;s:62:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderIpv6";d:0.001;s:70:"RequestUtilsTest::testIpExtractionUsingXFORWARDEDFORHeaderMultipleIpv4";d:0.001;s:60:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderIpv6";d:0.001;s:68:"RequestUtilsTest::testIpExtractionUsingHTTPXREALIPHeaderMultipleIpv4";d:0.001;s:59:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderIpv6";d:0.001;s:67:"RequestUtilsTest::testIpExtractionUsingREMOTEADDRHeaderMultipleIpv4";d:0.002;s:58:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderIpv6";d:0.001;s:66:"RequestUtilsTest::testIpExtractionUsingXClientIpHeaderMultipleIpv4";d:0.001;s:56:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderIpv6";d:0.001;s:64:"RequestUtilsTest::testIpExtractionUsingXRealIpHeaderMultipleIpv4";d:0.001;s:61:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderIpv6";d:0.001;s:69:"RequestUtilsTest::testIpExtractionUsingForwardedForHeaderMultipleIpv4";d:0.001;s:65:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderIpv6";d:0.002;s:73:"RequestUtilsTest::testIpExtractionUsingXClusterClientIpHeaderMultipleIpv4";d:0.002;s:59:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderIpv6";d:0.001;s:67:"RequestUtilsTest::testIpExtractionUsingXForwardedHeaderMultipleIpv4";d:0.001;s:58:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderIpv6";d:0.001;s:66:"RequestUtilsTest::testIpExtractionUsingForwardedHeaderMultipleIpv4";d:0.002;s:52:"RequestUtilsTest::testIpExtractionUsingViaHeaderIpv6";d:0.002;s:60:"RequestUtilsTest::testIpExtractionUsingViaHeaderMultipleIpv4";d:0.002;s:62:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderIpv6";d:0.001;s:70:"RequestUtilsTest::testIpExtractionUsingHTTPXCLIENTIPHeaderMultipleIpv4";d:0.001;s:57:"RequestUtilsTest::testExtractionPriorityWithXForwardedFor";d:0.001;s:60:"RequestUtilsTest::testExtractionPriorityWithoutXForwardedFor";d:0.001;}}}

build/logs/clover.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage generated="1605604249">
3-
<project timestamp="1605604249">
2+
<coverage generated="1605614915">
3+
<project timestamp="1605614915">
44
<package name="SecureNative\sdk">
55
<file name="/Users/inbaltako/code/securenative-php/src/ConfigurationManager.php">
66
<class name="SecureNative\sdk\ConfigurationManager" namespace="SecureNative\sdk">

tests/ApiTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public function testTrack()
2626
SecureNative::init(self::TEST_API_KEY, $options, $eventManager);
2727
$trackObject = mock_track_object();
2828

29-
3029
$callbackRes = null;
3130
SecureNative::track($trackObject, function ($params) use (&$callbackRes) {
3231
$callbackRes = $params;

tests/ConfigurationManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testEnvironmentVariables()
9292
{
9393
$testKeys = $this->getConfigTestKeys();
9494

95-
// Set env for each ovject item
95+
// Set env for each object item
9696
foreach ($testKeys as $key => $item) {
9797
putenv("$key=" . $item->value);
9898
}
@@ -126,7 +126,7 @@ public function testEnvironmentVariablesOverride()
126126
{
127127
$testKeys = $this->getConfigTestKeys();
128128

129-
// Set env for each ovject item
129+
// Set env for each object item
130130
foreach ($testKeys as $key => $item) {
131131
putenv("$key=" . $item->value);
132132
}

tests/EventManagerTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public function testAsyncShouldRetry() {
105105
$this->assertNull($callbackRes, 'Track callback should not be called');
106106
}
107107

108-
109108
public function testSendAsync()
110109
{
111110
$options = new SecureNativeOptions(self::TEST_API_KEY, "http://testushim.com");
@@ -133,5 +132,4 @@ public function testSendAsync()
133132
$this->assertObjectHasAttribute('prop1', $callbackRes->{'properties'});
134133
$this->assertObjectHasAttribute('prop2', $callbackRes->{'properties'});
135134
}
136-
137135
}

tests/SecureNativeTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public function testMaxTrackParamsException()
7373
));
7474
}
7575

76-
7776
public function testBasicVerify()
7877
{
7978
SecureNative::init(TEST_API_KEY);

0 commit comments

Comments
 (0)