libp2p/go-libp2p-core
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p-core.git synced 2025-03-22 12:20:07 +08:00
Code Issues Projects Releases Wiki Activity

add Seq field to envelope signature

Browse Source
This commit is contained in:
Yusef Napora 2020-01-07 13:49:44 -05:00
parent 25c1a5dcd2
commit ce6885c21e
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
record/envelope.go
View File

@ -52,7 +52,8 @@ func MakeEnvelope(privateKey crypto.PrivKey, domain string, payloadType []byte,
return nil, ErrEmptyDomain return nil, ErrEmptyDomain
} }
unsigned, err := makeUnsigned(domain, payloadType, payload) seq := statelessSeqNo()
unsigned, err := makeUnsigned(domain, payloadType, payload, seq)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -67,7 +68,7 @@ func MakeEnvelope(privateKey crypto.PrivKey, domain string, payloadType []byte,
PublicKey: privateKey.GetPublic(), PublicKey: privateKey.GetPublic(),
PayloadType: payloadType, PayloadType: payloadType,
Payload: payload, Payload: payload,
Seq: statelessSeqNo(), Seq: seq,
signature: sig, signature: sig,
}, nil }, nil
} }
@ -141,7 +142,7 @@ func (e *SignedEnvelope) Equal(other *SignedEnvelope) bool {
// validate returns true if the envelope signature is valid for the given 'domain', // validate returns true if the envelope signature is valid for the given 'domain',
// or false if it is invalid. May return an error if signature validation fails. // or false if it is invalid. May return an error if signature validation fails.
func (e *SignedEnvelope) validate(domain string) error { func (e *SignedEnvelope) validate(domain string) error {
unsigned, err := makeUnsigned(domain, e.PayloadType, e.Payload) unsigned, err := makeUnsigned(domain, e.PayloadType, e.Payload, e.Seq)
if err != nil { if err != nil {
return err return err
} }
@ -160,9 +161,10 @@ func (e *SignedEnvelope) validate(domain string) error {
// makeUnsigned is a helper function that prepares a buffer to sign or verify. // makeUnsigned is a helper function that prepares a buffer to sign or verify.
// It returns a byte slice from a pool. The caller MUST return this slice to the // It returns a byte slice from a pool. The caller MUST return this slice to the
// pool. // pool.
func makeUnsigned(domain string, payloadType []byte, payload []byte) ([]byte, error) { func makeUnsigned(domain string, payloadType []byte, payload []byte, seq uint64) ([]byte, error) {
var ( var (
fields = [][]byte{[]byte(domain), payloadType, payload} seqBytes = varint.ToUvarint(seq)
fields = [][]byte{[]byte(domain), payloadType, seqBytes, payload}
// fields are prefixed with their length as an unsigned varint. we // fields are prefixed with their length as an unsigned varint. we
// compute the lengths before allocating the sig buffer so we know how // compute the lengths before allocating the sig buffer so we know how

22
record/envelope_test.go
View File

@ -128,6 +128,28 @@ func TestEnvelopeValidateFailsIfContentsAreAltered(t *testing.T) {
test.ExpectError(t, err, "should not be able to open envelope with modified payload") test.ExpectError(t, err, "should not be able to open envelope with modified payload")
} }
func TestEnvelopeValidateFailsIfSeqIsAltered(t *testing.T) {
var (
payload = []byte("happy hacking")
domain = "libp2p-testing"
payloadType = []byte("/libp2p/testdata")
priv, _, err = test.RandTestKeyPair(crypto.Ed25519, 256)
)
test.AssertNilError(t, err)
envelope, err := MakeEnvelope(priv, domain, payloadType, payload)
test.AssertNilError(t, err)
serialized := alterMessageAndMarshal(t, envelope, func(msg *pb.SignedEnvelope) {
msg.Seq = envelope.Seq + 1
})
// try to open our modified envelope
_, err = ConsumeEnvelope(serialized, domain)
test.ExpectError(t, err, "should not be able to open envelope with modified seq field")
}
// Since we're outside of the crypto package (to avoid import cycles with test package), // Since we're outside of the crypto package (to avoid import cycles with test package),
// we can't alter the fields in a SignedEnvelope directly. This helper marshals // we can't alter the fields in a SignedEnvelope directly. This helper marshals
// the envelope to a protobuf and calls the alterMsg function, which should // the envelope to a protobuf and calls the alterMsg function, which should