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
26 changes: 3 additions & 23 deletions component.go
Original file line number Diff line number Diff line change
@@ -1,32 +1,12 @@
package httpsig

import (
"strings"

"github.com/dunglas/httpsfv"
)
import "strings"

type component struct {
key *componentIdentifier
value []string
}

type componentList []component

func (s componentList) marshal() (string, error) {
var builder strings.Builder

for _, item := range s {
marshalledKey, err := httpsfv.Marshal(item.key)
if err != nil {
return "", err
}

_, err = builder.WriteString(marshalledKey + ": " + strings.Join(item.value, ", ") + "\n")
if err != nil {
return "", err
}
}

return strings.TrimRight(builder.String(), "\n"), nil
func (c component) canonicalValue() string {
return strings.Join(c.value, ", ")
}
31 changes: 0 additions & 31 deletions component_test.go

This file was deleted.

95 changes: 95 additions & 0 deletions signature_base.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package httpsig

import (
"bytes"
"fmt"
"strings"

"github.com/dunglas/httpsfv"
)

type signatureBase []component

func newSignatureBase(params *signatureParameters, msg *Message) (signatureBase, error) {
marshalledSigParams, err := httpsfv.Marshal(params.InnerList)
if err != nil {
return nil, err
}

sigBase := make(signatureBase, 0, len(params.identifiers)+1)
seen := make(map[string]struct{}, len(params.identifiers))

for _, ci := range params.identifiers {
identifier, err := httpsfv.Marshal(ci.Item)
if err != nil {
return nil, err
}

if _, ok := seen[identifier]; ok {
return nil, fmt.Errorf("%w: duplicate component identifier %s", ErrMalformedData, identifier)
}

seen[identifier] = struct{}{}

comp, err := ci.createComponent(msg)
if err != nil {
return nil, err
}

sigBase = append(sigBase, comp)
}

sigBase = append(sigBase, component{
key: &componentIdentifier{Item: httpsfv.NewItem("@signature-params")},
value: []string{marshalledSigParams},
})

return sigBase, nil
}

func (s signatureBase) marshal() ([]byte, error) {
var buf bytes.Buffer

for i, item := range s {
marshalledKey, err := httpsfv.Marshal(item.key.Item)
if err != nil {
return nil, err
}

if i > 0 {
buf.WriteByte('\n')
}

buf.WriteString(marshalledKey)
buf.WriteString(": ")
buf.WriteString(item.canonicalValue())
}

return buf.Bytes(), nil
}

func (s signatureBase) components() (map[string]string, error) {
result := make(map[string]string, len(s))

for _, component := range s {
name := component.key.Value.(string) // nolint: forcetypeassert

if name == "@signature-params" {
continue
}

identifier, err := httpsfv.Marshal(component.key.Item)
if err != nil {
return nil, err
}

// Remove quotes around the component name,
// preserving identifier parameters.
prefix := `"` + name + `"`
key := name + strings.TrimPrefix(identifier, prefix)

result[key] = component.canonicalValue()
}

return result, nil
}
Loading
Loading