yves/meowlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Peer invitation refactor, Contact invitationId, Qrcode compression

Browse Source
This commit is contained in:
ycc
2022-11-27 21:08:34 +01:00
parent 2516b41597
commit 8195a22300
10 changed files with 466 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
client/peer.go
View File

@ -2,6 +2,8 @@ package client
import (
"fmt"
"io"
"os"
"time"
"forge.redroom.link/yves/meowlib"
@ -13,11 +15,13 @@ type Peer struct {
Name string `json:"name,omitempty"`
// Conversation []InternalMessage `json:"conversation,omitempty"`
// My own keys for that peer
Me meowlib.KeyPair `json:"me,omitempty"`
EncryptionKp meowlib.KeyPair `json:"conversation_kp,omitempty"`
LookupKp meowlib.KeyPair `json:"lookup_kp,omitempty"`
MyIdentity meowlib.KeyPair `json:"my_identity,omitempty"`
MyEncryptionKp meowlib.KeyPair `json:"my_encryption_kp,omitempty"`
MyLookupKp meowlib.KeyPair `json:"my_lookup_kp,omitempty"`
MyPullServers []meowlib.Server `json:"my_pull_servers,omitempty"`
// Peer keys and infos
Contact meowlib.ContactCard `json:"contact,omitempty"`
Contact meowlib.ContactCard `json:"contact,omitempty"`
InvitationId string `json:"invitation_id,omitempty"`
// Internal management attributes
Visible bool `json:"visible,omitempty"`
VisiblePassword string `json:"visible_password,omitempty"`
@ -26,7 +30,7 @@ type Peer struct {
MessageNotification string `json:"message_notification,omitempty"`
OnionMode bool `json:"onion_mode,omitempty"`
LastMessage time.Time `json:"last_message,omitempty"`
MessageDb string `json:"message_db,omitempty"` // sql url for messages storage
DbIds []string `json:"db_ids,omitempty"`
DbPassword string `json:"db_password,omitempty"`
}
@ -57,13 +61,59 @@ func (pl *PeerList) GetFromName(name string) *Peer {
func (p *Peer) BuildSimpleUserUMessage(message []byte) (*meowlib.UserMessage, error) {
var msg meowlib.UserMessage
msg.From = p.Me.Public
msg.From = p.MyIdentity.Public
msg.Data = message
msg.Type = "1"
msg.Status = &meowlib.UserMessage_ConversationStatus{}
msg.Status.LocalUuid = uuid.New().String()
return &msg, nil
}
func (p *Peer) BuildFileMessage(filename string, message []byte) ([]meowlib.UserMessage, error) {
var msgs []meowlib.UserMessage
fi, err := os.Stat(filename)
if err != nil {
return nil, err
}
file, err := os.Open(filename)
if err != nil {
return nil, err
}
defer file.Close()
// declare chunk size
maxSz := GetConfig().Chunksize
// create buffer
b := make([]byte, maxSz)
chunk := 0
for {
// read content to buffer
readTotal, err := file.Read(b)
if err != nil {
if err != io.EOF {
return nil, err
}
break
}
var msg meowlib.UserMessage
msg.From = p.MyIdentity.Public
msg.File.Filename = fi.Name()
msg.File.Chunk = uint32(chunk)
msg.File.Data = b[:readTotal]
msg.File.Size = uint64(fi.Size())
msg.Type = "2"
if chunk == 0 {
msg.Status = &meowlib.UserMessage_ConversationStatus{}
msg.Status.LocalUuid = uuid.New().String()
}
msgs = append(msgs, msg)
chunk++
}
return msgs, nil
}
func (p *Peer) SerializeUserMessage(msg *meowlib.UserMessage) ([]byte, error) {
out, err := proto.Marshal(msg)
if err != nil {
@ -74,7 +124,7 @@ func (p *Peer) SerializeUserMessage(msg *meowlib.UserMessage) ([]byte, error) {
// AsymEncryptMessage prepares a message to send to a specific peer contact
func (p *Peer) AsymEncryptMessage(Message []byte) (EncryptedMessage []byte, Signature []byte, Servers []*meowlib.Server, err error) {
EncryptedMessage, Signature, err = meowlib.AsymEncryptAndSign(p.Contact.EncryptionPublicKey, p.Me.Private, Message)
EncryptedMessage, Signature, err = meowlib.AsymEncryptAndSign(p.Contact.EncryptionPublicKey, p.MyIdentity.Private, Message)
if err != nil {
fmt.Println(err.Error())
return nil, nil, nil, err
@ -84,7 +134,7 @@ func (p *Peer) AsymEncryptMessage(Message []byte) (EncryptedMessage []byte, Sign
// AsymDecryptMessage reads a message from a specific peer contact
func (p *Peer) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMessage []byte, err error) {
DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.Me.Private, p.Contact.ContactPublicKey, Message, Signature)
DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.MyIdentity.Private, p.Contact.ContactPublicKey, Message, Signature)
if err != nil {
fmt.Println(err.Error())
return nil, err