optimize cf client

Author: YangSen-qn

QiniuDemo/QiniuDemo/ViewController.m

@@ -41,6 +41,9 @@ @interface ViewController () <UINavigationControllerDelegate, UIImagePickerContr
 
 @implementation ViewController
 
+#define kUploadFixHost00 @"up-z0.qbox.me"
+#define kUploadFixHost01 @"upload.qbox.me"
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     [QNLogUtil setLogLevel:QNLogLevelInfo];
@@ -62,15 +65,15 @@ - (IBAction)uploadAction:(UIButton *)sender {
         path = [[NSBundle mainBundle] pathForResource:@"image.png" ofType:nil];
         path = [[NSBundle mainBundle] pathForResource:@"image.jpg" ofType:nil];
         path = [[NSBundle mainBundle] pathForResource:@"UploadResource_6M.zip" ofType:nil];
-        path = [[NSBundle mainBundle] pathForResource:@"UploadResource_9M.zip" ofType:nil];
+//        path = [[NSBundle mainBundle] pathForResource:@"UploadResource_9M.zip" ofType:nil];
 //        path = [[NSBundle mainBundle] pathForResource:@"UploadResource_49M.zip" ofType:nil];
 //        path = [[NSBundle mainBundle] pathForResource:@"UploadResource_1.44G.zip" ofType:nil];
 
 //        NSFileManager *manager = [NSFileManager defaultManager];
 //        NSURL *desktopUrl = [manager URLsForDirectory:NSDesktopDirectory inDomains:NSUserDomainMask].firstObject;
 //        path = [desktopUrl URLByAppendingPathComponent:@"pycharm.dmg"].path;
 
-        [self uploadImageToQNFilePath:path index:0];
+//        [self uploadImageToQNFilePath:path index:0];
         [self uploadImageToQNFilePath:path complete:nil];
         [self changeUploadState:UploadStateUploading];
 #else
@@ -116,7 +119,7 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath index:(NSInteger)index {
 
 - (void)uploadImageToQNFilePath:(NSString *)filePath complete:(dispatch_block_t)complete {
 
-    kQNGlobalConfiguration.isDnsOpen = NO;
+//    kQNGlobalConfiguration.isDnsOpen = NO;
 //    kQNGlobalConfiguration.connectCheckEnable = false;
     kQNGlobalConfiguration.dnsCacheMaxTTL = 600;
     kQNGlobalConfiguration.partialHostFrozenTime = 20*60;
@@ -130,14 +133,14 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath complete:(dispatch_block_t)
     QNConfiguration *configuration = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
         builder.timeoutInterval = 90;
         builder.retryMax = 1;
-        builder.useHttps = NO;
+//        builder.useHttps = NO;
 
         builder.useConcurrentResumeUpload = true;
-//        builder.concurrentTaskCount = 6;
+        builder.concurrentTaskCount = 3;
         builder.resumeUploadVersion = QNResumeUploadVersionV1;
         builder.putThreshold = 4*1024*1024;
-//        builder.chunkSize = 1*1024*1024;
-//        builder.zone = [[QNFixedZone alloc] initWithUpDomainList:@[@"up-z0.qbox.me", /*@"upload.qbox.me"*/]];
+        builder.chunkSize = 1*1024*1024;
+        builder.zone = [[QNFixedZone alloc] initWithUpDomainList:@[kUploadFixHost00, kUploadFixHost01]];
         builder.recorder = [QNFileRecorder fileRecorderWithFolder:[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] error:nil];
     }];
 
@@ -310,9 +313,15 @@ - (void)alertMessage:(NSString *)message{
         item.ipValue = @"180.101.136.19";
         item.sourceValue = @"custom";
         [array addObject:item];
-    } else if ([host containsString:@"up-z0.qbox.me"]) {
+    } else if ([host containsString:kUploadFixHost00]) {
         DnsItem *item = [[DnsItem alloc] init];
         item.hostValue = host;
+        item.ipValue = @"220.181.38.148";
+        item.sourceValue = @"custom";
+        [array addObject:item];
+        
+        item = [[DnsItem alloc] init];
+        item.hostValue = host;
         item.ipValue = @"180.101.136.28";
         item.sourceValue = @"custom";
         [array addObject:item];

QiniuSDK/Http/Request/HttpClient/CFNetwork/QNCFHttpClient.m

@@ -77,7 +77,7 @@ - (void)request:(NSURLRequest *)request
     [self.requestMetrics start];
 
     self.responseData = [NSMutableData data];
-    self.httpClient = [QNCFHttpClientInner client:request connectionProxy:connectionProxy];
+    self.httpClient = [QNCFHttpClientInner client:self.request connectionProxy:connectionProxy];
     self.httpClient.delegate = self;
     [self.httpClient performSelector:@selector(main)
                             onThread:self.thread
@@ -126,31 +126,6 @@ - (void)didLoadData:(nonnull NSData *)data {
     [self.responseData appendData:data];
 }
 
-- (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust forDomain:(NSString *)domain {
-    
-    NSMutableArray *policies = [NSMutableArray array];
-    if (domain) {
-        [policies addObject:(__bridge_transfer id)SecPolicyCreateSSL(true, (__bridge CFStringRef)domain)];
-    } else {
-        [policies addObject:(__bridge_transfer id)SecPolicyCreateBasicX509()];
-    }
-
-    SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies);
-
-    SecTrustResultType result = kSecTrustResultInvalid;
-    
-    OSStatus status = SecTrustEvaluate(serverTrust, &result);
-    if (status != errSecSuccess) {
-        return NO;
-    }
-    
-    if (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed) {
-        return YES;
-    } else {
-        return NO;
-    }
-}
-
 - (void)onError:(nonnull NSError *)error {
     [self completeAction:error];
 }

QiniuSDK/Http/Request/HttpClient/CFNetwork/QNCFHttpClientInner.h

@@ -15,9 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)redirectedToRequest:(NSURLRequest *)request
            redirectResponse:(NSURLResponse *)redirectResponse;
 
-- (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust
-                  forDomain:(NSString *)domain;
-
 - (void)onError:(NSError *)error;
 
 - (void)didSendBodyData:(int64_t)bytesSent

QiniuSDK/Http/Request/HttpClient/CFNetwork/QNCFHttpClientInner.m

@@ -158,20 +158,6 @@ - (BOOL)shouldEvaluateInputStreamServerTrust{
     }
 }
 
-- (void)evaluateInputStreamServerTrust{
-    if (self.isInputStreamEvaluated) {
-        return;
-    }
-    
-    SecTrustRef trust = (__bridge SecTrustRef) [self.inputStream propertyForKey:(__bridge NSString *) kCFStreamPropertySSLPeerTrust];
-    NSString *host = [self.request allHTTPHeaderFields][@"host"];
-    if ([self delegate_evaluateServerTrust:trust forDomain:host]) {
-        self.isInputStreamEvaluated = YES;
-    } else {
-        [self delegate_onError:[self createError:NSURLErrorSecureConnectionFailed errorDescription:@"SSLHandshake failed"]];
-    }
-}
-
 - (void)inputStreamGetAndNotifyHttpResponse{
     @synchronized (self) {
         if (self.isReadResponseHeader) {
@@ -298,10 +284,6 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode{
     @autoreleasepool {
         switch (eventCode) {
             case NSStreamEventHasBytesAvailable:{
-                if ([self shouldEvaluateInputStreamServerTrust]) {
-                    [self evaluateInputStreamServerTrust];
-                }
-                
                 if (![self isInputStreamHttpResponseHeaderComplete]) {
                     break;
                 }
@@ -315,7 +297,7 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode{
             case NSStreamEventErrorOccurred:{
                 [self releaseResource];
                 [self endProgress: YES];
-                [self delegate_onError:[self translateCFNetworkErrorIntoUrlError:[self.inputStream streamError]]];
+                [self delegate_onError:[self translateCFNetworkErrorIntoUrlError:[aStream streamError]]];
             }
                 break;
             case NSStreamEventEndEncountered:{
@@ -816,15 +798,6 @@ - (void)delegate_redirectedToRequest:(NSURLRequest *)request
     }
 }
 
-- (BOOL)delegate_evaluateServerTrust:(SecTrustRef)serverTrust
-                           forDomain:(NSString *)domain{
-    if ([self.delegate respondsToSelector:@selector(evaluateServerTrust:forDomain:)]) {
-        return [self.delegate evaluateServerTrust:serverTrust forDomain:domain];
-    } else {
-        return NO;
-    }
-}
-
 - (void)delegate_onError:(NSError *)error{
     @synchronized (self) {
         if (self.isCallFinishOrError) {