Upload TPM version information in a structured format |
||||||||||||
Issue descriptionCurrently TPM version information is uploaded as a string, instead upload all the separate components in a structured format. Original bug @ crbug.com/738462
,
Sep 15 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/6864558683235c2f4b42d0111e596b5d6f1716ce commit 6864558683235c2f4b42d0111e596b5d6f1716ce Author: Ivan Sandrk <isandrk@google.com> Date: Fri Sep 15 13:02:08 2017 Roll src/third_party/cros_system_api/ f76589aaa..a2438c285 (5 commits) https://chromium.googlesource.com/chromiumos/platform/system_api.git/+log/f76589aaa750..a2438c2854c2 $ git log f76589aaa..a2438c285 --date=short --no-merges --format='%ad %ae %s' 2017-09-13 xiaochu add component updater dbus interface 2017-09-14 isandrk system_api: Add kCryptohomeTpmGetVersionStructured. 2017-09-13 akahuang hammerd: Add DBus signal for hammerd pair challenge. 2017-09-11 benchan shill: remove kGetVPNServiceFunction and kGetWifiServiceFunction constant 2017-08-02 akahuang hammerd: Add D-Bus service constants for hammerd. Created with: roll-dep src/third_party/cros_system_api Bug: chromium:764451 Change-Id: I9d0b2023ea1e9b07641f4191929c598b4d66ec0a Reviewed-on: https://chromium-review.googlesource.com/668400 Commit-Queue: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Roman Sorokin <rsorokin@chromium.org> Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Cr-Commit-Position: refs/heads/master@{#502236} [modify] https://crrev.com/6864558683235c2f4b42d0111e596b5d6f1716ce/DEPS
,
Sep 19 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/90cf3fa2ddc4c58814a44b5bf0e7765d325d600c commit 90cf3fa2ddc4c58814a44b5bf0e7765d325d600c Author: Ivan Sandrk <isandrk@google.com> Date: Tue Sep 19 14:11:07 2017 cryptohome: Add a DBus call to send TPM version information in a structured format BUG= chromium:764451 TEST=Manual end to end test on a real device using code sitting on the Chrome side, and checking the output there. Change-Id: Iac9f6b692dfeb80f3e1e4ab1274c714f08026bc0 Reviewed-on: https://chromium-review.googlesource.com/663541 Commit-Ready: Ivan Šandrk <isandrk@chromium.org> Tested-by: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org> [modify] https://crrev.com/90cf3fa2ddc4c58814a44b5bf0e7765d325d600c/cryptohome/service.h [modify] https://crrev.com/90cf3fa2ddc4c58814a44b5bf0e7765d325d600c/cryptohome/cryptohome.xml [modify] https://crrev.com/90cf3fa2ddc4c58814a44b5bf0e7765d325d600c/cryptohome/interface.cc [modify] https://crrev.com/90cf3fa2ddc4c58814a44b5bf0e7765d325d600c/cryptohome/interface.h [modify] https://crrev.com/90cf3fa2ddc4c58814a44b5bf0e7765d325d600c/cryptohome/service.cc
,
Sep 19 2017
,
Sep 19 2017
Currently there's one version of this feature in M61, a second one in M62, and a third revision is on its way to M63. We should really avoid this situation and backmerge the third version to M62 to avoid having three different versions floating around and thereby also reducing the workload on the server side teams.
,
Sep 19 2017
This bug requires manual review: DEPS changes referenced in bugdroid comments. Please contact the milestone owner if you have questions. Owners: amineer@(Android), cmasso@(iOS), bhthompson@(ChromeOS), abdulsyed@(Desktop) For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
,
Sep 19 2017
,
Sep 19 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/3c080cbeb3c4dca66c47670224db12fd3608ef09 commit 3c080cbeb3c4dca66c47670224db12fd3608ef09 Author: Ivan Sandrk <isandrk@google.com> Date: Tue Sep 19 16:28:14 2017 Send TPM version information in a structured format CrOS CL @ crrev.com/c/663541 Bug: chromium:764451 Change-Id: I8982adeaf8ac1b89fe6c339513b1cf22efaed303 Reviewed-on: https://chromium-review.googlesource.com/663548 Commit-Queue: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org> Reviewed-by: Bartosz Fabianowski <bartfab@chromium.org> Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> Cr-Commit-Position: refs/heads/master@{#502862} [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chrome/browser/chromeos/policy/device_status_collector.cc [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chrome/browser/chromeos/policy/device_status_collector.h [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chromeos/dbus/cryptohome_client.cc [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chromeos/dbus/cryptohome_client.h [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chromeos/dbus/fake_cryptohome_client.cc [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chromeos/dbus/fake_cryptohome_client.h [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chromeos/system/version_loader.cc [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/chromeos/system/version_loader.h [modify] https://crrev.com/3c080cbeb3c4dca66c47670224db12fd3608ef09/components/policy/proto/device_management_backend.proto
,
Sep 20 2017
The DEPS roll makes this complex, so by default such changes don't get merged back. How safe are the other changes in the DEPS roll to merge back? Can we do this without a DEPS roll?
,
Sep 21 2017
> Can we do this without a DEPS roll? Yes!
,
Sep 21 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/5a3b93e3a2a344922faa85ed7574115fdb4a5932 commit 5a3b93e3a2a344922faa85ed7574115fdb4a5932 Author: Ivan Sandrk <isandrk@google.com> Date: Thu Sep 21 12:42:00 2017 cryptohome: Allow call to TpmGetVersionStructured through Cryptohome interface An xml allow entry was missing for TpmGetVersionStructured therefore Chrome couldn't call the function. BUG= chromium:764451 TEST=manual Change-Id: I6c26f70ea064354579d746570163fbe80aba9d78 Reviewed-on: https://chromium-review.googlesource.com/674929 Commit-Ready: Ivan Šandrk <isandrk@chromium.org> Tested-by: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org> [modify] https://crrev.com/5a3b93e3a2a344922faa85ed7574115fdb4a5932/cryptohome/etc/Cryptohome.conf
,
Sep 25 2017
,
Sep 25 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/ee51e08d2932163df38a317e4eae5b44e32bafb9 commit ee51e08d2932163df38a317e4eae5b44e32bafb9 Author: Ivan Sandrk <isandrk@google.com> Date: Mon Sep 25 21:23:14 2017 cryptohome: Allow call to TpmGetVersionStructured through Cryptohome interface An xml allow entry was missing for TpmGetVersionStructured therefore Chrome couldn't call the function. BUG= chromium:764451 TEST=manual Change-Id: I6c26f70ea064354579d746570163fbe80aba9d78 Reviewed-on: https://chromium-review.googlesource.com/674929 Commit-Ready: Ivan Šandrk <isandrk@chromium.org> Tested-by: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org> (cherry picked from commit 5a3b93e3a2a344922faa85ed7574115fdb4a5932) Reviewed-on: https://chromium-review.googlesource.com/682855 Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Commit-Queue: Ivan Šandrk <isandrk@chromium.org> Trybot-Ready: Ivan Šandrk <isandrk@chromium.org> [modify] https://crrev.com/ee51e08d2932163df38a317e4eae5b44e32bafb9/cryptohome/etc/Cryptohome.conf
,
Sep 25 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/platform2/+/0cebd2e9b6f634f6e6483aa4b678dcf59387731d commit 0cebd2e9b6f634f6e6483aa4b678dcf59387731d Author: Ivan Sandrk <isandrk@google.com> Date: Mon Sep 25 21:23:17 2017 cryptohome: Add a DBus call to send TPM version information in a structured format BUG= chromium:764451 TEST=Manual end to end test on a real device using code sitting on the Chrome side, and checking the output there. Change-Id: Iac9f6b692dfeb80f3e1e4ab1274c714f08026bc0 Reviewed-on: https://chromium-review.googlesource.com/663541 Commit-Ready: Ivan Šandrk <isandrk@chromium.org> Tested-by: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Andrey Pronin <apronin@chromium.org> (cherry picked from commit 90cf3fa2ddc4c58814a44b5bf0e7765d325d600c) Reviewed-on: https://chromium-review.googlesource.com/682854 Commit-Queue: Ivan Šandrk <isandrk@chromium.org> Trybot-Ready: Ivan Šandrk <isandrk@chromium.org> [modify] https://crrev.com/0cebd2e9b6f634f6e6483aa4b678dcf59387731d/cryptohome/service.h [modify] https://crrev.com/0cebd2e9b6f634f6e6483aa4b678dcf59387731d/cryptohome/cryptohome.xml [modify] https://crrev.com/0cebd2e9b6f634f6e6483aa4b678dcf59387731d/cryptohome/interface.cc [modify] https://crrev.com/0cebd2e9b6f634f6e6483aa4b678dcf59387731d/cryptohome/interface.h [modify] https://crrev.com/0cebd2e9b6f634f6e6483aa4b678dcf59387731d/cryptohome/service.cc
,
Sep 25 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/67d32e5175cc89848cc707b6d8e0632a41315489 commit 67d32e5175cc89848cc707b6d8e0632a41315489 Author: Ivan Sandrk <isandrk@google.com> Date: Mon Sep 25 21:42:34 2017 [Merge to M62] Send TPM version information in a structured format CrOS CL @ crrev.com/c/663541 TBR=achuith@chromium.org,hashimoto@chromium.org,bartfab@chromium.org (cherry picked from commit 3c080cbeb3c4dca66c47670224db12fd3608ef09) Bug: chromium:764451 Change-Id: I8982adeaf8ac1b89fe6c339513b1cf22efaed303 Reviewed-on: https://chromium-review.googlesource.com/663548 Commit-Queue: Ivan Šandrk <isandrk@chromium.org> Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org> Reviewed-by: Bartosz Fabianowski <bartfab@chromium.org> Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#502862} Reviewed-on: https://chromium-review.googlesource.com/683114 Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Cr-Commit-Position: refs/branch-heads/3202@{#438} Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098} [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chrome/browser/chromeos/policy/device_status_collector.cc [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chrome/browser/chromeos/policy/device_status_collector.h [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chromeos/dbus/cryptohome_client.cc [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chromeos/dbus/cryptohome_client.h [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chromeos/dbus/fake_cryptohome_client.cc [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chromeos/dbus/fake_cryptohome_client.h [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chromeos/system/version_loader.cc [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/chromeos/system/version_loader.h [modify] https://crrev.com/67d32e5175cc89848cc707b6d8e0632a41315489/components/policy/proto/device_management_backend.proto
,
Sep 27 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/654e2afd77e377c5803c41e9e511fa34c48a948f commit 654e2afd77e377c5803c41e9e511fa34c48a948f Author: Ivan Šandrk <isandrk@chromium.org> Date: Wed Sep 27 07:28:53 2017 Revert "[Merge to M62] Send TPM version information in a structured format" This reverts commit 67d32e5175cc89848cc707b6d8e0632a41315489. Reason for revert: Breaking M62 build, no DBusMethodCallback in M62. Original change's description: > [Merge to M62] Send TPM version information in a structured format > > CrOS CL @ crrev.com/c/663541 > > TBR=achuith@chromium.org,hashimoto@chromium.org,bartfab@chromium.org > > (cherry picked from commit 3c080cbeb3c4dca66c47670224db12fd3608ef09) > > Bug: chromium:764451 > Change-Id: I8982adeaf8ac1b89fe6c339513b1cf22efaed303 > Reviewed-on: https://chromium-review.googlesource.com/663548 > Commit-Queue: Ivan Šandrk <isandrk@chromium.org> > Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org> > Reviewed-by: Bartosz Fabianowski <bartfab@chromium.org> > Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> > Cr-Original-Commit-Position: refs/heads/master@{#502862} > Reviewed-on: https://chromium-review.googlesource.com/683114 > Reviewed-by: Ivan Šandrk <isandrk@chromium.org> > Cr-Commit-Position: refs/branch-heads/3202@{#438} > Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098} TBR=isandrk@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:764451 Change-Id: I41530a5341ccf49d41238d6a6032efeeffe32991 Reviewed-on: https://chromium-review.googlesource.com/686234 Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Cr-Commit-Position: refs/branch-heads/3202@{#465} Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098} [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chrome/browser/chromeos/policy/device_status_collector.cc [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chrome/browser/chromeos/policy/device_status_collector.h [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chromeos/dbus/cryptohome_client.cc [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chromeos/dbus/cryptohome_client.h [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chromeos/dbus/fake_cryptohome_client.cc [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chromeos/dbus/fake_cryptohome_client.h [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chromeos/system/version_loader.cc [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/chromeos/system/version_loader.h [modify] https://crrev.com/654e2afd77e377c5803c41e9e511fa34c48a948f/components/policy/proto/device_management_backend.proto
,
Sep 27 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec commit fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec Author: Ivan Sandrk <isandrk@google.com> Date: Wed Sep 27 11:05:21 2017 Reland "[Merge to M62] Send TPM version information in a structured format" TBR=isandrk@chromium.org This is a reland of 67d32e5175cc89848cc707b6d8e0632a41315489 Original change's description: > [Merge to M62] Send TPM version information in a structured format > > CrOS CL @ crrev.com/c/663541 > > TBR=achuith@chromium.org,hashimoto@chromium.org,bartfab@chromium.org > > (cherry picked from commit 3c080cbeb3c4dca66c47670224db12fd3608ef09) > > Bug: chromium:764451 > Change-Id: I8982adeaf8ac1b89fe6c339513b1cf22efaed303 > Reviewed-on: https://chromium-review.googlesource.com/663548 > Commit-Queue: Ivan Šandrk <isandrk@chromium.org> > Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org> > Reviewed-by: Bartosz Fabianowski <bartfab@chromium.org> > Reviewed-by: Achuith Bhandarkar <achuith@chromium.org> > Cr-Original-Commit-Position: refs/heads/master@{#502862} > Reviewed-on: https://chromium-review.googlesource.com/683114 > Reviewed-by: Ivan Šandrk <isandrk@chromium.org> > Cr-Commit-Position: refs/branch-heads/3202@{#438} > Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098} Bug: chromium:764451 Change-Id: I0108b3a1cbf01f63d8cf1dfd68fe0f8122f09213 Reviewed-on: https://chromium-review.googlesource.com/686374 Reviewed-by: Ivan Šandrk <isandrk@chromium.org> Cr-Commit-Position: refs/branch-heads/3202@{#466} Cr-Branched-From: fa6a5d87adff761bc16afc5498c3f5944c1daa68-refs/heads/master@{#499098} [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chrome/browser/chromeos/policy/device_status_collector.cc [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chrome/browser/chromeos/policy/device_status_collector.h [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chromeos/dbus/cryptohome_client.cc [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chromeos/dbus/cryptohome_client.h [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chromeos/dbus/fake_cryptohome_client.cc [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chromeos/dbus/fake_cryptohome_client.h [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chromeos/system/version_loader.cc [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/chromeos/system/version_loader.h [modify] https://crrev.com/fb1aa51802a8ad9ae35c54c4abf2c73aad9296ec/components/policy/proto/device_management_backend.proto
,
Oct 16 2017
,
Nov 11 2017
isandrk@ >TEST=Manual end to end test on a real device using code sitting on >the Chrome side, and checking the output there. Could you provide us the code/methods for verifying this bug? Thanks!
,
Nov 11 2017
Uh, I had some testing/prototype code while I was developing this feature. But currently it can be tested using the admin console / cpanel. Using an enrolled device, go to its Device management > Chrome devices > device_id page, open section "Hardware and OS", and the field "TPM Firmware Version" should match one of the fields that you get on the device by running "tpm-manager get_version_info". I've got a question tho - maybe I'm not using this "TEST=" line correctly, what is its exact purpose and how should it be used? I used it to signal to the reviewer how I tested the code, but now thinking about it, its maybe used to communicate to the testers on how to test the code. Thanks!
,
Nov 28 2017
I tried in M63.0.3239.68 10032.58.0 beta paine. After powerwashed and TPM update, the version shown by "tpm-manager get_version_info" on device did not match that on the Cpanel. Before: Device: firmware version: 0000000000000420 Cpanel: TPM Firmware Version 420 After: Device: firmware version: 0000000000000422 Cpanel: TPM Firmware Version 420 The version value did not change after I shut down and restarted the device and refreshed the device's Hardware and OS information on Cpanel.
,
Nov 29 2017
The only thing that crosses my mind is that it maybe takes some more time for the change to propagate to Cpanel. Do you still see this on the same device after another day?
,
Nov 30 2017
isandrk@ The TPM version was not updated on Cpanel after executing clear_tpm_owner_request=1, deprovisioned, enrolled and waiting for a day with M63.0.3239.68 10032.58.0 beta paine. Then, I deprovisioned it, updated to M63.0.3239.70 10032.59.0 beta paine via recovery image and enrolled. After that, I checked again but the version is still not updated on Cpanel.
,
Nov 30 2017
I apologize for my mistake and carelessness. I did not realize my OU's device reporting policy was disabled. After enabling it and rebooting the device, Cpanel reflected the TPM firmware version correctly tallied to the device. Thus, the status is verified.
,
Dec 1 2017
Hah no problem, glad everything works :-)
,
Dec 1 2017
As an aside, seem like we should not display stale data if reporting is disabled - we should display nothing or "reporting disabled".
,
Apr 26 2018
isandrk@: Just stumbled upon these TODOs on the old API removal. Is there any plan to complete that piece? I think this deprecated method is already unused. // TODO(isandrk): Deprecated, remove on (or before) 2017/09/21 - after the // Chromium side has been changed to use the new TpmGetVersionStructured. const char kCryptohomeTpmGetVersion[] = "TpmGetVersion"; http://cs/chromeos_public/src/platform/system_api/dbus/cryptohome/dbus-constants.h?l=104&rcl=43880122c4f3dfce062613e5b1d2865647c03a5a
,
Apr 27 2018
Yes this code is deprecated, and can probably be removed by now. Here's the tracking crbug I put for myself to track this crbug.com/765597 |
||||||||||||
►
Sign in to add a comment |
||||||||||||
Comment 1 by bugdroid1@chromium.org
, Sep 15 2017