Skip to content

Fix OpenClaw stats when Heimdall shares a trusted proxy host #1071

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

Draft
sidevesh wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix OpenClaw stats when Heimdall shares a trusted proxy host #1071

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
40 changes: 34 additions & 6 deletions OpenClaw/OpenClaw.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private function fetchStats(): array
/**
* @return array{status: string, message?: string, socket?: resource}
*/
private function connectAndAuthenticate(): array
private function connectAndAuthenticate(bool $forwardClientAddress = false): array
{
$url = parse_url(rtrim($this->config->url, '/'));
$host = $url['host'] ?? null;
Expand Down Expand Up @@ -165,25 +165,53 @@ private function connectAndAuthenticate(): array
}
stream_set_timeout($socket, 10);

// Only retry with attribution when the gateway explicitly identifies
// this host as a trusted proxy. Ordinary direct clients send no headers.
$clientAddressHeader = '';
if ($forwardClientAddress) {
$local = stream_socket_get_name($socket, false);
$ip = $local === false ? '' : trim(substr($local, 0, strrpos($local, ':')), '[]');
if (! filter_var($ip, FILTER_VALIDATE_IP) || $ip === '::1' || str_starts_with($ip, '127.')) {
fclose($socket);

return ['status' => 'error', 'message' => 'Could not determine a non-loopback client address'];
}
$clientAddressHeader = "X-Forwarded-For: $ip\r\n";
}

$key = base64_encode(random_bytes(16));
fwrite($socket, "GET $path HTTP/1.1\r\n"
. "Host: $host:$port\r\n"
. "Upgrade: websocket\r\n"
. "Connection: Upgrade\r\n"
. "Sec-WebSocket-Key: $key\r\n"
. "Sec-WebSocket-Version: 13\r\n"
. $clientAddressHeader
. "\r\n");

$statusLine = fgets($socket, 1024);
if ($statusLine === false || strpos($statusLine, '101') === false) {
fclose($socket);

return ['status' => 'error', 'message' => 'WebSocket upgrade failed'];
}
$contentLength = 0;
while (($line = fgets($socket, 4096)) !== false) {
if (trim($line) === '') {
break;
}
if (preg_match('/^Content-Length:\s*(\d+)\s*$/i', trim($line), $matches)) {
$contentLength = (int) $matches[1];
}
}
if ($statusLine === false || ! preg_match('/^HTTP\/1\.[01] 101\b/', $statusLine)) {
$error = null;
if (is_string($statusLine) && preg_match('/^HTTP\/1\.[01] 403\b/', $statusLine)
&& $contentLength > 0 && $contentLength <= 4096) {
$body = $this->readExact($socket, $contentLength);
$error = $body === null ? null : json_decode($body, true);
}
fclose($socket);
if (! $forwardClientAddress && ($error['error']['type'] ?? null) === 'proxy_attribution_required') {
return $this->connectAndAuthenticate(true);
}

return ['status' => 'error', 'message' => 'WebSocket upgrade failed'];
}

$challenge = $this->readJsonFrame($socket);
Expand Down
Loading