check the query string (#118)

Author: unclezoro

rpc/core/tx.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 
 	cmn "github.com/tendermint/tendermint/libs/common"
-
-	tmquery "github.com/tendermint/tendermint/libs/pubsub/query"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	rpctypes "github.com/tendermint/tendermint/rpc/lib/types"
 	"github.com/tendermint/tendermint/state/txindex/null"
@@ -193,12 +191,7 @@ func TxSearch(ctx *rpctypes.Context, query string, prove bool, page, perPage int
 		return nil, fmt.Errorf("Transaction indexing is disabled")
 	}
 
-	q, err := tmquery.New(query)
-	if err != nil {
-		return nil, err
-	}
-
-	results, err := txIndexer.Search(q)
+	results, err := txIndexer.Search(query)
 	if err != nil {
 		return nil, err
 	}

state/txindex/indexer.go

@@ -3,7 +3,6 @@ package txindex
 import (
 	"errors"
 
-	"github.com/tendermint/tendermint/libs/pubsub/query"
 	"github.com/tendermint/tendermint/types"
 )
 
@@ -21,7 +20,7 @@ type TxIndexer interface {
 	Get(hash []byte) (*types.TxResult, error)
 
 	// Search allows you to query for transactions.
-	Search(q *query.Query) ([]*types.TxResult, error)
+	Search(q string) ([]*types.TxResult, error)
 }
 
 //----------------------------------------------------

state/txindex/kv/kv.go

@@ -151,7 +151,15 @@ func (txi *TxIndex) Index(result *types.TxResult) error {
 // result for it (2) for range queries it is better for the client to provide
 // both lower and upper bounds, so we are not performing a full scan. Results
 // from querying indexes are then intersected and returned to the caller.
-func (txi *TxIndex) Search(q *query.Query) ([]*types.TxResult, error) {
+func (txi *TxIndex) Search(queryStr string) ([]*types.TxResult, error) {
+	if !txi.enableRangeQuery && strings.ContainsAny(queryStr, "<>") {
+		return nil, fmt.Errorf("range query is not supported by this node, detected invalid operators['>', '<', '<=', '>='] in the query statement")
+	}
+
+	q, err := query.New(queryStr)
+	if err != nil {
+		return nil, err
+	}
 	var hashes [][]byte
 	var hashesInitialized bool
 
@@ -177,9 +185,6 @@ func (txi *TxIndex) Search(q *query.Query) ([]*types.TxResult, error) {
 	// if both upper and lower bounds exist, it's better to get them in order not
 	// no iterate over kvs that are not within range.
 	ranges, rangeIndexes := lookForRanges(conditions)
-	if !txi.enableRangeQuery && len(rangeIndexes) > 0 {
-		return nil, fmt.Errorf("range query is not supported by this node, detected invalid operators['>', '<', '<=', '>='] in the query statement")
-	}
 
 	if len(ranges) > 0 {
 		skipIndexes = append(skipIndexes, rangeIndexes...)

state/txindex/kv/kv_test.go

@@ -10,9 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	db "github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tendermint/libs/db"
 
-	"github.com/tendermint/tendermint/libs/pubsub/query"
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/types"
 )
@@ -97,7 +96,7 @@ func TestTxSearch(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.q, func(t *testing.T) {
-			results, err := indexer.Search(query.MustParse(tc.q))
+			results, err := indexer.Search(tc.q)
 			assert.NoError(t, err)
 
 			assert.Len(t, results, tc.resultsLength)
@@ -120,7 +119,7 @@ func TestTxSearchOneTxWithMultipleSameTagsButDifferentValues(t *testing.T) {
 	err := indexer.Index(txResult)
 	require.NoError(t, err)
 
-	results, err := indexer.Search(query.MustParse("account.number >= 1"))
+	results, err := indexer.Search("account.number >= 1")
 	assert.NoError(t, err)
 
 	assert.Len(t, results, 1)
@@ -173,7 +172,7 @@ func TestTxSearchMultipleTxs(t *testing.T) {
 	err = indexer.Index(txResult4)
 	require.NoError(t, err)
 
-	results, err := indexer.Search(query.MustParse("account.number >= 1"))
+	results, err := indexer.Search("account.number >= 1")
 	assert.NoError(t, err)
 
 	require.Len(t, results, 3)
@@ -191,12 +190,12 @@ func TestIndexAllTags(t *testing.T) {
 	err := indexer.Index(txResult)
 	require.NoError(t, err)
 
-	results, err := indexer.Search(query.MustParse("account.number >= 1"))
+	results, err := indexer.Search("account.number >= 1")
 	assert.NoError(t, err)
 	assert.Len(t, results, 1)
 	assert.Equal(t, []*types.TxResult{txResult}, results)
 
-	results, err = indexer.Search(query.MustParse("account.owner = 'Ivan'"))
+	results, err = indexer.Search("account.owner = 'Ivan'")
 	assert.NoError(t, err)
 	assert.Len(t, results, 1)
 	assert.Equal(t, []*types.TxResult{txResult}, results)
@@ -205,9 +204,9 @@ func TestIndexAllTags(t *testing.T) {
 func TestDisableRangeQuery(t *testing.T) {
 	indexer := NewTxIndex(db.NewMemDB(), IndexAllTags())
 
-	_, err := indexer.Search(query.MustParse("account.number >= 1"))
+	_, err := indexer.Search("account.number >= 1")
 	assert.Error(t, err)
-	_, err = indexer.Search(query.MustParse("account.number >= 1 AND account.sequence < 100 AND tx.height > 200 AND tx.height <= 300"))
+	_, err = indexer.Search("account.number >= 1 AND account.sequence < 100 AND tx.height > 200 AND tx.height <= 300")
 	assert.Error(t, err)
 }
 

state/txindex/null/null.go

@@ -3,7 +3,6 @@ package null
 import (
 	"errors"
 
-	"github.com/tendermint/tendermint/libs/pubsub/query"
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/types"
 )
@@ -28,6 +27,6 @@ func (txi *TxIndex) Index(result *types.TxResult) error {
 	return nil
 }
 
-func (txi *TxIndex) Search(q *query.Query) ([]*types.TxResult, error) {
+func (txi *TxIndex) Search(q string) ([]*types.TxResult, error) {
 	return []*types.TxResult{}, nil
 }