Refactor FXIOS-10788 [Logins] Apply necessary adjustments for A-S EncryptorDecryptor update #24108
+348
−445
Conversation
This file contains 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
issammani
added
the
Do Not Merge ⛔️
|
Adding |
issammani
changed the title
nbhasin2
reviewed
Jan 13, 2025
Comment on lines
831
to
833
| let key = rustKeys.keychain.string(forKey: rustKeys.loginPerFieldKeychainKey) | ||
| let encryptedCanaryPhrase = rustKeys.keychain.string(forKey: rustKeys.canaryPhraseKey) | ||
| return (key, encryptedCanaryPhrase) |
There was a problem hiding this comment.
no need for background call here?
There was a problem hiding this comment.
I had some code before that called getKeychainData in the background and removed it 😓 Looking at it now, I think it makes sense to keep it in the background still, since I am not sure how compute intensive it is. Good catch !
nbhasin2
reviewed
Jan 13, 2025
Comment on lines
837
to
838
| let rustKeys = RustLoginEncryptionKeys() | ||
| let (key, encryptedCanaryPhrase) = getKeychainData(rustKeys: rustKeys) |
There was a problem hiding this comment.
Suggested change
| let rustKeys = RustLoginEncryptionKeys() | |
| let (key, encryptedCanaryPhrase) = getKeychainData(rustKeys: rustKeys) | |
| let rustKeys = RustLoginEncryptionKeys() | |
| let (key, encryptedCanaryPhrase) = getKeychainData(rustKeys: rustKeys) |
strange indent
nbhasin2
reviewed
Jan 13, 2025
| // This method will be called internally by rust when it needs to encrypt/decrypt logins. | ||
| // NOTE: Since this is called internally by rust and each CRUD operation will acquire a mutex lock on the db | ||
| // before doing anything we must make sure that getStoredKey is called before doing any CRUD operation in swift. | ||
| public func getKey() throws -> Data { |
There was a problem hiding this comment.
Note: should put an example somewhere or show how this works for reference
5 tasks
|
This pull request has conflicts when rebasing. Could you fix it @issammani? 🙏 |
issammani
force-pushed
the
feat/update-enc-dec
branch
from
9238a45 to
8ee6f31
Compare
issammani
had a problem deploying
to
github-pages
GitHub Actions
Failure
issammani
force-pushed
the
feat/update-enc-dec
branch
from
3a6e775 to
8ee6f31
Compare
|
This pull request has conflicts when rebasing. Could you fix it @issammani? 🙏 |
issammani
force-pushed
the
feat/update-enc-dec
branch
from
8ee6f31 to
33af679
Compare
|
@issammani #24265 is the Application Services bump that contains mozilla/application-services#6469 |
issammani
force-pushed
the
feat/update-enc-dec
branch
2 times, most recently
from
eb022e8 to
e7f06db
Compare
issammani
force-pushed
the
feat/update-enc-dec
branch
3 times, most recently
from
30eac48 to
8536b0c
Compare
issammani
force-pushed
the
feat/update-enc-dec
branch
4 times, most recently
from
dc81b9f to
0ce0fca
Compare
issammani
force-pushed
the
feat/update-enc-dec
branch
from
0ce0fca to
94f9815
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
📜 Tickets
Jira ticket
Github issue
💡 Description
This PR:
Loginstruct instead ofEncryptedLogin.LoginEntryFlattenedsinceLoginEntryis flat in the new implementation.getKeyto implementKeyManagerinterface.I ran tests locally and the only failure is not related:
Also tested locally adding/deleting/updating and everything seems to work correctly.
We can only merge this once this PR merges and a new A-S swift component is created. We will need to update the A-S version in this PR as well for BR to pass.
This PR is big enough. I will address other nice-to-haves in follow-ups:
is_emptyforHasSyncedLoginswhich doesn't require decryption.has_logins_by_base_domainfor domain search related operations.Deferred<Maybe<...>>()since it's hard to read and instead use completions.📝 Checklist
You have to check all boxes before merging
@Mergifyio backport release/v120)