haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ios: be resilient to invalid UUIDs

This commit is contained in:
Saúl Ibarra Corretgé 2019-05-29 15:42:09 +02:00 committed by Saúl Ibarra Corretgé
parent 477826089c
commit 431a221c63
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ios/sdk/src/callkit/CallKit.m
View File

@ -74,6 +74,12 @@ RCT_EXPORT_METHOD(endCall:(NSString *)callUUID
#endif #endif
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID]; NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
if (!callUUID_) {
reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
return;
}
CXEndCallAction *action CXEndCallAction *action
= [[CXEndCallAction alloc] initWithCallUUID:callUUID_]; = [[CXEndCallAction alloc] initWithCallUUID:callUUID_];
[self requestTransaction:[[CXTransaction alloc] initWithAction:action] [self requestTransaction:[[CXTransaction alloc] initWithAction:action]
@ -91,6 +97,12 @@ RCT_EXPORT_METHOD(setMuted:(NSString *)callUUID
#endif #endif
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID]; NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
if (!callUUID_) {
reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
return;
}
CXSetMutedCallAction *action CXSetMutedCallAction *action
= [[CXSetMutedCallAction alloc] initWithCallUUID:callUUID_ muted:muted]; = [[CXSetMutedCallAction alloc] initWithCallUUID:callUUID_ muted:muted];
[self requestTransaction:[[CXTransaction alloc] initWithAction:action] [self requestTransaction:[[CXTransaction alloc] initWithAction:action]
@ -123,6 +135,13 @@ RCT_EXPORT_METHOD(startCall:(NSString *)callUUID
NSLog(@"[RNCallKit][startCall] callUUID = %@", callUUID); NSLog(@"[RNCallKit][startCall] callUUID = %@", callUUID);
#endif #endif
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
if (!callUUID_) {
reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
return;
}
// Don't start a new call if there's an active call for the specified // Don't start a new call if there's an active call for the specified
// callUUID. JitsiMeetView was configured for an incoming call. // callUUID. JitsiMeetView was configured for an incoming call.
if ([JMCallKitProxy hasActiveCallForUUID:callUUID]) { if ([JMCallKitProxy hasActiveCallForUUID:callUUID]) {
@ -132,7 +151,6 @@ RCT_EXPORT_METHOD(startCall:(NSString *)callUUID
CXHandle *handle_ CXHandle *handle_
= [[CXHandle alloc] initWithType:CXHandleTypeGeneric value:handle]; = [[CXHandle alloc] initWithType:CXHandleTypeGeneric value:handle];
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
CXStartCallAction *action CXStartCallAction *action
= [[CXStartCallAction alloc] initWithCallUUID:callUUID_ = [[CXStartCallAction alloc] initWithCallUUID:callUUID_
handle:handle_]; handle:handle_];
@ -146,6 +164,12 @@ RCT_EXPORT_METHOD(reportCallFailed:(NSString *)callUUID
resolve:(RCTPromiseResolveBlock)resolve resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject) { reject:(RCTPromiseRejectBlock)reject) {
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID]; NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
if (!callUUID_) {
reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
return;
}
[JMCallKitProxy reportCallWith:callUUID_ [JMCallKitProxy reportCallWith:callUUID_
endedAt:nil endedAt:nil
reason:CXCallEndedReasonFailed]; reason:CXCallEndedReasonFailed];
@ -157,6 +181,12 @@ RCT_EXPORT_METHOD(reportConnectedOutgoingCall:(NSString *)callUUID
resolve:(RCTPromiseResolveBlock)resolve resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject) { reject:(RCTPromiseRejectBlock)reject) {
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID]; NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
if (!callUUID_) {
reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
return;
}
[JMCallKitProxy reportOutgoingCallWith:callUUID_ [JMCallKitProxy reportOutgoingCallWith:callUUID_
connectedAt:nil]; connectedAt:nil];
resolve(nil); resolve(nil);
@ -175,6 +205,12 @@ RCT_EXPORT_METHOD(updateCall:(NSString *)callUUID
#endif #endif
NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID]; NSUUID *callUUID_ = [[NSUUID alloc] initWithUUIDString:callUUID];
if (!callUUID_) {
reject(nil, [NSString stringWithFormat:@"Invalid UUID: %@", callUUID], nil);
return;
}
NSString *displayName = options[@"displayName"]; NSString *displayName = options[@"displayName"];
BOOL hasVideo = [(NSNumber*)options[@"hasVideo"] boolValue]; BOOL hasVideo = [(NSNumber*)options[@"hasVideo"] boolValue];