Conversation
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
Feat: Rules for Multiple validator
fix: prevent callable strings
Fix: Cookie headers
Feat: Improve cookie handling
Feat: Allow array for headers
Headers can now be arrays (after recent changes allowing array headers). The getSize() method was attempting to directly implode headers, causing a warning when a header value was an array. This fix properly handles both string and array header values by joining array values with commas (standard HTTP header format) before calculating the request size. Added test case to verify the fix works correctly with array headers.
feat: remove validators and use utopia validators lib
* Use utopia-php/di for resource injection * Move resource ownership into utopia-php/di * Update DI branch dependency * update getting started * update * update * update appwrite base version * update to use php 8.2 * fix: restore php 8.2 test runtime * chore: use container scopes * remove utopia keyword * remove optional container in run * remove optional container in run * renaming * remove public getContainer * fix getcontainer * fix getcontainer * update * remove tests * make public * remove tests * add scoped request containers * cleanup * feat: request scopes * fixes --------- Co-authored-by: loks0n <22452787+loks0n@users.noreply.github.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
📝 Coding Plan
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
#230) * feat: split Swoole adapters, add compression support, and adopt utopia-php/servers - Split Swoole adapter into Swoole (SWOOLE_PROCESS) and SwooleCoroutine (coroutine-based) servers - Add response compression support with configurable min size and algorithm selection - Migrate Hook to utopia-php/servers and Route now extends Servers\Hook - Add View class for template rendering - Add trusted IP header support and IP validation in Request - Enhance Response with cookie management, content-type helpers, and chunked transfer - Add utopia-php/servers and utopia-php/compression dependencies - Fix server-swoole.php test server to work with non-coroutine Swoole adapter - Disable Swoole cookie parsing to preserve raw Cookie headers * fix: address Greptile review comments on PR #230 - Remove Content-Length before re-adding after compression to prevent duplicate headers - Defer onStart callback into coroutine event loop for SwooleCoroutine adapter consistency - Add null-coalescing fallback for preg_replace in View::render - Add void return types to compression setter methods for API consistency * add telemetry
Greptile SummaryThis is a large structural PR for version 0.34.x that splits the Swoole adapter into separate
Confidence Score: 3/5Two P1 defects affect all Swoole users: getReferer silently drops caller-supplied defaults, and the new requestBodySize telemetry always records zero bytes for Swoole requests. Both P1 issues are confirmed present-defects on the changed path. getReferer breaks the interface contract for any Swoole caller supplying a custom fallback. The getSize/php://input mismatch makes the newly-added telemetry metric wrong for all Swoole requests. The dead OPTIONS block is P2. These issues together warrant a score of 3. src/Http/Adapter/Swoole/Request.php (getReferer default bug, missing getSize override), src/Http/Request.php (getSize reads php://input), src/Http/Http.php (dead OPTIONS elseif block) Important Files Changed
Greploops — Automatically fix all review issues by running Reviews (2): Last reviewed commit: "[codex] Normalize null request paths dur..." | Re-trigger Greptile |
| array $settings = [], | ||
| ?Container $container = null | ||
| ) { | ||
| $this->server = new SwooleServer($host, $port, false, true); |
There was a problem hiding this comment.
The Swoole\Coroutine\Http\Server constructor expects int $port. $port is typed as ?string here and is passed without any cast. If $port is null (the default), PHP coerces null → 0 in non-strict mode, which silently opens the server on a random port. The non-coroutine Swoole\Server adapter (line 20 of Swoole/Server.php) correctly applies (int) $port to handle this.
| $this->server = new SwooleServer($host, $port, false, true); | |
| $this->server = new SwooleServer($host, (int) $port, false, true); |
| */ | ||
| protected function sendStatus(int $statusCode): void | ||
| { | ||
| $this->swoole->status((string) $statusCode); |
There was a problem hiding this comment.
Unnecessary
(string) cast in sendStatus
Swoole\Http\Response::status() has the signature status(int $http_status_code, string $reason = ''): bool. $statusCode is already typed as int by the parent abstract method — casting it to string before passing it in is at best a no-op (PHP coerces it back) and could cause a TypeError if Swoole ever enforces strict typing internally. The cast should be removed.
| $this->swoole->status((string) $statusCode); | |
| $this->swoole->status($statusCode); |
| $this->server->on('request', function (SwooleRequest $request, SwooleResponse $response) use ($callback) { | ||
| $requestContainer = new Container($this->container); | ||
| $requestContainer->set('swooleRequest', fn () => $request); | ||
| $requestContainer->set('swooleResponse', fn () => $response); | ||
|
|
||
| Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] = $requestContainer; | ||
|
|
||
| \call_user_func($callback, new Request($request), new Response($response)); |
There was a problem hiding this comment.
Missing
try/finally cleanup for coroutine context
The SwooleCoroutine\Server variant wraps the callback invocation in a try/finally to unset(Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY]) after each request, ensuring stale per-request containers don't linger if an exception escapes. The process-mode Swoole\Server does not do this:
Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] = $requestContainer;
\call_user_func($callback, new Request($request), new Response($response));
// No cleanupAlthough Swoole destroys each request coroutine's context automatically when the coroutine exits, adding the matching try/finally here keeps the two adapters consistent and guards against any future change that reuses coroutines across requests:
| $this->server->on('request', function (SwooleRequest $request, SwooleResponse $response) use ($callback) { | |
| $requestContainer = new Container($this->container); | |
| $requestContainer->set('swooleRequest', fn () => $request); | |
| $requestContainer->set('swooleResponse', fn () => $response); | |
| Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] = $requestContainer; | |
| \call_user_func($callback, new Request($request), new Response($response)); | |
| Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] = $requestContainer; | |
| try { | |
| \call_user_func($callback, new Request($request), new Response($response)); | |
| } finally { | |
| unset(Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY]); | |
| } |
| public function getSize(): int | ||
| { | ||
| return \mb_strlen(\implode("\n", $this->generateHeaders()), '8bit') + \mb_strlen(\file_get_contents('php://input'), '8bit'); | ||
| $headers = $this->generateHeaders(); | ||
| $headerStrings = []; | ||
| foreach ($headers as $key => $value) { | ||
| if (\is_array($value)) { | ||
| $headerStrings[] = $key . ': ' . \implode(', ', $value); | ||
| } else { | ||
| $headerStrings[] = $key . ': ' . $value; | ||
| } | ||
| } | ||
| return \mb_strlen(\implode("\n", $headerStrings), '8bit') + \mb_strlen(\file_get_contents('php://input'), '8bit'); | ||
| } |
There was a problem hiding this comment.
getSize() reads php://input — incorrect for Swoole adapters
The base getSize() calls file_get_contents('php://input') to measure the request body size. This works under PHP-FPM, but in Swoole the request body is only accessible via $swoole->rawContent() — PHP's php://input stream is empty in that context.
Neither Swoole/Request.php nor SwooleCoroutine/Request.php override getSize(). Because Http::run() now calls $this->requestBodySize->record($request->getSize(), ...) for the new telemetry, all Swoole requests will report zero bytes for the body in the http.server.request.body.size metric.
Fix: override getSize() in Swoole/Request.php to use rawContent() for the body component:
public function getSize(): int
{
$headers = $this->generateHeaders();
$headerStrings = [];
foreach ($headers as $key => $value) {
$headerStrings[] = is_array($value)
? $key . ': ' . implode(', ', $value)
: $key . ': ' . $value;
}
return mb_strlen(implode("\n", $headerStrings), '8bit')
+ mb_strlen($this->swoole->rawContent(), '8bit');
}SwooleCoroutine/Request.php extends Swoole/Request.php, so it will inherit the fix.
No description provided.