Skip to content

Handle hex escapes and other variable length escape sequences #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
levinalex wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle hex escapes and other variable length escape sequences #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1ce8e4
Forward unhandled escape sequences unchanged
levinalex-samedi Oct 11, 2018
42a4202
Silently fix unpaired escape characters in parsing
levinalex-samedi Oct 11, 2018
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
9 changes: 8 additions & 1 deletion messageparser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func ParseMessage(buf []byte) (Message, *Delimiters, error) {
}

func unescape(b []byte, d *Delimiters) []byte {
r := make([]byte, len(b))
r := make([]byte, len(b)+1) // +1 to make room for possible unpaired escape character

j, e := 0, false
for i := 0; i < len(b); i++ {
Expand Down Expand Up @@ -225,6 +225,13 @@ func unescape(b []byte, d *Delimiters) []byte {
r[j] = d.Escape
j++
r[j] = c
j++
i++
for ; i < len(b) && b[i] != d.Escape; i++ {
r[j] = b[i]
j++
}
r[j] = d.Escape
}

j++
Expand Down
36 changes: 35 additions & 1 deletion messageparser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func TestParseSimpleContent(t *testing.T) {
Field{FieldItem{Component{"^~\\&"}}},
Field{FieldItem{Component{"field"}}},
Field{FieldItem{
Component{"\\|~^&\\X484559"},
Component{"\\|~^&\\X484559\\"},
}},
Field{FieldItem{
Component{"component1"},
Expand Down Expand Up @@ -321,6 +321,40 @@ func TestParseLiteralNewline(t *testing.T) {
}, m)
}

func TestParseHexEscapes(t *testing.T) {
a := assert.New(t)

m, d, err := ParseMessage([]byte(`MSH|^~\&|Foo\X41\|Bar\X42\Fred`))
a.NoError(err)
a.Equal(&Delimiters{'|', '^', '~', '\\', '&'}, d)
a.Equal(Message{
Segment{
Field{FieldItem{Component{`MSH`}}},
Field{FieldItem{Component{`|`}}},
Field{FieldItem{Component{`^~\&`}}},
Field{FieldItem{Component{`Foo\X41\`}}},
Field{FieldItem{Component{`Bar\X42\Fred`}}},
},
}, m)
}

func TestParseUnpairedInvalidHexEscapes(t *testing.T) {
a := assert.New(t)

m, d, err := ParseMessage([]byte(`MSH|^~\&|Foo\X41|Bar\X42\Fred`))
a.NoError(err)
a.Equal(&Delimiters{'|', '^', '~', '\\', '&'}, d)
a.Equal(Message{
Segment{
Field{FieldItem{Component{`MSH`}}},
Field{FieldItem{Component{`|`}}},
Field{FieldItem{Component{`^~\&`}}},
Field{FieldItem{Component{`Foo\X41\`}}},
Field{FieldItem{Component{`Bar\X42\Fred`}}},
},
}, m)
}

func TestParseBad(t *testing.T) {
a := assert.New(t)

Expand Down