Validate input t-address
This commit is contained in:
parent
f217d20ca0
commit
cc30455a72
|
@ -5,6 +5,7 @@ import (
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -51,6 +52,16 @@ func (s *SqlStreamer) GetLatestBlock(ctx context.Context, placeholder *walletrpc
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentAddressBlockFilter, resp walletrpc.CompactTxStreamer_GetAddressTxidsServer) error {
|
func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentAddressBlockFilter, resp walletrpc.CompactTxStreamer_GetAddressTxidsServer) error {
|
||||||
|
var err error
|
||||||
|
var errCode int64
|
||||||
|
|
||||||
|
// Test to make sure Address is a single t address
|
||||||
|
match, err := regexp.Match("^t[a-zA-Z0-9]{34}$", []byte(addressBlockFilter.Address))
|
||||||
|
if err != nil || !match {
|
||||||
|
s.log.Errorf("Unrecognized address: %s", addressBlockFilter.Address)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
params := make([]json.RawMessage, 1)
|
params := make([]json.RawMessage, 1)
|
||||||
st := "{\"addresses\": [\"" + addressBlockFilter.Address + "\"]," +
|
st := "{\"addresses\": [\"" + addressBlockFilter.Address + "\"]," +
|
||||||
"\"start\": " + strconv.FormatUint(addressBlockFilter.Range.Start.Height, 10) +
|
"\"start\": " + strconv.FormatUint(addressBlockFilter.Range.Start.Height, 10) +
|
||||||
|
@ -60,9 +71,6 @@ func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentA
|
||||||
|
|
||||||
result, rpcErr := s.client.RawRequest("getaddresstxids", params)
|
result, rpcErr := s.client.RawRequest("getaddresstxids", params)
|
||||||
|
|
||||||
var err error
|
|
||||||
var errCode int64
|
|
||||||
|
|
||||||
// For some reason, the error responses are not JSON
|
// For some reason, the error responses are not JSON
|
||||||
if rpcErr != nil {
|
if rpcErr != nil {
|
||||||
s.log.Errorf("Got error: %s", rpcErr.Error())
|
s.log.Errorf("Got error: %s", rpcErr.Error())
|
||||||
|
|
Loading…
Reference in New Issue