aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-19 01:42:30 +0800
committerobscuren <geffobscura@gmail.com>2015-03-19 01:42:30 +0800
commit5f35e6778f10d9e2c6418beff7ed201be80448c4 (patch)
treef9421631e60966d3ddaa12af311ed9c14532a93b
parentf0bb13609939ebbee22e9c9f39c6742341b0d20b (diff)
parentaf9da83ce2c6b0ab3047bfa2544b6914a2c4e2ea (diff)
downloadgo-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.tar
go-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.tar.gz
go-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.tar.bz2
go-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.tar.lz
go-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.tar.xz
go-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.tar.zst
go-tangerine-5f35e6778f10d9e2c6418beff7ed201be80448c4.zip
Merge branch 'rpcfrontier' into conversion
-rw-r--r--rpc/http.go98
-rw-r--r--rpc/util.go34
2 files changed, 65 insertions, 67 deletions
diff --git a/rpc/http.go b/rpc/http.go
index b6edb7cd7..5f2445e6c 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -1,6 +1,9 @@
package rpc
import (
+ "encoding/json"
+ "io"
+ "io/ioutil"
"net/http"
"github.com/ethereum/go-ethereum/logger"
@@ -16,54 +19,83 @@ const (
// JSONRPC returns a handler that implements the Ethereum JSON-RPC API.
func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
- var json JsonWrapper
api := NewEthereumApi(pipe, dataDir)
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+ // TODO this needs to be configurable
w.Header().Set("Access-Control-Allow-Origin", "*")
- rpchttplogger.DebugDetailln("Handling request")
-
+ // Limit request size to resist DoS
if req.ContentLength > maxSizeReqLength {
jsonerr := &RpcErrorObject{-32700, "Request too large"}
- json.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
+ Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
return
}
- reqParsed, reqerr := json.ParseRequestBody(req)
- switch reqerr.(type) {
- case nil:
- break
- case *DecodeParamError, *InsufficientParamsError, *ValidationError:
- jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
- json.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
- return
- default:
- jsonerr := &RpcErrorObject{-32700, "Could not parse request"}
- json.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
- return
+ // Read request body
+ defer req.Body.Close()
+ body, err := ioutil.ReadAll(req.Body)
+ if err != nil {
+ jsonerr := &RpcErrorObject{-32700, "Could not read request body"}
+ Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
}
- var response interface{}
- reserr := api.GetRequestReply(&reqParsed, &response)
- switch reserr.(type) {
- case nil:
- break
- case *NotImplementedError:
- jsonerr := &RpcErrorObject{-32601, reserr.Error()}
- json.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: reqParsed.Id, Error: jsonerr})
+ // Try to parse the request as a single
+ var reqSingle RpcRequest
+ if err := json.Unmarshal(body, &reqSingle); err == nil {
+ response := RpcResponse(api, &reqSingle)
+ Send(w, &response)
return
- case *DecodeParamError, *InsufficientParamsError, *ValidationError:
- jsonerr := &RpcErrorObject{-32602, reserr.Error()}
- json.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: reqParsed.Id, Error: jsonerr})
- return
- default:
- jsonerr := &RpcErrorObject{-32603, reserr.Error()}
- json.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: reqParsed.Id, Error: jsonerr})
+ }
+
+ // Try to parse the request to batch
+ var reqBatch []RpcRequest
+ if err := json.Unmarshal(body, &reqBatch); err == nil {
+ // Build response batch
+ resBatch := make([]*interface{}, len(reqBatch))
+ for i, request := range reqBatch {
+ response := RpcResponse(api, &request)
+ resBatch[i] = response
+ }
+ Send(w, resBatch)
return
}
- rpchttplogger.DebugDetailf("Generated response: %T %s", response, response)
- json.Send(w, &RpcSuccessResponse{Jsonrpc: jsonrpcver, Id: reqParsed.Id, Result: response})
+ // Not a batch or single request, error
+ jsonerr := &RpcErrorObject{-32600, "Could not decode request"}
+ Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
})
}
+
+func RpcResponse(api *EthereumApi, request *RpcRequest) *interface{} {
+ var reply, response interface{}
+ reserr := api.GetRequestReply(request, &reply)
+ switch reserr.(type) {
+ case nil:
+ response = &RpcSuccessResponse{Jsonrpc: jsonrpcver, Id: request.Id, Result: reply}
+ case *NotImplementedError:
+ jsonerr := &RpcErrorObject{-32601, reserr.Error()}
+ response = &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: request.Id, Error: jsonerr}
+ case *DecodeParamError, *InsufficientParamsError, *ValidationError:
+ jsonerr := &RpcErrorObject{-32602, reserr.Error()}
+ response = &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: request.Id, Error: jsonerr}
+ default:
+ jsonerr := &RpcErrorObject{-32603, reserr.Error()}
+ response = &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: request.Id, Error: jsonerr}
+ }
+
+ rpchttplogger.DebugDetailf("Generated response: %T %s", response, response)
+ return &response
+}
+
+func Send(writer io.Writer, v interface{}) (n int, err error) {
+ var payload []byte
+ payload, err = json.MarshalIndent(v, "", "\t")
+ if err != nil {
+ rpclogger.Fatalln("Error marshalling JSON", err)
+ return 0, err
+ }
+ rpclogger.DebugDetailf("Sending payload: %s", payload)
+
+ return writer.Write(payload)
+}
diff --git a/rpc/util.go b/rpc/util.go
index d3c3420ae..b3d83409f 100644
--- a/rpc/util.go
+++ b/rpc/util.go
@@ -19,9 +19,7 @@ package rpc
import (
"encoding/json"
"fmt"
- "io"
"math/big"
- "net/http"
"reflect"
"time"
@@ -33,8 +31,6 @@ import (
var rpclogger = logger.NewLogger("RPC")
-type JsonWrapper struct{}
-
// Unmarshal state is a helper method which has the ability to decode messsages
// that use the `defaultBlock` (https://github.com/ethereum/wiki/wiki/JSON-RPC#the-default-block-parameter)
// For example a `call`: [{to: "0x....", data:"0x..."}, "latest"]. The first argument is the transaction
@@ -94,36 +90,6 @@ func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error
return nil
}
-func (self JsonWrapper) Send(writer io.Writer, v interface{}) (n int, err error) {
- var payload []byte
- payload, err = json.MarshalIndent(v, "", "\t")
- if err != nil {
- rpclogger.Fatalln("Error marshalling JSON", err)
- return 0, err
- }
- rpclogger.DebugDetailf("Sending payload: %s", payload)
-
- return writer.Write(payload)
-}
-
-func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) {
- var reqParsed RpcRequest
-
- // Convert JSON to native types
- d := json.NewDecoder(req.Body)
- defer req.Body.Close()
- err := d.Decode(&reqParsed)
-
- if err != nil {
- rpclogger.Errorln("Error decoding JSON: ", err)
- return reqParsed, err
- }
-
- rpclogger.DebugDetailf("Parsed request: %s", reqParsed)
-
- return reqParsed, nil
-}
-
func i2hex(n int) string {
return common.ToHex(big.NewInt(int64(n)).Bytes())
}