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
|
|
|
package common
|
|
|
|
|
|
|
|
import (
|
|
|
|
"crypto/ecdsa"
|
2020-05-01 18:14:01 +00:00
|
|
|
crand "crypto/rand"
|
|
|
|
"errors"
|
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
|
|
|
"fmt"
|
2020-05-01 18:14:01 +00:00
|
|
|
mrand "math/rand"
|
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/ethereum/go-ethereum/common"
|
|
|
|
)
|
|
|
|
|
|
|
|
// IsPubKeyEqual checks that two public keys are equal
|
|
|
|
func IsPubKeyEqual(a, b *ecdsa.PublicKey) bool {
|
|
|
|
if !ValidatePublicKey(a) {
|
|
|
|
return false
|
|
|
|
} else if !ValidatePublicKey(b) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
// the curve is always the same, just compare the points
|
|
|
|
return a.X.Cmp(b.X) == 0 && a.Y.Cmp(b.Y) == 0
|
|
|
|
}
|
|
|
|
|
|
|
|
// ValidatePublicKey checks the format of the given public key.
|
|
|
|
func ValidatePublicKey(k *ecdsa.PublicKey) bool {
|
|
|
|
return k != nil && k.X != nil && k.Y != nil && k.X.Sign() != 0 && k.Y.Sign() != 0
|
|
|
|
}
|
|
|
|
|
|
|
|
// BytesToUintLittleEndian converts the slice to 64-bit unsigned integer.
|
|
|
|
func BytesToUintLittleEndian(b []byte) (res uint64) {
|
|
|
|
mul := uint64(1)
|
|
|
|
for i := 0; i < len(b); i++ {
|
|
|
|
res += uint64(b[i]) * mul
|
|
|
|
mul *= 256
|
|
|
|
}
|
|
|
|
return res
|
|
|
|
}
|
|
|
|
|
|
|
|
// BytesToUintBigEndian converts the slice to 64-bit unsigned integer.
|
|
|
|
func BytesToUintBigEndian(b []byte) (res uint64) {
|
|
|
|
for i := 0; i < len(b); i++ {
|
|
|
|
res *= 256
|
|
|
|
res += uint64(b[i])
|
|
|
|
}
|
|
|
|
return res
|
|
|
|
}
|
|
|
|
|
|
|
|
// ContainsOnlyZeros checks if the data contain only zeros.
|
|
|
|
func ContainsOnlyZeros(data []byte) bool {
|
|
|
|
for _, b := range data {
|
|
|
|
if b != 0 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
2020-05-01 18:14:01 +00:00
|
|
|
// GenerateSecureRandomData generates random data where extra security is required.
|
|
|
|
// The purpose of this function is to prevent some bugs in software or in hardware
|
|
|
|
// from delivering not-very-random data. This is especially useful for AES nonce,
|
|
|
|
// where true randomness does not really matter, but it is very important to have
|
|
|
|
// a unique nonce for every message.
|
|
|
|
func GenerateSecureRandomData(length int) ([]byte, error) {
|
|
|
|
x := make([]byte, length)
|
|
|
|
y := make([]byte, length)
|
|
|
|
res := make([]byte, length)
|
|
|
|
|
|
|
|
_, err := crand.Read(x)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !ValidateDataIntegrity(x, length) {
|
|
|
|
return nil, errors.New("crypto/rand failed to generate secure random data")
|
|
|
|
}
|
|
|
|
_, err = mrand.Read(y) // nolint: gosec
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
} else if !ValidateDataIntegrity(y, length) {
|
|
|
|
return nil, errors.New("math/rand failed to generate secure random data")
|
|
|
|
}
|
|
|
|
for i := 0; i < length; i++ {
|
|
|
|
res[i] = x[i] ^ y[i]
|
|
|
|
}
|
|
|
|
if !ValidateDataIntegrity(res, length) {
|
|
|
|
return nil, errors.New("failed to generate secure random data")
|
|
|
|
}
|
|
|
|
return res, nil
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// GenerateRandomID generates a random string, which is then returned to be used as a key id
|
|
|
|
func GenerateRandomID() (id string, err error) {
|
|
|
|
buf, err := GenerateSecureRandomData(KeyIDSize)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
if !ValidateDataIntegrity(buf, KeyIDSize) {
|
|
|
|
return "", fmt.Errorf("error in generateRandomID: crypto/rand failed to generate random data")
|
|
|
|
}
|
|
|
|
id = common.Bytes2Hex(buf)
|
|
|
|
return id, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// ValidateDataIntegrity returns false if the data have the wrong or contains all zeros,
|
|
|
|
// which is the simplest and the most common bug.
|
|
|
|
func ValidateDataIntegrity(k []byte, expectedSize int) bool {
|
|
|
|
if len(k) != expectedSize {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if expectedSize > 3 && ContainsOnlyZeros(k) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|