From e1b5d70758f8b81c126627a1c89e3aaab6d17d00 Mon Sep 17 00:00:00 2001 From: Dimitrij Drus Date: Thu, 5 Nov 2026 00:33:35 +0100 Subject: [PATCH] fix: Rejecting non-string signature component identifiers --- component_identifier.go | 8 +++++--- component_identifier_test.go | 10 ++++++++++ httpsig.go | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/component_identifier.go b/component_identifier.go index 86f9aa0..3983afd 100644 --- a/component_identifier.go +++ b/component_identifier.go @@ -79,10 +79,12 @@ func toComponentIdentifiers(identifiers []string) ([]*componentIdentifier, error } func newComponentIdentifier(item httpsfv.Item) (*componentIdentifier, error) { - // ok if panics - name := strings.ToLower(item.Value.(string)) //nolint: forcetypeassert + name, ok := item.Value.(string) + if !ok { + return nil, fmt.Errorf("%w: component name must be a string", ErrInvalidComponentIdentifier) + } - canonicalizer, err := canonicalizerFor(name) + canonicalizer, err := canonicalizerFor(strings.ToLower(name)) if err != nil { return nil, err } diff --git a/component_identifier_test.go b/component_identifier_test.go index 0e0cb09..8dd3977 100644 --- a/component_identifier_test.go +++ b/component_identifier_test.go @@ -169,6 +169,16 @@ func TestNewComponentIdentifier(t *testing.T) { item httpsfv.Item assert func(t *testing.T, ci *componentIdentifier, err error) }{ + { + uc: "non-string component name", + item: httpsfv.NewItem(int64(42)), + assert: func(t *testing.T, ci *componentIdentifier, err error) { + t.Helper() + + require.ErrorIs(t, err, ErrInvalidComponentIdentifier) + assert.Nil(t, ci) + }, + }, { uc: "invalid", item: httpsfv.NewItem("@foo"), diff --git a/httpsig.go b/httpsig.go index fa500a8..3808efa 100644 --- a/httpsig.go +++ b/httpsig.go @@ -35,7 +35,7 @@ var ( // ErrUnsupportedComponentIdentifier indicates that a covered component identifier is unsupported. ErrUnsupportedComponentIdentifier = errors.New("unsupported component identifier") - // ErrInvalidComponentIdentifier indicates malformed or invalid parameters on a component identifier. + // ErrInvalidComponentIdentifier indicates a malformed component identifier or invalid component parameters. ErrInvalidComponentIdentifier = errors.New("invalid component identifier") // ErrCanonicalization indicates that a covered HTTP message component could not be canonicalized.