cros: DBUS client to interact with fingerprint DBUS API.

chromeos/dbus/biod_biometrics_manager_client.cc

Index: chromeos/dbus/biod_biometrics_manager_client.cc
diff --git a/chromeos/dbus/biod_biometrics_manager_client.cc b/chromeos/dbus/biod_biometrics_manager_client.cc
new file mode 100644
index 0000000000000000000000000000000000000000..770e8bf7d81f5316558d9e404af00d2672f87709
--- /dev/null
+++ b/chromeos/dbus/biod_biometrics_manager_client.cc
@@ -0,0 +1,278 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chromeos/dbus/biod_biometrics_manager_client.h"
+
+#include <stdint.h>
+
+#include "base/bind.h"
+#include "base/macros.h"
+#include "dbus/bus.h"
+#include "dbus/message.h"
+#include "dbus/object_path.h"
+#include "dbus/object_proxy.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
+namespace chromeos {
+
+// The BiodBiometricsManagerClient implementation used in production.
+class BiodBiometricsManagerClientImpl : public BiodBiometricsManagerClient {
+ public:
+  BiodBiometricsManagerClientImpl()
+      : biometrics_manager_proxy_(NULL), weak_ptr_factory_(this) {}

[stevenjb, 2017/03/21 18:46:16]

s/NULL/nullptr throughout

[sammiequon, 2017/03/21 20:50:18]

Done.

+
+  ~BiodBiometricsManagerClientImpl() override {}
+
+  // BiodBiometricsManagerClient overrides:
+  void AddObserver(Observer* observer) override {
+    observers_.AddObserver(observer);
+  }
+
+  void RemoveObserver(Observer* observer) override {
+    observers_.RemoveObserver(observer);
+  }
+
+  bool HasObserver(const Observer* observer) const override {
+    return observers_.HasObserver(observer);
+  }
+
+  void StartEnrollSession(const std::string& user_id,
+                          const std::string& label,
+                          const ObjectPathCallback& callback) override {
+    dbus::MethodCall method_call(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerStartEnrollSessionMethod);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(user_id);
+    writer.AppendString(label);
+
+    biometrics_manager_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&BiodBiometricsManagerClientImpl::OnStartEnrollSession,
+                   weak_ptr_factory_.GetWeakPtr(), callback));
+  }
+
+  void GetRecordsForUser(const std::string& user_id,
+                         const ObjectPathArrayCallback& callback) override {
+    dbus::MethodCall method_call(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerGetRecordsForUserMethod);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(user_id);
+
+    biometrics_manager_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&BiodBiometricsManagerClientImpl::OnGetRecordsForUser,
+                   weak_ptr_factory_.GetWeakPtr(), callback));
+  }
+
+  void DestroyAllRecords() override {
+    dbus::MethodCall method_call(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerDestroyAllRecordsMethod);
+
+    biometrics_manager_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        dbus::ObjectProxy::EmptyResponseCallback());
+  }
+
+  void StartAuthSession(const ObjectPathCallback& callback) override {
+    dbus::MethodCall method_call(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerStartAuthSessionMethod);
+
+    biometrics_manager_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&BiodBiometricsManagerClientImpl::OnStartAuthSession,
+                   weak_ptr_factory_.GetWeakPtr(), callback));
+  }
+
+  void GetType(const BiometricTypeCallback& callback) override {
+    dbus::MethodCall method_call(dbus::kDBusPropertiesInterface,
+                                 dbus::kDBusPropertiesGet);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(biod::kBiometricsManagerInterface);
+    writer.AppendString(biod::kBiometricsManagerBiometricTypeProperty);
+
+    biometrics_manager_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&BiodBiometricsManagerClientImpl::OnGetType,
+                   weak_ptr_factory_.GetWeakPtr(), callback));
+  }
+
+  biod::BiometricType GetTypeBlocking() override {
+    dbus::MethodCall method_call(dbus::kDBusPropertiesInterface,
+                                 dbus::kDBusPropertiesGet);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(biod::kBiometricsManagerInterface);
+    writer.AppendString(biod::kBiometricsManagerBiometricTypeProperty);
+
+    std::unique_ptr<dbus::Response> response =
+        biometrics_manager_proxy_->CallMethodAndBlock(
+            &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
+
+    dbus::MessageReader reader(response.get());
+    uint32_t result;
+    if (reader.PopVariantOfUint32(&result))
+      return static_cast<biod::BiometricType>(result);
+
+    return biod::BiometricType::BIOMETRIC_FINGERPRINT;
+  }
+
+ protected:
+  void Init(dbus::Bus* bus) override {
+    biometrics_manager_proxy_ = bus->GetObjectProxy(
+        biod::kBiodServiceName, dbus::ObjectPath(biod::kBiodServicePath));
+
+    // Monitor the NameOwnerChanged signal.
+    biometrics_manager_proxy_->SetNameOwnerChangedCallback(
+        base::Bind(&BiodBiometricsManagerClientImpl::NameOwnerChangedReceived,
+                   weak_ptr_factory_.GetWeakPtr()));
+
+    // Monitor the D-Bus signal for enroll scans.
+    biometrics_manager_proxy_->ConnectToSignal(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerEnrollScanDoneSignal,
+        base::Bind(&BiodBiometricsManagerClientImpl::EnrollScanDoneReceived,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BiodBiometricsManagerClientImpl::SignalConnected,
+                   weak_ptr_factory_.GetWeakPtr()));
+
+    // Monitor the D-Bus signal for auth scans.
+    biometrics_manager_proxy_->ConnectToSignal(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerAuthScanDoneSignal,
+        base::Bind(&BiodBiometricsManagerClientImpl::AuthScanDoneReceived,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BiodBiometricsManagerClientImpl::SignalConnected,
+                   weak_ptr_factory_.GetWeakPtr()));
+
+    // Monitor the D-Bus signal for scan failures.
+    biometrics_manager_proxy_->ConnectToSignal(
+        biod::kBiometricsManagerInterface,
+        biod::kBiometricsManagerScanFailedSignal,
+        base::Bind(&BiodBiometricsManagerClientImpl::ScanFailedReceived,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BiodBiometricsManagerClientImpl::SignalConnected,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
+
+ private:
+  void OnStartEnrollSession(const ObjectPathCallback& callback,
+                            dbus::Response* response) {
+    dbus::MessageReader reader(response);
+    dbus::ObjectPath result;
+    if (reader.PopObjectPath(&result))
+      callback.Run(result);
+  }
+
+  void OnGetRecordsForUser(const ObjectPathArrayCallback& callback,
+                           dbus::Response* response) {
+    dbus::MessageReader reader(response);
+    std::vector<dbus::ObjectPath> result;
+    if (reader.PopArrayOfObjectPaths(&result))
+      callback.Run(result);
+  }
+
+  void OnStartAuthSession(const ObjectPathCallback& callback,
+                          dbus::Response* response) {
+    dbus::MessageReader reader(response);
+    dbus::ObjectPath result;
+    if (reader.PopObjectPath(&result))
+      callback.Run(result);
+  }
+
+  void OnGetType(const BiometricTypeCallback& callback,
+                 dbus::Response* response) {
+    dbus::MessageReader reader(response);
+    uint32_t result;
+    if (reader.PopVariantOfUint32(&result))
+      callback.Run(static_cast<biod::BiometricType>(result));
+  }
+
+  // Called when the biometrics signal is initially connected.
+  void SignalConnected(const std::string& interface_name,

[stevenjb, 2017/03/21 18:46:16]

nit: OnSignalConnected

[sammiequon, 2017/03/21 20:50:18]

Done.

+                       const std::string& signal_name,
+                       bool success) {
+    LOG_IF(ERROR, !success)
+        << "Failed to connect to biometrics signal:" << signal_name;
+  }
+
+  void NameOwnerChangedReceived(const std::string& old_owner,
+                                const std::string& new_owner) {
+    for (auto& observer : observers_)
+      observer.ClientRestarted();
+  }
+
+  void EnrollScanDoneReceived(dbus::Signal* signal) {
+    dbus::MessageReader reader(signal);
+    uint32_t scan_result;
+    bool is_complete;
+    if (!reader.PopUint32(&scan_result) || !reader.PopBool(&is_complete)) {
+      LOG(ERROR) << "Error reading signal from biometrics:"
+                 << signal->ToString();
+      return;
+    }
+
+    for (auto& observer : observers_)
+      observer.EnrollScanDoneReceived(scan_result, is_complete);
+  }
+
+  void AuthScanDoneReceived(dbus::Signal* signal) {
+    dbus::MessageReader signal_reader(signal);
+    dbus::MessageReader array_reader(NULL);
+    uint32_t scan_result;
+    AuthScanMatches matches;
+    if (!signal_reader.PopUint32(&scan_result) ||
+        !signal_reader.PopArray(&array_reader)) {
+      LOG(ERROR) << "Error reading signal from biometrics:"
+                 << signal->ToString();
+      return;
+    }
+
+    while (array_reader.HasMoreData()) {
+      dbus::MessageReader entry_reader(NULL);
+      std::string user_id;
+      std::vector<std::string> labels;
+      if (!array_reader.PopDictEntry(&entry_reader) ||
+          !entry_reader.PopString(&user_id) ||
+          !entry_reader.PopArrayOfStrings(&labels)) {
+        LOG(ERROR) << "Error reading signal from biometrics:"
+                   << signal->ToString();
+        return;
+      }
+
+      matches[user_id] = labels;

[stevenjb, 2017/03/21 18:46:16]

I think you can use std::move(labels) here to avoid a copy.

[sammiequon, 2017/03/21 20:50:18]

Done.

+    }
+
+    for (auto& observer : observers_)
+      observer.AuthScanDoneReceived(scan_result, matches);
+  }
+
+  void ScanFailedReceived(dbus::Signal* signal) {
+    for (auto& observer : observers_)
+      observer.ScanFailedReceived();
+  }
+
+  dbus::ObjectProxy* biometrics_manager_proxy_;
+  base::ObserverList<Observer> observers_;
+
+  // Note: This should remain the last member so it'll be destroyed and
+  // invalidate its weak pointers before any other members are destroyed.
+  base::WeakPtrFactory<BiodBiometricsManagerClientImpl> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(BiodBiometricsManagerClientImpl);
+};
+
+BiodBiometricsManagerClient::BiodBiometricsManagerClient() {}
+
+BiodBiometricsManagerClient::~BiodBiometricsManagerClient() {}
+
+// static
+BiodBiometricsManagerClient* BiodBiometricsManagerClient::Create(
+    DBusClientImplementationType /* type */) {
+  return new BiodBiometricsManagerClientImpl();
+}
+
+}  // namespace chromeos