Skip to content

fix(ws): surface HTTP status/body on relay dial failure #134

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

Open
PrashantBtkl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ws): surface HTTP status/body on relay dial failure #134

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
8 changes: 7 additions & 1 deletion pkg/ws/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
"io"
"log/slog"
"net/http"
"sync"
Expand Down Expand Up @@ -142,8 +143,13 @@ func (c *Client) connectAndServe(ctx context.Context) error {

c.logger.Info("connecting to relay", "url", c.relayURL)

conn, _, err := websocket.DefaultDialer.DialContext(ctx, c.relayURL, header)
conn, resp, err := websocket.DefaultDialer.DialContext(ctx, c.relayURL, header)
if err != nil {
if resp != nil {
body, _ := io.ReadAll(io.LimitReader(resp.Body, 1024))
resp.Body.Close() // nolint:errcheck
return fmt.Errorf("dial failed: %w (status=%d body=%q)", err, resp.StatusCode, body)
}
Comment on lines +148 to +152

@gemini-code-assist gemini-code-assist Bot Aug 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To prevent potential nil pointer dereference panics, we should check if resp.Body is nil before attempting to read from or close it. Even if resp.Body is nil, we can still safely report the HTTP status code.

		if resp != nil {
			var body []byte
			if resp.Body != nil {
				body, _ = io.ReadAll(io.LimitReader(resp.Body, 1024))
				resp.Body.Close() // nolint:errcheck
			}
			return fmt.Errorf("dial failed: %w (status=%d body=%q)", err, resp.StatusCode, body)
		}

return fmt.Errorf("dial failed: %w", err)
}

Expand Down
Loading