Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make setupPayloadWithOnboardingPayload return error on invalid input. #23357

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Make setupPayloadWithOnboardingPayload return error on invalid input. #23357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion src/darwin/Framework/CHIP/MTRSetupPayload.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,36 @@ + (NSNumber *)generateRandomSetupPasscode
return @(chip::kSetupPINCodeUndefinedValue);
}

+ (bool)isQRCode:(NSString *)onboardingPayload
{
return [onboardingPayload hasPrefix:@"MT:"];
}

+ (MTRSetupPayload * _Nullable)setupPayloadWithOnboardingPayload:(NSString *)onboardingPayload
error:(NSError * __autoreleasing *)error
{
// TODO: Do we actually need the MTROnboardingPayloadParser abstraction?
return [MTROnboardingPayloadParser setupPayloadForOnboardingPayload:onboardingPayload error:error];
MTRSetupPayload * payload = [MTROnboardingPayloadParser setupPayloadForOnboardingPayload:onboardingPayload error:error];
if (payload == nil) {
return nil;
}

bool isQRCode = [MTRSetupPayload isQRCode:onboardingPayload];
bool validPayload;
if (isQRCode) {
validPayload = payload->_chipSetupPayload.isValidQRCodePayload();
} else {
validPayload = payload->_chipSetupPayload.isValidManualCode();
}

if (!validPayload) {
if (error) {
*error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_ARGUMENT];
}
return nil;
}

return payload;
}

#pragma mark - NSSecureCoding
Expand Down