From 7cd7de14edb4ead8a636733595e0dbfbaef7a633 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Thu, 7 Jul 2022 18:27:30 +0200 Subject: [PATCH] [Darwin] Make sure to access the cpp controller from the right dispatch queue from MTRDeviceController --- .../Framework/CHIP/MTRDeviceController.mm | 309 +++++++++--------- 1 file changed, 149 insertions(+), 160 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm index 987166a6fc4abf..da9b475a2a491e 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm @@ -59,6 +59,7 @@ static NSString * const kErrorPairDevice = @"Failure while pairing the device"; static NSString * const kErrorUnpairDevice = @"Failure while unpairing the device"; static NSString * const kErrorStopPairing = @"Failure while trying to stop the pairing process"; +static NSString * const kErrorOpenPairingWindow = @"Open Pairing Window failed"; static NSString * const kErrorGetPairedDevice = @"Failure while trying to retrieve a paired device"; static NSString * const kErrorNotRunning = @"Controller is not running. Call startup first."; static NSString * const kInfoStackShutdown = @"Shutting down the Matter Stack"; @@ -328,27 +329,23 @@ - (BOOL)pairDevice:(uint64_t)deviceID setupPINCode:(uint32_t)setupPINCode error:(NSError * __autoreleasing *)error { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; + VerifyOrReturnValue([self checkIsRunning:error], NO); + __block BOOL success = NO; - if (![self isRunning]) { - success = ![self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return success; - } dispatch_sync(_chipWorkQueue, ^{ + VerifyOrReturn([self checkIsRunning:error]); + std::string manualPairingCode; chip::SetupPayload payload; payload.discriminator = discriminator; payload.setUpPINCode = setupPINCode; - errorCode = chip::ManualSetupPayloadGenerator(payload).payloadDecimalStringRepresentation(manualPairingCode); + auto errorCode = chip::ManualSetupPayloadGenerator(payload).payloadDecimalStringRepresentation(manualPairingCode); success = ![self checkForError:errorCode logMsg:kErrorSetupCodeGen error:error]; - if (!success) { - return; - } - if ([self isRunning]) { - _operationalCredentialsDelegate->SetDeviceID(deviceID); - errorCode = self.cppCommissioner->EstablishPASEConnection(deviceID, manualPairingCode.c_str()); - } + VerifyOrReturn(success); + + _operationalCredentialsDelegate->SetDeviceID(deviceID); + errorCode = self.cppCommissioner->EstablishPASEConnection(deviceID, manualPairingCode.c_str()); success = ![self checkForError:errorCode logMsg:kErrorPairDevice error:error]; }); @@ -361,22 +358,20 @@ - (BOOL)pairDevice:(uint64_t)deviceID setupPINCode:(uint32_t)setupPINCode error:(NSError * __autoreleasing *)error { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; + VerifyOrReturnValue([self checkIsRunning:error], NO); + __block BOOL success = NO; - if (![self isRunning]) { - success = ![self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return success; - } dispatch_sync(_chipWorkQueue, ^{ + VerifyOrReturn([self checkIsRunning:error]); + chip::Inet::IPAddress addr; chip::Inet::IPAddress::FromString([address UTF8String], addr); chip::Transport::PeerAddress peerAddress = chip::Transport::PeerAddress::UDP(addr, port); - chip::RendezvousParameters params = chip::RendezvousParameters().SetSetupPINCode(setupPINCode).SetPeerAddress(peerAddress); - if ([self isRunning]) { - _operationalCredentialsDelegate->SetDeviceID(deviceID); - errorCode = self.cppCommissioner->EstablishPASEConnection(deviceID, params); - } + _operationalCredentialsDelegate->SetDeviceID(deviceID); + + auto params = chip::RendezvousParameters().SetSetupPINCode(setupPINCode).SetPeerAddress(peerAddress); + auto errorCode = self.cppCommissioner->EstablishPASEConnection(deviceID, params); success = ![self checkForError:errorCode logMsg:kErrorPairDevice error:error]; }); @@ -385,17 +380,14 @@ - (BOOL)pairDevice:(uint64_t)deviceID - (BOOL)pairDevice:(uint64_t)deviceID onboardingPayload:(NSString *)onboardingPayload error:(NSError * __autoreleasing *)error { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; + VerifyOrReturnValue([self checkIsRunning:error], NO); + __block BOOL success = NO; - if (![self isRunning]) { - success = ![self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return success; - } dispatch_sync(_chipWorkQueue, ^{ - if ([self isRunning]) { - _operationalCredentialsDelegate->SetDeviceID(deviceID); - errorCode = self.cppCommissioner->EstablishPASEConnection(deviceID, [onboardingPayload UTF8String]); - } + VerifyOrReturn([self checkIsRunning:error]); + + _operationalCredentialsDelegate->SetDeviceID(deviceID); + auto errorCode = self.cppCommissioner->EstablishPASEConnection(deviceID, [onboardingPayload UTF8String]); success = ![self checkForError:errorCode logMsg:kErrorPairDevice error:error]; }); return success; @@ -405,50 +397,46 @@ - (BOOL)commissionDevice:(uint64_t)deviceId commissioningParams:(MTRCommissioningParameters *)commissioningParams error:(NSError * __autoreleasing *)error { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; + VerifyOrReturnValue([self checkIsRunning:error], NO); + __block BOOL success = NO; - if (![self isRunning]) { - success = ![self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return success; - } dispatch_sync(_chipWorkQueue, ^{ - if ([self isRunning]) { - chip::Controller::CommissioningParameters params; - if (commissioningParams.CSRNonce) { - params.SetCSRNonce( - chip::ByteSpan((uint8_t *) commissioningParams.CSRNonce.bytes, commissioningParams.CSRNonce.length)); - } - if (commissioningParams.attestationNonce) { - params.SetAttestationNonce(chip::ByteSpan( - (uint8_t *) commissioningParams.attestationNonce.bytes, commissioningParams.attestationNonce.length)); - } - if (commissioningParams.threadOperationalDataset) { - params.SetThreadOperationalDataset(chip::ByteSpan((uint8_t *) commissioningParams.threadOperationalDataset.bytes, - commissioningParams.threadOperationalDataset.length)); - } - if (commissioningParams.wifiSSID && commissioningParams.wifiCredentials) { - chip::ByteSpan ssid((uint8_t *) commissioningParams.wifiSSID.bytes, commissioningParams.wifiSSID.length); - chip::ByteSpan credentials( - (uint8_t *) commissioningParams.wifiCredentials.bytes, commissioningParams.wifiCredentials.length); - chip::Controller::WiFiCredentials wifiCreds(ssid, credentials); - params.SetWiFiCredentials(wifiCreds); - } - if (commissioningParams.deviceAttestationDelegate) { - [self clearDeviceAttestationDelegateBridge]; + VerifyOrReturn([self checkIsRunning:error]); - chip::Optional timeoutSecs; - if (commissioningParams.failSafeExpiryTimeoutSecs) { - timeoutSecs = chip::MakeOptional( - static_cast([commissioningParams.failSafeExpiryTimeoutSecs unsignedIntValue])); - } - _deviceAttestationDelegateBridge = new MTRDeviceAttestationDelegateBridge( - self, commissioningParams.deviceAttestationDelegate, _chipWorkQueue, timeoutSecs); - params.SetDeviceAttestationDelegate(_deviceAttestationDelegateBridge); - } + chip::Controller::CommissioningParameters params; + if (commissioningParams.CSRNonce) { + params.SetCSRNonce(chip::ByteSpan((uint8_t *) commissioningParams.CSRNonce.bytes, commissioningParams.CSRNonce.length)); + } + if (commissioningParams.attestationNonce) { + params.SetAttestationNonce(chip::ByteSpan( + (uint8_t *) commissioningParams.attestationNonce.bytes, commissioningParams.attestationNonce.length)); + } + if (commissioningParams.threadOperationalDataset) { + params.SetThreadOperationalDataset(chip::ByteSpan((uint8_t *) commissioningParams.threadOperationalDataset.bytes, + commissioningParams.threadOperationalDataset.length)); + } + if (commissioningParams.wifiSSID && commissioningParams.wifiCredentials) { + chip::ByteSpan ssid((uint8_t *) commissioningParams.wifiSSID.bytes, commissioningParams.wifiSSID.length); + chip::ByteSpan credentials( + (uint8_t *) commissioningParams.wifiCredentials.bytes, commissioningParams.wifiCredentials.length); + chip::Controller::WiFiCredentials wifiCreds(ssid, credentials); + params.SetWiFiCredentials(wifiCreds); + } + if (commissioningParams.deviceAttestationDelegate) { + [self clearDeviceAttestationDelegateBridge]; - _operationalCredentialsDelegate->SetDeviceID(deviceId); - errorCode = self.cppCommissioner->Commission(deviceId, params); + chip::Optional timeoutSecs; + if (commissioningParams.failSafeExpiryTimeoutSecs) { + timeoutSecs + = chip::MakeOptional(static_cast([commissioningParams.failSafeExpiryTimeoutSecs unsignedIntValue])); + } + _deviceAttestationDelegateBridge = new MTRDeviceAttestationDelegateBridge( + self, commissioningParams.deviceAttestationDelegate, _chipWorkQueue, timeoutSecs); + params.SetDeviceAttestationDelegate(_deviceAttestationDelegateBridge); } + + _operationalCredentialsDelegate->SetDeviceID(deviceId); + auto errorCode = self.cppCommissioner->Commission(deviceId, params); success = ![self checkForError:errorCode logMsg:kErrorPairDevice error:error]; }); return success; @@ -458,22 +446,19 @@ - (BOOL)continueCommissioningDevice:(void *)device ignoreAttestationFailure:(BOOL)ignoreAttestationFailure error:(NSError * __autoreleasing *)error { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; + VerifyOrReturnValue([self checkIsRunning:error], NO); + __block BOOL success = NO; - if (![self isRunning]) { - success = ![self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return success; - } dispatch_sync(_chipWorkQueue, ^{ - if ([self isRunning]) { - auto lastAttestationResult = _deviceAttestationDelegateBridge - ? _deviceAttestationDelegateBridge->attestationVerificationResult() - : chip::Credentials::AttestationVerificationResult::kSuccess; + VerifyOrReturn([self checkIsRunning:error]); - chip::DeviceProxy * deviceProxy = static_cast(device); - errorCode = self.cppCommissioner->ContinueCommissioningAfterDeviceAttestationFailure(deviceProxy, - ignoreAttestationFailure ? chip::Credentials::AttestationVerificationResult::kSuccess : lastAttestationResult); - } + auto lastAttestationResult = _deviceAttestationDelegateBridge + ? _deviceAttestationDelegateBridge->attestationVerificationResult() + : chip::Credentials::AttestationVerificationResult::kSuccess; + + auto deviceProxy = static_cast(device); + auto errorCode = self.cppCommissioner->ContinueCommissioningAfterDeviceAttestationFailure(deviceProxy, + ignoreAttestationFailure ? chip::Credentials::AttestationVerificationResult::kSuccess : lastAttestationResult); success = ![self checkForError:errorCode logMsg:kErrorPairDevice error:error]; }); return success; @@ -481,17 +466,14 @@ - (BOOL)continueCommissioningDevice:(void *)device - (BOOL)stopDevicePairing:(uint64_t)deviceID error:(NSError * __autoreleasing *)error { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; + VerifyOrReturnValue([self checkIsRunning:error], NO); + __block BOOL success = NO; - if (![self isRunning]) { - success = ![self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return success; - } dispatch_sync(_chipWorkQueue, ^{ - if ([self isRunning]) { - _operationalCredentialsDelegate->ResetDeviceID(); - errorCode = self.cppCommissioner->StopPairing(deviceID); - } + VerifyOrReturn([self checkIsRunning:error]); + + _operationalCredentialsDelegate->ResetDeviceID(); + auto errorCode = self.cppCommissioner->StopPairing(deviceID); success = ![self checkForError:errorCode logMsg:kErrorStopPairing error:error]; }); @@ -500,20 +482,19 @@ - (BOOL)stopDevicePairing:(uint64_t)deviceID error:(NSError * __autoreleasing *) - (MTRBaseDevice *)getDeviceBeingCommissioned:(uint64_t)deviceId error:(NSError * __autoreleasing *)error { - CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; - if (![self isRunning]) { - [self checkForError:errorCode logMsg:kErrorNotRunning error:error]; - return nil; - } + VerifyOrReturnValue([self checkIsRunning:error], nil); + + __block chip::CommissioneeDeviceProxy * deviceProxy; + + __block BOOL success = NO; + dispatch_sync(_chipWorkQueue, ^{ + VerifyOrReturn([self checkIsRunning:error]); + + auto errorCode = self->_cppCommissioner->GetDeviceBeingCommissioned(deviceId, &deviceProxy); + success = ![self checkForError:errorCode logMsg:kErrorStopPairing error:error]; + }); + VerifyOrReturnValue(success, nil); - chip::CommissioneeDeviceProxy * deviceProxy; - errorCode = self->_cppCommissioner->GetDeviceBeingCommissioned(deviceId, &deviceProxy); - if (errorCode != CHIP_NO_ERROR) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:errorCode]; - } - return nil; - } return [[MTRBaseDevice alloc] initWithDevice:deviceProxy]; } @@ -521,10 +502,8 @@ - (BOOL)getBaseDevice:(uint64_t)deviceID queue:(dispatch_queue_t)queue completionHandler:(MTRDeviceConnectionCallback)completionHandler { - __block CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; - if (![self isRunning]) { - NSError * error; - [self checkForError:errorCode logMsg:kErrorNotRunning error:&error]; + NSError * error; + if (![self checkIsRunning:&error]) { dispatch_async(queue, ^{ completionHandler(nil, error); }); @@ -532,13 +511,11 @@ - (BOOL)getBaseDevice:(uint64_t)deviceID } dispatch_async(_chipWorkQueue, ^{ - if ([self isRunning]) { - MTRDeviceConnectionBridge * connectionBridge = new MTRDeviceConnectionBridge(completionHandler, queue); - errorCode = connectionBridge->connect(self->_cppCommissioner, deviceID); - } + VerifyOrReturn([self checkIsRunning]); - NSError * error; - if ([self checkForError:errorCode logMsg:kErrorGetPairedDevice error:&error]) { + auto connectionBridge = new MTRDeviceConnectionBridge(completionHandler, queue); + auto errorCode = connectionBridge->connect(self->_cppCommissioner, deviceID); + if ([self checkForError:errorCode logMsg:kErrorGetPairedDevice error:nil]) { // Errors are propagated to the caller through completionHandler. // No extra error handling is needed here. return; @@ -550,7 +527,7 @@ - (BOOL)getBaseDevice:(uint64_t)deviceID - (BOOL)openPairingWindow:(uint64_t)deviceID duration:(NSUInteger)duration error:(NSError * __autoreleasing *)error { - CHIP_ERROR err = CHIP_NO_ERROR; + VerifyOrReturnValue([self checkIsRunning:error], NO); if (duration > UINT16_MAX) { MTR_LOG_ERROR("Error: Duration %tu is too large. Max value %d", duration, UINT16_MAX); @@ -560,18 +537,16 @@ - (BOOL)openPairingWindow:(uint64_t)deviceID duration:(NSUInteger)duration error return NO; } - err = chip::Controller::AutoCommissioningWindowOpener::OpenBasicCommissioningWindow( - self.cppCommissioner, deviceID, chip::System::Clock::Seconds16(static_cast(duration))); + __block BOOL success = NO; + dispatch_sync(_chipWorkQueue, ^{ + VerifyOrReturn([self checkIsRunning:error]); - if (err != CHIP_NO_ERROR) { - MTR_LOG_ERROR("Error(%s): Open Pairing Window failed", chip::ErrorStr(err)); - if (error) { - *error = [MTRError errorForCHIPErrorCode:err]; - } - return NO; - } + auto errorCode = chip::Controller::AutoCommissioningWindowOpener::OpenBasicCommissioningWindow( + self.cppCommissioner, deviceID, chip::System::Clock::Seconds16(static_cast(duration))); + success = ![self checkForError:errorCode logMsg:kErrorOpenPairingWindow error:error]; + }); - return YES; + return success; } - (NSString *)openPairingWindowWithPIN:(uint64_t)deviceID @@ -580,14 +555,16 @@ - (NSString *)openPairingWindowWithPIN:(uint64_t)deviceID setupPIN:(NSUInteger)setupPIN error:(NSError * __autoreleasing *)error { - CHIP_ERROR err = CHIP_NO_ERROR; + __block NSString * rv = nil; + + VerifyOrReturnValue([self checkIsRunning:error], rv); if (duration > UINT16_MAX) { MTR_LOG_ERROR("Error: Duration %tu is too large. Max value %d", duration, UINT16_MAX); if (error) { *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_INTEGER_VALUE]; } - return nil; + return rv; } if (discriminator > 0xfff) { @@ -595,36 +572,35 @@ - (NSString *)openPairingWindowWithPIN:(uint64_t)deviceID if (error) { *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_INTEGER_VALUE]; } - return nil; + return rv; } setupPIN &= ((1 << chip::kSetupPINCodeFieldLengthInBits) - 1); - chip::SetupPayload setupPayload; - err = chip::Controller::AutoCommissioningWindowOpener::OpenCommissioningWindow(self.cppCommissioner, deviceID, - chip::System::Clock::Seconds16(static_cast(duration)), chip::Crypto::kSpake2p_Min_PBKDF_Iterations, - static_cast(discriminator), chip::MakeOptional(static_cast(setupPIN)), chip::NullOptional, - setupPayload); + dispatch_sync(_chipWorkQueue, ^{ + VerifyOrReturn([self checkIsRunning:error]); + + chip::SetupPayload setupPayload; + auto errorCode = chip::Controller::AutoCommissioningWindowOpener::OpenCommissioningWindow(self.cppCommissioner, deviceID, + chip::System::Clock::Seconds16(static_cast(duration)), chip::Crypto::kSpake2p_Min_PBKDF_Iterations, + static_cast(discriminator), chip::MakeOptional(static_cast(setupPIN)), chip::NullOptional, + setupPayload); - if (err != CHIP_NO_ERROR) { - MTR_LOG_ERROR("Error(%s): Open Pairing Window failed", chip::ErrorStr(err)); - if (error) { - *error = [MTRError errorForCHIPErrorCode:err]; - } - return nil; - } + auto success = ![self checkForError:errorCode logMsg:kErrorOpenPairingWindow error:error]; + VerifyOrReturn(success); - chip::ManualSetupPayloadGenerator generator(setupPayload); - std::string outCode; + chip::ManualSetupPayloadGenerator generator(setupPayload); + std::string outCode; - if (generator.payloadDecimalStringRepresentation(outCode) == CHIP_NO_ERROR) { - MTR_LOG_ERROR("Setup code is %s", outCode.c_str()); - } else { - MTR_LOG_ERROR("Failed to get decimal setup code"); - return nil; - } + if (generator.payloadDecimalStringRepresentation(outCode) == CHIP_NO_ERROR) { + MTR_LOG_ERROR("Setup code is %s", outCode.c_str()); + rv = [NSString stringWithCString:outCode.c_str() encoding:[NSString defaultCStringEncoding]]; + } else { + MTR_LOG_ERROR("Failed to get decimal setup code"); + } + }); - return [NSString stringWithCString:outCode.c_str() encoding:[NSString defaultCStringEncoding]]; + return rv; } - (void)setPairingDelegate:(id)delegate queue:(dispatch_queue_t)queue @@ -680,20 +656,33 @@ - (BOOL)checkForError:(CHIP_ERROR)errorCode logMsg:(NSString *)logMsg error:(NSE return YES; } -- (BOOL)_deviceBeingCommissionedOverBLE:(uint64_t)deviceId +- (BOOL)checkIsRunning { - CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE; - if (![self isRunning]) { - [self checkForError:errorCode logMsg:kErrorNotRunning error:nil]; - return NO; + return [self checkIsRunning:nil]; +} + +- (BOOL)checkIsRunning:(NSError * __autoreleasing *)error +{ + if ([self isRunning]) { + return YES; } - chip::CommissioneeDeviceProxy * deviceProxy; - errorCode = self->_cppCommissioner->GetDeviceBeingCommissioned(deviceId, &deviceProxy); - if (errorCode != CHIP_NO_ERROR) { - return NO; + MTR_LOG_ERROR("Error: %s", [kErrorNotRunning UTF8String]); + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; } + return NO; +} + +- (BOOL)_deviceBeingCommissionedOverBLE:(uint64_t)deviceId +{ + VerifyOrReturnValue([self checkIsRunning], NO); + + chip::CommissioneeDeviceProxy * deviceProxy; + auto errorCode = self->_cppCommissioner->GetDeviceBeingCommissioned(deviceId, &deviceProxy); + VerifyOrReturnValue(errorCode == CHIP_NO_ERROR, NO); + return deviceProxy->GetDeviceTransportType() == chip::Transport::Type::kBle; }