Keep the request URL out of transport errors and document fixture provenance
CI / ci (push) Successful in 1m30s
CI / ci (pull_request) Successful in 1m28s

A base URL path may hold the API key, and net/http's *url.Error names the
full request URL. Transport failures now keep only the wrapped cause, with
the key redacted, and unwrap only to llm.ErrTimeout or context.Canceled.
The request-build error no longer echoes the URL either. A new test fails
the exchange (connection refused and connection dropped) against a base
URL whose path holds the key.

testdata/README.md records each fixture's source in the vendor's public
API documentation (Ollama: its openai middleware source), how it was
sanitized, and which fields are not in the public example.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-03 16:33:41 -04:00
co-authored by Claude Opus 5.5
parent 1f4356cd17
commit 80d91eba70
3 changed files with 155 additions and 10 deletions
+43
View File
@@ -8,6 +8,7 @@ import (
"io"
"net/http"
"net/http/httptest"
"net/url"
"os"
"path/filepath"
"strings"
@@ -498,6 +499,48 @@ func TestTransportErrorHasNoSecret(t *testing.T) {
assertNoSecret(t, err)
}
// TestTransportErrorWithKeyInBaseURLPath fails the exchange against a base
// URL whose path holds the key, which New accepts; net/http names the full
// request URL in its transport errors.
func TestTransportErrorWithKeyInBaseURLPath(t *testing.T) {
refused := newVendorServer(t, reply{status: 200})
refusedBase := refused.URL
refused.Close()
dropped := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
conn, _, err := w.(http.Hijacker).Hijack()
if err != nil {
t.Error(err)
return
}
conn.Close()
}))
t.Cleanup(dropped.Close)
for name, base := range map[string]string{
"connection refused": refusedBase + "/v1/" + testKey,
"connection dropped": dropped.URL + "/v1/" + testKey,
} {
p := newProvider(t, base, JSONSchema, nil)
_, genErr := p.Generate(context.Background(), schemaRequest())
_, listErr := p.ListModels(context.Background())
verifyErr := p.Verify(context.Background())
for _, err := range []error{genErr, listErr, verifyErr} {
if err == nil {
t.Fatalf("%s: nil error", name)
}
assertNoSecret(t, err)
var ue *url.Error
if errors.As(err, &ue) {
t.Fatalf("%s: error chain exposes the request URL: %v", name, ue)
}
if errors.Is(err, llm.ErrTimeout) || errors.Is(err, llm.ErrProvider) {
t.Fatalf("%s: err = %v, want an untyped transport failure", name, err)
}
}
}
}
// TestKeyedErrorsNeverLeakKey drives every error path of the keyed OpenAI
// and OpenRouter shapes with vendor bodies that echo the key.
func TestKeyedErrorsNeverLeakKey(t *testing.T) {