aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-08-07 15:52:12 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-08-07 15:52:12 +0800
commitcf7cef4293cf1b1a9b393f1030f8c8e648c2975b (patch)
tree47228d592884c208e7c31ed5318f2cb513b0fb2d /xeth
parent698e98d9814605bfea98ba3ad2fe7fda073cb2b1 (diff)
downloaddexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.tar
dexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.tar.gz
dexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.tar.bz2
dexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.tar.lz
dexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.tar.xz
dexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.tar.zst
dexon-cf7cef4293cf1b1a9b393f1030f8c8e648c2975b.zip
xeth: added address hex check and length check
Diffstat (limited to 'xeth')
-rw-r--r--xeth/xeth.go11
-rw-r--r--xeth/xeth_test.go26
2 files changed, 37 insertions, 0 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 5d54c1f7e..372068c14 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -20,8 +20,10 @@ package xeth
import (
"bytes"
"encoding/json"
+ "errors"
"fmt"
"math/big"
+ "regexp"
"sync"
"time"
@@ -45,6 +47,7 @@ var (
defaultGasPrice = big.NewInt(10000000000000) //150000000000
defaultGas = big.NewInt(90000) //500000
dappStorePre = []byte("dapp-")
+ addrReg = regexp.MustCompile(`^(0x)?[a-fA-F0-9]{40}$`)
)
// byte will be inferred
@@ -878,6 +881,10 @@ func (self *XEth) Sign(fromStr, hashStr string, didUnlock bool) (string, error)
return common.ToHex(sig), nil
}
+func isAddress(addr string) bool {
+ return addrReg.MatchString(addr)
+}
+
func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) {
// this minimalistic recoding is enough (works for natspec.js)
@@ -887,6 +894,10 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
return "", err
}
+ if !isAddress(toStr) {
+ return "", errors.New("Invalid address")
+ }
+
var (
from = common.HexToAddress(fromStr)
to = common.HexToAddress(toStr)
diff --git a/xeth/xeth_test.go b/xeth/xeth_test.go
new file mode 100644
index 000000000..e649d20ef
--- /dev/null
+++ b/xeth/xeth_test.go
@@ -0,0 +1,26 @@
+package xeth
+
+import "testing"
+
+func TestIsAddress(t *testing.T) {
+ for _, invalid := range []string{
+ "0x00",
+ "0xNN",
+ "0x00000000000000000000000000000000000000NN",
+ "0xAAar000000000000000000000000000000000000",
+ } {
+ if isAddress(invalid) {
+ t.Error("Expected", invalid, "to be invalid")
+ }
+ }
+
+ for _, valid := range []string{
+ "0x0000000000000000000000000000000000000000",
+ "0xAABBbbCCccff9900000000000000000000000000",
+ "AABBbbCCccff9900000000000000000000000000",
+ } {
+ if !isAddress(valid) {
+ t.Error("Expected", valid, "to be valid")
+ }
+ }
+}