This repository has been archived by the owner on Dec 14, 2021. It is now read-only.
Resolve local database access issues #1202
Merged
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
|
Build currently failing because new certificates need to be uploaded to buddybuild. Resolving on Monday. |
Comment on lines
+530
to
+533
| enum DatabaseError: Error { | ||
| case issueDeletingDatabase(description: String) | ||
| case issueCreatingDatabase(description: String) | ||
| } |
| } | ||
|
|
||
| private func createNewDatabase() throws { | ||
| guard let encryptionKey = loginsKey else { throw DatabaseError.issueCreatingDatabase(description: "logins database key is nil") } |
jhugman
approved these changes
Apr 6, 2020
| @@ -487,19 +491,59 @@ extension BaseDataStore { | |||
| guard let db = loginsStorage as? LoginsStorage else { | |||
| return createRandomSalt() | |||
| } | |||
|
|
|||
Shared/Store/BaseDataStore.swift
Outdated
|
|
||
| do { | ||
| try loginsStorage.ensureUnlockedWithKeyAndSalt(key: loginsKey, salt: salt) | ||
| self.storageStateSubject.onNext(.Unlocked) | ||
| } catch let error as LoginsStoreError { | ||
| pushError(error) | ||
| // If we can not access database with current salt and key, need to delete local database and migrate to replacement salt | ||
| // This only deletes the local database file, does not delete the user's sync data | ||
| _ = handleDatabaseAccessFailure(databasePath: loginsDatabasePath, encryptionKey: loginsKey) |
There was a problem hiding this comment.
If we fail in this method, what happens? e.g. if we throw an unexpected runtime exception, or if the app can't continue, perhaps we could fail more loudly (e.g. alert) than a crash?
There was a problem hiding this comment.
If this fails - maybe I could fire off a reset action from within the handleDatabaseAccessFailure function? I actually changed this so that handleDatabaseAccessFailure doesn't return, as it didn't need to since the salt gets stored locally in the keychain.
Closed
kaylagalway
changed the title
kaylagalway
changed the title
kaylagalway
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #1201
Database salt and plain text header migration failed for certain users with the update of 1.7.2, which left their app in an unusable state as the database was not accessible. This PR resolves those issues and resets the local database without deleting any user sync data.