Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 0 deletions internal/cassette/io.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import (
"errors"
"fmt"
"io"
"net/url"
"os"
"sort"
"strings"
"sync"
)

Expand Down Expand Up @@ -94,6 +96,12 @@ func Load(path string) (Header, []Entry, error) {
if entry.Request.Method == "" || entry.Request.URI == "" || entry.Response.Status < 100 || entry.Response.Status > 999 {
return Header{}, nil, fmt.Errorf("invalid interaction %d", entry.ID)
}
if strings.ContainsAny(entry.Request.URI, " \t\r\n") {
return Header{}, nil, fmt.Errorf("interaction %d invalid request URI %q: whitespace is not allowed", entry.ID, entry.Request.URI)
}
if _, err := url.ParseRequestURI(entry.Request.URI); err != nil {
return Header{}, nil, fmt.Errorf("interaction %d request URI %q: %w", entry.ID, entry.Request.URI, err)
}
if _, err := entry.Request.Bytes(); err != nil {
return Header{}, nil, fmt.Errorf("interaction %d request: %w", entry.ID, err)
}
Expand Down
40 changes: 40 additions & 0 deletions internal/cassette/uri_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package cassette

import (
"path/filepath"
"strings"
"testing"
)

func TestLoadRequestURI(t *testing.T) {
for _, tc := range []struct {
uri string
valid bool
}{
{"/v1/a%zz", false}, {"/v1/a b", false},
{"/v1/users/42?include=profile", true},
{"https://example.com/v1/users?include=profile", true},
} {
t.Run(tc.uri, func(t *testing.T) {
path := filepath.Join(t.TempDir(), "cassette.jsonl")
recorder, err := NewRecorder(path, Header{Format: Format}, false, false)
if err != nil {
t.Fatal(err)
}
if err := recorder.Write(Entry{ID: 7, Request: Request{Method: "GET", URI: tc.uri}, Response: Response{Status: 200}}); err != nil {
t.Fatal(err)
}
if err := recorder.Close(); err != nil {
t.Fatal(err)
}
_, entries, err := Load(path)
if tc.valid {
if err != nil || len(entries) != 1 {
t.Fatalf("valid URI: entries=%v err=%v", entries, err)
}
} else if err == nil || !strings.Contains(err.Error(), "interaction 7") || !strings.Contains(err.Error(), tc.uri) {
t.Fatalf("expected interaction and URI in error, got %v", err)
}
})
}
}
Loading