Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
63d977da
Commit
63d977da
authored
Apr 4, 2022
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
refactor group chat receive.go
parent
174bc622
Branches
Branches containing commit
Tags
Tags containing commit
4 merge requests
!510
Release
,
!207
WIP: Client Restructure
,
!203
Symmetric broadcast
,
!194
refactor send group chat code
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
groupChat/receive.go
+39
-40
39 additions, 40 deletions
groupChat/receive.go
groupChat/send.go
+3
-3
3 additions, 3 deletions
groupChat/send.go
with
42 additions
and
43 deletions
groupChat/receive.go
+
39
−
40
View file @
63d977da
...
@@ -16,7 +16,6 @@ import (
...
@@ -16,7 +16,6 @@ import (
"gitlab.com/elixxir/crypto/group"
"gitlab.com/elixxir/crypto/group"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/primitives/id"
"time"
"time"
)
)
...
@@ -42,71 +41,70 @@ func (p *receptionProcessor) Process(message format.Message, receptionID recepti
...
@@ -42,71 +41,70 @@ func (p *receptionProcessor) Process(message format.Message, receptionID recepti
jww
.
TRACE
.
Print
(
"Group message reception received cMix message."
)
jww
.
TRACE
.
Print
(
"Group message reception received cMix message."
)
// Attempt to read the message
// Attempt to read the message
roundTimeStamp
:=
round
.
Timestamps
[
states
.
QUEUED
]
roundTimestamp
:=
round
.
Timestamps
[
states
.
QUEUED
]
msgID
,
timestamp
,
senderID
,
msg
,
err
:=
decryptMessage
(
p
.
g
,
message
,
roundTimeStamp
)
// Unmarshal cMix message contents to get public message format
pubMsg
,
err
:=
unmarshalPublicMsg
(
message
.
GetContents
())
if
err
!=
nil
{
jww
.
WARN
.
Printf
(
"Failed to unmarshal: %+v"
,
errors
.
Errorf
(
unmarshalPublicMsgErr
,
err
))
}
// Obtain the cryptKey for the public message
key
,
err
:=
getCryptKey
(
p
.
g
.
Key
,
pubMsg
.
GetSalt
(),
message
.
GetMac
(),
pubMsg
.
GetPayload
(),
p
.
g
.
DhKeys
,
roundTimestamp
)
if
err
!=
nil
{
jww
.
WARN
.
Printf
(
"Unable to getCryptKey: %+v"
,
err
)
return
}
// Decrypt the message payload using the cryptKey
result
,
err
:=
decryptMessage
(
p
.
g
,
message
.
GetKeyFP
(),
key
,
pubMsg
.
GetPayload
())
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
WARN
.
Printf
(
"Group message reception failed to read "
+
jww
.
WARN
.
Printf
(
"Group message reception failed to read "
+
"cMix message: %+v"
,
err
)
"cMix message: %+v"
,
err
)
return
return
}
}
// Populate remaining fields from the top level
result
.
GroupID
=
p
.
g
.
ID
result
.
RecipientID
=
receptionID
.
Source
result
.
EphemeralID
=
receptionID
.
EphId
result
.
RoundID
=
round
.
ID
result
.
RoundTimestamp
=
roundTimestamp
jww
.
DEBUG
.
Printf
(
"Received group message with ID %s from sender "
+
jww
.
DEBUG
.
Printf
(
"Received group message with ID %s from sender "
+
"%s in group %s with ID %s at %s."
,
msgID
,
s
enderID
,
p
.
g
.
Name
,
"%s in group %s with ID %s at %s."
,
result
.
ID
,
result
.
S
enderID
,
p
.
g
.
Name
,
p
.
g
.
ID
,
t
imestamp
)
p
.
g
.
ID
,
result
.
T
imestamp
)
// If the message was read correctly, send it to the callback
// If the message was read correctly, send it to the callback
go
p
.
m
.
receiveFunc
(
MessageReceive
{
go
p
.
m
.
receiveFunc
(
result
)
GroupID
:
p
.
g
.
ID
,
ID
:
msgID
,
Payload
:
msg
,
SenderID
:
senderID
,
RecipientID
:
receptionID
.
Source
,
EphemeralID
:
receptionID
.
EphId
,
Timestamp
:
timestamp
,
RoundID
:
round
.
ID
,
RoundTimestamp
:
roundTimeStamp
,
})
}
}
// decryptMessage decrypts the group message payload and returns its message ID,
// decryptMessage decrypts the group message payload and returns its message ID,
// timestamp, sender ID, and message contents.
// timestamp, sender ID, and message contents.
func
decryptMessage
(
g
gs
.
Group
,
cMixMsg
format
.
Message
,
roundTimestamp
time
.
Time
)
(
func
decryptMessage
(
g
gs
.
Group
,
fingerprint
format
.
Fingerprint
,
key
group
.
CryptKey
,
payload
[]
byte
)
(
group
.
MessageID
,
time
.
Time
,
*
id
.
ID
,
[]
byte
,
error
)
{
MessageReceive
,
error
)
{
// Unmarshal cMix message contents to get public message format
pubMsg
,
err
:=
unmarshalPublicMsg
(
cMixMsg
.
GetContents
())
if
err
!=
nil
{
return
group
.
MessageID
{},
time
.
Time
{},
nil
,
nil
,
errors
.
Errorf
(
unmarshalPublicMsgErr
,
err
)
}
key
,
err
:=
getCryptKey
(
g
.
Key
,
pubMsg
.
GetSalt
(),
cMixMsg
.
GetMac
(),
pubMsg
.
GetPayload
(),
g
.
DhKeys
,
roundTimestamp
)
if
err
!=
nil
{
return
group
.
MessageID
{},
time
.
Time
{},
nil
,
nil
,
err
}
// Decrypt internal message
// Decrypt internal message
decryptedPayload
:=
group
.
Decrypt
(
key
,
cMixMsg
.
GetKeyFP
(),
decryptedPayload
:=
group
.
Decrypt
(
key
,
fingerprint
,
payload
)
pubMsg
.
GetPayload
())
// Unmarshal internal message
// Unmarshal internal message
intlMsg
,
err
:=
unmarshalInternalMsg
(
decryptedPayload
)
intlMsg
,
err
:=
unmarshalInternalMsg
(
decryptedPayload
)
if
err
!=
nil
{
if
err
!=
nil
{
return
group
.
MessageID
{},
time
.
Time
{},
nil
,
nil
,
return
MessageReceive
{},
errors
.
Errorf
(
unmarshalInternalMsgErr
,
err
)
errors
.
Errorf
(
unmarshalInternalMsgErr
,
err
)
}
}
// Unmarshal sender ID
// Unmarshal sender ID
senderID
,
err
:=
intlMsg
.
GetSenderID
()
senderID
,
err
:=
intlMsg
.
GetSenderID
()
if
err
!=
nil
{
if
err
!=
nil
{
return
group
.
MessageID
{},
time
.
Time
{},
nil
,
nil
,
return
MessageReceive
{},
errors
.
Errorf
(
unmarshalSenderIdErr
,
err
)
errors
.
Errorf
(
unmarshalSenderIdErr
,
err
)
}
}
messageID
:=
group
.
NewMessageID
(
g
.
ID
,
intlMsg
.
Marshal
())
return
MessageReceive
{
ID
:
group
.
NewMessageID
(
g
.
ID
,
intlMsg
.
Marshal
()),
return
messageID
,
intlMsg
.
GetTimestamp
(),
senderID
,
intlMsg
.
GetPayload
(),
nil
Payload
:
intlMsg
.
GetPayload
(),
SenderID
:
senderID
,
Timestamp
:
intlMsg
.
GetTimestamp
(),
},
nil
}
}
// getCryptKey generates the decryption key for a group internal message. The
// getCryptKey generates the decryption key for a group internal message. The
...
@@ -117,6 +115,7 @@ func decryptMessage(g gs.Group, cMixMsg format.Message, roundTimestamp time.Time
...
@@ -117,6 +115,7 @@ func decryptMessage(g gs.Group, cMixMsg format.Message, roundTimestamp time.Time
// DH key is tried until there is a match.
// DH key is tried until there is a match.
func
getCryptKey
(
key
group
.
Key
,
salt
[
group
.
SaltLen
]
byte
,
mac
,
payload
[]
byte
,
func
getCryptKey
(
key
group
.
Key
,
salt
[
group
.
SaltLen
]
byte
,
mac
,
payload
[]
byte
,
dhKeys
gs
.
DhKeyList
,
roundTimestamp
time
.
Time
)
(
group
.
CryptKey
,
error
)
{
dhKeys
gs
.
DhKeyList
,
roundTimestamp
time
.
Time
)
(
group
.
CryptKey
,
error
)
{
// Compute the current epoch
// Compute the current epoch
epoch
:=
group
.
ComputeEpoch
(
roundTimestamp
)
epoch
:=
group
.
ComputeEpoch
(
roundTimestamp
)
...
...
This diff is collapsed.
Click to expand it.
groupChat/send.go
+
3
−
3
View file @
63d977da
...
@@ -37,8 +37,8 @@ const (
...
@@ -37,8 +37,8 @@ const (
saltReadLengthErr
=
"length of generated salt %d != %d required"
saltReadLengthErr
=
"length of generated salt %d != %d required"
)
)
// Send sends a message to all group members using Client.SendManyCMIX.
The
// Send sends a message to all group members using Client.SendManyCMIX.
// send fails if the message is too long.
//
The
send fails if the message is too long.
func
(
m
*
Manager
)
Send
(
groupID
*
id
.
ID
,
message
[]
byte
)
(
id
.
Round
,
time
.
Time
,
group
.
MessageID
,
error
)
{
func
(
m
*
Manager
)
Send
(
groupID
*
id
.
ID
,
message
[]
byte
)
(
id
.
Round
,
time
.
Time
,
group
.
MessageID
,
error
)
{
// Get the relevant group
// Get the relevant group
...
@@ -69,7 +69,7 @@ func (m *Manager) Send(groupID *id.ID, message []byte) (id.Round, time.Time, gro
...
@@ -69,7 +69,7 @@ func (m *Manager) Send(groupID *id.ID, message []byte) (id.Round, time.Time, gro
rid
,
_
,
err
:=
m
.
net
.
SendManyCMIX
(
groupMessages
,
param
)
rid
,
_
,
err
:=
m
.
net
.
SendManyCMIX
(
groupMessages
,
param
)
if
err
!=
nil
{
if
err
!=
nil
{
return
0
,
time
.
Time
{},
group
.
MessageID
{},
return
0
,
time
.
Time
{},
group
.
MessageID
{},
errors
.
Errorf
(
sendManyCmixErr
,
m
.
gs
.
GetUser
()
.
ID
,
groupID
,
err
)
errors
.
Errorf
(
sendManyCmixErr
,
m
.
receptionId
,
groupID
,
err
)
}
}
jww
.
DEBUG
.
Printf
(
"Sent message to %d members in group %s at %s."
,
jww
.
DEBUG
.
Printf
(
"Sent message to %d members in group %s at %s."
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment