[iOS] Protect for invalid JSON object on iOS13 which will crash.

qianyuan.wqy · qianyuan.wqy · commit 146169900bdc · 2019-09-23T21:08:16.000+08:00
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
@@ -1302,6 +1302,7 @@ - (void)callCreateBody:(NSString*)pageId data:(NSDictionary*)data
         _customPages[sId] = page;
     }
     
+    SetConvertCurrentPage(pageId);
     [WXCustomPageBridge parseRenderObject:data parentRef:"" index:0 genObject:^(const std::string &ref, const std::string &type, const std::string &parentRef, std::map<std::string, std::string> *styles, std::map<std::string, std::string> *attrs, std::set<std::string> *events, int index) {
         if (parentRef.empty()) {
             // is root body
@@ -1343,6 +1344,7 @@ - (void)callUpdateAttrs:(NSString*)pageId ref:(NSString*)ref data:(NSDictionary*
 {
     RenderPageCustom* page = [self getPage:pageId];
     if (page && page->IsValid()) {
+        SetConvertCurrentPage(pageId);
         page->UpdateAttr([ref UTF8String] ?: "", [WXCustomPageBridge parseMapValuePairs:data]);
     }
 }
@@ -1351,6 +1353,7 @@ - (void)callUpdateStyle:(NSString*)pageId ref:(NSString*)ref data:(NSDictionary*
 {
     RenderPageCustom* page = [self getPage:pageId];
     if (page && page->IsValid()) {
+        SetConvertCurrentPage(pageId);
         page->UpdateStyle([ref UTF8String] ?: "", [WXCustomPageBridge parseMapValuePairs:data]);
     }
 }
@@ -1406,6 +1409,7 @@ - (BOOL)forwardCallNativeModuleToCustomPage:(NSString*)pageId
         if (target && target->shouldHandleModuleMethod([moduleName UTF8String] ?: "", [methodName UTF8String] ?: "")) {
             __block const char* seralizedArguments = nullptr;
             __block const char* seralizedOptions = nullptr;
+            SetConvertCurrentPage(pageId);
             ConvertToCString(arguments, ^(const char * value) {
                 if (value != nullptr) {
                     seralizedArguments = strdup(value);
@@ -1495,6 +1499,7 @@ - (void)forwardCallComponentToCustomPage:(NSString*)pageId
         if (target) {
             __block const char* seralizedArguments = nullptr;
             __block const char* seralizedOptions = nullptr;
+            SetConvertCurrentPage(pageId);
             ConvertToCString(arguments, ^(const char * value) {
                 if (value != nullptr) {
                     seralizedArguments = strdup(value);
@@ -1847,6 +1852,7 @@ + (void)callCreateBody:(NSString*)pageId data:(NSDictionary*)data
         return;
     }
     
+    SetConvertCurrentPage(pageId);
     const std::string page([pageId UTF8String] ?: "");
     RenderManager::GetInstance()->CreatePage(page, [&] (RenderPage* pageInstance) -> RenderObject* {
         pageInstance->set_before_layout_needed(false); // we do not need before and after layout
@@ -1868,11 +1874,13 @@ + (void)callMoveElement:(NSString*)pageId ref:(NSString*)ref parentRef:(NSString
 
 + (void)callUpdateAttrs:(NSString*)pageId ref:(NSString*)ref data:(NSDictionary*)data
 {
+    SetConvertCurrentPage(pageId);
     WeexCore::RenderManager::GetInstance()->UpdateAttr([pageId UTF8String] ?: "", [ref UTF8String] ?: "", [self _parseMapValuePairs:data]);
 }
 
 + (void)callUpdateStyle:(NSString*)pageId ref:(NSString*)ref data:(NSDictionary*)data
 {
+    SetConvertCurrentPage(pageId);
     WeexCore::RenderManager::GetInstance()->UpdateStyle([pageId UTF8String] ?: "", [ref UTF8String] ?: "", [self _parseMapValuePairs:data]);
 }
 
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h
@@ -107,6 +107,7 @@ typedef NS_ENUM(int, WXSDKErrCode)
     WX_KEY_EXCEPTION_EMPTY_SCREEN_NATIVE = -9701,
     
     WX_KEY_EXCEPTION_NO_BUNDLE_TYPE = -9801,
+    WX_KEY_EXCEPTION_INVALID_JSON_OBJECT = -9802,
     
     WX_KEY_EXCEPTION_HERON_ERROR = -9900,
     WX_KEY_EXCEPTION_HERON_RENDER_ERROR = -9901,
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKError.m
@@ -105,6 +105,8 @@ +(NSDictionary *) getMap
                 
                 @(WX_KEY_EXCEPTION_NO_BUNDLE_TYPE):@{ERROR_TYPE:@(WX_JS_ERROR),ERROR_GROUP:@(WX_JS)},
                 
+                @(WX_KEY_EXCEPTION_INVALID_JSON_OBJECT):@{ERROR_TYPE:@(WX_JS_ERROR),ERROR_GROUP:@(WX_JS)},
+                
                 @(WX_KEY_EXCEPTION_HERON_ERROR):@{ERROR_TYPE:@(WX_NATIVE_ERROR),ERROR_GROUP:@(WX_NATIVE)},
                 @(WX_KEY_EXCEPTION_HERON_RENDER_ERROR):@{ERROR_TYPE:@(WX_RENDER_ERROR),ERROR_GROUP:@(WX_NATIVE)},
                 };
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -49,6 +49,7 @@
 #import "WXJSCoreBridge.h"
 #import "WXSDKInstance_performance.h"
 #import "WXPageEventNotifyEvent.h"
+#import "WXConvertUtility.h"
 #import "WXCoreBridge.h"
 #import <WeexSDK/WXDataRenderHandler.h>
 
@@ -599,6 +600,11 @@ - (BOOL)_handleConfigCenter
     if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {		
         BOOL enableRTLLayoutDirection = [[configCenter configForKey:@"iOS_weex_ext_config.enableRTLLayoutDirection" defaultValue:@(YES) isDefault:NULL] boolValue];
         [WXUtility setEnableRTLLayoutDirection:enableRTLLayoutDirection];
+        
+        BOOL isIOS13 = [[[UIDevice currentDevice] systemVersion] integerValue] == 13;
+        BOOL useMRCForInvalidJSONObject = [[configCenter configForKey:@"iOS_weex_ext_config.useMRCForInvalidJSONObject" defaultValue:@(YES) isDefault:NULL] boolValue];
+        BOOL alwaysUseMRCForObjectToWeexCore = [[configCenter configForKey:@"iOS_weex_ext_config.alwaysUseMRC" defaultValue:@(NO) isDefault:NULL] boolValue];
+        ConvertSwitches(isIOS13, useMRCForInvalidJSONObject, alwaysUseMRCForObjectToWeexCore);
     }
     return NO;
 }
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvertUtility.h b/ios/sdk/WeexSDK/Sources/Utility/WXConvertUtility.h
@@ -47,6 +47,14 @@ NSMutableArray* _Nonnull NSARRAY(std::vector<std::unordered_map<std::string, std
 
 void ConvertToCString(id _Nonnull obj, void (^ _Nonnull callback)(const char* _Nullable));
 
+extern "C" {
+    void SetConvertCurrentPage(NSString* _Nonnull pageId);
+    void ConvertSwitches(BOOL isIOS13, BOOL invalidJSONObjectUseMRC, BOOL alwaysUseMRC);
+}
+
+#else
+void SetConvertCurrentPage(NSString* _Nonnull pageId);
+void ConvertSwitches(BOOL isIOS13, BOOL invalidJSONObjectUseMRC, BOOL alwaysUseMRC);
 #endif
 
 #endif
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXConvertUtility.mm b/ios/sdk/WeexSDK/Sources/Utility/WXConvertUtility.mm
@@ -20,10 +20,32 @@
 #import "WXConvertUtility.h"
 #import "WXLog.h"
 #import "WXAssert.h"
+#import "WXExceptionUtils.h"
+#import "WXSDKError.h"
+
 #include <vector>
 #include <string>
 
 static NSString* const JSONSTRING_SUFFIX = @"\t\n\t\r";
+static NSString* const OBJC_MRC_SUFFIX = @"\t\t\n\r";
+
+static BOOL bIsIOS13 = NO;
+static BOOL bUseMRCForInvalidJSONObject = NO;
+static BOOL bAlwaysUseMRC = NO;
+
+static NSString* sCurrentPage = nil;
+
+void SetConvertCurrentPage(NSString* pageId)
+{
+    sCurrentPage = pageId;
+}
+
+void ConvertSwitches(BOOL isIOS13, BOOL invalidJSONObjectUseMRC, BOOL alwaysUseMRC)
+{
+    bIsIOS13 = isIOS13;
+    bUseMRCForInvalidJSONObject = invalidJSONObjectUseMRC;
+    bAlwaysUseMRC = alwaysUseMRC;
+}
 
 #if 0
 
@@ -78,6 +100,28 @@ void _detectObjectRecursion(id object, NSMutableSet* nodes)
             _detectObjectRecursion(object, nodes);
 #endif
             
+            if (bAlwaysUseMRC) {
+                return [NSString stringWithFormat:@"%p%@", (__bridge_retained void*)object, OBJC_MRC_SUFFIX];
+            }
+            
+            if (bIsIOS13) {
+                if (![NSJSONSerialization isValidJSONObject:object]) {
+                    [WXExceptionUtils commitCriticalExceptionRT:sCurrentPage
+                                                        errCode:[NSString stringWithFormat:@"%d", WX_KEY_EXCEPTION_INVALID_JSON_OBJECT]
+                                                       function:@""
+                                                      exception:@"Invalid JSON object."
+                                                      extParams:nil];
+                    
+                    // Report for instance.
+                    if (bUseMRCForInvalidJSONObject) {
+                        return [NSString stringWithFormat:@"%p%@", (__bridge_retained void*)object, OBJC_MRC_SUFFIX];
+                    }
+                    else {
+                        return nil;
+                    }
+                }
+            }
+            
             NSError *error = nil;
             NSData *data = [NSJSONSerialization dataWithJSONObject:object
                                                            options:0
@@ -126,6 +170,15 @@ id TO_OBJECT(NSString* s)
             WXAssert(NO, @"Fail to convert json to object. %@", exception);
         }
     }
+    else if ([s hasSuffix:OBJC_MRC_SUFFIX]) {
+        NSScanner* scanner = [NSScanner scannerWithString:s];
+        unsigned long long address = 0;
+        [scanner scanHexLongLong:&address];
+        if (address != 0) {
+            return (__bridge_transfer id)((void*)address);
+        }
+    }
+    
     return s; // return s instead
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1302,6 +1302,7 @@ - (void)callCreateBody:(NSString)pageId data:(NSDictionary)data`
`1302`	`1302`	`_customPages[sId] = page;`
`1303`	`1303`	`}`
`1304`	`1304`
	`1305`	`+ SetConvertCurrentPage(pageId);`
`1305`	`1306`	`[WXCustomPageBridge parseRenderObject:data parentRef:"" index:0 genObject:^(const std::string &ref, const std::string &type, const std::string &parentRef, std::map<std::string, std::string> styles, std::map<std::string, std::string> attrs, std::set<std::string> *events, int index) {`
`1306`	`1307`	`if (parentRef.empty()) {`
`1307`	`1308`	`// is root body`
`@@ -1343,6 +1344,7 @@ - (void)callUpdateAttrs:(NSString)pageId ref:(NSString)ref data:(NSDictionary*`
`1343`	`1344`	`{`
`1344`	`1345`	`RenderPageCustom* page = [self getPage:pageId];`
`1345`	`1346`	`if (page && page->IsValid()) {`
	`1347`	`+ SetConvertCurrentPage(pageId);`
`1346`	`1348`	`page->UpdateAttr([ref UTF8String] ?: "", [WXCustomPageBridge parseMapValuePairs:data]);`
`1347`	`1349`	`}`
`1348`	`1350`	`}`
`@@ -1351,6 +1353,7 @@ - (void)callUpdateStyle:(NSString)pageId ref:(NSString)ref data:(NSDictionary*`
`1351`	`1353`	`{`
`1352`	`1354`	`RenderPageCustom* page = [self getPage:pageId];`
`1353`	`1355`	`if (page && page->IsValid()) {`
	`1356`	`+ SetConvertCurrentPage(pageId);`
`1354`	`1357`	`page->UpdateStyle([ref UTF8String] ?: "", [WXCustomPageBridge parseMapValuePairs:data]);`
`1355`	`1358`	`}`
`1356`	`1359`	`}`
`@@ -1406,6 +1409,7 @@ - (BOOL)forwardCallNativeModuleToCustomPage:(NSString*)pageId`
`1406`	`1409`	`if (target && target->shouldHandleModuleMethod([moduleName UTF8String] ?: "", [methodName UTF8String] ?: "")) {`
`1407`	`1410`	`__block const char* seralizedArguments = nullptr;`
`1408`	`1411`	`__block const char* seralizedOptions = nullptr;`
	`1412`	`+ SetConvertCurrentPage(pageId);`
`1409`	`1413`	`ConvertToCString(arguments, ^(const char * value) {`
`1410`	`1414`	`if (value != nullptr) {`
`1411`	`1415`	`seralizedArguments = strdup(value);`
`@@ -1495,6 +1499,7 @@ - (void)forwardCallComponentToCustomPage:(NSString*)pageId`
`1495`	`1499`	`if (target) {`
`1496`	`1500`	`__block const char* seralizedArguments = nullptr;`
`1497`	`1501`	`__block const char* seralizedOptions = nullptr;`
	`1502`	`+ SetConvertCurrentPage(pageId);`
`1498`	`1503`	`ConvertToCString(arguments, ^(const char * value) {`
`1499`	`1504`	`if (value != nullptr) {`
`1500`	`1505`	`seralizedArguments = strdup(value);`
`@@ -1847,6 +1852,7 @@ + (void)callCreateBody:(NSString)pageId data:(NSDictionary)data`
`1847`	`1852`	`return;`
`1848`	`1853`	`}`
`1849`	`1854`
	`1855`	`+ SetConvertCurrentPage(pageId);`
`1850`	`1856`	`const std::string page([pageId UTF8String] ?: "");`
`1851`	`1857`	`RenderManager::GetInstance()->CreatePage(page, [&] (RenderPage* pageInstance) -> RenderObject* {`
`1852`	`1858`	`pageInstance->set_before_layout_needed(false); // we do not need before and after layout`
`@@ -1868,11 +1874,13 @@ + (void)callMoveElement:(NSString)pageId ref:(NSString)ref parentRef:(NSString`
`1868`	`1874`
`1869`	`1875`	`+ (void)callUpdateAttrs:(NSString)pageId ref:(NSString)ref data:(NSDictionary*)data`
`1870`	`1876`	`{`
	`1877`	`+ SetConvertCurrentPage(pageId);`
`1871`	`1878`	`WeexCore::RenderManager::GetInstance()->UpdateAttr([pageId UTF8String] ?: "", [ref UTF8String] ?: "", [self _parseMapValuePairs:data]);`
`1872`	`1879`	`}`
`1873`	`1880`
`1874`	`1881`	`+ (void)callUpdateStyle:(NSString)pageId ref:(NSString)ref data:(NSDictionary*)data`
`1875`	`1882`	`{`
	`1883`	`+ SetConvertCurrentPage(pageId);`
`1876`	`1884`	`WeexCore::RenderManager::GetInstance()->UpdateStyle([pageId UTF8String] ?: "", [ref UTF8String] ?: "", [self _parseMapValuePairs:data]);`
`1877`	`1885`	`}`
`1878`	`1886`