Skip to content

fix(auth): Prevent crash if KeyStore not available (ex: instant app) #2993

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

Merged
merged 2 commits into from
Feb 22, 2025
Merged

fix(auth): Prevent crash if KeyStore not available (ex: instant app) #2993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ed771
Prevent crash if keystore not available (ex: instant app)
tylerjroach Feb 21, 2025
d452998
lint
tylerjroach Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/data/LegacyKeyProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@ internal object LegacyKeyProvider {
val keyStore = KeyStore.getInstance(ANDROID_KEY_STORE_NAME)
keyStore.load(null)

if (keyStore.containsAlias(keyAlias)) {
return Result.failure(
CredentialStoreError(
"Key already exists for the keyAlias: $keyAlias in $ANDROID_KEY_STORE_NAME"
try {
if (keyStore.containsAlias(keyAlias)) {
return Result.failure(
CredentialStoreError(
"Key already exists for the keyAlias: $keyAlias in $ANDROID_KEY_STORE_NAME"
)
)
)
}
} catch (exception: Exception) {
return Result.failure(CredentialStoreError("Failed to connect to KeyStore"))
}

val parameterSpec =
Expand All @@ -60,9 +64,13 @@ internal object LegacyKeyProvider {
val keyStore = KeyStore.getInstance(ANDROID_KEY_STORE_NAME)
keyStore.load(null)

if (!keyStore.containsAlias(keyAlias)) {
val message = "Key does not exists for the keyAlias: $keyAlias in $ANDROID_KEY_STORE_NAME"
return Result.failure(CredentialStoreError(message))
try {
if (!keyStore.containsAlias(keyAlias)) {
val message = "Key does not exists for the keyAlias: $keyAlias in $ANDROID_KEY_STORE_NAME"
return Result.failure(CredentialStoreError(message))
}
} catch (exception: Exception) {
return Result.failure(CredentialStoreError("Failed to connect to KeyStore"))
}

val key: Key? = keyStore.getKey(keyAlias, null)
Expand All @@ -79,6 +87,10 @@ internal object LegacyKeyProvider {
val keyStore = KeyStore.getInstance(ANDROID_KEY_STORE_NAME)
keyStore.load(null)

keyStore.deleteEntry(keyAlias)
try {
keyStore.deleteEntry(keyAlias)
} catch (exception: Exception) {
// KeyStore unreachable
}
}
}