# 5.5.2

- 加了校验MD开关

Author: karisli

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 5.5.2    
+- 加了校验MD开关
+    
 # 5.5.1    
 -将部分文件与 FCUUID 作区分
 

QCloudCOSXML.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
-s.version              = "5.5.1"
+s.version              = "5.5.2"
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
   s.homepage         = "https://cloud.tencent.com/"
@@ -9,12 +9,12 @@ s.version              = "5.5.1"
   s.source           = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
   s.source_files = 'QCloudCOSXML/Classes/**/*'
-  s.dependency "QCloudCore",'5.5.1'
+  s.dependency "QCloudCore",'5.5.2'
   s.static_framework = true
 
   s.subspec 'Transfer' do |sbt|
     sbt.source_files = 'QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
-    sbt.dependency "QCloudCore",'5.5.1'
+    sbt.dependency "QCloudCore",'5.5.2'
  #   sbt.static_framework=true
   end
 end

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -6,15 +6,15 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 505001
+#define QCloudCOSXMLModuleVersionNumber 505002
 
 //dependency
-#if QCloudCoreModuleVersionNumber != 505001 
+#if QCloudCoreModuleVersionNumber != 505002
     #error "库QCloudCOSXML依赖QCloudCore最小版本号为5.5.1，当前引入的QCloudCore版本号过低，请及时升级后使用" 
 #endif
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
 
-#endif
+#endif

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"5.5.1";
+NSString * const QCloudCOSXMLModuleVersion = @"5.5.2";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
@@ -26,4 +26,4 @@ + (void) load
 #pragma clang diagnostic pop
     }
 }
-@end
+@end

QCloudCOSXML/Classes/Transfer/QCloudCOSXMLService+Transfer.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QCLoudCOSXMLService.h"
+#import "QCloudCOSXMLService.h"
 @class QCloudPutObjectRequest;
 @class QCloudGetObjectRequest;
 @class QCloudInitiateMultipartUploadRequest;

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.h

@@ -112,6 +112,12 @@ typedef void(^InitMultipleUploadFinishBlock)(QCloudInitiateMultipartUploadResult
  */
 @property (nonatomic, copy) InitMultipleUploadFinishBlock initMultipleUploadFinishBlock;
 
+
+/**
+ 是否在上传完成以后，将 COS 返回的文件MD5与本地文件算出来的md5进行校验。默认开启，如果校验出错，文件仍然会被上传到 COS, 不过我们会在本地抛出校验失败的error。
+ */
+@property (nonatomic, assign) BOOL enableMD5Verification;
+
 /**
  上传完成后会通过该block回调。若error为空，可视为成功。
 

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

@@ -79,6 +79,7 @@ - (instancetype) init
     }
     _requestCacheArray = [NSPointerArray weakObjectsPointerArray];
     _aborted = NO;
+    _enableMD5Verification = YES;
     _recursiveLock = [NSRecursiveLock new];
     _progressLock = [NSRecursiveLock new];
     return self;
@@ -193,32 +194,33 @@ - (void) startSimpleUpload
         if (error) {
             [weakSelf onError:error];
             [self cancel];
-        } else {
+        } else{
             QCloudUploadObjectResult* result = [QCloudUploadObjectResult new];
-            result.eTag = [outputObject valueForKey:@"Etag"];
             if (outputObject[@"x-cos-version-id"]) {
                 result.versionID = outputObject[@"x-cos-version-id"];
             }
 
-            NSString* localMD5 ;
-            if ([weakSelf.body isKindOfClass:[NSData class]]) {
-                localMD5 = QCloudEncrytNSDataMD5(weakSelf.body);
-            } else if ([weakSelf.body isKindOfClass:[NSURL class]]) {
-                localMD5 = QCloudEncrytFileMD5(((NSURL*)weakSelf.body).path);
-            }
-            NSString* MD5FromCOS = [result.eTag substringWithRange:NSMakeRange(1, result.eTag.length - 2)];
-            if (![localMD5.lowercaseString isEqualToString:MD5FromCOS]) {
-                NSMutableString* errorMessageString = [[NSMutableString alloc] init];
-                [errorMessageString appendFormat:@"简单上传过程中MD5校验与本地不一致，请检查本地文件在上传过程中是否发生了变化,建议调用删除接口将COS上的文件删除并重新上传"];
-                if ( outputObject[@"x-cos-request-id"]!= nil) {
-                    NSString* requestID = outputObject[@"x-cos-request-id"];
-                    [errorMessageString appendFormat:@", Request id:%@",requestID];
+            if(self.enableMD5Verification) {
+                result.eTag = [outputObject valueForKey:@"Etag"];
+                NSString* localMD5 ;
+                if ([weakSelf.body isKindOfClass:[NSData class]]) {
+                    localMD5 = QCloudEncrytNSDataMD5(weakSelf.body);
+                } else if ([weakSelf.body isKindOfClass:[NSURL class]]) {
+                    localMD5 = QCloudEncrytFileMD5(((NSURL*)weakSelf.body).path);
+                }
+                NSString* MD5FromCOS = [result.eTag substringWithRange:NSMakeRange(1, result.eTag.length - 2)];
+                if ( (localMD5 != nil)  && (![localMD5.lowercaseString isEqualToString:MD5FromCOS]) ) {
+                    NSMutableString* errorMessageString = [[NSMutableString alloc] init];
+                    [errorMessageString appendFormat:@"简单上传过程中MD5校验与本地不一致，请检查本地文件在上传过程中是否发生了变化,建议调用删除接口将COS上的文件删除并重新上传"];
+                    if ( outputObject[@"x-cos-request-id"]!= nil) {
+                        NSString* requestID = outputObject[@"x-cos-request-id"];
+                        [errorMessageString appendFormat:@", Request id:%@",requestID];
+                    }
+                    NSError* error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeMD5NotMatch message:errorMessageString];
+                    [weakSelf onError:error];
+                    return ;
                 }
-                NSError* error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeMD5NotMatch message:errorMessageString];
-                [weakSelf onError:error];
-                return ;
             }
-            
             result.key = weakSelf.object;
             result.bucket = weakSelf.bucket;
             result.location = QCloudCOSXMLObjectLocation(weakSelf.transferManager.configuration.endpoint,
@@ -391,24 +393,26 @@ - (void) uploadOffsetBodys:(NSArray<QCloudFileOffsetBody*>*)allParts
                 if (!self.canceled) {
                     [strongSelf cancel];
                 }
-            } else {
+            } else{
 
-                NSString* MD5FromeETag = [outputObject.eTag substringWithRange:NSMakeRange(1, outputObject.eTag.length-2)];
-                NSString* localMD5String = [QCloudEncrytFileOffsetMD5(body.fileURL.path, body.offset, body.sliceLength) lowercaseString];
-                if (![MD5FromeETag isEqualToString:localMD5String]) {
-                    NSMutableString* errorMessageString = [[NSMutableString alloc] init];
-                    [errorMessageString appendFormat:@"分片上传过程中MD5校验与本地不一致，请检查本地文件在上传过程中是否发生了变化,建议调用删除接口将COS上的文件删除并重新上传"];
-                    if ( [outputObject __originHTTPURLResponse__]&& [[outputObject __originHTTPURLResponse__].allHeaderFields valueForKey:@"x-cos-request-id"]!= nil) {
-                        NSString* requestID = [[outputObject __originHTTPURLResponse__].allHeaderFields valueForKey:@"x-cos-request-id"];
-                        [errorMessageString appendFormat:@", Request id:%@",requestID];
+                if(self.enableMD5Verification) {
+                
+                    NSString* MD5FromeETag = [outputObject.eTag substringWithRange:NSMakeRange(1, outputObject.eTag.length-2)];
+                    NSString* localMD5String = [QCloudEncrytFileOffsetMD5(body.fileURL.path, body.offset, body.sliceLength) lowercaseString];
+                    if (![MD5FromeETag isEqualToString:localMD5String]) {
+                        NSMutableString* errorMessageString = [[NSMutableString alloc] init];
+                        [errorMessageString appendFormat:@"分片上传过程中MD5校验与本地不一致，请检查本地文件在上传过程中是否发生了变化,建议调用删除接口将COS上的文件删除并重新上传"];
+                        if ( [outputObject __originHTTPURLResponse__]&& [[outputObject __originHTTPURLResponse__].allHeaderFields valueForKey:@"x-cos-request-id"]!= nil) {
+                            NSString* requestID = [[outputObject __originHTTPURLResponse__].allHeaderFields valueForKey:@"x-cos-request-id"];
+                            [errorMessageString appendFormat:@", Request id:%@",requestID];
+                        }
+                        NSError* error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeMD5NotMatch message:errorMessageString];
+                        [weakSelf onError:error];
+                        [weakSelf cancel];
+                        return ;
                     }
-                    NSError* error = [NSError qcloud_errorWithCode:QCloudNetworkErrorCodeMD5NotMatch message:errorMessageString];
-                    [weakSelf onError:error];
-                    [weakSelf cancel];
-                    return ;
                 }
 
-                
                 QCloudMultipartInfo* info = [QCloudMultipartInfo new];
                 info.eTag = outputObject.eTag;
                 info.partNumber = [@(body.index+1) stringValue];

QCloudCore.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "QCloudCore"
-s.version              = "5.5.1"
+s.version              = "5.5.2"
   s.summary          = "QCloudCore--腾讯云iOS-SDK Foundation"
 
 # This description is used to generate tags and improve search results.

QCloudCore/Classes/QCloudClientBase/Request/QCloudService.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class QCloudHTTPRequest;
 @class QCloudSignatureFields;
+@class UIApplication;
 @interface QCloudService : NSObject
 {
     @protected

QCloudCore/Classes/QCloudCoreVersion.h

@@ -5,12 +5,12 @@
 
 #ifndef QCloudCoreModuleVersion_h
 #define QCloudCoreModuleVersion_h
-#define QCloudCoreModuleVersionNumber 505001
+#define QCloudCoreModuleVersionNumber 505002
 
 //dependency
 
 //
 FOUNDATION_EXTERN NSString * const QCloudCoreModuleVersion;
 FOUNDATION_EXTERN NSString * const QCloudCoreModuleName;
 
-#endif
+#endif