Cryptohome: Notify about error in async calls if cryptohome is not ready yet.

chromeos/dbus/cryptohome_client.cc

 // Copyright (c) 2012 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/cryptohome_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/blocking_method_caller.h"
 #include "chromeos/dbus/cryptohome/key.pb.h"
 #include "chromeos/dbus/cryptohome/rpc.pb.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 {
 
+const int CryptohomeClient::kNotReadyAsyncId = -1;
+
 namespace {
 
 // This suffix is appended to user_id to get hash in stub implementation:
 // stub_hash = "[user_id]-hash";
 static const char kUserIdStubHashSuffix[] = "-hash";
 
 // Timeout for TPM operations. On slow machines it should be larger, than
 // default DBus timeout. TPM operations can take up to 80 seconds, so limit
 // is 2 minutes.
 const int kTpmDBusTimeoutMs = 2 * 60 * 1000;
@@ skipping 842 matching lines @@
         base::Bind(&CryptohomeClientImpl::OnAsyncCallStatusWithData,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&CryptohomeClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
  private:
   // Handles the result of AsyncXXX methods.
   void OnAsyncMethodCall(const AsyncMethodCallback& callback,
                          dbus::Response* response) {
-    if (!response)
+    if (!response) {
+      callback.Run(kNotReadyAsyncId);
       return;
+    }
     dbus::MessageReader reader(response);
     int async_id = 0;
     if (!reader.PopInt32(&async_id)) {
       LOG(ERROR) << "Invalid response: " << response->ToString();
       return;
     }
     callback.Run(async_id);
   }
 
   // Handles the result of GetSystemSalt().
@@ skipping 232 matching lines @@
   return new CryptohomeClientImpl();
 }
 
 // static
 std::string CryptohomeClient::GetStubSanitizedUsername(
     const std::string& username) {
   return username + kUserIdStubHashSuffix;
 }
 
 }  // namespace chromeos