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
23 changes: 23 additions & 0 deletions component_identifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func newComponentIdentifier(item httpsfv.Item) (*componentIdentifier, error) {
return nil, fmt.Errorf("%w: component name %q must be lowercase", ErrInvalidComponentIdentifier, name)
}

if !strings.HasPrefix(name, "@") && !isValidHTTPFieldName(name) {
return nil, fmt.Errorf("%w: invalid HTTP field name %q", ErrInvalidComponentIdentifier, name)
}

canonicalizer, err := canonicalizerFor(name, item.Params)
if err != nil {
return nil, err
Expand Down Expand Up @@ -110,3 +114,22 @@ func equalComponentParameterValues(actual, expected any) bool {

return actual == expected
}

// HTTP field names follow the token syntax of RFC 9110, Section 5.1.
func isValidHTTPFieldName(name string) bool {
if name == "" {
return false
}

for i := range len(name) {
ch := name[i]
if (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
(ch >= '0' && ch <= '9') || strings.IndexByte("!#$%&'*+-.^_`|~", ch) >= 0 {
continue
}

return false
}

return true
}
42 changes: 42 additions & 0 deletions component_identifier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,30 @@ func TestToComponentIdentifiers(t *testing.T) {
}
}

func TestIsValidHTTPFieldName(t *testing.T) {
t.Parallel()

for uc, tc := range map[string]struct {
name string
valid bool
}{
"lowercase field name": {name: "content-type", valid: true},
"uppercase field name": {name: "Content-Type", valid: true},
"all permitted punctuation": {name: "!#$%&'*+-.^_`|~", valid: true},
"empty name": {name: ""},
"space": {name: "bad name"},
"colon": {name: ":authority"},
"slash": {name: "bad/name"},
"at sign": {name: "name@other"},
"non-ASCII": {name: "caf\u00e9"},
"control character": {name: "bad\nname"},
} {
t.Run(uc, func(t *testing.T) {
assert.Equal(t, tc.valid, isValidHTTPFieldName(tc.name))
})
}
}

func TestNewComponentIdentifier(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -140,6 +164,24 @@ func TestNewComponentIdentifier(t *testing.T) {
assert.Nil(t, ci)
},
},
"invalid HTTP field name": {
item: httpsfv.NewItem("bad name"),
assert: func(t *testing.T, ci *componentIdentifier, err error) {
t.Helper()

require.ErrorIs(t, err, ErrInvalidComponentIdentifier)
assert.Nil(t, ci)
},
},
"valid HTTP field name": {
item: httpsfv.NewItem("x_test"),
assert: func(t *testing.T, ci *componentIdentifier, err error) {
t.Helper()

require.NoError(t, err)
assert.NotNil(t, ci.c)
},
},
"valid": {
item: func() httpsfv.Item {
item := httpsfv.NewItem("@method")
Expand Down
4 changes: 2 additions & 2 deletions integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ func TestParseAcceptSignatureBuilderOutput(t *testing.T) {
func TestParsedComponentsRoundTripThroughWithComponents(t *testing.T) {
t.Parallel()

const field = `sig=("@status" "content-digest";req "@query-param";name="a;b" "a;req" "b\"c" "d\\e");created`
const field = `sig=("@status" "content-digest";req "@query-param";name="a;b" "@query-param";name="b\"c" "@query-param";name="d\\e" "x_test");created`

requests, err := ParseAcceptSignature(http.Header{headerAcceptSignature: {field}})
require.NoError(t, err)
require.Len(t, requests, 1)
assert.Equal(t, []string{
`"@status"`, `"content-digest";req`, `"@query-param";name="a;b"`,
`"a;req"`, `"b\"c"`, `"d\\e"`,
`"@query-param";name="b\"c"`, `"@query-param";name="d\\e"`, `"x_test"`,
}, requests[0].Components)

builder, err := NewAcceptSignature(
Expand Down
Loading