Check hash lengths before storing tspend/treasury policies.

Author: jholdstock

internal/rpc/jsonrpc/methods.go

@@ -3820,6 +3820,11 @@ func (s *Server) setTreasuryPolicy(ctx context.Context, icmd interface{}) (inter
 
 	var ticketHash *chainhash.Hash
 	if cmd.Ticket != nil && *cmd.Ticket != "" {
+		if len(*cmd.Ticket) != chainhash.MaxHashStringSize {
+			err := fmt.Errorf("invalid ticket hash length, expected %d got %d",
+				chainhash.MaxHashStringSize, len(*cmd.Ticket))
+			return nil, rpcError(dcrjson.ErrRPCDecodeHexString, err)
+		}
 		var err error
 		ticketHash, err = chainhash.NewHashFromStr(*cmd.Ticket)
 		if err != nil {
@@ -3931,13 +3936,24 @@ func (s *Server) setTSpendPolicy(ctx context.Context, icmd interface{}) (interfa
 		return nil, errUnloadedWallet
 	}
 
+	if len(cmd.Hash) != chainhash.MaxHashStringSize {
+		err := fmt.Errorf("invalid tspend hash length, expected %d got %d",
+			chainhash.MaxHashStringSize, len(cmd.Hash))
+		return nil, rpcError(dcrjson.ErrRPCDecodeHexString, err)
+	}
+
 	hash, err := chainhash.NewHashFromStr(cmd.Hash)
 	if err != nil {
 		return nil, rpcError(dcrjson.ErrRPCDecodeHexString, err)
 	}
 
 	var ticketHash *chainhash.Hash
 	if cmd.Ticket != nil && *cmd.Ticket != "" {
+		if len(*cmd.Ticket) != chainhash.MaxHashStringSize {
+			err := fmt.Errorf("invalid ticket hash length, expected %d got %d",
+				chainhash.MaxHashStringSize, len(*cmd.Ticket))
+			return nil, rpcError(dcrjson.ErrRPCDecodeHexString, err)
+		}
 		var err error
 		ticketHash, err = chainhash.NewHashFromStr(*cmd.Ticket)
 		if err != nil {

rpc/jsonrpc/types/methods.go

@@ -927,6 +927,16 @@ type SetTreasuryPolicyCmd struct {
 	Ticket *string
 }
 
+// NewSetTreasuryPolicyCmd returns a new instance which can be used to issue a settreasurypolicy
+// JSON-RPC command.
+func NewSetTreasuryPolicyCmd(key string, policy string, ticket *string) *SetTreasuryPolicyCmd {
+	return &SetTreasuryPolicyCmd{
+		Key:    key,
+		Policy: policy,
+		Ticket: ticket,
+	}
+}
+
 // TSpendPolicyCmd defines the parameters for the tspendpolicy JSON-RPC
 // command.
 type TSpendPolicyCmd struct {
@@ -942,6 +952,16 @@ type SetTSpendPolicyCmd struct {
 	Ticket *string
 }
 
+// NewSetTSpendPolicyCmd returns a new instance which can be used to issue a settspendpolicy
+// JSON-RPC command.
+func NewSetTSpendPolicyCmd(hash string, policy string, ticket *string) *SetTSpendPolicyCmd {
+	return &SetTSpendPolicyCmd{
+		Hash:   hash,
+		Policy: policy,
+		Ticket: ticket,
+	}
+}
+
 // SetTxFeeCmd defines the settxfee JSON-RPC command.
 type SetTxFeeCmd struct {
 	Amount float64 // In DCR

rpc/jsonrpc/types/methods_test.go

@@ -963,6 +963,66 @@ func TestWalletSvrCmds(t *testing.T) {
 				Amount: 0.5,
 			},
 		},
+		{
+			name: "settspendpolicy",
+			newCmd: func() (interface{}, error) {
+				return dcrjson.NewCmd(Method("settspendpolicy"), "hash", "policy")
+			},
+			staticCmd: func() interface{} {
+				return NewSetTSpendPolicyCmd("hash", "policy", nil)
+			},
+			marshalled: `{"jsonrpc":"1.0","method":"settspendpolicy","params":["hash","policy"],"id":1}`,
+			unmarshalled: &SetTSpendPolicyCmd{
+				Hash:   "hash",
+				Policy: "policy",
+				Ticket: nil,
+			},
+		},
+		{
+			name: "settspendpolicy optional",
+			newCmd: func() (interface{}, error) {
+				return dcrjson.NewCmd(Method("settspendpolicy"), "hash", "policy", "ticket")
+			},
+			staticCmd: func() interface{} {
+				return NewSetTSpendPolicyCmd("hash", "policy", dcrjson.String("ticket"))
+			},
+			marshalled: `{"jsonrpc":"1.0","method":"settspendpolicy","params":["hash","policy","ticket"],"id":1}`,
+			unmarshalled: &SetTSpendPolicyCmd{
+				Hash:   "hash",
+				Policy: "policy",
+				Ticket: dcrjson.String("ticket"),
+			},
+		},
+		{
+			name: "settreasurypolicy",
+			newCmd: func() (interface{}, error) {
+				return dcrjson.NewCmd(Method("settreasurypolicy"), "key", "policy")
+			},
+			staticCmd: func() interface{} {
+				return NewSetTreasuryPolicyCmd("key", "policy", nil)
+			},
+			marshalled: `{"jsonrpc":"1.0","method":"settreasurypolicy","params":["key","policy"],"id":1}`,
+			unmarshalled: &SetTreasuryPolicyCmd{
+				Key:    "key",
+				Policy: "policy",
+				Ticket: nil,
+			},
+		},
+		{
+			name: "settreasurypolicy optional",
+			newCmd: func() (interface{}, error) {
+				return dcrjson.NewCmd(Method("settreasurypolicy"), "key", "policy", "ticket")
+			},
+			staticCmd: func() interface{} {
+				return NewSetTreasuryPolicyCmd("key", "policy", dcrjson.String("ticket"))
+			},
+			marshalled: `{"jsonrpc":"1.0","method":"settreasurypolicy","params":["key","policy","ticket"],"id":1}`,
+			unmarshalled: &SetTreasuryPolicyCmd{
+				Key:    "key",
+				Policy: "policy",
+				Ticket: dcrjson.String("ticket"),
+			},
+		},
 		{
 			name: "settxfee",
 			newCmd: func() (interface{}, error) {