BleConnectionManager: Check when receiving BLE advertisements if a SecureChannel already exists. No…

chromeos/components/tether/ble_connection_manager.cc

 // 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/components/tether/ble_connection_manager.h"
 
 #include "chromeos/components/tether/ble_constants.h"
 #include "components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "device/bluetooth/bluetooth_uuid.h"
@@ skipping 83 matching lines @@
   connection_attempt_timeout_timer_->Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(timeout_millis),
       base::Bind(&ConnectionMetadata::OnConnectionAttemptTimeout,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BleConnectionManager::ConnectionMetadata::OnConnectionAttemptTimeout() {
   manager_->OnConnectionAttemptTimeout(remote_device_);
 }
 
+bool BleConnectionManager::ConnectionMetadata::HasSecureChannel() {
+  return secure_channel_ != nullptr;
+}
+
 void BleConnectionManager::ConnectionMetadata::SetSecureChannel(
     std::unique_ptr<cryptauth::SecureChannel> secure_channel) {
   DCHECK(!secure_channel_);
 
   // The connection has succeeded, so cancel the timeout.
   connection_attempt_timeout_timer_->Stop();
 
   secure_channel_ = std::move(secure_channel);
   secure_channel_->AddObserver(this);
   secure_channel_->Initialize();
@@ skipping 197 matching lines @@
       GetConnectionMetadata(remote_device);
   if (!connection_metadata) {
     // If an advertisement  is received from a device that is not registered,
     // ignore it.
     PA_LOG(WARNING) << "Received an advertisement from a device which is not "
                     << "registered. Bluetooth address: " << device_address
                     << ", Remote Device ID: " << remote_device.GetDeviceId();
     return;
   }
 
+  if (connection_metadata->HasSecureChannel()) {
+    PA_LOG(WARNING) << "Received another advertisement from a registered "
+                    << "device which is already being actively communicated "
+                    << "with. Bluetooth address: " << device_address
+                    << ", Remote Device ID: " << remote_device.GetDeviceId();

[Kyle Horimoto, 2017/04/06 21:17:30]

Truncate the device ID.

[Ryan Hansberry, 2017/04/06 22:14:59]

Done for here and the log above as well.

+    return;
+  }
+
   PA_LOG(INFO) << "Received advertisement from device with ID "
                << remote_device.GetTruncatedDeviceIdForLogs() << ". "
                << "Starting authentication handshake to that device.";
 
   // Create a connection to that device.
   std::unique_ptr<cryptauth::Connection> connection =
       cryptauth::weave::BluetoothLowEnergyWeaveClientConnection::Factory::
           NewInstance(remote_device, device_address, adapter_,
                       device::BluetoothUUID(std::string(kGattServerUuid)),
                       bluetooth_throttler_);
@@ skipping 158 matching lines @@
                << cryptauth::SecureChannel::StatusToString(new_status);
   for (auto& observer : observer_list_) {
     observer.OnSecureChannelStatusChanged(remote_device, old_status,
                                           new_status);
   }
 }
 
 }  // namespace tether
 
 }  // namespace chromeos