package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-06 07:37:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow headers with zero or multiple spaces between key and value

Browse Source
This commit is contained in:
aler9
2020-06-14 17:29:40 +02:00
parent 37bd9a1b98
commit c06d302979
9 changed files with 99 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
header_test.go
View File

@@ -10,11 +10,15 @@ import (
var casesHeader = []struct {
name string
byts []byte
dec []byte
enc []byte
header Header
}{
{
"single",
[]byte("Proxy-Require: gzipped-messages\r\n" +
"Require: implicit-play\r\n" +
"\r\n"),
[]byte("Proxy-Require: gzipped-messages\r\n" +
"Require: implicit-play\r\n" +
"\r\n"),
@@ -25,6 +29,9 @@ var casesHeader = []struct {
},
{
"multiple",
[]byte("WWW-Authenticate: Digest realm=\"4419b63f5e51\", nonce=\"8b84a3b789283a8bea8da7fa7d41f08b\", stale=\"FALSE\"\r\n" +
"WWW-Authenticate: Basic realm=\"4419b63f5e51\"\r\n" +
"\r\n"),
[]byte("WWW-Authenticate: Digest realm=\"4419b63f5e51\", nonce=\"8b84a3b789283a8bea8da7fa7d41f08b\", stale=\"FALSE\"\r\n" +
"WWW-Authenticate: Basic realm=\"4419b63f5e51\"\r\n" +
"\r\n"),
@@ -35,12 +42,58 @@ var casesHeader = []struct {
},
},
},
{
"without space",
[]byte("CSeq:2\r\n" +
"\r\n"),
[]byte("CSeq: 2\r\n" +
"\r\n"),
Header{
"CSeq": []string{"2"},
},
},
{
"with multiple spaces",
[]byte("CSeq: 2\r\n" +
"\r\n"),
[]byte("CSeq: 2\r\n" +
"\r\n"),
Header{
"CSeq": []string{"2"},
},
},
{
"normalized keys, standard",
[]byte("Content-type: testing\r\n" +
"Content-length: value\r\n" +
"\r\n"),
[]byte("Content-Length: value\r\n" +
"Content-Type: testing\r\n" +
"\r\n"),
Header{
"Content-Length": []string{"value"},
"Content-Type": []string{"testing"},
},
},
{
"normalized keys, non-standard",
[]byte("Www-Authenticate: value\r\n" +
"Cseq: value\r\n" +
"\r\n"),
[]byte("CSeq: value\r\n" +
"WWW-Authenticate: value\r\n" +
"\r\n"),
Header{
"CSeq": []string{"value"},
"WWW-Authenticate": []string{"value"},
},
},
}
func TestHeaderRead(t *testing.T) {
for _, c := range casesHeader {
t.Run(c.name, func(t *testing.T) {
req, err := readHeader(bufio.NewReader(bytes.NewBuffer(c.byts)))
req, err := headerRead(bufio.NewReader(bytes.NewBuffer(c.dec)))
require.NoError(t, err)
require.Equal(t, c.header, req)
})
@@ -55,44 +108,7 @@ func TestHeaderWrite(t *testing.T) {
err := c.header.write(bw)
require.NoError(t, err)
bw.Flush()
require.Equal(t, c.byts, buf.Bytes())
})
}
}
var casesHeaderNormalization = []struct {
name string
byts []byte
header Header
}{
{
"standard",
[]byte("Content-type: testing\r\n" +
"Content-length: value\r\n" +
"\r\n"),
Header{
"Content-Type": []string{"testing"},
"Content-Length": []string{"value"},
},
},
{
"non-standard",
[]byte("Www-Authenticate: value\r\n" +
"Cseq: value\r\n" +
"\r\n"),
Header{
"WWW-Authenticate": []string{"value"},
"CSeq": []string{"value"},
},
},
}
func TestHeaderNormalization(t *testing.T) {
for _, c := range casesHeaderNormalization {
t.Run(c.name, func(t *testing.T) {
req, err := readHeader(bufio.NewReader(bytes.NewBuffer(c.byts)))
require.NoError(t, err)
require.Equal(t, c.header, req)
require.Equal(t, c.enc, buf.Bytes())
})
}
}