-
Notifications
You must be signed in to change notification settings - Fork 3
chore: log cause of keychain load failures #898
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1f0eed2
chore: surface cause of keychain load failures in logs
jvsena42 89aea3a
chore: changelog entry
jvsena42 7b87d7b
refactor: simplify collection call chain
jvsena42 32a9101
fix: distinguish probe failure from false in keychain diagnostic
jvsena42 dedea29
Merge branch 'master' into chore/keychain-error-logs
jvsena42 0a113fc
Update CHANGELOG.md
jvsena42 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,4 +87,6 @@ class AndroidKeyStore( | |
| } | ||
| generateKey() | ||
| } | ||
|
|
||
| fun containsAlias(): Boolean = keyStore.containsAlias(alias) | ||
| } | ||
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
96 changes: 96 additions & 0 deletions
96
app/src/test/java/to/bitkit/data/keychain/KeychainErrorTest.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package to.bitkit.data.keychain | ||
|
|
||
| import org.junit.Test | ||
| import java.io.IOException | ||
| import javax.crypto.AEADBadTagException | ||
| import javax.crypto.BadPaddingException | ||
| import kotlin.test.assertEquals | ||
| import kotlin.test.assertFalse | ||
| import kotlin.test.assertNull | ||
| import kotlin.test.assertSame | ||
|
|
||
| class KeychainErrorTest { | ||
|
|
||
| @Test | ||
| fun `FailedToLoad without cause renders key and terminating period`() { | ||
| val error = KeychainError.FailedToLoad(key = "BIP39_MNEMONIC") | ||
|
|
||
| assertEquals("Failed to load BIP39_MNEMONIC from keychain.", error.message) | ||
| assertNull(error.cause) | ||
| } | ||
|
|
||
| @Test | ||
| fun `FailedToLoad preserves cause and embeds its simple class name`() { | ||
| val cause = AEADBadTagException("leak-probe-9f3a") | ||
| val error = KeychainError.FailedToLoad(key = "BIP39_MNEMONIC", cause = cause) | ||
|
|
||
| assertSame(cause, error.cause) | ||
| assertEquals( | ||
| "Failed to load BIP39_MNEMONIC from keychain (cause='AEADBadTagException')", | ||
| error.message, | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `FailedToLoad does not leak underlying cause message`() { | ||
| val probe = "leak-probe-9f3a" | ||
| val causes = listOf( | ||
| AEADBadTagException(probe), | ||
| BadPaddingException(probe), | ||
| ClassCastException(probe), | ||
| IllegalArgumentException(probe), | ||
| IOException(probe), | ||
| ) | ||
|
|
||
| causes.forEach { cause -> | ||
| val error = KeychainError.FailedToLoad(key = "BIP39_MNEMONIC", cause = cause) | ||
| assertFalse( | ||
| actual = error.message.orEmpty().contains(probe), | ||
| message = "message leaked cause.message for ${cause.javaClass.simpleName}", | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `FailedToLoad exposes the failing key`() { | ||
| val error = KeychainError.FailedToLoad(key = "BIP39_PASSPHRASE", cause = IOException()) | ||
|
|
||
| assertEquals("BIP39_PASSPHRASE", error.key) | ||
| } | ||
|
|
||
| @Test | ||
| fun `FailedToSave preserves cause and renders simple class name`() { | ||
| val cause = IOException("probe") | ||
| val error = KeychainError.FailedToSave(key = "BIP39_MNEMONIC", cause = cause) | ||
|
|
||
| assertSame(cause, error.cause) | ||
| assertEquals( | ||
| "Failed to save to BIP39_MNEMONIC keychain (cause='IOException')", | ||
| error.message, | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `FailedToDelete preserves cause and renders simple class name`() { | ||
| val cause = IOException("probe") | ||
| val error = KeychainError.FailedToDelete(key = "BIP39_MNEMONIC", cause = cause) | ||
|
|
||
| assertSame(cause, error.cause) | ||
| assertEquals( | ||
| "Failed to delete BIP39_MNEMONIC from keychain (cause='IOException')", | ||
| error.message, | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `FailedToSaveAlreadyExists has no cause and static message`() { | ||
| val error = KeychainError.FailedToSaveAlreadyExists(key = "BIP39_MNEMONIC") | ||
|
|
||
| assertNull(error.cause) | ||
| assertEquals( | ||
| "Key BIP39_MNEMONIC already exists in keychain. " + | ||
| "Explicitly delete key before attempting to update value.", | ||
| error.message, | ||
| ) | ||
| } | ||
| } |
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.
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.
Uh oh!
There was an error while loading. Please reload this page.