commit 4cab1725704950b51965675d77e9e3854b234601
author Yi Chou <yich@google.com> Thu Dec 24 18:51:39 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Sun Dec 27 00:10:52 2020 +0000
tree c597abc47d98887f1179dba641fb49f9d6161b5d
parent 295be4e59b3fb26e20539c6605373091984d3285

cryptohome: add install_attributes_get_status in dev tool

This would be the bridge for
org.chromium.UserDataAuthInterface.InstallAttributesGetStatus

BUG=b:175510138
TEST=cryptohome --action=install_attributes_get_status

Change-Id: Icef02fe7f4ad903efcf46a9b37589c638e47fbcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2603198
Tested-by: Yi Chou <yich@google.com>
Reviewed-by: John L Chen <zuan@chromium.org>
Reviewed-by: Leo Lai <cylai@google.com>
Commit-Queue: Yi Chou <yich@google.com>

cryptohome/cryptohome.cc

diff --git a/cryptohome/cryptohome.cc b/cryptohome/cryptohome.cc
index c754397..0242eb5 100644
--- a/cryptohome/cryptohome.cc
+++ b/cryptohome/cryptohome.cc
@@ -44,6 +44,7 @@
 #include "cryptohome/rpc.pb.h"
 #include "cryptohome/signed_secret.pb.h"
 #include "cryptohome/storage/homedirs.h"
+#include "cryptohome/UserDataAuth.pb.h"
 #include "cryptohome/vault_keyset.pb.h"
 
 #include "bindings/cryptohome.dbusclient.h"
@@ -116,6 +117,7 @@
                                  "install_attributes_get",
                                  "install_attributes_finalize",
                                  "install_attributes_count",
+                                 "install_attributes_get_status",
                                  "install_attributes_is_ready",
                                  "install_attributes_is_secure",
                                  "install_attributes_is_invalid",
@@ -198,6 +200,7 @@
   ACTION_INSTALL_ATTRIBUTES_GET,
   ACTION_INSTALL_ATTRIBUTES_FINALIZE,
   ACTION_INSTALL_ATTRIBUTES_COUNT,
+  ACTION_INSTALL_ATTRIBUTES_GET_STATUS,
   ACTION_INSTALL_ATTRIBUTES_IS_READY,
   ACTION_INSTALL_ATTRIBUTES_IS_SECURE,
   ACTION_INSTALL_ATTRIBUTES_IS_INVALID,
@@ -1793,6 +1796,55 @@
     }
     printf("InstallAttributesCount(): %d\n", result);
   } else if (!strcmp(switches::kActions
+                         [switches::ACTION_INSTALL_ATTRIBUTES_GET_STATUS],
+                     action.c_str())) {
+    user_data_auth::InstallAttributesState result =
+        user_data_auth::InstallAttributesState::UNKNOWN;
+    do {
+      brillo::glib::ScopedError error;
+      gboolean is_invalid;
+      if (!org_chromium_CryptohomeInterface_install_attributes_is_invalid(
+              proxy.gproxy(), &is_invalid,
+              &brillo::Resetter(&error).lvalue())) {
+        printf("InstallAttributesIsInvalid() call failed: %s.\n",
+               error->message);
+        return 1;
+      }
+
+      if (is_invalid) {
+        result = user_data_auth::InstallAttributesState::INVALID;
+        break;
+      }
+
+      gboolean is_first_install;
+      if (!org_chromium_CryptohomeInterface_install_attributes_is_first_install(
+              proxy.gproxy(), &is_first_install,
+              &brillo::Resetter(&error).lvalue())) {
+        printf("InstallAttributesIsFirstInstall() call failed: %s.\n",
+               error->message);
+        return 1;
+      }
+
+      if (is_first_install) {
+        result = user_data_auth::InstallAttributesState::FIRST_INSTALL;
+        break;
+      }
+
+      gboolean is_ready;
+      if (!org_chromium_CryptohomeInterface_install_attributes_is_ready(
+              proxy.gproxy(), &is_ready, &brillo::Resetter(&error).lvalue())) {
+        printf("InstallAttributesIsReady() call failed: %s.\n", error->message);
+        return 1;
+      }
+
+      if (is_ready) {
+        result = user_data_auth::InstallAttributesState::VALID;
+      } else {
+        result = user_data_auth::InstallAttributesState::TPM_NOT_OWNED;
+      }
+    } while (false);
+    printf("%s\n", InstallAttributesState_Name(result).c_str());
+  } else if (!strcmp(switches::kActions
                          [switches::ACTION_INSTALL_ATTRIBUTES_IS_READY],
                      action.c_str())) {
     brillo::glib::ScopedError error;