[iOS] Protect websocket url argument. (#2004)

apache · Jan 4, 2019 · 0f7a042 · 0f7a042
1 parent eb3f28b
commit 0f7a042
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
@@ -87,7 +87,6 @@ Pod::Spec.new do |s|
                           'ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h',
                           'ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h',
                           'ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.h',
-                          'ios/sdk/WeexSDK/Sources/Manager/WXDisplayLinkManager.h',
                           'ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h',
                           'ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h',
                           'ios/sdk/WeexSDK/Sources/Utility/WXConvert.h',

diff --git a/ios/sdk/WeexSDK/Sources/Module/WXWebSocketModule.m b/ios/sdk/WeexSDK/Sources/Module/WXWebSocketModule.m
@@ -49,6 +49,17 @@ @implementation WXWebSocketModule
 
 - (void)WebSocket:(NSString *)url protocol:(NSString *)protocol
 {
+    // check url
+    NSURL* theURL = [NSURL URLWithString:url];
+    if (theURL == nil) {
+        return;
+    }
+    NSString *scheme = theURL.scheme.lowercaseString;
+    if (!([scheme isEqualToString:@"ws"] || [scheme isEqualToString:@"http"] ||
+          [scheme isEqualToString:@"wss"] || [scheme isEqualToString:@"https"])) {
+        return;
+    }
+
     if(loader)
     {
         [loader clear];

diff --git a/ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.m b/ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.m
@@ -276,7 +276,7 @@ - (void) startRecord:(NSString*) instanceId
     [self updateDiffStats:KEY_PAGE_STATS_IMG_UN_RECYCLE_NUM withDiffValue:0];
 }
 
-- (void) endRecord;
+- (void) endRecord
 {
     if (_isEnd) {
         return;