Skip to content

fix: harden log encoding and the rejection rethrow #19

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
ernolf merged 1 commit into from
Jul 19, 2026
Merged

fix: harden log encoding and the rejection rethrow #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lib/Http/Client/Middleware/HttpClientLoggerMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ function ($reason) use ($request, $reqHeaders, $reqId) {
if ($reason instanceof \Throwable) {
throw $reason;
}
throw new \RuntimeException('HTTP request rejected: ' . (string)$reason);
throw new \RuntimeException(
'HTTP request rejected: ' . (is_object($reason) ? get_class($reason) : (string)$reason)
);
}
);
};
Expand Down
7 changes: 6 additions & 1 deletion lib/Http/Client/Middleware/LogWriter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ public static function write(
LoggerInterface $logger,
): void {
if (in_array($format, ['json', 'both'], true)) {
self::append($jsonFile, json_encode($entry, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . PHP_EOL, $logger);
// Remote servers can send headers with broken UTF-8; substitute
// those bytes instead of losing the whole entry.
$json = json_encode($entry, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE);
if ($json !== false) {
self::append($jsonFile, $json . PHP_EOL, $logger);
}
}
if (in_array($format, ['plain', 'both'], true)) {
self::append($plainFile, $plainLine, $logger);
Expand Down
Loading