diff --git a/serializer.go b/serializer.go index f01282b..8bb80b8 100644 --- a/serializer.go +++ b/serializer.go @@ -12,7 +12,7 @@ import ( var errSerialization = errors.New("serialization error") //nolint:gochecknoglobals -var byteSequenceWhitespace = regexp.MustCompile(`\s+`) +var byteSequenceObsFold = regexp.MustCompile("[ \t]*\r\n[ \t]+") type serializer interface { serialize(v []string) ([]string, error) @@ -51,12 +51,11 @@ func (s *byteSequenceSerializer) serialize(v []string) ([]string, error) { encoded := make([]string, len(v)) for i, sv := range v { - values := strings.Split(sv, ",") - for j, v := range values { - values[j] = byteSequenceWhitespace.ReplaceAllString(strings.TrimSpace(v), " ") - } - - item := httpsfv.NewItem([]byte(strings.Join(values, ", "))) + // RFC 9421, Section 2.1.3: preserve field-value bytes except for + // surrounding HTTP whitespace and obsolete line folding. + value := strings.Trim(sv, " \t") + value = byteSequenceObsFold.ReplaceAllString(value, " ") + item := httpsfv.NewItem([]byte(value)) marshalled, err := httpsfv.Marshal(item) if err != nil { diff --git a/serializer_test.go b/serializer_test.go index 85af7a3..f1851c5 100644 --- a/serializer_test.go +++ b/serializer_test.go @@ -152,6 +152,36 @@ func TestByteSequenceSerialization(t *testing.T) { input: []string{"value, with, lots, of, commas"}, result: []string{":dmFsdWUsIHdpdGgsIGxvdHMsIG9mLCBjb21tYXM=:"}, }, + { + uc: "preserve internal spaces and commas", + input: []string{"foo , bar"}, + result: []string{":Zm9vICwgIGJhcg==:"}, + }, + { + uc: "preserve internal tabs", + input: []string{"alpha\tbeta"}, + result: []string{":YWxwaGEJYmV0YQ==:"}, + }, + { + uc: "strip surrounding HTTP whitespace", + input: []string{"\t alpha \t"}, + result: []string{":YWxwaGE=:"}, + }, + { + uc: "unfold obsolete line folding", + input: []string{"hello\r\n \tworld"}, + result: []string{":aGVsbG8gd29ybGQ=:"}, + }, + { + uc: "unfold obsolete line folding with preceding whitespace", + input: []string{"hello \r\n \tworld"}, + result: []string{":aGVsbG8gd29ybGQ=:"}, + }, + { + uc: "preserve non-ASCII whitespace bytes", + input: []string{"\u00a0alpha"}, + result: []string{":wqBhbHBoYQ==:"}, + }, } { t.Run(tc.uc, func(t *testing.T) { params := httpsfv.NewParams()