feat: Add SDS unwrap process for received messages #7149
+156
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Jenkins BuildsClick to see older builds (232)
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #7149 +/- ##
============================================
- Coverage 59.76% 39.48% -20.28%
============================================
Files 822 823 +1
Lines 113641 113592 -49
============================================
- Hits 67916 44856 -23060
- Misses 38849 64453 +25604
+ Partials 6876 4283 -2593
Flags with carried forward coverage won't be shown. Click here to find out more.
|
kaichaosun
force-pushed
the
feat/sds-log
branch
2 times, most recently
from
e79a1c9 to
bfa9be7
Compare
kaichaosun
force-pushed
the
feat/sds-log
branch
from
bfa9be7 to
b659e65
Compare
kaichaosun
changed the title
kaichaosun
force-pushed
the
feat/sds-log
branch
from
752ca5e to
351f552
Compare
jrainville
reviewed
Dec 8, 2025
Member
jrainville
left a comment
jrainville
left a comment
There was a problem hiding this comment.
Nice job, just some small things.
Also, I noticed that you also did some wrapping in this PR, but the description only talks about unwrapping. Just wondering if it's a description error or some commits got into this PR by accident?
| if len(msg.EncryptionLayer.Payload) > 0 { | ||
| unwrappedMessage, err := r.stack.SDSManager.UnwrapReceivedMessage(msg.EncryptionLayer.Payload) | ||
| if err != nil { | ||
| r.logger.Warn("SDS: failed to unwrap received message", zap.Error(err)) |
Member
There was a problem hiding this comment.
Shouldn't we just return the error? If the message was wrapped, there is no way to process it further anyway no?
Contributor
Author
There was a problem hiding this comment.
The error should be returned after the SDS wrap is enable by default, I will disable SDS wrap in the PR after tests, and enable it in newer release as it introduce broken changes.
igor-sirotin
reviewed
Dec 8, 2025
Collaborator
igor-sirotin
left a comment
igor-sirotin
left a comment
There was a problem hiding this comment.
Thank you!
Just a few minor things. Looking forward to testing it
kaichaosun
force-pushed
the
feat/sds-log
branch
4 times, most recently
from
85bbc62 to
3cde176
Compare
kaichaosun
requested review from
Ivansete-status,
igor-sirotin,
jazzz,
jrainville and
osmaczko
kaichaosun
force-pushed
the
feat/sds-log
branch
from
80d3aec to
d889036
Compare
jrainville
reviewed
Dec 9, 2025
igor-sirotin
approved these changes
Dec 10, 2025
Collaborator
igor-sirotin
left a comment
igor-sirotin
left a comment
There was a problem hiding this comment.
LGTM, but please get an approval from @osmaczko before merging
Ivansete-status
approved these changes
Dec 10, 2025
Contributor
Ivansete-status
left a comment
Ivansete-status
left a comment
There was a problem hiding this comment.
LGTM! Thanks for it! 🙌
Adding minor nitpicks.
Besides¡, maybe the PR's title doesn't reflect the internal changes? Unless I'm missing somthing.
I thought that first we aimed to perform the unwrap but the code changes seem to perform wrap
jrainville
approved these changes
Dec 10, 2025
kaichaosun
force-pushed
the
feat/sds-log
branch
2 times, most recently
from
13dd00e to
dc89cf3
Compare
osmaczko
requested changes
Dec 11, 2025
Contributor
osmaczko
left a comment
osmaczko
left a comment
There was a problem hiding this comment.
Thanks for the update. There is one key issue remaining around exposing reliability from messaging. Please see comments.
| } | ||
| } | ||
|
|
||
| err = r.processSDSLayer(responseMessage) |
Contributor
There was a problem hiding this comment.
Can you please invoke it from within processReliabilityLayer? This way process*Layer invocations in processMessage reflect the protocol layers, i.e. SDS is part of reliability.
Contributor
Author
There was a problem hiding this comment.
The current processReliabilityLayer API looks specifically made for mvds. It'll be hard to reason about this PR if refactor this API.
protocol/common/message_sender.go
Outdated
Comment on lines
170
to
174
| sdsWrappedPayload, err := s.messaging.Reliability().WrapPayloadForSDS(wrappedMessage, rawMessage.CommunityID) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to wrap payload for SDS") | ||
| } | ||
| wrappedMessage = sdsWrappedPayload |
Contributor
There was a problem hiding this comment.
Suggested change
| sdsWrappedPayload, err := s.messaging.Reliability().WrapPayloadForSDS(wrappedMessage, rawMessage.CommunityID) | |
| if err != nil { | |
| return nil, errors.Wrap(err, "failed to wrap payload for SDS") | |
| } | |
| wrappedMessage = sdsWrappedPayload | |
| withSDS = true |
Then
... messagingtypes.SendPublicParams{
...
withSDS: withSDS,
...
}
Contributor
Author
There was a problem hiding this comment.
Put community id into the params and use it for the check of sds looks better. Not reusing the existing CommunityPublicKey, because it seems very different in its downstream usage, and how it gets set.
I remove the condition of ApplicationMetadataMessage_COMMUNITY_DESCRIPTION , as I don't see major blocker for not use sds for this type of message.
Co-authored-by: Igor Sirotin <[email protected]>
Co-authored-by: Igor Sirotin <[email protected]>
kaichaosun
force-pushed
the
feat/sds-log
branch
from
e95e82c to
15cfb07
Compare
osmaczko
approved these changes
Dec 12, 2025
Contributor
osmaczko
left a comment
osmaczko
left a comment
There was a problem hiding this comment.
Much cleaner, thank you!
Contributor
Author
|
@status-im/devops please review :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add SDS unwrap process for received messages.
Important changes:
Relates #logos-messaging/pm#194