From d790229a33b1f3e6256ca6916be17a0cc3663076 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 25 Jan 2015 14:50:43 -0600 Subject: Move HTTP transport to sub package of RPC --- rpc/http/server.go | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 rpc/http/server.go (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go new file mode 100644 index 000000000..a8b116076 --- /dev/null +++ b/rpc/http/server.go @@ -0,0 +1,107 @@ +/* + This file is part of go-ethereum + + go-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + go-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with go-ethereum. If not, see . +*/ +package rpchttp + +import ( + "fmt" + "net" + "net/http" + + "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/rpc" + "github.com/ethereum/go-ethereum/xeth" +) + +var rpchttplogger = logger.NewLogger("RPC-HTTP") +var JSON rpc.JsonWrapper + +func NewRpcHttpServer(pipe *xeth.JSXEth, port int) (*RpcHttpServer, error) { + sport := fmt.Sprintf(":%d", port) + l, err := net.Listen("tcp", sport) + if err != nil { + return nil, err + } + + return &RpcHttpServer{ + listener: l, + quit: make(chan bool), + pipe: pipe, + }, nil +} + +type RpcHttpServer struct { + quit chan bool + listener net.Listener + pipe *xeth.JSXEth +} + +func (s *RpcHttpServer) exitHandler() { +out: + for { + select { + case <-s.quit: + s.listener.Close() + break out + } + } + + rpchttplogger.Infoln("Shutdown RPC-HTTP server") +} + +func (s *RpcHttpServer) Stop() { + close(s.quit) +} + +func (s *RpcHttpServer) Start() { + rpchttplogger.Infoln("Starting RPC-HTTP server") + go s.exitHandler() + + api := rpc.NewEthereumApi(s.pipe) + h := s.apiHandler(api) + http.Handle("/", h) + + err := http.Serve(s.listener, nil) + // FIX Complains on shutdown due to listner already being closed + if err != nil { + rpchttplogger.Errorln("Error on RPC-HTTP interface:", err) + } +} + +func (s *RpcHttpServer) apiHandler(xeth *rpc.EthereumApi) http.Handler { + fn := func(w http.ResponseWriter, req *http.Request) { + rpchttplogger.Debugln("Handling request") + + reqParsed, reqerr := JSON.ParseRequestBody(req) + if reqerr != nil { + JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: rpc.ErrorParseRequest}) + return + } + + var response interface{} + reserr := xeth.GetRequestReply(&reqParsed, &response) + if reserr != nil { + rpchttplogger.Errorln(reserr) + JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: reserr.Error()}) + return + } + + rpchttplogger.Debugf("Generated response: %T %s", response, response) + JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: false, Result: response}) + } + + return http.HandlerFunc(fn) +} -- cgit v1.2.3 From 2f0166b94583cc17fab28f3e4f1214f220d6c4a3 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 27 Jan 2015 12:26:30 -0600 Subject: Indicate port in startup log message --- rpc/http/server.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index a8b116076..631d47110 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -40,6 +40,7 @@ func NewRpcHttpServer(pipe *xeth.JSXEth, port int) (*RpcHttpServer, error) { listener: l, quit: make(chan bool), pipe: pipe, + port: port, }, nil } @@ -47,6 +48,7 @@ type RpcHttpServer struct { quit chan bool listener net.Listener pipe *xeth.JSXEth + port int } func (s *RpcHttpServer) exitHandler() { @@ -67,7 +69,7 @@ func (s *RpcHttpServer) Stop() { } func (s *RpcHttpServer) Start() { - rpchttplogger.Infoln("Starting RPC-HTTP server") + rpchttplogger.Infof("Starting RPC-HTTP server on port %d", s.port) go s.exitHandler() api := rpc.NewEthereumApi(s.pipe) -- cgit v1.2.3 From e9d017ba082bfd624267c974fa93a77da6269756 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 27 Jan 2015 14:34:01 -0600 Subject: Rename api var for clarity --- rpc/http/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 631d47110..93b52a634 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -83,7 +83,7 @@ func (s *RpcHttpServer) Start() { } } -func (s *RpcHttpServer) apiHandler(xeth *rpc.EthereumApi) http.Handler { +func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { fn := func(w http.ResponseWriter, req *http.Request) { rpchttplogger.Debugln("Handling request") @@ -94,7 +94,7 @@ func (s *RpcHttpServer) apiHandler(xeth *rpc.EthereumApi) http.Handler { } var response interface{} - reserr := xeth.GetRequestReply(&reqParsed, &response) + reserr := api.GetRequestReply(&reqParsed, &response) if reserr != nil { rpchttplogger.Errorln(reserr) JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: reserr.Error()}) -- cgit v1.2.3 From 7f638f0b2d8d989be25e660178d79df3278e4c84 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 28 Jan 2015 18:14:28 +0100 Subject: moving to a better xeth --- rpc/http/server.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 93b52a634..2a492f465 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -85,6 +85,8 @@ func (s *RpcHttpServer) Start() { func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { fn := func(w http.ResponseWriter, req *http.Request) { + w.Header().Set("Access-Control-Allow-Origin", "*") + rpchttplogger.Debugln("Handling request") reqParsed, reqerr := JSON.ParseRequestBody(req) -- cgit v1.2.3 From 872b2497114209119becf2e8a4d4a5818e2084ee Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 28 Jan 2015 18:35:49 +0100 Subject: further cleaned up xeth interface --- rpc/http/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 2a492f465..965727a4e 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -29,7 +29,7 @@ import ( var rpchttplogger = logger.NewLogger("RPC-HTTP") var JSON rpc.JsonWrapper -func NewRpcHttpServer(pipe *xeth.JSXEth, port int) (*RpcHttpServer, error) { +func NewRpcHttpServer(pipe *xeth.XEth, port int) (*RpcHttpServer, error) { sport := fmt.Sprintf(":%d", port) l, err := net.Listen("tcp", sport) if err != nil { @@ -47,7 +47,7 @@ func NewRpcHttpServer(pipe *xeth.JSXEth, port int) (*RpcHttpServer, error) { type RpcHttpServer struct { quit chan bool listener net.Listener - pipe *xeth.JSXEth + pipe *xeth.XEth port int } -- cgit v1.2.3 From 55ed0ff07c6cf2dc8b422a3bf8d623a039ad6dbd Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 3 Feb 2015 17:29:29 -0600 Subject: Update RPC message format --- rpc/http/server.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 965727a4e..caa50d67c 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -84,6 +84,7 @@ func (s *RpcHttpServer) Start() { } func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { + var jsonrpcver string = "2.0" fn := func(w http.ResponseWriter, req *http.Request) { w.Header().Set("Access-Control-Allow-Origin", "*") @@ -91,20 +92,22 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { reqParsed, reqerr := JSON.ParseRequestBody(req) if reqerr != nil { - JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: rpc.ErrorParseRequest}) + jsonerr := &rpc.RpcErrorObject{-32700, rpc.ErrorParseRequest} + JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr}) return } var response interface{} reserr := api.GetRequestReply(&reqParsed, &response) if reserr != nil { - rpchttplogger.Errorln(reserr) - JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: true, ErrorText: reserr.Error()}) + rpchttplogger.Warnln(reserr) + jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()} + JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr}) return } rpchttplogger.Debugf("Generated response: %T %s", response, response) - JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: false, Result: response}) + JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Result: response}) } return http.HandlerFunc(fn) -- cgit v1.2.3 From 65158d39b0632226c168b9a3415365ca8f072cbf Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 4 Feb 2015 15:05:47 -0800 Subject: Filtering --- rpc/http/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 965727a4e..bcfd46234 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -87,7 +87,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { fn := func(w http.ResponseWriter, req *http.Request) { w.Header().Set("Access-Control-Allow-Origin", "*") - rpchttplogger.Debugln("Handling request") + rpchttplogger.DebugDetailln("Handling request") reqParsed, reqerr := JSON.ParseRequestBody(req) if reqerr != nil { @@ -103,7 +103,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { return } - rpchttplogger.Debugf("Generated response: %T %s", response, response) + rpchttplogger.DebugDetailf("Generated response: %T %s", response, response) JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: reqParsed.JsonRpc, ID: reqParsed.ID, Error: false, Result: response}) } -- cgit v1.2.3 From 0fa6927171644e8cdc64c1d555c5e62a6442c476 Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 7 Feb 2015 17:03:33 +0100 Subject: Moved log message to detail output --- rpc/http/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 7dcd6b867..a34400a77 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -106,7 +106,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { return } - rpchttplogger.Debugf("Generated response: %T %s", response, response) + rpchttplogger.DebugDetailf("Generated response: %T %s", response, response) JSON.Send(w, &rpc.RpcSuccessResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Result: response}) } -- cgit v1.2.3 From d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 11 Feb 2015 11:56:29 +0100 Subject: #295 Allow RPC ID to be string --- rpc/http/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index a34400a77..10c8fa813 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -102,7 +102,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { if reserr != nil { rpchttplogger.Warnln(reserr) jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()} - JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr}) + JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr}) return } -- cgit v1.2.3 From 7299eb72e0c57d8bf7279cbf2544c266a3fd145b Mon Sep 17 00:00:00 2001 From: obscuren Date: Sun, 15 Feb 2015 02:26:30 +0100 Subject: HTTP RPC only listen on localhost --- rpc/http/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpc/http') diff --git a/rpc/http/server.go b/rpc/http/server.go index 10c8fa813..dd6ba68e3 100644 --- a/rpc/http/server.go +++ b/rpc/http/server.go @@ -30,7 +30,7 @@ var rpchttplogger = logger.NewLogger("RPC-HTTP") var JSON rpc.JsonWrapper func NewRpcHttpServer(pipe *xeth.XEth, port int) (*RpcHttpServer, error) { - sport := fmt.Sprintf(":%d", port) + sport := fmt.Sprintf("127.0.0.1:%d", port) l, err := net.Listen("tcp", sport) if err != nil { return nil, err -- cgit v1.2.3