-
Notifications
You must be signed in to change notification settings - Fork 1.4k
feat: Encryption security hardening #6668
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
diegolmello
wants to merge
98
commits into
develop
Choose a base branch
from
feat.e2ee-v2
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4,713
−1,320
Open
Changes from all commits
Commits
Show all changes
98 commits
Select commit
Hold shift + click to select a range
3f239ab
fix lib
diegolmello 5c460bc
encrypt/decrypt working
diegolmello d1dc09d
Avoid attempting to decrypt a message when keyId is not the same
diegolmello 18fca07
Implement request for room key when old key is not available, with a …
diegolmello 66caa65
tmsg commented out for future me
diegolmello f3ff8be
Fix ts types
diegolmello 96f9528
swift header finally working
diegolmello b200e94
new keyid makes sense, but v1 is not working
diegolmello 46be7c6
Fix and simplify old key logic for v1 and v2
diegolmello 77f25c9
comment
diegolmello 74f4cc6
New master key generation
diegolmello 6607369
bip39
diegolmello f3481d5
Improve styling
diegolmello e5fc185
Cleanup
diegolmello 9eb3f33
fix lib
diegolmello 85e2bf3
encrypt/decrypt working
diegolmello 6c748d5
Avoid attempting to decrypt a message when keyId is not the same
diegolmello 1e309ad
Implement request for room key when old key is not available, with a …
diegolmello 7623ed4
tmsg commented out for future me
diegolmello b57b7e8
Fix ts types
diegolmello 9b35cd7
swift header finally working
diegolmello 78d9a07
new keyid makes sense, but v1 is not working
diegolmello 4da4e95
Fix and simplify old key logic for v1 and v2
diegolmello 6f8e100
comment
diegolmello 44a552a
New master key generation
diegolmello 0b8e406
bip39
diegolmello acd3dc3
Improve styling
diegolmello 89fa448
Cleanup
diegolmello ffaf945
Merge branch 'feat.e2ee-v2' of github.com:RocketChat/Rocket.Chat.Reac…
diegolmello 3bdfbbc
Content over msg
diegolmello 1f920dd
Push android working
diegolmello b7e6f9e
Push iOS
diegolmello 8ef27d3
Encrypt push iOS
diegolmello 268fd9d
Reply from push use content instead of msg
diegolmello 059f0ec
Make msg receive decrypted content.text
diegolmello 4ebc75b
Update CustomPushNotification to check for content and msg; modify Re…
diegolmello 0ad2dff
Add redundancy check on handshake
diegolmello 036324b
Avoid decrypting last message unnecessarily
diegolmello 1311592
Merge branch 'develop' into feat.e2ee-v2
diegolmello 450ba88
Enhance SendMessageRequest to support both text and content for backw…
diegolmello 8b41c8b
Stop sending msg on e2ee push reply iOS
diegolmello 7f2c936
Fix ts on Message model
diegolmello 31126ee
Merge branch 'develop' into feat.e2ee-v2
diegolmello 1119be6
Adapt to rc.v2.aes-sha2
diegolmello 6651a56
Refactor E2EE content structure to support versioned encryption algor…
diegolmello 4690076
ugly, but ios/android push working on the new structure
diegolmello 388d619
working on web
diegolmello f85ec9b
Decrypt/encrypt push iOS working on web
diegolmello f9f7dd1
Encrypt/decrypt refactor
diegolmello 23d1376
version -> algorithm
diegolmello e320ebb
fix type
diegolmello 890714e
Android notification fixes to match iOS implementation
diegolmello 7752340
Merge branch 'develop' into feat.e2ee-v2
diegolmello faae390
Avoid decrypting sub.lastMessage too often
diegolmello b580fcb
Get rid of too many ready checks
diegolmello 6eb95b7
Enhance encryption room logic to handle private key checks and error …
diegolmello 41823d8
Refactor encryption utilities to use ArrayBuffer instead of Uint8Arra…
diegolmello b0f9cb0
Fix push notification when app is killed
diegolmello 90fc90f
Cleanup
diegolmello 04efb46
Fix in-app notification
diegolmello 50deb65
Fix v2 room key creation
diegolmello 9a0aa95
fix suggested keys approval/rejection
diegolmello 1f4ae70
Add generate password to change e2ee password
diegolmello b0600c3
action: organized translations
diegolmello d116d26
cleanup
diegolmello 1b245e3
Fix room creation and file upload
diegolmello b1cae4b
Refactor e2ee tests
diegolmello bc30582
cleanup
diegolmello 8f96d34
Improve versioning
diegolmello e33580a
Avoid decrypting lastmessage too often
diegolmello 375f4f2
Merge branch 'feat.e2ee-v2' of github.com:RocketChat/Rocket.Chat.Reac…
diegolmello 4ae92d6
Merge branch 'develop' into feat.e2ee-v2
diegolmello 9b2f0c7
Fix some ts issues on e2ee
diegolmello cdd41ce
Fix iOS header disabled items styles
diegolmello 3a670b2
cleanup
diegolmello d66189c
Fix wmdb issues on decryptPendingSubscriptions
diegolmello 67a29e7
Add state management for E2EE key visibility in RoomView
diegolmello dde22ff
Merge branch 'develop' into feat.e2ee-v2
diegolmello b34fd01
Fix comment
diegolmello e091692
Fix edit message
diegolmello 320faaf
Stop trying to decrypt sub.lastMessage from unencrypted channels
diegolmello 70bd76e
Fix room not being persisted after created
diegolmello 06be35f
Minor fix on decryptSubscription
diegolmello 3c7d63d
Add e2eePassword to data tests
diegolmello cb42ce8
Merge branch 'develop' into feat.e2ee-v2
diegolmello 9dd0e78
Update e2e tests to use deeplink
diegolmello d827a0e
Fix banner and room wall flickering
diegolmello 8d0efca
Merge branch 'develop' into feat.e2ee-v2
diegolmello 7823aef
Point to 7.13.0
diegolmello cd2951e
Merge branch 'feat.e2ee-v2' of github.com:RocketChat/Rocket.Chat.Reac…
diegolmello 23c15fa
Merge branch 'develop' into feat.e2ee-v2
diegolmello b5dff4a
chore: format code and fix lint issues
diegolmello 8a3f7e5
Fix decode private key not using the salt from json and change salt g…
diegolmello b019fec
Make sure subscription is persisted before trying to decrypt
diegolmello a808de9
Fix room creation
diegolmello 8d17033
Prevent handshake from running on non e2ee rooms
diegolmello bc335fb
Fix salt
diegolmello 412d689
Fix lint
diegolmello File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix the regex casing for the notification prompt
iOS renders the system alert as
"AppName" Would Like to Send You Notifications; the current pattern uses lowercaselike, so Maestro never matches and the Allow tap never executes. Update the regex to match the actual casing, e.g.'.*Would Like to Send You Notifications.*'.🤖 Prompt for AI Agents