Skip to content

add length check in parseTag()'s loop #13

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add length check in parseTag()'s loop #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
177c597
add length check in parseTag()'s loop
May 5, 2017
dbae01c
add length check in parseTag()'s loop
May 5, 2017
59de780
Merge branch 'master' into patch-3
May 11, 2017
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
14 changes: 10 additions & 4 deletions rfc3164/rfc3164.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"github.com/jeromer/syslogparser"
"time"
"fmt"
)

type Parser struct {
Expand Down Expand Up @@ -113,9 +114,9 @@ func (p *Parser) parsemessage() (rfc3164message, error) {
msg := rfc3164message{}
var err error

tag, err := p.parseTag()
tag, cursor, err := p.parseTag()
if err != nil {
return msg, err
p.cursor = cursor
}

content, err := p.parseContent()
Expand Down Expand Up @@ -189,7 +190,7 @@ func (p *Parser) parseHostname() (string, error) {
}

// http://tools.ietf.org/html/rfc3164#section-4.1.3
func (p *Parser) parseTag() (string, error) {
func (p *Parser) parseTag() (string, int, error) {
var b byte
var endOfTag bool
var bracketOpen bool
Expand All @@ -200,6 +201,11 @@ func (p *Parser) parseTag() (string, error) {
from := p.cursor

for {
if p.l <= p.cursor {
err = fmt.Errorf("No tag")
tag = []byte("")
break
}
b = p.buff[p.cursor]
bracketOpen = (b == '[')
endOfTag = (b == ':' || b == ' ')
Expand Down Expand Up @@ -227,7 +233,7 @@ func (p *Parser) parseTag() (string, error) {
p.cursor++
}

return string(tag), err
return string(tag), from, err
}

func (p *Parser) parseContent() (string, error) {
Expand Down
29 changes: 27 additions & 2 deletions rfc3164/rfc3164_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func (s *Rfc3164TestSuite) BenchmarkParseTag(c *C) {
p := NewParser(buff)

for i := 0; i < c.N; i++ {
_, err := p.parseTag()
_, _, err := p.parseTag()
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -265,7 +265,7 @@ func (s *Rfc3164TestSuite) assertTimestamp(c *C, ts time.Time, b []byte, expC in

func (s *Rfc3164TestSuite) assertTag(c *C, t string, b []byte, expC int, e error) {
p := NewParser(b)
obtained, err := p.parseTag()
obtained, _, err := p.parseTag()
c.Assert(obtained, Equals, t)
c.Assert(p.cursor, Equals, expC)
c.Assert(err, Equals, e)
Expand All @@ -286,3 +286,28 @@ func (s *Rfc3164TestSuite) assertRfc3164message(c *C, msg rfc3164message, b []by
c.Assert(obtained, Equals, msg)
c.Assert(p.cursor, Equals, expC)
}

func (s *Rfc3164TestSuite) TestParseWithout_Tag(c *C) {
buff := []byte("<30>Jun 23 13:17:42 127.0.0.1 java.lang.NullPointerException")

p := NewParser(buff)

err := p.Parse()
c.Assert(err, IsNil)

now := time.Now()

obtained := p.Dump()
expected := syslogparser.LogParts{
"timestamp": time.Date(now.Year(), time.June, 23, 13, 17, 42, 0, time.UTC),
"hostname": "127.0.0.1",
"tag": "",
"content": "java.lang.NullPointerException",
"priority": 30,
"facility": 3,
"severity": 6,
}

c.Assert(obtained, DeepEquals, expected)

}