forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from renaynay/handle-ws-only-if-specified

Browse source 
pass nil ws handler if not specified
This commit is contained in:
rene 2020-03-24 22:24:54 +01:00 committed by GitHub
commit 307f70b2c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
node/node.go
View file

@ -372,24 +372,15 @@ func (n *Node) startHTTP(endpoint string, apis []rpc.API, modules []string, cors
srv := rpc.NewServer()
// Generate the whitelist based on the allowed modules
whitelist := make(map[string]bool)
for _, module := range modules {
whitelist[module] = true
err := RegisterApisFromWhitelist(apis, modules, srv)
var ws http.Handler
if n.httpEndpoint == n.wsEndpoint {
ws = srv.WebsocketHandler(wsOrigins)
}
// Register all the APIs exposed by the services
for _, api := range apis {
if whitelist[api.Namespace] || (len(whitelist) == 0 && api.Public) {
if err := srv.RegisterName(api.Namespace, api.Service); err != nil {
return err
}
log.Debug("HTTP registered", "namespace", api.Namespace)
}
}
// create handler stack
handler := n.CreateHandler(srv, cors, vhosts, wsOrigins)
// wrap handler in websocket handler only if websocket port is the same as http rpc
handler := n.AddWebsocketHandler(rpc.NewHTTPHandlerStack(srv, cors, vhosts), ws)
listener, err := rpc.StartHTTPEndpoint(endpoint, apis, modules, timeouts, handler)
if err != nil {
@ -411,10 +402,13 @@ func (n *Node) startHTTP(endpoint string, apis []rpc.API, modules []string, cors
return nil
}
// CreateHandler creates the handler stack necessary to handle both http rpc requests and websocket requests
func (n *Node) CreateHandler(srv *rpc.Server, cors []string, vhosts []string, wsOrigins []string) http.Handler {
handler := rpc.NewHTTPHandlerStack(srv, cors, vhosts)
return rpc.NewWebsocketUpgradeHandler(handler, srv.WebsocketHandler(wsOrigins))
// AddWebsocketHandler creates the handler stack necessary to handle both http rpc requests and websocket requests
func (n *Node) AddWebsocketHandler(handler http.Handler, websocket http.Handler) http.Handler {
if websocket != nil {
return rpc.NewWebsocketUpgradeHandler(handler, websocket)
}
return handler
}
// stopHTTP terminates the HTTP RPC endpoint.
@ -702,3 +696,23 @@ func (n *Node) apis() []rpc.API {
},
}
}
func RegisterApisFromWhitelist(apis []rpc.API, modules []string, srv *rpc.Server) error {
// Generate the whitelist based on the allowed modules
whitelist := make(map[string]bool)
for _, module := range modules {
whitelist[module] = true
}
// Register all the APIs exposed by the services
for _, api := range apis {
if whitelist[api.Namespace] || (len(whitelist) == 0 && api.Public) {
if err := srv.RegisterName(api.Namespace, api.Service); err != nil {
return err
}
log.Debug("HTTP registered", "namespace", api.Namespace)
}
}
return nil
}