Skip to content

Commit a29c153

Browse files
authored
fix: Rejecting non-string signature component identifiers (#171)
1 parent bf37e1d commit a29c153

3 files changed

Lines changed: 16 additions & 4 deletions

File tree

‎component_identifier.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@ func toComponentIdentifiers(identifiers []string) ([]*componentIdentifier, error
7979
}
8080

8181
func newComponentIdentifier(item httpsfv.Item) (*componentIdentifier, error) {
82-
// ok if panics
83-
name := strings.ToLower(item.Value.(string)) //nolint: forcetypeassert
82+
name, ok := item.Value.(string)
83+
if !ok {
84+
return nil, fmt.Errorf("%w: component name must be a string", ErrInvalidComponentIdentifier)
85+
}
8486

85-
canonicalizer, err := canonicalizerFor(name)
87+
canonicalizer, err := canonicalizerFor(strings.ToLower(name))
8688
if err != nil {
8789
return nil, err
8890
}

‎component_identifier_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,16 @@ func TestNewComponentIdentifier(t *testing.T) {
169169
item httpsfv.Item
170170
assert func(t *testing.T, ci *componentIdentifier, err error)
171171
}{
172+
{
173+
uc: "non-string component name",
174+
item: httpsfv.NewItem(int64(42)),
175+
assert: func(t *testing.T, ci *componentIdentifier, err error) {
176+
t.Helper()
177+
178+
require.ErrorIs(t, err, ErrInvalidComponentIdentifier)
179+
assert.Nil(t, ci)
180+
},
181+
},
172182
{
173183
uc: "invalid",
174184
item: httpsfv.NewItem("@foo"),

‎httpsig.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var (
3535
// ErrUnsupportedComponentIdentifier indicates that a covered component identifier is unsupported.
3636
ErrUnsupportedComponentIdentifier = errors.New("unsupported component identifier")
3737

38-
// ErrInvalidComponentIdentifier indicates malformed or invalid parameters on a component identifier.
38+
// ErrInvalidComponentIdentifier indicates a malformed component identifier or invalid component parameters.
3939
ErrInvalidComponentIdentifier = errors.New("invalid component identifier")
4040

4141
// ErrCanonicalization indicates that a covered HTTP message component could not be canonicalized.

0 commit comments

Comments
 (0)