forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Dominik Hirzel 2017-05-13 17:41:20 +02:00
parent ef7b9fb7d0
commit 1f6cec8924
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

@ -163,22 +163,25 @@ func parseRequest(incomingMsg json.RawMessage) ([]rpcRequest, bool, Error) {
return nil, false, &invalidMessageError{err.Error()} return nil, false, &invalidMessageError{err.Error()}
} }
// subscribe are special, they will always use `subscribeMethod` as first param in the payload // shh_subscribe should not be handled in a special way
if strings.HasSuffix(in.Method, subscribeMethodSuffix) { if !strings.HasPrefix(in.Method, "shh_") {
reqs := []rpcRequest{{id: &in.Id, isPubSub: true}} // subscribe are special, they will always use `subscribeMethod` as first param in the payload
if len(in.Payload) > 0 { if strings.HasSuffix(in.Method, subscribeMethodSuffix) {
// first param must be subscription name reqs := []rpcRequest{{id: &in.Id, isPubSub: true}}
var subscribeMethod [1]string if len(in.Payload) > 0 {
if err := json.Unmarshal(in.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(in.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"}
}
reqs[0].service, reqs[0].method = strings.TrimSuffix(in.Method, subscribeMethodSuffix), subscribeMethod[0] reqs[0].service, reqs[0].method = strings.TrimSuffix(in.Method, subscribeMethodSuffix), subscribeMethod[0]
reqs[0].params = in.Payload reqs[0].params = in.Payload
return reqs, false, nil return reqs, false, nil
}
return nil, false, &invalidRequestError{"Unable to parse subscription request"}
} }
return nil, false, &invalidRequestError{"Unable to parse subscription request"}
} }
if strings.HasSuffix(in.Method, unsubscribeMethodSuffix) { if strings.HasSuffix(in.Method, unsubscribeMethodSuffix) {