melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle nil response request in fetch document

Browse Source
This commit is contained in:
mkelvers
2026-06-12 13:40:19 +02:00
parent ffe42a352b
commit 45b4a01801
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/net/document.go
View File

@@ -9,6 +9,16 @@ import (
"github.com/PuerkitoBio/goquery"
)
func responseURL(response *http.Response, fallbackRequest *http.Request) string {
if response != nil && response.Request != nil && response.Request.URL != nil {
return response.Request.URL.String()
}
if fallbackRequest != nil && fallbackRequest.URL != nil {
return fallbackRequest.URL.String()
}
return ""
}
func FetchHTMLDocument(
ctx context.Context,
httpClient *http.Client,
@@ -37,13 +47,13 @@ func FetchHTMLDocument(
if response.StatusCode != http.StatusOK {
body, _ := io.ReadAll(io.LimitReader(response.Body, Bytes512))
return nil, response.Request.URL.String(), buildStatusError(response, body)
return nil, responseURL(response, request), buildStatusError(response, body)
}
document, err := goquery.NewDocumentFromReader(response.Body)
if err != nil {
return nil, response.Request.URL.String(), fmt.Errorf("failed to parse html: %w", err)
return nil, responseURL(response, request), fmt.Errorf("failed to parse html: %w", err)
}
return document, response.Request.URL.String(), nil
return document, responseURL(response, request), nil
}

41
pkg/net/document_test.go Normal file
View File

@@ -0,0 +1,41 @@
package netutil
import (
"context"
"io"
"net/http"
"strings"
"testing"
)
type roundTripFunc func(*http.Request) (*http.Response, error)
func (f roundTripFunc) RoundTrip(request *http.Request) (*http.Response, error) {
return f(request)
}
func TestFetchHTMLDocumentFallsBackToOriginalURLWhenResponseRequestMissing(t *testing.T) {
client := &http.Client{
Transport: roundTripFunc(func(request *http.Request) (*http.Response, error) {
return &http.Response{
StatusCode: http.StatusOK,
Header: make(http.Header),
Body: io.NopCloser(strings.NewReader("<!doctype html><html><body><main>ok</main></body></html>")),
}, nil
}),
}
url := "https://example.test/watch-order"
document, finalURL, err := FetchHTMLDocument(context.Background(), client, url, nil, nil)
if err != nil {
t.Fatalf("expected no error, got %v", err)
}
if finalURL != url {
t.Fatalf("expected final url %q, got %q", url, finalURL)
}
if got := strings.TrimSpace(document.Find("main").Text()); got != "ok" {
t.Fatalf("expected document text ok, got %q", got)
}
}