Skip to content

Feat: Improve cookie handling #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Meldiron merged 2 commits into from
Sep 2, 2025
Merged

Feat: Improve cookie handling #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4700d38
Improve cookie handling
Meldiron Sep 2, 2025
abe3304
Logical fixes & new tests
Meldiron Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions src/Http/Adapter/Swoole/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,20 @@ public function getFiles($key): array
*/
public function getCookie(string $key, string $default = ''): string
{
$key = strtolower($key);
$key = \strtolower($key);

$cookies = \explode(';', $this->getHeader('cookie', ''));
foreach ($cookies as $cookie) {
$cookie = \trim($cookie);
[$cookieKey, $cookieValue] = \explode('=', $cookie, 2);
$cookieKey = \trim($cookieKey);
$cookieValue = \trim($cookieValue);
if ($cookieKey === $key) {
return $cookieValue;
}
}

return $this->swoole->cookie[$key] ?? $default;
return $default;
}

/**
Expand Down Expand Up @@ -361,17 +372,8 @@ protected function generateHeaders(): array
{
$headers = $this->swoole->header;

if (empty($this->swoole->cookie)) {
return $headers;
}

$cookieHeaders = [];
foreach ($this->swoole->cookie as $key => $value) {
$cookieHeaders[] = "{$key}={$value}";
}

if (!empty($cookieHeaders)) {
$headers['cookie'] = \implode('; ', $cookieHeaders);
foreach ($headers as $key => $value) {
$headers[strtolower($key)] = $value;
}

return $headers;
Expand Down
3 changes: 2 additions & 1 deletion src/Http/Adapter/Swoole/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public function __construct(string $host, ?string $port = null, array $settings
{
$this->server = new SwooleServer($host, $port);
$this->server->set(\array_merge($settings, [
'enable_coroutine' => true
'enable_coroutine' => true,
'http_parse_cookie' => false,
]));
}

Expand Down
31 changes: 27 additions & 4 deletions tests/e2e/BaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,34 @@ public function testFile()

public function testCookie()
{
$response = $this->client->call(Client::METHOD_GET, '/cookies', [
'Cookie: cookie1=value1; cookie2=value2'
]);
// One cookie
$cookie = 'cookie1=value1';
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($cookie, $response['body']);

// Two cookiees
$cookie = 'cookie1=value1; cookie2=value2';
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($cookie, $response['body']);

// Two cookies without optional space
$cookie = 'cookie1=value1;cookie2=value2';
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($cookie, $response['body']);

// Cookie with "=" in value
$cookie = 'cookie1=value1=value2';
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($cookie, $response['body']);

// Case sensitivity for cookie names
$cookie = 'cookie1=v1; Cookie1=v2';
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('cookie1=value1; cookie2=value2', $response['body']);
$this->assertEquals($cookie, $response['body']);
}
}