logos-messaging/go-libp2p-pubsub
1
0
Fork 0
mirror of https://github.com/logos-messaging/go-libp2p-pubsub.git synced 2026-01-05 22:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

reify key extraction logic, with more context in error messages

Browse Source
This commit is contained in:
vyzo 2018-08-28 11:14:14 +03:00
parent 4addc898c1
commit 777c68fe0e
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sign.go
View File

@ -10,31 +10,11 @@ import (
)
func verifyMessageSignature(m *pb.Message) error {
var pubk crypto.PubKey
pid, err := peer.IDFromBytes(m.From)
pubk, err := messagePubKey(m)
if err != nil {
return err
}
if m.Key == nil {
// no attached key, it must be extractable from the source ID
pubk, err = pid.ExtractPublicKey()
if err != nil {
return err
}
} else {
pubk, err = crypto.UnmarshalPublicKey(m.Key)
if err != nil {
return err
}
// verify that the source ID matches the attached key
if !pid.MatchesPublicKey(pubk) {
return fmt.Errorf("bad signing key; source ID %s doesn't match key", pid)
}
}
xm := pb.Message{
Data: m.Data,
TopicIDs: m.TopicIDs,
@ -58,6 +38,35 @@ func verifyMessageSignature(m *pb.Message) error {
return nil
}
func messagePubKey(m *pb.Message) (crypto.PubKey, error) {
var pubk crypto.PubKey
pid, err := peer.IDFromBytes(m.From)
if err != nil {
return nil, err
}
if m.Key == nil {
// no attached key, it must be extractable from the source ID
pubk, err = pid.ExtractPublicKey()
if err != nil {
return nil, fmt.Errorf("cannot extract signing key: %s", err.Error())
}
} else {
pubk, err = crypto.UnmarshalPublicKey(m.Key)
if err != nil {
return nil, fmt.Errorf("cannot unmarshal signing key: %s", err.Error())
}
// verify that the source ID matches the attached key
if !pid.MatchesPublicKey(pubk) {
return nil, fmt.Errorf("bad signing key; source ID %s doesn't match key", pid)
}
}
return pubk, nil
}
func signMessage(key crypto.PrivKey, m *pb.Message) error {
bytes, err := m.Marshal()
if err != nil {