RFC3164 support old syslog

nontransparent/example_test.go

@@ -22,6 +22,24 @@ func Example_withoutTrailerAtEnd() {
 	// Output:
 	// ([]syslog.Result) (len=1) {
 	//  (syslog.Result) {
+	//   Message: (syslog.Message) <nil>,
+	//   Error: (*ragel.ReadingError)(unexpected EOF)
+	//  }
+	// }
+}
+
+func Example_bestEffortWithoutTrailerAtEnd() {
+	results := []syslog.Result{}
+	acc := func(res *syslog.Result) {
+		results = append(results, *res)
+	}
+	// Notice the message ends without trailer but we catch it anyway
+	r := strings.NewReader("<1>1 2003-10-11T22:14:15.003Z host.local - - - - mex")
+	NewParser(syslog.WithBestEffort(), syslog.WithListener(acc)).Parse(r)
+	output(results)
+	// Output:
+	// ([]syslog.Result) (len=1) {
+	//  (syslog.Result) {
 	//   Message: (*rfc5424.SyslogMessage)({
 	//    Base: (syslog.Base) {
 	//     Facility: (*uint8)(0),
@@ -37,7 +55,7 @@ func Example_withoutTrailerAtEnd() {
 	//    Version: (uint16) 1,
 	//    StructuredData: (*map[string]map[string]string)(<nil>)
 	//   }),
-	//   Error: (*ragel.ReadingError)(unexpected EOF)
+	//   Error: (error) <nil>
 	//  }
 	// }
 }

nontransparent/parser.go

@@ -4,6 +4,7 @@ import (
 	"io"
 
 	syslog "github.com/influxdata/go-syslog/v3"
+	"github.com/influxdata/go-syslog/v3/rfc3164"
 	"github.com/influxdata/go-syslog/v3/rfc5424"
 	parser "github.com/leodido/ragel-machinery/parser"
 )
@@ -184,7 +185,8 @@ func (m *machine) OnCompletion() {
 	// Try to parse last chunk as a candidate
 	if m.readError != nil && len(m.lastChunk) > 0 {
 		res, err := m.internal.Parse(m.lastChunk)
-		if err == nil {
+		if err == nil && !m.bestEffort {
+			res = nil
 			err = m.readError
 		}
 		m.emit(&syslog.Result{
@@ -218,6 +220,29 @@ func NewParser(options ...syslog.ParserOption) syslog.Parser {
 	return m
 }
 
+func NewParserRFC3164(options ...syslog.ParserOption) syslog.Parser {
+	m := &machine{
+		emit: func(*syslog.Result) { /* noop */ },
+	}
+
+	for _, opt := range options {
+		m = opt(m).(*machine)
+	}
+
+	// No error can happens since during its setting we check the trailer type passed in
+	trailer, _ := m.trailertyp.Value()
+	m.trailer = byte(trailer)
+
+	// Create internal parser depending on options
+	if m.bestEffort {
+		m.internal = rfc3164.NewMachine(rfc3164.WithBestEffort())
+	} else {
+		m.internal = rfc3164.NewMachine()
+	}
+
+	return m
+}
+
 // WithMaxMessageLength does nothing for this parser
 func (m *machine) WithMaxMessageLength(length int) {}
 

nontransparent/parser.go.rl

@@ -6,6 +6,7 @@ import (
     parser "github.com/leodido/ragel-machinery/parser"
     syslog "github.com/influxdata/go-syslog/v3"
     "github.com/influxdata/go-syslog/v3/rfc5424"
+	"github.com/influxdata/go-syslog/v3/rfc3164"
 )
 
 %%{
@@ -78,7 +79,8 @@ func (m *machine) OnCompletion() {
     // Try to parse last chunk as a candidate
     if m.readError != nil && len(m.lastChunk) > 0 {
         res, err := m.internal.Parse(m.lastChunk)
-        if err == nil {
+        if err == nil && !m.bestEffort {
+            res = nil
             err = m.readError
         }
         m.emit(&syslog.Result{
@@ -112,6 +114,32 @@ func NewParser(options ...syslog.ParserOption) syslog.Parser {
     return m
 }
 
+func NewParserRFC3164(options ...syslog.ParserOption) syslog.Parser {
+	m := &machine{
+		emit: func(*syslog.Result) { /* noop */ },
+	}
+
+	for _, opt := range options {
+		m = opt(m).(*machine)
+	}
+
+	// No error can happens since during its setting we check the trailer type passed in
+	trailer, _ := m.trailertyp.Value()
+	m.trailer = byte(trailer)
+
+	// Create internal parser depending on options
+	if m.bestEffort {
+		m.internal = rfc3164.NewMachine(rfc3164.WithBestEffort())
+	} else {
+		m.internal = rfc3164.NewMachine()
+	}
+
+	return m
+}
+
+// WithMaxMessageLength does nothing for this parser
+func (m *machine) WithMaxMessageLength(length int) {}
+
 // HasBestEffort tells whether the receiving parser has best effort mode on or off.
 func (m *machine) HasBestEffort() bool {
     return m.bestEffort

nontransparent/parser_test.go

@@ -57,14 +57,12 @@ func getTestCases() []testCase {
 			false,
 			[]syslog.Result{
 				{
-					Message: (&rfc5424.SyslogMessage{}).SetPriority(3).SetVersion(1),
-					Error:   ragel.NewReadingError(io.ErrUnexpectedEOF.Error()),
+					Error: ragel.NewReadingError(io.ErrUnexpectedEOF.Error()),
 				},
 			},
 			[]syslog.Result{
 				{
 					Message: (&rfc5424.SyslogMessage{}).SetPriority(3).SetVersion(1),
-					Error:   ragel.NewReadingError(io.ErrUnexpectedEOF.Error()),
 				},
 			},
 		},
@@ -98,8 +96,7 @@ func getTestCases() []testCase {
 					Message: (&rfc5424.SyslogMessage{}).SetPriority(1).SetVersion(1),
 				},
 				{
-					Message: (&rfc5424.SyslogMessage{}).SetPriority(2).SetVersion(1),
-					Error:   ragel.NewReadingError(io.ErrUnexpectedEOF.Error()),
+					Error: ragel.NewReadingError(io.ErrUnexpectedEOF.Error()),
 				},
 			},
 			[]syslog.Result{
@@ -108,7 +105,6 @@ func getTestCases() []testCase {
 				},
 				{
 					Message: (&rfc5424.SyslogMessage{}).SetPriority(2).SetVersion(1),
-					Error:   ragel.NewReadingError(io.ErrUnexpectedEOF.Error()),
 				},
 			},
 		},

octetcounting/example_test.go

@@ -173,3 +173,89 @@ func Example_channel() {
 	//  Error: (*errors.errorString)(parsing error [col 4])
 	// }
 }
+
+func Example_channelOpenBSD() {
+	messages := []string{
+		"42 <46>Apr 28 11:53:44 syslogd[18823]: start\n",
+		"44 <47>Apr 28 11:53:44 syslogd[18823]: running\n",
+		"88 <86>Apr 28 11:53:46 doas: catap ran command ls / as root from /home/catap/src/go-syslog\n",
+	}
+
+	r, w := io.Pipe()
+
+	go func() {
+		defer w.Close()
+
+		for _, m := range messages {
+			w.Write([]byte(m))
+			time.Sleep(time.Millisecond * 220)
+		}
+	}()
+
+	c := make(chan syslog.Result)
+	emit := func(res *syslog.Result) {
+		c <- *res
+	}
+
+	parser := NewParserRFC3164(syslog.WithBestEffort(), syslog.WithListener(emit))
+	go func() {
+		defer close(c)
+		parser.Parse(r)
+	}()
+
+	for r := range c {
+		output(r)
+	}
+
+	r.Close()
+
+	// Output:
+	// (syslog.Result) {
+	//  Message: (*rfc3164.SyslogMessage)({
+	//   Base: (syslog.Base) {
+	//    Facility: (*uint8)(5),
+	//    Severity: (*uint8)(6),
+	//    Priority: (*uint8)(46),
+	//    Timestamp: (*time.Time)(0000-04-28 11:53:44 +0000 UTC),
+	//    Hostname: (*string)(<nil>),
+	//    Appname: (*string)((len=7) "syslogd"),
+	//    ProcID: (*string)((len=5) "18823"),
+	//    MsgID: (*string)(<nil>),
+	//    Message: (*string)((len=5) "start")
+	//   }
+	//  }),
+	//  Error: (error) <nil>
+	// }
+	// (syslog.Result) {
+	//  Message: (*rfc3164.SyslogMessage)({
+	//   Base: (syslog.Base) {
+	//    Facility: (*uint8)(5),
+	//    Severity: (*uint8)(7),
+	//    Priority: (*uint8)(47),
+	//    Timestamp: (*time.Time)(0000-04-28 11:53:44 +0000 UTC),
+	//    Hostname: (*string)(<nil>),
+	//    Appname: (*string)((len=7) "syslogd"),
+	//    ProcID: (*string)((len=5) "18823"),
+	//    MsgID: (*string)(<nil>),
+	//    Message: (*string)((len=7) "running")
+	//   }
+	//  }),
+	//  Error: (error) <nil>
+	// }
+	// (syslog.Result) {
+	//  Message: (*rfc3164.SyslogMessage)({
+	//   Base: (syslog.Base) {
+	//    Facility: (*uint8)(10),
+	//    Severity: (*uint8)(6),
+	//    Priority: (*uint8)(86),
+	//    Timestamp: (*time.Time)(0000-04-28 11:53:46 +0000 UTC),
+	//    Hostname: (*string)(<nil>),
+	//    Appname: (*string)((len=4) "doas"),
+	//    ProcID: (*string)(<nil>),
+	//    MsgID: (*string)(<nil>),
+	//    Message: (*string)((len=61) "catap ran command ls / as root from /home/catap/src/go-syslog")
+	//   }
+	//  }),
+	//  Error: (error) <nil>
+	// }
+}

octetcounting/parser.go

@@ -5,6 +5,7 @@ import (
 	"io"
 
 	syslog "github.com/influxdata/go-syslog/v3"
+	"github.com/influxdata/go-syslog/v3/rfc3164"
 	"github.com/influxdata/go-syslog/v3/rfc5424"
 )
 
@@ -43,6 +44,26 @@ func NewParser(opts ...syslog.ParserOption) syslog.Parser {
 	return p
 }
 
+func NewParserRFC3164(opts ...syslog.ParserOption) syslog.Parser {
+	p := &parser{
+		emit:             func(*syslog.Result) { /* noop */ },
+		maxMessageLength: 1024,
+	}
+
+	for _, opt := range opts {
+		p = opt(p).(*parser)
+	}
+
+	// Create internal parser depending on options
+	if p.bestEffort {
+		p.internal = rfc3164.NewMachine(rfc3164.WithBestEffort())
+	} else {
+		p.internal = rfc3164.NewMachine()
+	}
+
+	return p
+}
+
 func (p *parser) WithMaxMessageLength(length int) {
 	p.maxMessageLength = length
 }
@@ -134,7 +155,8 @@ func (p *parser) run() {
 		// Next we MUST see an EOF otherwise the parsing we'll start again
 		if tok = p.scan(); tok.typ == EOF {
 			break
-		} else {
+		} else if tok.typ != LF {
+			// but some syslog may separate lines with octet by \n, ignore it
 			p.unscan()
 		}
 	}

octetcounting/parser_test.go

@@ -179,8 +179,8 @@ func getTestCases() []testCase {
 			},
 		},
 		{
-			descr: "1st ok/2nd ok/3rd ok",
-			input: "48 <1>1 2003-10-11T22:14:15.003Z host.local - - - -25 <3>1 - host.local - - - -38 <2>1 - host.local su - - - κόσμε",
+			descr: "1st ok/2nd ok/LF/3rd ok", // LF means new line aka \n
+			input: "48 <1>1 2003-10-11T22:14:15.003Z host.local - - - -25 <3>1 - host.local - - - -\n38 <2>1 - host.local su - - - κόσμε",
 			// results w/o best effort
 			results: []syslog.Result{
 				{

octetcounting/scanner.go

@@ -10,6 +10,9 @@ import (
 // eof represents a marker byte for the end of the reader
 var eof = byte(0)
 
+// lf represents the NewLine
+var lf = byte(10)
+
 // ws represents the whitespace
 var ws = byte(32)
 
@@ -73,6 +76,12 @@ func (s *Scanner) Scan() (tok Token) {
 		return Token{
 			typ: EOF,
 		}
+	case lf:
+		s.ready = true
+		return Token{
+			typ: LF,
+			lit: []byte{lf},
+		}
 	case ws:
 		s.ready = true
 		return Token{

octetcounting/tokens.go

@@ -17,6 +17,7 @@ type TokenType int
 const (
 	ILLEGAL TokenType = iota
 	EOF
+	LF
 	WS
 	MSGLEN
 	SYSLOGMSG
@@ -32,9 +33,9 @@ func (t Token) String() string {
 	}
 }
 
-const tokentypename = "ILLEGALEOFWSMSGLENSYSLOGMSG"
+const tokentypename = "ILLEGALEOFLFWSMSGLENSYSLOGMSG"
 
-var tokentypeindex = [...]uint8{0, 7, 10, 12, 18, 27}
+var tokentypeindex = [...]uint8{0, 7, 10, 12, 14, 20, 29}
 
 // String outputs the string representation of the receiving TokenType.
 func (i TokenType) String() string {

rfc3164/example_test.go

@@ -46,7 +46,7 @@ func Example_currentyear() {
 	//   Facility: (*uint8)(1),
 	//   Severity: (*uint8)(5),
 	//   Priority: (*uint8)(13),
-	//   Timestamp: (*time.Time)(2021-12-02 16:31:03 +0000 UTC),
+	//   Timestamp: (*time.Time)(2024-12-02 16:31:03 +0000 UTC),
 	//   Hostname: (*string)((len=4) "host"),
 	//   Appname: (*string)((len=3) "app"),
 	//   ProcID: (*string)(<nil>),
@@ -138,7 +138,7 @@ func Example_besteffort() {
 	//   Appname: (*string)(<nil>),
 	//   ProcID: (*string)(<nil>),
 	//   MsgID: (*string)(<nil>),
-	//   Message: (*string)(<nil>)
+	//   Message: (*string)((len=1) "-")
 	//  }
 	// })
 }