Commit Graph

329 Commits

Author SHA1 Message Date
Dmitry Dementyev
16d9db57f5 Use Builder instead for KeyChainProtectionParams.
Use Builder to create KeyChainSnapshot it tests.
Bug: 75952916
Test: apct
Change-Id: I5ab8c864a7ccc55dafa40867ec4364a705738d86
2018-03-26 12:03:51 -07:00
Dmitry Dementyev
a5b29ffffe Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev 2018-03-26 02:18:33 +00:00
Dmitry Dementyev
0bbaf189c2 Add more NonNull annotations to RecoveryController API
Bug: 73959762
Test: none
Change-Id: I648c20a099d4ac1c002f4f467d7189a8bc019560
2018-03-23 17:36:58 -07:00
Dmitry Dementyev
9cd3e43d86 Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev 2018-03-24 00:10:30 +00:00
Dmitry Dementyev
4da14e00fc Remove unimplemented RecoverableKeystoreManager APIs.
Add some Nullable annotations.

Bug: 75952916,74859770
Test: apct
Change-Id: I25710263a1ba806d49ec11638dab00f3513631a8
2018-03-23 16:30:51 -07:00
Dmitry Dementyev
fd4ae0b2dd Add NonNull annotation to more parameters in Recovery Controller.
Use Builder instead of deprecated constructor for KeyDerivationParams.
Bug: 75952916
Test: adb shell am instrument \
-w -e package com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I223e4dc1aa92cbde60e53b364ed74a452d3f6bbd
2018-03-23 15:04:37 -07:00
TreeHugger Robot
73b7722c13 Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev 2018-03-23 20:03:45 +00:00
Dmitry Dementyev
95f2965a74 Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev 2018-03-23 17:16:17 +00:00
Dmitry Dementyev
364dbf1c9e Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev 2018-03-23 17:06:18 +00:00
Bo Zhu
9ec7026e92 Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev 2018-03-23 15:25:36 +00:00
Robert Berry
72f5755721 Do not throw KeystoreException for when a key does not exist
Bug: 75955240
Test: manual
Change-Id: Ibd2f4d7cd654752b69d2d22e803d4d1cc05c118f
2018-03-23 08:08:02 +00:00
Aseem Kumar
933dfc1cd6 Delete unimplemented APIs from RecoveryController.
Bug: 74859770
Test: make update-api builds
Change-Id: Ic547e0ee2ef13995389a71369ffa736a7d83b78a
2018-03-23 05:16:42 +00:00
Bo Zhu
40d8a45b23 Unhide the enum/function for the password hashing algorithm scrypt
Bug: 75024420
Test: none, it's just unhiding APIs
Change-Id: I9cbb327678d334079e2c660d85013f3073d4cb87
2018-03-22 20:22:44 -07:00
Dmitry Dementyev
1e6a9dcecb Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument.
Mark serverParams as nullable. Null value can be used to prevent new
snapshots creation.

Bug: 73959762
Test: Test: adb shell am instrument \
-w -e package com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I5c6ddd696b2882b3d27978b0146ff419bedaf5ee
2018-03-22 19:47:20 -07:00
Dmitry Dementyev
3b67e06de5 Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method.
Add null checks to getTrustedHardwareCertPath.
Remove unused and outdated PersistentKeyChainSnapshot class.
Use CertPath instead of public keys in  KeySyncTaskTest.

Bug: 75952916
Test: adb shell am instrument \
-w -e package com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ifabe7d5fa250069ebe0885ce52ec29b01294f63a
2018-03-22 19:43:17 -07:00
Robert Berry
c6bd185565 Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev 2018-03-22 17:23:05 +00:00
Robert Berry
3818de595b Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev 2018-03-22 17:19:33 +00:00
Robert Berry
f9332469a4 Merge "Small fix for the key grant alias used in importKey" into pi-dev 2018-03-22 13:55:31 +00:00
Robert Berry
750b71c651 Unhide RecoverySession#recoverKeyChainSnapshot() method
The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.

Bug: 74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9
2018-03-22 13:49:54 +00:00
Robert Berry
93d002ca5f Unhide RecoveryController#getRootCertificates()
This is so we can add a GTS test to affirm that GMS devices include the
Google Cloud Key Vault root certificate.

Test: runtest frameworks-core -p android.security.keystore.recovery
Bug: 74621045
Change-Id: Ib6431f5739f3dff066832e6aa300dd9da5bc0727
2018-03-22 13:49:20 +00:00
Bo Zhu
e7997a3ea7 Unhide the new RecoverySession#start with the alias for root cert
Bug: 76033708
Test: none, it's just unhiding APIs
Change-Id: Iec1e44d24bb1704da082404566233ada83b8eb81
2018-03-21 19:50:50 -07:00
Bo Zhu
c5ab69469d Small fix for the key grant alias used in importKey
Bug: 74345822
Test: atest RecoveryControllerHostTest#testImportKey_ValidKey
Change-Id: I54812b3d7465ee508fe48886f5897470fe7455a0
2018-03-21 23:46:20 +00:00
Robert Berry
889e78cb28 Merge "Add RecoverySession importKeyChainSnapshot method" into pi-dev 2018-03-21 12:25:37 +00:00
Robert Berry
4a5c87def0 Add RecoverySession importKeyChainSnapshot method
This imports the keys directly into the keystore of LockSettingsService,
allowing them to be accessed via the RecoveryController getKey method.
This is better as it does not expose raw key material to any app.

Bug: 74345822
Test: runtest frameworks-services -p \
      com.android.server.locksettings.recoverablekeystore

Change-Id: I4991b0cff1d2fa2e5bd0b53a71c096499e93e98b
2018-03-21 10:24:41 +00:00
Bo Zhu
b31ab6740d Use the new root cert file under the core/ folder
This CL also adds an alias param to the RecoverySession#start method.

Bug: 76033708
Test: runtest frameworks-services -p \
      com.android.server.locksettings.recoverablekeystore

Change-Id: I870f4f89bd6e319e1687a981aa04af0d23f3c922
2018-03-20 22:49:00 -07:00
TreeHugger Robot
62fa81f7b4 Merge "Move the trusted root CA certs for RecoverableKeyStore to our own folder" into pi-dev 2018-03-21 00:38:35 +00:00
Bo Zhu
c5c4a0e948 Move the trusted root CA certs for RecoverableKeyStore to our own folder
Bug: 74621071
Test: runtest frameworks-core -p android.security.keystore.recovery
Change-Id: I3668594b29f56832f2a1fe78b01f585c897bf952
2018-03-20 15:17:30 -07:00
TreeHugger Robot
cb686a19e6 Merge "Minor changes to the API to align the choice of password hashing algorithm" into pi-dev 2018-03-20 21:13:26 +00:00
Bo Zhu
e066a59436 Minor changes to the API to align the choice of password hashing
algorithm

The password hashing algorithm has existing implementation in AOSP.

Bug: 75024420
Test: None
Change-Id: If1b07dadf21837af1cb2835df3f12c234894f57e
2018-03-19 22:32:27 -07:00
TreeHugger Robot
f679bda843 Merge "Move trusted CA certs to core" into pi-dev 2018-03-19 21:44:23 +00:00
Robert Berry
2efe66b649 Move trusted CA certs to core
Android Security team asked us to do this.

Bug: 74621071
Test: runtest frameworks-core -p android.security.backup
Change-Id: Ieae1649b82d0143fd5d560195f74b9fc10316d02
2018-03-19 16:27:07 +00:00
TreeHugger Robot
b57365562d Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev 2018-03-19 14:27:16 +00:00
Aseem Kumar
c1742e5137 Unhide getKey() and importKey() and the whole class of RecoveryController.
Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all
public APIs of RecoveryController.

Bug: 73900159
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I1047c038603869307d7a2462a2e5635fcd1c94c2
2018-03-16 13:07:25 -07:00
Robert Berry
06764e5ad8 Delete unused RecoveryController exceptions
These were never used by GMSCore, so can safely be deleted.

Bug: 74944591
Test: it builds
Change-Id: Ib8955262223aa5d86de0b342f6e04c7461c71583
2018-03-15 14:34:16 +00:00
Bo Zhu
636108077f DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath
I forgot to serialize and deserialize it in the last CL adding it.

Bug: 74359698
Change-Id: I34f9225dc63b55223c2a7db23ee3fa6abf056a0d
Test: atest RecoveryControllerHostTest
(cherry picked from commit b4d2cc684d)
2018-03-14 22:10:24 +00:00
David Zeuthen
e3aad1c076 ConfirmationDialog: Fail if accessibility services are running.
As the confirmation dialog only has limited accessibility support it
may not be usable by users requiring accessibility services.

Therefore, if the user has enabled accessibility services, fail with
ConfirmationNotAvailableException so the application can handle this
case. Also document this behavior.

Bug: 74545109
Test: Manually tested.
Change-Id: Ibfb80d217f5cbdc9ec2f4e0432dfdd88add69703
2018-03-12 17:27:38 -04:00
Bo Zhu
7f414d94fc Check the public-key signature of the whole certificate file before
accepting the certificates

This change requires an additional param to the initRecoveryService()
API to take in the public-key signature.

Bug: 73904566
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I2aeead1fda51b6cd8df71ed3b5066342ebc8d5ea
2018-02-28 11:58:30 -08:00
TreeHugger Robot
5240541e01 Merge "Remove @removed from APIs still in use" 2018-02-28 13:43:36 +00:00
Robert Berry
5af199c56e Remove @removed from APIs still in use
I completely misunderstood this annotation.

Bug: 73962883
Test: ran unit tests
Change-Id: Id3e3863fc6fd1e0614a3c75d25cd35239667eaf0
2018-02-28 10:31:43 +00:00
TreeHugger Robot
195599663a Merge "ConfirmationDialog: Pass accessibility options and implement isSupported()." 2018-02-27 22:26:30 +00:00
TreeHugger Robot
e2a95e5c5f Merge "Add a new API to import a key provided by the caller, such that this key can also be synced to the remote service" 2018-02-27 20:30:57 +00:00
TreeHugger Robot
9ba8462a06 Merge "Mark all old RecoveryController APIs as deprecated" 2018-02-27 19:51:27 +00:00
Bo Zhu
2c8e5383c8 Add a new API to import a key provided by the caller, such that this key
can also be synced to the remote service

This API may be useful for backward-compatibility work, e.g., recovering
a key that's backed up in Android Q+ to Android P without updating the
Android P Frameworks code. This API may also be useful for other use cases.

Bug: 73785182
Change-Id: I1022dffb6a12bdf3df2022db5739169fcc9347d2
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
2018-02-27 09:18:59 -08:00
Robert Berry
19512fa32e Remove unused RecoveryClaim file
This is not part of the API so not sure why it's even in the package.

Test: manual
Change-Id: Ie970d2801d84719126e5d2e90351b14655f9e6f3
2018-02-27 11:10:38 +00:00
Robert Berry
8cb582d8bc Mark all old RecoveryController APIs as deprecated
Test: none, no functionality changed
Change-Id: I0ff1d169b1597bf6e4447f52b0685874e7ec3745
2018-02-27 11:10:22 +00:00
Robert Berry
beafcb50d4 Fix minor documentation issues in RecoveryController
Test: none, just doc updates
Change-Id: I7d2152f788a65162d72dbd9970230a9a07034014
2018-02-26 19:01:38 +00:00
David Zeuthen
bbb7f65a23 ConfirmationDialog: Pass accessibility options and implement isSupported().
Bug: 63928580
Test: Manually tested.
Change-Id: I6a06d10a4cb924c3e57c8e212ba4626cad00f4a1
2018-02-26 11:08:00 -05:00
TreeHugger Robot
a620aa1a13 Merge "Remove account param from generateKey method" 2018-02-26 15:16:18 +00:00
TreeHugger Robot
c44d5053f2 Merge "Remove account from WrappedApplicationKey" 2018-02-26 14:52:19 +00:00
Robert Berry
8230c8e0d4 Add test for KeyChainSnapshot Parcelable
Bug: 73811828
Test: runtest frameworks-core -p android.security.keystore.recovery
Change-Id: I9448ff791f4f8b82621df2d4343febdce86dbf42
2018-02-26 11:17:55 +00:00