Skip to content

Commit

Permalink
Merge pull request #1574 from starred-com/fix-numeric-headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnapoli
mnapoli authored Jun 22, 2023
2 parents fe6df81 + 42696f4 commit 888055c
Show file tree
Hide file tree
Showing 8 changed files with 283 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Event/Http/Psr7Bridge.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static function convertRequest(HttpRequestEvent $event, Context $context)
]);

foreach ($headers as $name => $values) {
$server['HTTP_' . strtoupper(str_replace('-', '_', $name))] = $values[0];
$server['HTTP_' . strtoupper(str_replace('-', '_', (string) $name))] = $values[0];
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/FpmRuntime/FpmHandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private function eventToFastCgiRequest(HttpRequestEvent $event, Context $context
}
foreach ($event->getHeaders() as $header => $values) {
foreach ($values as $value) {
$key = 'HTTP_' . strtoupper(str_replace('-', '_', $header));
$key = 'HTTP_' . strtoupper(str_replace('-', '_', (string) $header));
$request->setCustomVar($key, $value);
}
}
Expand Down
25 changes: 25 additions & 0 deletions tests/Event/Http/CommonHttpTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,31 @@ public function test request with custom multi header(int $version)
}
}

/**
* @dataProvider provide API Gateway versions
*/
public function test request with numeric header(int $version)
{
$this->fromFixture(__DIR__ . "/Fixture/ag-v$version-header-numeric.json");
$this->assertHeader('12345', ['Hello world']);
}

/**
* @dataProvider provide API Gateway versions
*/
public function test request with numeric multi header(int $version)
{
$this->fromFixture(__DIR__ . "/Fixture/ag-v$version-header-numeric-multivalue.json");
if ($version === 2) {
// In v2, multi-value headers are joined by a comma
// See https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
$this->assertHeader('12345', ['Hello world,Hello john']);
} else {
$this->assertHeader('12345', ['Hello world', 'Hello john']);
$this->assertHasMultiHeader(true);
}
}

/**
* @dataProvider provide API Gateway versions
*/
Expand Down
86 changes: 86 additions & 0 deletions tests/Event/Http/Fixture/ag-v1-header-numeric-multivalue.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"version": "1.0",
"resource": "/path",
"path": "/path",
"httpMethod": "GET",
"headers": {
"Accept": "*/*",
"Accept-Encoding": "gzip, deflate",
"Cache-Control": "no-cache",
"Host": "example.org",
"User-Agent": "PostmanRuntime/7.20.1",
"X-Amzn-Trace-Id": "Root=1-ffffffff-ffffffffffffffffffffffff",
"X-Forwarded-For": "1.1.1.1",
"X-Forwarded-Port": "443",
"X-Forwarded-Proto": "https",
"12345": "Hello world"
},
"multiValueHeaders": {
"Accept": [
"*/*"
],
"Accept-Encoding": [
"gzip, deflate"
],
"Cache-Control": [
"no-cache"
],
"Host": [
"example.org"
],
"User-Agent": [
"PostmanRuntime/7.20.1"
],
"X-Amzn-Trace-Id": [
"Root=1-ffffffff-ffffffffffffffffffffffff"
],
"X-Forwarded-For": [
"1.1.1.1"
],
"X-Forwarded-Port": [
"443"
],
"X-Forwarded-Proto": [
"https"
],
"12345": [
"Hello world",
"Hello john"
]
},
"queryStringParameters": null,
"pathParameters": null,
"stageVariables": null,
"requestContext": {
"resourceId": "xxxxxx",
"resourcePath": "/path",
"httpMethod": "PUT",
"extendedRequestId": "XXXXXX-xxxxxxxx=",
"requestTime": "24/Nov/2019:18:55:08 +0000",
"path": "/path",
"accountId": "123400000000",
"protocol": "HTTP/1.1",
"stage": "dev",
"domainPrefix": "dev",
"requestTimeEpoch": 1574621708700,
"requestId": "ffffffff-ffff-4fff-ffff-ffffffffffff",
"identity": {
"cognitoIdentityPoolId": null,
"accountId": null,
"cognitoIdentityId": null,
"caller": null,
"sourceIp": "1.1.1.1",
"principalOrgId": null,
"accessKey": null,
"cognitoAuthenticationType": null,
"cognitoAuthenticationProvider": null,
"userArn": null,
"userAgent": "PostmanRuntime/7.20.1",
"user": null
},
"domainName": "example.org",
"apiId": "xxxxxxxxxx"
},
"body": "",
"isBase64Encoded": false
}
53 changes: 53 additions & 0 deletions tests/Event/Http/Fixture/ag-v1-header-numeric.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"version": "1.0",
"resource": "/path",
"path": "/path",
"httpMethod": "GET",
"headers": {
"Accept": "*/*",
"Accept-Encoding": "gzip, deflate",
"Cache-Control": "no-cache",
"Host": "example.org",
"User-Agent": "PostmanRuntime/7.20.1",
"X-Amzn-Trace-Id": "Root=1-ffffffff-ffffffffffffffffffffffff",
"X-Forwarded-For": "1.1.1.1",
"X-Forwarded-Port": "443",
"X-Forwarded-Proto": "https",
"12345": "Hello world"
},
"queryStringParameters": null,
"pathParameters": null,
"stageVariables": null,
"requestContext": {
"resourceId": "xxxxxx",
"resourcePath": "/path",
"httpMethod": "PUT",
"extendedRequestId": "XXXXXX-xxxxxxxx=",
"requestTime": "24/Nov/2019:18:55:08 +0000",
"path": "/path",
"accountId": "123400000000",
"protocol": "HTTP/1.1",
"stage": "dev",
"domainPrefix": "dev",
"requestTimeEpoch": 1574621708700,
"requestId": "ffffffff-ffff-4fff-ffff-ffffffffffff",
"identity": {
"cognitoIdentityPoolId": null,
"accountId": null,
"cognitoIdentityId": null,
"caller": null,
"sourceIp": "1.1.1.1",
"principalOrgId": null,
"accessKey": null,
"cognitoAuthenticationType": null,
"cognitoAuthenticationProvider": null,
"userArn": null,
"userAgent": "PostmanRuntime/7.20.1",
"user": null
},
"domainName": "example.org",
"apiId": "xxxxxxxxxx"
},
"body": "",
"isBase64Encoded": false
}
41 changes: 41 additions & 0 deletions tests/Event/Http/Fixture/ag-v2-header-numeric-multivalue.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": "2.0",
"routeKey": "ANY /path",
"rawPath": "/path",
"rawQueryString": "",
"headers": {
"Accept": "*/*",
"Accept-Encoding": "gzip, deflate",
"Cache-Control": "no-cache",
"Host": "example.org",
"User-Agent": "PostmanRuntime/7.20.1",
"X-Amzn-Trace-Id": "Root=1-ffffffff-ffffffffffffffffffffffff",
"X-Forwarded-For": "1.1.1.1",
"X-Forwarded-Port": "443",
"X-Forwarded-Proto": "https",
"12345": "Hello world,Hello john"
},
"queryStringParameters": null,
"stageVariables": null,
"requestContext": {
"accountId": "123400000000",
"apiId": "xxxxxxxxxx",
"domainName": "example.org",
"domainPrefix": "0000000000",
"http": {
"method": "GET",
"path": "/path",
"protocol": "HTTP/1.1",
"sourceIp": "1.1.1.1",
"userAgent": "PostmanRuntime/7.20.1"
},
"requestId": "JTHoQgr2oAMEPMg=",
"routeId": "47matwk",
"routeKey": "ANY /path",
"stage": "$default",
"time": "24/Nov/2019:18:55:08 +0000",
"timeEpoch": 1574621708700
},
"body": "",
"isBase64Encoded": false
}
41 changes: 41 additions & 0 deletions tests/Event/Http/Fixture/ag-v2-header-numeric.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": "2.0",
"routeKey": "ANY /path",
"rawPath": "/path",
"rawQueryString": "",
"headers": {
"Accept": "*/*",
"Accept-Encoding": "gzip, deflate",
"Cache-Control": "no-cache",
"Host": "example.org",
"User-Agent": "PostmanRuntime/7.20.1",
"X-Amzn-Trace-Id": "Root=1-ffffffff-ffffffffffffffffffffffff",
"X-Forwarded-For": "1.1.1.1",
"X-Forwarded-Port": "443",
"X-Forwarded-Proto": "https",
"12345": "Hello world"
},
"queryStringParameters": null,
"stageVariables": null,
"requestContext": {
"accountId": "123400000000",
"apiId": "xxxxxxxxxx",
"domainName": "example.org",
"domainPrefix": "0000000000",
"http": {
"method": "GET",
"path": "/path",
"protocol": "HTTP/1.1",
"sourceIp": "1.1.1.1",
"userAgent": "PostmanRuntime/7.20.1"
},
"requestId": "JTHoQgr2oAMEPMg=",
"routeId": "47matwk",
"routeKey": "ANY /path",
"stage": "$default",
"time": "24/Nov/2019:18:55:08 +0000",
"timeEpoch": 1574621708700
},
"body": "",
"isBase64Encoded": false
}
35 changes: 35 additions & 0 deletions tests/FpmRuntime/FpmHandlerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,41 @@ public function test request with custom header(int $version)
]);
}

/**
* @dataProvider provide API Gateway versions
*/
public function test request with numeric header(int $version)
{
$event = [
'version' => '1.0',
'httpMethod' => 'GET',
'path' => '/',
'headers' => [
'12345' => 'Hello world',
],
];
$this->assertGlobalVariables($event, [
'$_GET' => [],
'$_POST' => [],
'$_FILES' => [],
'$_COOKIE' => [],
'$_REQUEST' => [],
'$_SERVER' => [
'REQUEST_URI' => '/',
'PHP_SELF' => '/',
'PATH_INFO' => '/',
'REQUEST_METHOD' => 'GET',
'QUERY_STRING' => '',
'HTTP_12345' => 'Hello world',
'CONTENT_LENGTH' => '0',
'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
'LAMBDA_INVOCATION_CONTEXT' => json_encode($this->fakeContext),
'LAMBDA_REQUEST_CONTEXT' => '[]',
],
'HTTP_RAW_BODY' => '',
]);
}

/**
* @dataProvider provide API Gateway versions
*/
Expand Down

0 comments on commit 888055c

Please sign in to comment.