2019-12-20 09:40:50 +00:00
|
|
|
// Copyright 2019 The Waku Library Authors.
|
|
|
|
//
|
|
|
|
// The Waku library is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// The Waku library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty off
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
|
|
// along with the Waku library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//
|
|
|
|
// This software uses the go-ethereum library, which is licensed
|
|
|
|
// under the GNU Lesser General Public Library, version 3 or any later.
|
|
|
|
|
|
|
|
package waku
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"crypto/ecdsa"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"sync"
|
|
|
|
"time"
|
|
|
|
|
2021-10-29 14:29:28 +00:00
|
|
|
"go.uber.org/zap"
|
|
|
|
|
2024-10-28 20:54:17 +00:00
|
|
|
"github.com/status-im/status-go/logutils"
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
"github.com/status-im/status-go/waku/common"
|
|
|
|
|
2019-12-20 09:40:50 +00:00
|
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
|
|
"github.com/ethereum/go-ethereum/rpc"
|
2024-09-26 22:37:32 +00:00
|
|
|
gocommon "github.com/status-im/status-go/common"
|
2019-12-20 09:40:50 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// List of errors
|
|
|
|
var (
|
|
|
|
ErrSymAsym = errors.New("specify either a symmetric or an asymmetric key")
|
|
|
|
ErrInvalidSymmetricKey = errors.New("invalid symmetric key")
|
|
|
|
ErrInvalidPublicKey = errors.New("invalid public key")
|
|
|
|
ErrInvalidSigningPubKey = errors.New("invalid signing public key")
|
|
|
|
ErrTooLowPoW = errors.New("message rejected, PoW too low")
|
|
|
|
ErrNoTopics = errors.New("missing topic(s)")
|
|
|
|
)
|
|
|
|
|
|
|
|
// PublicWakuAPI provides the waku RPC service that can be
|
|
|
|
// use publicly without security implications.
|
|
|
|
type PublicWakuAPI struct {
|
|
|
|
w *Waku
|
|
|
|
|
|
|
|
mu sync.Mutex
|
|
|
|
lastUsed map[string]time.Time // keeps track when a filter was polled for the last time.
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewPublicWakuAPI create a new RPC waku service.
|
|
|
|
func NewPublicWakuAPI(w *Waku) *PublicWakuAPI {
|
|
|
|
api := &PublicWakuAPI{
|
|
|
|
w: w,
|
|
|
|
lastUsed: make(map[string]time.Time),
|
|
|
|
}
|
|
|
|
return api
|
|
|
|
}
|
|
|
|
|
|
|
|
// Info contains diagnostic information.
|
|
|
|
type Info struct {
|
|
|
|
Messages int `json:"messages"` // Number of floating messages.
|
|
|
|
MinPow float64 `json:"minPow"` // Minimal accepted PoW
|
|
|
|
MaxMessageSize uint32 `json:"maxMessageSize"` // Maximum accepted message size
|
|
|
|
}
|
|
|
|
|
2020-04-30 12:52:48 +00:00
|
|
|
// Context is used higher up the food-chain and without significant refactoring is not a simple thing to remove / change
|
|
|
|
|
2019-12-20 09:40:50 +00:00
|
|
|
// Info returns diagnostic information about the waku node.
|
|
|
|
func (api *PublicWakuAPI) Info(ctx context.Context) Info {
|
|
|
|
return Info{
|
|
|
|
Messages: len(api.w.msgQueue) + len(api.w.p2pMsgQueue),
|
|
|
|
MinPow: api.w.MinPow(),
|
|
|
|
MaxMessageSize: api.w.MaxMessageSize(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetMaxMessageSize sets the maximum message size that is accepted.
|
|
|
|
// Upper limit is defined by MaxMessageSize.
|
|
|
|
func (api *PublicWakuAPI) SetMaxMessageSize(ctx context.Context, size uint32) (bool, error) {
|
|
|
|
return true, api.w.SetMaxMessageSize(size)
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetMinPoW sets the minimum PoW, and notifies the peers.
|
|
|
|
func (api *PublicWakuAPI) SetMinPoW(ctx context.Context, pow float64) (bool, error) {
|
|
|
|
return true, api.w.SetMinimumPoW(pow, true)
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetBloomFilter sets the new value of bloom filter, and notifies the peers.
|
|
|
|
func (api *PublicWakuAPI) SetBloomFilter(ctx context.Context, bloom hexutil.Bytes) (bool, error) {
|
|
|
|
return true, api.w.SetBloomFilter(bloom)
|
|
|
|
}
|
|
|
|
|
2021-08-26 20:25:43 +00:00
|
|
|
func (api *PublicWakuAPI) BloomFilter() []byte {
|
|
|
|
return api.w.BloomFilter()
|
|
|
|
}
|
|
|
|
|
2019-12-20 09:40:50 +00:00
|
|
|
// MarkTrustedPeer marks a peer trusted, which will allow it to send historic (expired) messages.
|
|
|
|
// Note: This function is not adding new nodes, the node needs to exists as a peer.
|
|
|
|
func (api *PublicWakuAPI) MarkTrustedPeer(ctx context.Context, url string) (bool, error) {
|
|
|
|
n, err := enode.Parse(enode.ValidSchemes, url)
|
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
return true, api.w.AllowP2PMessagesFromPeer(n.ID().Bytes())
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewKeyPair generates a new public and private key pair for message decryption and encryption.
|
|
|
|
// It returns an ID that can be used to refer to the keypair.
|
|
|
|
func (api *PublicWakuAPI) NewKeyPair(ctx context.Context) (string, error) {
|
|
|
|
return api.w.NewKeyPair()
|
|
|
|
}
|
|
|
|
|
|
|
|
// AddPrivateKey imports the given private key.
|
|
|
|
func (api *PublicWakuAPI) AddPrivateKey(ctx context.Context, privateKey hexutil.Bytes) (string, error) {
|
|
|
|
key, err := crypto.ToECDSA(privateKey)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
return api.w.AddKeyPair(key)
|
|
|
|
}
|
|
|
|
|
|
|
|
// DeleteKeyPair removes the key with the given key if it exists.
|
|
|
|
func (api *PublicWakuAPI) DeleteKeyPair(ctx context.Context, key string) (bool, error) {
|
|
|
|
if ok := api.w.DeleteKeyPair(key); ok {
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
return false, fmt.Errorf("key pair %s not found", key)
|
|
|
|
}
|
|
|
|
|
|
|
|
// HasKeyPair returns an indication if the node has a key pair that is associated with the given id.
|
|
|
|
func (api *PublicWakuAPI) HasKeyPair(ctx context.Context, id string) bool {
|
|
|
|
return api.w.HasKeyPair(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetPublicKey returns the public key associated with the given key. The key is the hex
|
|
|
|
// encoded representation of a key in the form specified in section 4.3.6 of ANSI X9.62.
|
|
|
|
func (api *PublicWakuAPI) GetPublicKey(ctx context.Context, id string) (hexutil.Bytes, error) {
|
|
|
|
key, err := api.w.GetPrivateKey(id)
|
|
|
|
if err != nil {
|
|
|
|
return hexutil.Bytes{}, err
|
|
|
|
}
|
|
|
|
return crypto.FromECDSAPub(&key.PublicKey), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetPrivateKey returns the private key associated with the given key. The key is the hex
|
|
|
|
// encoded representation of a key in the form specified in section 4.3.6 of ANSI X9.62.
|
|
|
|
func (api *PublicWakuAPI) GetPrivateKey(ctx context.Context, id string) (hexutil.Bytes, error) {
|
|
|
|
key, err := api.w.GetPrivateKey(id)
|
|
|
|
if err != nil {
|
|
|
|
return hexutil.Bytes{}, err
|
|
|
|
}
|
|
|
|
return crypto.FromECDSA(key), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewSymKey generate a random symmetric key.
|
|
|
|
// It returns an ID that can be used to refer to the key.
|
|
|
|
// Can be used encrypting and decrypting messages where the key is known to both parties.
|
|
|
|
func (api *PublicWakuAPI) NewSymKey(ctx context.Context) (string, error) {
|
|
|
|
return api.w.GenerateSymKey()
|
|
|
|
}
|
|
|
|
|
|
|
|
// AddSymKey import a symmetric key.
|
|
|
|
// It returns an ID that can be used to refer to the key.
|
|
|
|
// Can be used encrypting and decrypting messages where the key is known to both parties.
|
|
|
|
func (api *PublicWakuAPI) AddSymKey(ctx context.Context, key hexutil.Bytes) (string, error) {
|
|
|
|
return api.w.AddSymKeyDirect([]byte(key))
|
|
|
|
}
|
|
|
|
|
|
|
|
// GenerateSymKeyFromPassword derive a key from the given password, stores it, and returns its ID.
|
|
|
|
func (api *PublicWakuAPI) GenerateSymKeyFromPassword(ctx context.Context, passwd string) (string, error) {
|
|
|
|
return api.w.AddSymKeyFromPassword(passwd)
|
|
|
|
}
|
|
|
|
|
|
|
|
// HasSymKey returns an indication if the node has a symmetric key associated with the given key.
|
|
|
|
func (api *PublicWakuAPI) HasSymKey(ctx context.Context, id string) bool {
|
|
|
|
return api.w.HasSymKey(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetSymKey returns the symmetric key associated with the given id.
|
|
|
|
func (api *PublicWakuAPI) GetSymKey(ctx context.Context, id string) (hexutil.Bytes, error) {
|
|
|
|
return api.w.GetSymKey(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// DeleteSymKey deletes the symmetric key that is associated with the given id.
|
|
|
|
func (api *PublicWakuAPI) DeleteSymKey(ctx context.Context, id string) bool {
|
|
|
|
return api.w.DeleteSymKey(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// MakeLightClient turns the node into light client, which does not forward
|
|
|
|
// any incoming messages, and sends only messages originated in this node.
|
|
|
|
func (api *PublicWakuAPI) MakeLightClient(ctx context.Context) bool {
|
|
|
|
api.w.SetLightClientMode(true)
|
|
|
|
return api.w.LightClientMode()
|
|
|
|
}
|
|
|
|
|
|
|
|
// CancelLightClient cancels light client mode.
|
|
|
|
func (api *PublicWakuAPI) CancelLightClient(ctx context.Context) bool {
|
|
|
|
api.w.SetLightClientMode(false)
|
|
|
|
return !api.w.LightClientMode()
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewMessage represents a new waku message that is posted through the RPC.
|
|
|
|
type NewMessage struct {
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
SymKeyID string `json:"symKeyID"`
|
|
|
|
PublicKey []byte `json:"pubKey"`
|
|
|
|
Sig string `json:"sig"`
|
|
|
|
TTL uint32 `json:"ttl"`
|
|
|
|
Topic common.TopicType `json:"topic"`
|
|
|
|
Payload []byte `json:"payload"`
|
|
|
|
Padding []byte `json:"padding"`
|
|
|
|
PowTime uint32 `json:"powTime"`
|
|
|
|
PowTarget float64 `json:"powTarget"`
|
|
|
|
TargetPeer string `json:"targetPeer"`
|
2022-11-07 20:01:06 +00:00
|
|
|
Ephemeral bool `json:"ephemeral"`
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Post posts a message on the Waku network.
|
|
|
|
// returns the hash of the message in case of success.
|
|
|
|
func (api *PublicWakuAPI) Post(ctx context.Context, req NewMessage) (hexutil.Bytes, error) {
|
|
|
|
var (
|
|
|
|
symKeyGiven = len(req.SymKeyID) > 0
|
|
|
|
pubKeyGiven = len(req.PublicKey) > 0
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
|
|
|
// user must specify either a symmetric or an asymmetric key
|
|
|
|
if (symKeyGiven && pubKeyGiven) || (!symKeyGiven && !pubKeyGiven) {
|
|
|
|
return nil, ErrSymAsym
|
|
|
|
}
|
|
|
|
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
params := &common.MessageParams{
|
2019-12-20 09:40:50 +00:00
|
|
|
TTL: req.TTL,
|
|
|
|
Payload: req.Payload,
|
|
|
|
Padding: req.Padding,
|
|
|
|
WorkTime: req.PowTime,
|
|
|
|
PoW: req.PowTarget,
|
|
|
|
Topic: req.Topic,
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set key that is used to sign the message
|
|
|
|
if len(req.Sig) > 0 {
|
|
|
|
if params.Src, err = api.w.GetPrivateKey(req.Sig); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set symmetric key that is used to encrypt the message
|
|
|
|
if symKeyGiven {
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
if params.Topic == (common.TopicType{}) { // topics are mandatory with symmetric encryption
|
2019-12-20 09:40:50 +00:00
|
|
|
return nil, ErrNoTopics
|
|
|
|
}
|
|
|
|
if params.KeySym, err = api.w.GetSymKey(req.SymKeyID); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
if !common.ValidateDataIntegrity(params.KeySym, common.AESKeyLength) {
|
2019-12-20 09:40:50 +00:00
|
|
|
return nil, ErrInvalidSymmetricKey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set asymmetric key that is used to encrypt the message
|
|
|
|
if pubKeyGiven {
|
|
|
|
if params.Dst, err = crypto.UnmarshalPubkey(req.PublicKey); err != nil {
|
|
|
|
return nil, ErrInvalidPublicKey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// encrypt and sent message
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
msg, err := common.NewSentMessage(params)
|
2019-12-20 09:40:50 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var result []byte
|
|
|
|
env, err := msg.Wrap(params, api.w.CurrentTime())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// send to specific node (skip PoW check)
|
|
|
|
if len(req.TargetPeer) > 0 {
|
|
|
|
n, err := enode.Parse(enode.ValidSchemes, req.TargetPeer)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("failed to parse target peer: %s", err)
|
|
|
|
}
|
|
|
|
err = api.w.SendP2PMessages(n.ID().Bytes(), env)
|
|
|
|
if err == nil {
|
|
|
|
hash := env.Hash()
|
|
|
|
result = hash[:]
|
|
|
|
}
|
|
|
|
return result, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// ensure that the message PoW meets the node's minimum accepted PoW
|
|
|
|
if req.PowTarget < api.w.MinPow() {
|
|
|
|
return nil, ErrTooLowPoW
|
|
|
|
}
|
|
|
|
|
|
|
|
err = api.w.Send(env)
|
|
|
|
if err == nil {
|
|
|
|
hash := env.Hash()
|
|
|
|
result = hash[:]
|
|
|
|
}
|
|
|
|
return result, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// UninstallFilter is alias for Unsubscribe
|
|
|
|
func (api *PublicWakuAPI) UninstallFilter(id string) {
|
2020-02-21 14:48:53 +00:00
|
|
|
api.w.Unsubscribe(id) // nolint: errcheck
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Unsubscribe disables and removes an existing filter.
|
|
|
|
func (api *PublicWakuAPI) Unsubscribe(id string) {
|
2020-02-21 14:48:53 +00:00
|
|
|
api.w.Unsubscribe(id) // nolint: errcheck
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Criteria holds various filter options for inbound messages.
|
|
|
|
type Criteria struct {
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
SymKeyID string `json:"symKeyID"`
|
|
|
|
PrivateKeyID string `json:"privateKeyID"`
|
|
|
|
Sig []byte `json:"sig"`
|
|
|
|
MinPow float64 `json:"minPow"`
|
|
|
|
Topics []common.TopicType `json:"topics"`
|
|
|
|
AllowP2P bool `json:"allowP2P"`
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Messages set up a subscription that fires events when messages arrive that match
|
|
|
|
// the given set of criteria.
|
|
|
|
func (api *PublicWakuAPI) Messages(ctx context.Context, crit Criteria) (*rpc.Subscription, error) {
|
|
|
|
var (
|
|
|
|
symKeyGiven = len(crit.SymKeyID) > 0
|
|
|
|
pubKeyGiven = len(crit.PrivateKeyID) > 0
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
|
|
|
// ensure that the RPC connection supports subscriptions
|
|
|
|
notifier, supported := rpc.NotifierFromContext(ctx)
|
|
|
|
if !supported {
|
|
|
|
return nil, rpc.ErrNotificationsUnsupported
|
|
|
|
}
|
|
|
|
|
|
|
|
// user must specify either a symmetric or an asymmetric key
|
|
|
|
if (symKeyGiven && pubKeyGiven) || (!symKeyGiven && !pubKeyGiven) {
|
|
|
|
return nil, ErrSymAsym
|
|
|
|
}
|
|
|
|
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
filter := common.Filter{
|
2019-12-20 09:40:50 +00:00
|
|
|
PoW: crit.MinPow,
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
Messages: common.NewMemoryMessageStore(),
|
2019-12-20 09:40:50 +00:00
|
|
|
AllowP2P: crit.AllowP2P,
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(crit.Sig) > 0 {
|
|
|
|
if filter.Src, err = crypto.UnmarshalPubkey(crit.Sig); err != nil {
|
|
|
|
return nil, ErrInvalidSigningPubKey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-30 12:52:48 +00:00
|
|
|
for _, bt := range crit.Topics {
|
2019-12-20 09:40:50 +00:00
|
|
|
filter.Topics = append(filter.Topics, bt[:])
|
|
|
|
}
|
|
|
|
|
|
|
|
// listen for message that are encrypted with the given symmetric key
|
|
|
|
if symKeyGiven {
|
|
|
|
if len(filter.Topics) == 0 {
|
|
|
|
return nil, ErrNoTopics
|
|
|
|
}
|
|
|
|
key, err := api.w.GetSymKey(crit.SymKeyID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
if !common.ValidateDataIntegrity(key, common.AESKeyLength) {
|
2019-12-20 09:40:50 +00:00
|
|
|
return nil, ErrInvalidSymmetricKey
|
|
|
|
}
|
|
|
|
filter.KeySym = key
|
|
|
|
filter.SymKeyHash = crypto.Keccak256Hash(filter.KeySym)
|
|
|
|
}
|
|
|
|
|
|
|
|
// listen for messages that are encrypted with the given public key
|
|
|
|
if pubKeyGiven {
|
|
|
|
filter.KeyAsym, err = api.w.GetPrivateKey(crit.PrivateKeyID)
|
|
|
|
if err != nil || filter.KeyAsym == nil {
|
|
|
|
return nil, ErrInvalidPublicKey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
id, err := api.w.Subscribe(&filter)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// create subscription and start waiting for message events
|
|
|
|
rpcSub := notifier.CreateSubscription()
|
|
|
|
go func() {
|
2024-09-26 22:37:32 +00:00
|
|
|
defer gocommon.LogOnPanic()
|
2019-12-20 09:40:50 +00:00
|
|
|
// for now poll internally, refactor waku internal for channel support
|
|
|
|
ticker := time.NewTicker(250 * time.Millisecond)
|
|
|
|
defer ticker.Stop()
|
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-ticker.C:
|
|
|
|
if filter := api.w.GetFilter(id); filter != nil {
|
|
|
|
for _, rpcMessage := range toMessage(filter.Retrieve()) {
|
|
|
|
if err := notifier.Notify(rpcSub.ID, rpcMessage); err != nil {
|
2024-10-28 20:54:17 +00:00
|
|
|
logutils.ZapLogger().Error("Failed to send notification", zap.Error(err))
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case <-rpcSub.Err():
|
|
|
|
_ = api.w.Unsubscribe(id)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
return rpcSub, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Message is the RPC representation of a waku message.
|
|
|
|
type Message struct {
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
Sig []byte `json:"sig,omitempty"`
|
|
|
|
TTL uint32 `json:"ttl"`
|
|
|
|
Timestamp uint32 `json:"timestamp"`
|
|
|
|
Topic common.TopicType `json:"topic"`
|
|
|
|
Payload []byte `json:"payload"`
|
|
|
|
Padding []byte `json:"padding"`
|
|
|
|
PoW float64 `json:"pow"`
|
|
|
|
Hash []byte `json:"hash"`
|
|
|
|
Dst []byte `json:"recipientPublicKey,omitempty"`
|
|
|
|
P2P bool `json:"bool,omitempty"`
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ToWakuMessage converts an internal message into an API version.
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
func ToWakuMessage(message *common.ReceivedMessage) *Message {
|
2019-12-20 09:40:50 +00:00
|
|
|
msg := Message{
|
|
|
|
Payload: message.Payload,
|
|
|
|
Padding: message.Padding,
|
|
|
|
Timestamp: message.Sent,
|
|
|
|
TTL: message.TTL,
|
|
|
|
PoW: message.PoW,
|
|
|
|
Hash: message.EnvelopeHash.Bytes(),
|
|
|
|
Topic: message.Topic,
|
|
|
|
P2P: message.P2P,
|
|
|
|
}
|
|
|
|
|
|
|
|
if message.Dst != nil {
|
|
|
|
b := crypto.FromECDSAPub(message.Dst)
|
|
|
|
if b != nil {
|
|
|
|
msg.Dst = b
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
if common.IsMessageSigned(message.Raw[0]) {
|
2019-12-20 09:40:50 +00:00
|
|
|
b := crypto.FromECDSAPub(message.SigToPubKey())
|
|
|
|
if b != nil {
|
|
|
|
msg.Sig = b
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return &msg
|
|
|
|
}
|
|
|
|
|
|
|
|
// toMessage converts a set of messages to its RPC representation.
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
func toMessage(messages []*common.ReceivedMessage) []*Message {
|
2019-12-20 09:40:50 +00:00
|
|
|
msgs := make([]*Message, len(messages))
|
|
|
|
for i, msg := range messages {
|
|
|
|
msgs[i] = ToWakuMessage(msg)
|
|
|
|
}
|
|
|
|
return msgs
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetFilterMessages returns the messages that match the filter criteria and
|
|
|
|
// are received between the last poll and now.
|
|
|
|
func (api *PublicWakuAPI) GetFilterMessages(id string) ([]*Message, error) {
|
2021-10-29 14:29:28 +00:00
|
|
|
logger := api.w.logger.With(zap.String("site", "getFilterMessages"), zap.String("filterId", id))
|
2019-12-20 09:40:50 +00:00
|
|
|
api.mu.Lock()
|
|
|
|
f := api.w.GetFilter(id)
|
|
|
|
if f == nil {
|
|
|
|
api.mu.Unlock()
|
|
|
|
return nil, fmt.Errorf("filter not found")
|
|
|
|
}
|
|
|
|
api.lastUsed[id] = time.Now()
|
|
|
|
api.mu.Unlock()
|
|
|
|
|
|
|
|
receivedMessages := f.Retrieve()
|
|
|
|
messages := make([]*Message, 0, len(receivedMessages))
|
|
|
|
for _, msg := range receivedMessages {
|
2021-10-29 14:29:28 +00:00
|
|
|
|
|
|
|
logger.Debug("retrieved filter message", zap.String("hash", msg.EnvelopeHash.String()), zap.Bool("isP2P", msg.P2P), zap.String("topic", msg.Topic.String()))
|
2019-12-20 09:40:50 +00:00
|
|
|
messages = append(messages, ToWakuMessage(msg))
|
|
|
|
}
|
|
|
|
|
|
|
|
return messages, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// DeleteMessageFilter deletes a filter.
|
|
|
|
func (api *PublicWakuAPI) DeleteMessageFilter(id string) (bool, error) {
|
|
|
|
api.mu.Lock()
|
|
|
|
defer api.mu.Unlock()
|
|
|
|
|
|
|
|
delete(api.lastUsed, id)
|
|
|
|
return true, api.w.Unsubscribe(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewMessageFilter creates a new filter that can be used to poll for
|
|
|
|
// (new) messages that satisfy the given criteria.
|
|
|
|
func (api *PublicWakuAPI) NewMessageFilter(req Criteria) (string, error) {
|
|
|
|
var (
|
|
|
|
src *ecdsa.PublicKey
|
|
|
|
keySym []byte
|
|
|
|
keyAsym *ecdsa.PrivateKey
|
|
|
|
topics [][]byte
|
|
|
|
|
|
|
|
symKeyGiven = len(req.SymKeyID) > 0
|
|
|
|
asymKeyGiven = len(req.PrivateKeyID) > 0
|
|
|
|
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
|
|
|
// user must specify either a symmetric or an asymmetric key
|
|
|
|
if (symKeyGiven && asymKeyGiven) || (!symKeyGiven && !asymKeyGiven) {
|
|
|
|
return "", ErrSymAsym
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(req.Sig) > 0 {
|
|
|
|
if src, err = crypto.UnmarshalPubkey(req.Sig); err != nil {
|
|
|
|
return "", ErrInvalidSigningPubKey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if symKeyGiven {
|
|
|
|
if keySym, err = api.w.GetSymKey(req.SymKeyID); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
if !common.ValidateDataIntegrity(keySym, common.AESKeyLength) {
|
2019-12-20 09:40:50 +00:00
|
|
|
return "", ErrInvalidSymmetricKey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if asymKeyGiven {
|
|
|
|
if keyAsym, err = api.w.GetPrivateKey(req.PrivateKeyID); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(req.Topics) > 0 {
|
|
|
|
topics = make([][]byte, len(req.Topics))
|
|
|
|
for i, topic := range req.Topics {
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
topics[i] = make([]byte, common.TopicLength)
|
2019-12-20 09:40:50 +00:00
|
|
|
copy(topics[i], topic[:])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
f := &common.Filter{
|
2019-12-20 09:40:50 +00:00
|
|
|
Src: src,
|
|
|
|
KeySym: keySym,
|
|
|
|
KeyAsym: keyAsym,
|
|
|
|
PoW: req.MinPow,
|
|
|
|
AllowP2P: req.AllowP2P,
|
|
|
|
Topics: topics,
|
Move networking code for waku under `v0` namespace
Why make the change?
As discussed previously, the way we will move across versions is to maintain completely separate
codebases and eventually remove those that are not supported anymore.
This has the drawback of some code duplication, but the advantage is that is more
explicit what each version requires, and changes in one version will not
impact the other, so we won't pile up backward compatible code.
This is the same strategy used by `whisper` in go ethereum and is influenced by
https://www.youtube.com/watch?v=oyLBGkS5ICk .
All the code that is used for the networking protocol is now under `v0/`.
Some of the common parts might still be refactored out.
The main namespace `waku` deals with `host`->`waku` interactions (through RPC),
while `v0` deals with `waku`->`remote-waku` interactions.
In order to support `v1`, the namespace `v0` will be copied over, and changed to
support `v1`. Once `v0` will be not used anymore, the whole namespace will be removed.
This PR does not actually implement `v1`, I'd rather get things looked over to
make sure the structure is what we would like before implementing the changes.
What has changed?
- Moved all code for the common parts under `waku/common/` namespace
- Moved code used for bloomfilters in `waku/common/bloomfilter.go`
- Removed all version specific code from `waku/common/const` (`ProtocolVersion`, status-codes etc)
- Added interfaces for `WakuHost` and `Peer` under `waku/common/protocol.go`
Things still to do
Some tests in `waku/` are still testing by stubbing components of a particular version (`v0`).
I started moving those tests to instead of stubbing using the actual component, which increases
the testing surface. Some other tests that can't be easily ported should be likely moved under
`v0` instead. Ideally no version specif code should be exported from a version namespace (for
example the various codes, as those might change across versions). But this will be a work-in-progress.
Some code that will be common in `v0`/`v1` could still be extract to avoid duplication, and duplicated only
when implementations diverge across versions.
2020-04-21 12:40:30 +00:00
|
|
|
Messages: common.NewMemoryMessageStore(),
|
2019-12-20 09:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
id, err := api.w.Subscribe(f)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
api.mu.Lock()
|
|
|
|
api.lastUsed[id] = time.Now()
|
|
|
|
api.mu.Unlock()
|
|
|
|
|
|
|
|
return id, nil
|
|
|
|
}
|