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
20 changes: 18 additions & 2 deletions signature_input.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package httpsig

import (
"fmt"
"slices"
"time"

"github.com/dunglas/httpsfv"
Expand Down Expand Up @@ -38,7 +37,24 @@ func newSignatureInput(

func (si *signatureInput) hasIdentifier(id *componentIdentifier) bool {
for _, identifier := range si.identifiers {
if identifier.Value == id.Value && slices.Equal(identifier.Params.Names(), id.Params.Names()) {
if identifier.Value != id.Value || len(identifier.Params.Names()) != len(id.Params.Names()) {
continue
}

matches := true

for _, name := range id.Params.Names() {
actual, present := identifier.Params.Get(name)

expected, _ := id.Params.Get(name)
if !present || actual != expected {
matches = false

break
}
}

if matches {
return true
}
}
Expand Down
71 changes: 48 additions & 23 deletions signature_input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -781,41 +781,66 @@ func TestSignatureInputHasIdentifier(t *testing.T) {
t.Parallel()

for uc, tc := range map[string]struct {
given []*componentIdentifier
identifier *componentIdentifier
given []string
identifier string
expected bool
}{
"no identifiers": {
identifier: &componentIdentifier{
Item: httpsfv.Item{Value: "@method", Params: httpsfv.NewParams()},
},
expected: false,
identifier: "@method",
},
"matching identifier": {
given: []*componentIdentifier{{
Item: httpsfv.Item{Value: "@method", Params: httpsfv.NewParams()},
}},
identifier: &componentIdentifier{
Item: httpsfv.Item{Value: "@method", Params: httpsfv.NewParams()},
},
expected: true,
given: []string{"@method"},
identifier: "@method",
expected: true,
},
"different identifier name": {
given: []*componentIdentifier{{
Item: httpsfv.Item{Value: "@method", Params: httpsfv.NewParams()},
}},
identifier: &componentIdentifier{
Item: httpsfv.Item{Value: "@authority", Params: httpsfv.NewParams()},
},
expected: false,
given: []string{"@method"},
identifier: "@authority",
},
"matching parameter value": {
given: []string{`@query-param;name="foo"`},
identifier: `@query-param;name="foo"`,
expected: true,
},
"different parameter value": {
given: []string{`@query-param;name="bar"`},
identifier: `@query-param;name="foo"`,
},
"different parameter type": {
given: []string{`x-test;value=1`},
identifier: `x-test;value="1"`,
},
"different flag value": {
given: []string{`x-test;sf=?0`},
identifier: `x-test;sf`,
},
"different parameter name": {
given: []string{`x-test;sf`},
identifier: `x-test;req`,
},
"additional parameter": {
given: []string{`x-test;sf;req`},
identifier: `x-test;sf`,
},
"missing parameter": {
given: []string{`x-test;sf`},
identifier: `x-test;sf;req`,
},
"different parameter order": {
given: []string{`x-test;key="foo";req`},
identifier: `x-test;req;key="foo"`,
expected: true,
},
} {
t.Run(uc, func(t *testing.T) {
input := &signatureInput{identifiers: tc.given}
given, err := toComponentIdentifiers(tc.given)
require.NoError(t, err)

found := input.hasIdentifier(tc.identifier)
ids, err := toComponentIdentifiers([]string{tc.identifier})
require.NoError(t, err)

require.Equal(t, tc.expected, found)
input := &signatureInput{identifiers: given}
assert.Equal(t, tc.expected, input.hasIdentifier(ids[0]))
})
}
}
25 changes: 25 additions & 0 deletions verification_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,31 @@ func TestVerificationPolicyAssertMetadata(t *testing.T) {
require.ErrorContains(t, err, "too old")
},
},
"expected component identifier has different parameter value": {
params: httpsfv.InnerList{
Items: []httpsfv.Item{{
Value: "@query-param",
Params: func() *httpsfv.Params {
params := httpsfv.NewParams()
params.Add("name", "bar")

return params
}(),
}},
},
exp: func() verificationPolicy {
ids, err := toComponentIdentifiers([]string{`@query-param;name="foo"`})
require.NoError(t, err)

return verificationPolicy{identifiers: ids, reqCreatedTS: &falseVal, reqExpiresTS: &falseVal}
}(),
assert: func(t *testing.T, err error) {
t.Helper()

require.ErrorIs(t, err, ErrMissingParameter)
require.ErrorContains(t, err, `"@query-param";name="foo"`)
},
},
"expected component identifier missing": {
params: httpsfv.InnerList{Params: httpsfv.NewParams()},
exp: func() verificationPolicy {
Expand Down
Loading