commit 18313830ff5a974152fe9c0259be1abcac0fedb1
author Janis Danisevskis <jdanis@google.com> Mon May 17 13:30:32 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Mon May 17 13:51:06 2021 -0700
tree e07d42526027b8a3dce175a75ae2e74bf1ee6eaf
parent 2cb4f090ae08e0dc4e4ee13df10418c7466c9246

Keystore 2.0: Restrict list to KeyType::Client.

Running keystore_cli_v2 as root included user0 super keys in the list of
keys. This revealed that the database list keys query was not
restrictive enough.

Bug: 188451778
Test: keystore_cli_v2 list as root should not include any super keys.
Merged-In: I803b7c19f3cdb8a29fbc114e74da1b0dc2473c81
Change-Id: I803b7c19f3cdb8a29fbc114e74da1b0dc2473c81

keystore2/src/service.rs

diff --git a/keystore2/src/service.rs b/keystore2/src/service.rs
index 3ce0550..1f61729 100644
--- a/keystore2/src/service.rs
+++ b/keystore2/src/service.rs
@@ -291,7 +291,7 @@
             &mut DB
                 .with(|db| {
                     let mut db = db.borrow_mut();
-                    db.list(k.domain, k.nspace)
+                    db.list(k.domain, k.nspace, KeyType::Client)
                 })
                 .context("In list_entries: Trying to list keystore database.")?,
         );