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

Address book encryption #1383

Merged
merged 11 commits into from
Nov 17, 2024
Merged

Address book encryption #1383

merged 11 commits into from
Nov 17, 2024

Conversation

str4d
Copy link
Contributor

@str4d str4d commented Oct 22, 2024

Blocked on changes to the SDK to expose ZIP 32 Arbitrary key derivation.

Author

  • Self-review: Did you review your own code in GitHub's web interface? Code often looks different when reviewing the diff in a browser, making it easier to spot potential bugs.
  • Does the code abide by the Coding Guidelines?
  • Automated tests: Did you add appropriate automated tests for any code changes?
  • Code coverage: Did you check the code coverage report for the automated tests? While we are not looking for perfect coverage, the tool can point out potential cases that have been missed.
  • Documentation: Did you update Docs as appropiate? (E.g README.md, etc.)
  • Run the app: Did you run the app and try the changes?
  • Did you provide Screenshots of what the App looks like before and after your changes as part of the description of this PR? (only applicable to UI Changes)
  • Rebase and squash: Did you pull in the latest changes from the main branch and squash your commits before assigning a reviewer? Having your code up to date and squashed will make it easier for others to review. Use best judgement when squashing commits, as some changes (such as refactoring) might be easier to review as a separate commit.

Reviewer

  • Checklist review: Did you go through the code with the Code Review Guidelines checklist?
  • Ad hoc review: Did you perform an ad hoc review? In addition to a first pass using the code review guidelines, do a second pass using your best judgement and experience which may identify additional questions or comments. Research shows that code review is most effective when done in multiple passes, where reviewers look for different things through each pass.
  • Automated tests: Did you review the automated tests?
  • Manual tests: Did you review the manual tests?You will find manual testing guidelines under our manual testing section
  • How is Code Coverage affected by this PR? We encourage you to compare coverage before and after your changes and when possible, leave it in a better place. Learn More...
  • Documentation: Did you review Docs, README.md, LICENSE.md, and Architecture.md as appropriate?
  • Run the app: Did you run the app and try the changes? While the CI server runs the app to look for build failures or crashes, humans running the app are more likely to notice unexpected log messages, UI inconsistencies, or bad output data.

@LukasKorba LukasKorba force-pushed the address-book-encryption branch from 484d422 to 21c539f Compare October 28, 2024 11:06
daira
daira approved these changes Oct 31, 2024
View reviewed changes
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

Looks good so far.

@str4d str4d force-pushed the address-book-encryption branch 2 times, most recently from 8db66c4 to 7beff33 Compare November 2, 2024 07:19
@str4d str4d force-pushed the address-book-encryption branch from 7beff33 to 532d31a Compare November 2, 2024 08:16
@true-jared true-jared added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 12, 2024
daira
daira reviewed Nov 12, 2024
View reviewed changes
zashi-internal.entitlements Outdated Show resolved Hide resolved
daira
daira requested changes Nov 12, 2024
View reviewed changes
Copy link
Contributor

@daira daira left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Changes needed. I have marked which things are blocking.

str4d
str4d commented Nov 13, 2024
View reviewed changes
zashi-internal-Info.plist Show resolved Hide resolved
zashi-internal.entitlements Show resolved Hide resolved
zashi-internal.entitlements Show resolved Hide resolved
modules/Sources/Dependencies/AddressBookClient/AddressBookEncryption.swift Outdated Show resolved Hide resolved
@LukasKorba LukasKorba mentioned this pull request Nov 14, 2024
Open
@LukasKorba LukasKorba requested a review from daira November 14, 2024 14:06
@LukasKorba
Migration and remote storage
9326ff5 
- Migration from v1 to 2 implemented
- Remote storage activated
- Merge strategy implemented
- Zashi internal setup to use the same remote container
@LukasKorba
Encryption of the AddressBook by the agreed design
f1cb968 
- Code cleaned up and refactored to clearly divide unencrypted from encrypted
- Migration of unencrypted AB data to the encrypted implemented
- Deletion of the unencrypted file implemented
- Filename for the address book data file derive method implemented
@LukasKorba
Fix for the derive key
f09f0d9 
- The `encryption_key` info needed to be added so Android can decrypt the file
@LukasKorba
Resolution of review comments
8eefa04 
- All blocking comments from the PR have been resolved
@LukasKorba
Fixes of reported blockers
7e2309c 
- latest comments resolved
@LukasKorba
Tweak of a code comment
04d978c 
- comment description improved
- resolved file updated
@LukasKorba
Propagation of the correct version
27d48dd 
- for the future changes, version is inherited
@LukasKorba
Remote error handling and byte alignment resolved
6ae9ce1 
- All AddressBookClient operations have been updated to return a remote store result
- Undefined Behaviour resolved for byte load operation
- Typos fixed
@LukasKorba
Final cleanup and feedback resolution
7c60449 
- data -> plainData refactor
- syncContacs improved
- code cleaned up
@LukasKorba LukasKorba force-pushed the address-book-encryption branch from efe73df to 7c60449 Compare November 17, 2024 17:50
@LukasKorba
Cleanup & fixes
7bcce7e 
- The branch with AddressBook can be build and has the latest code
@LukasKorba LukasKorba self-requested a review November 17, 2024 17:59
@LukasKorba LukasKorba marked this pull request as ready for review November 17, 2024 18:00
LukasKorba
LukasKorba approved these changes Nov 17, 2024
View reviewed changes
Copy link
Collaborator

@LukasKorba LukasKorba left a comment

Choose a reason for hiding this comment

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

LGTM

@LukasKorba LukasKorba changed the base branch from main to linear-version-1-2-3-features November 17, 2024 18:06
@LukasKorba LukasKorba merged commit b3ab535 into linear-version-1-2-3-features Nov 17, 2024
@LukasKorba LukasKorba deleted the address-book-encryption branch November 17, 2024 18:06
@true-jared true-jared removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LukasKorba LukasKorba LukasKorba approved these changes

@daira daira Awaiting requested review from daira

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

Successfully merging this pull request may close these issues.
4 participants
@str4d @daira @LukasKorba @true-jared