Skip to content
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.

Sign up for GitHub

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

Jump to bottom

#1254 Send password-protected messages #1308

Merged
merged 21 commits into from
Jan 14, 2022
Merged

#1254 Send password-protected messages #1308

merged 21 commits into from
Jan 14, 2022

Conversation

sosnovsky
Copy link
Collaborator

@sosnovsky sosnovsky commented Jan 13, 2022 •
edited by tomholub
Loading

This PR adds ability to send emails protected with password.

close #1254

Tests (delete all except exactly one):

  • Tests added or updated - added encryptMsg -> parseDecryptMsg (with password) test for Core and test_sendable_msg_copy on iOS

To be filled by reviewers

I have reviewed that this PR... (tick whichever items you personally focused on during this review):

  • addresses the issue it closes (if any)
  • code is readable and understandable
  • is accompanied with tests, or tests are not needed
  • is free of vulnerabilities
  • is documented clearly and usefully, or doesn't need documentation

sosnovsky added 16 commits January 3, 2022 22:29
@sosnovsky
#1254 add pwd param to composeEmail
c7a2515
@sosnovsky
#1254 add encryptMsgWithPwd
ebe6569
@sosnovsky
#1254 update password message structure
0aa5e0e
@sosnovsky
Merge branch 'master' into feature/issue-1254-message-password
1d61dab
@sosnovsky
Merge branch 'master' into feature/issue-1254-message-password
59fb87b
@sosnovsky
update msg password encryption
bc22167
@sosnovsky
Merge branch 'master' into feature/issue-1254-message-password
b844813 
# Conflicts:
#	FlowCrypt/Core/CoreHost.swift
#	FlowCrypt/Resources/flowcrypt-ios-prod.js.txt
@sosnovsky
Merge branch 'master' into feature/issue-1254-message-password
3d2db3c
@sosnovsky
encrypt attachments for password message
4c8ef09
@sosnovsky
fix attachments password encryption
baa9dd0
@sosnovsky
refactor password encryption
273964e
@sosnovsky
fix message password
7f24320
@sosnovsky
add core test for password encryption
d868980
@sosnovsky
add message upload progress
4f0e493
@sosnovsky
improve password message progress calculation
a2faf06
@sosnovsky
code cleaning
ed388d0
tomholub
tomholub requested changes Jan 13, 2022
View reviewed changes
Copy link
Collaborator

@tomholub tomholub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks excellent, see comment below.

FlowCrypt/Core/Core.swift Outdated Show resolved Hide resolved
FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageService.swift Outdated Show resolved Hide resolved
@tomholub
Copy link
Collaborator

The code structure is exactly what I'm familiar with 👍 so reviewing this was a breeze.

@sosnovsky
Copy link
Collaborator Author

The code structure is exactly what I'm familiar with 👍 so reviewing this was a breeze.

Yeah, having already implemented code structure in flowcrypt-browser repo was very useful for understanding how password-protected messages should work 👍

@sosnovsky sosnovsky marked this pull request as ready for review January 14, 2022 13:31
@sosnovsky sosnovsky requested a review from tomholub January 14, 2022 13:32
@sosnovsky
Copy link
Collaborator Author

@tomholub I currently have only 2 assigned tasks left - #1120 and #1233, can you please assign next ones?
(probably #1306 and #1253, which are remaining parts for password-protected messages functionality)

tomholub
tomholub reviewed Jan 14, 2022
View reviewed changes
Copy link
Collaborator

@tomholub tomholub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my comment, else it's looking good.

FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageService.swift Outdated Show resolved Hide resolved
@sosnovsky sosnovsky requested a review from tomholub January 14, 2022 21:03
tomholub
tomholub approved these changes Jan 14, 2022
View reviewed changes
Copy link
Collaborator

@tomholub tomholub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@tomholub tomholub merged commit 0400fa0 into master Jan 14, 2022
@tomholub tomholub deleted the feature/issue-1254-message-password branch January 14, 2022 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomholub tomholub tomholub approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

send password-protected message through FES and update email format
2 participants
@sosnovsky @tomholub