status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change API of BuildDirectMessage function to use variadic arguments (#1243)

This commit is contained in:
Ivan Daniluk 2018-10-16 17:22:28 +02:00 committed by GitHub
parent 820217ea7a
commit e7c588fcd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/shhext/api.go
View File

@ -260,9 +260,8 @@ func (api *PublicAPI) SendDirectMessage(ctx context.Context, msg chat.SendDirect
return nil, err
}
keys := []*ecdsa.PublicKey{publicKey}
// This is transport layer-agnostic
protocolMessages, err := api.service.protocol.BuildDirectMessage(privateKey, keys, msg.Payload)
protocolMessages, err := api.service.protocol.BuildDirectMessage(privateKey, msg.Payload, publicKey)
if err != nil {
return nil, err
}
@ -344,7 +343,7 @@ func (api *PublicAPI) SendGroupMessage(ctx context.Context, msg chat.SendGroupMe
}
// This is transport layer-agnostic
protocolMessages, err := api.service.protocol.BuildDirectMessage(privateKey, keys, msg.Payload)
protocolMessages, err := api.service.protocol.BuildDirectMessage(privateKey, msg.Payload, keys...)
if err != nil {
return nil, err
}

5
services/shhext/chat/protocol.go
View File

@ -59,9 +59,10 @@ func (p *ProtocolService) BuildPublicMessage(myIdentityKey *ecdsa.PrivateKey, pa
}
// BuildDirectMessage marshals a 1:1 chat message given the user identity private key, the recipient's public key, and a payload
func (p *ProtocolService) BuildDirectMessage(myIdentityKey *ecdsa.PrivateKey, theirPublicKeys []*ecdsa.PublicKey, payload []byte) (map[*ecdsa.PublicKey][]byte, error) {
func (p *ProtocolService) BuildDirectMessage(myIdentityKey *ecdsa.PrivateKey, payload []byte, theirPublicKeys ...*ecdsa.PublicKey) (map[*ecdsa.PublicKey][]byte, error) {
response := make(map[*ecdsa.PublicKey][]byte)
for _, publicKey := range append(theirPublicKeys, &myIdentityKey.PublicKey) {
publicKeys := append(theirPublicKeys, &myIdentityKey.PublicKey)
for _, publicKey := range publicKeys {
// Encrypt payload
encryptionResponse, err := p.encryption.EncryptPayload(publicKey, myIdentityKey, payload)
if err != nil {

8
services/shhext/chat/protocol_test.go
View File

@ -1,7 +1,6 @@
package chat
import (
"crypto/ecdsa"
"os"
"testing"
@ -57,8 +56,7 @@ func (s *ProtocolServiceTestSuite) TestBuildDirectMessage() {
})
s.NoError(err)
keys := []*ecdsa.PublicKey{&bobKey.PublicKey}
marshaledMsg, err := s.alice.BuildDirectMessage(aliceKey, keys, payload)
marshaledMsg, err := s.alice.BuildDirectMessage(aliceKey, payload, &bobKey.PublicKey)
s.NoError(err)
s.NotNil(marshaledMsg, "It creates a message")
@ -98,10 +96,8 @@ func (s *ProtocolServiceTestSuite) TestBuildAndReadDirectMessage() {
marshaledPayload, err := proto.Marshal(&payload)
s.NoError(err)
keys := []*ecdsa.PublicKey{&bobKey.PublicKey}
// Message is sent with DH
marshaledMsg, err := s.alice.BuildDirectMessage(aliceKey, keys, marshaledPayload)
marshaledMsg, err := s.alice.BuildDirectMessage(aliceKey, marshaledPayload, &bobKey.PublicKey)
s.NoError(err)