fix: Modify PEG rule to support escape chracter (#774)

* Modify PEG rule * Revert Go version * Add parser test case * Add query match test
Finschia · Jun 14, 2024 · 3191c51 · 3191c51
1 parent 5651d4f
commit 3191c51
Show file tree

Hide file tree

Showing 6 changed files with 293 additions and 504 deletions.
diff --git a/libs/pubsub/query/Makefile b/libs/pubsub/query/Makefile
@@ -1,7 +1,9 @@
-gen_query_parser:
-	go get -u -v github.com/pointlander/peg
+gen_query_parser: peg
 	peg -inline -switch query.peg
 
+peg:
+	@go install github.com/pointlander/peg@v1.0.1
+
 fuzzy_test:
 	go get -u -v github.com/dvyukov/go-fuzz/go-fuzz
 	go get -u -v github.com/dvyukov/go-fuzz/go-fuzz-build

diff --git a/libs/pubsub/query/parser_test.go b/libs/pubsub/query/parser_test.go
@@ -84,6 +84,12 @@ func TestParser(t *testing.T) {
 
 		{"hash='136E18F7E4C348B780CF873A0BF43922E5BAFA63'", true},
 		{"hash=136E18F7E4C348B780CF873A0BF43922E5BAFA63", false},
+
+		{"root.dummy.v1.EventDummy.seq='\"1\"'", true},
+		{"root.dummy.v1.EventDummy.descr='\\\"slash included\\\"'", true},
+		{"root.dummy.v1.EventDummy.descr='\"single quote \\' included\"'", true},
+		{"root.dummy.v1.EventDummy.descr='\"single quote ' included\"'", false},
+		{"root.dummy.v1.EventDummy.descr='{\"object\":\"style\"}'", true},
 	}
 
 	for _, c := range cases {

diff --git a/libs/pubsub/query/query.go b/libs/pubsub/query/query.go
@@ -39,10 +39,15 @@ type Condition struct {
 // invalid.
 func New(s string) (*Query, error) {
 	p := &QueryParser{Buffer: fmt.Sprintf(`"%s"`, s)}
-	p.Init()
+	err := p.Init()
+	if err != nil {
+		return nil, err
+	}
+
 	if err := p.Parse(); err != nil {
 		return nil, err
 	}
+
 	return &Query{str: s, parser: p}, nil
 }
 
@@ -101,7 +106,7 @@ func (q *Query) Conditions() ([]Condition, error) {
 	buffer, begin, end := q.parser.Buffer, 0, 0
 
 	// tokens must be in the following order: tag ("tx.gas") -> operator ("=") -> operand ("7")
-	for token := range q.parser.Tokens() {
+	for _, token := range q.parser.Tokens() {
 		switch token.pegRule {
 		case rulePegText:
 			begin, end = int(token.begin), int(token.end)
@@ -213,7 +218,7 @@ func (q *Query) Matches(events map[string][]string) (bool, error) {
 	// tokens must be in the following order:
 
 	// tag ("tx.gas") -> operator ("=") -> operand ("7")
-	for token := range q.parser.Tokens() {
+	for _, token := range q.parser.Tokens() {
 		switch token.pegRule {
 		case rulePegText:
 			begin, end = int(token.begin), int(token.end)

diff --git a/libs/pubsub/query/query.peg b/libs/pubsub/query/query.peg
@@ -15,7 +15,7 @@ condition <- tag ' '* (le ' '* (number / time / date)
                       )
 
 tag <- < (![ \t\n\r\\()"'=><] .)+ >
-value <- < '\'' (!["'] .)* '\''>
+value <- < '\'' (('\\' .) / (!['] .))* '\''>
 number <- < ('0'
            / [1-9] digit* ('.' digit*)?) >
 digit <- [0-9]