forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-12 06:53:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

shh: fix shh_subscribe request parsing for batch requests in jsonrpc api (#14450)

Browse source
This commit is contained in:
Dominik Hirzel 2017-05-15 09:40:14 +02:00
parent 1f6cec8924
commit 10cd54e924
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
rpc/json.go
View file

@ -218,23 +218,26 @@ func parseBatchRequest(incomingMsg json.RawMessage) ([]rpcRequest, bool, Error)
id := &in[i].Id id := &in[i].Id
// subscribe are special, they will always use `subscriptionMethod` as first param in the payload // shh_subscribe should not be handled in a special way
if strings.HasSuffix(r.Method, subscribeMethodSuffix) { if !strings.HasPrefix(r.Method, "shh_") {
requests[i] = rpcRequest{id: id, isPubSub: true} // subscribe are special, they will always use `subscriptionMethod` as first param in the payload
if len(r.Payload) > 0 { if strings.HasSuffix(r.Method, subscribeMethodSuffix) {
// first param must be subscription name requests[i] = rpcRequest{id: id, isPubSub: true}
var subscribeMethod [1]string if len(r.Payload) > 0 {
if err := json.Unmarshal(r.Payload, &subscribeMethod); err != nil { // first param must be subscription name
log.Debug(fmt.Sprintf("Unable to parse subscription method: %v\n", err)) var subscribeMethod [1]string
return nil, false, &invalidRequestError{"Unable to parse subscription request"} if err := json.Unmarshal(r.Payload, &subscribeMethod); err != nil {
log.Debug(fmt.Sprintf("Unable to parse subscription method: %v\n", err))
return nil, false, &invalidRequestError{"Unable to parse subscription request"}
}
requests[i].service, requests[i].method = strings.TrimSuffix(r.Method, subscribeMethodSuffix), subscribeMethod[0]
requests[i].params = r.Payload
continue
} }
requests[i].service, requests[i].method = strings.TrimSuffix(r.Method, subscribeMethodSuffix), subscribeMethod[0] return nil, true, &invalidRequestError{"Unable to parse (un)subscribe request arguments"}
requests[i].params = r.Payload
continue
} }
return nil, true, &invalidRequestError{"Unable to parse (un)subscribe request arguments"}
} }
if strings.HasSuffix(r.Method, unsubscribeMethodSuffix) { if strings.HasSuffix(r.Method, unsubscribeMethodSuffix) {