# 5.7.7

修MD5

Author: karisli

CHANGELOG.md

@@ -1,13 +1,11 @@
+# 5.7.7    
+- 修复本地二次校验依赖md5导致校验失败的问题
+    
 # 5.7.6    
 - fix上传crash
 
 # 5.7.5    
-- 5.7.5:增加crc检验
-- 新增background优先级
-- 修复iOS14频繁弹出剪贴板的问题
-- 支持上传时添加盲水印
-- 修复list多版本文件bug
-- 增加截屏接口
+- 5.7.5:增加crc检验\- 新增background优先级\- 修复iOS14频繁弹出剪贴板的问题\- 支持上传时添加盲水印\- 修复list多版本文件bug\- 增加截屏接口
 
 # 5.7.4    
 一些修复

QCloudCOSXML.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
-s.version              = "5.7.6"
+s.version              = "5.7.7"
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
@@ -17,15 +17,15 @@ s.version              = "5.7.6"
   s.default_subspec = 'Default'
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  default.dependency "QCloudCore",'5.7.6'
+  default.dependency "QCloudCore",'5.7.7'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'5.7.6'
+  slim.dependency "QCloudCore/WithoutMTA",'5.7.7'
   end
   s.subspec 'Transfer' do |transfer|
   transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'5.7.6'
+  transfer.dependency "QCloudCore/WithoutMTA",'5.7.7'
   end
 
 end

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -5,7 +5,7 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 507006
+#define QCloudCOSXMLModuleVersionNumber 507007
 
 //dependency
 

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"5.7.6";
+NSString * const QCloudCOSXMLModuleVersion = @"5.7.7";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end

QCloudCOSXML/Classes/Transfer/enum/QCloudCOSStorageClassEnum.h

@@ -32,7 +32,9 @@ typedef NS_ENUM(NSInteger, QCloudCOSStorageClass) {
 
   QCloudCOSStorageStandard = 0,
   QCloudCOSStorageStandardIA = 1,
-  QCloudCOSStorageARCHIVE = 2
+  QCloudCOSStorageARCHIVE = 2,
+  QCloudCOSStorageMAZ_Standard = 3,
+  QCloudCOSStorageMAZ_StandardIA = 4
 };
 
 FOUNDATION_EXTERN QCloudCOSStorageClass QCloudCOSStorageClassDumpFromString(NSString* key);

QCloudCOSXML/Classes/Transfer/enum/QCloudCOSStorageClassEnum.m

@@ -18,7 +18,12 @@ QCloudCOSStorageClass QCloudCOSStorageClassDumpFromString(NSString* key) {
           return QCloudCOSStorageStandardIA;
       }else if([key isEqualToString:@"ARCHIVE"]){
           return QCloudCOSStorageARCHIVE;
+      }else if([key isEqualToString:@"MAZ_STANDARD"]){
+          return QCloudCOSStorageMAZ_Standard;
+      }else if([key isEqualToString:@"MAZ_STANDARD_IA"]){
+          return QCloudCOSStorageMAZ_StandardIA;
       }
+    
       return 0;
 }
 NSString* QCloudCOSStorageClassTransferToString(QCloudCOSStorageClass type) {
@@ -35,6 +40,14 @@ QCloudCOSStorageClass QCloudCOSStorageClassDumpFromString(NSString* key) {
         {
             return @"ARCHIVE";
         }
+        case QCloudCOSStorageMAZ_Standard:
+        {
+            return @"MAZ_STANDARD";
+        }
+        case QCloudCOSStorageMAZ_StandardIA:
+        {
+            return @"MAZ_STANDARD_IA";
+        }
         default:
             return nil;
     }

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.h

@@ -132,9 +132,14 @@ RFC 2616 中定义用于指示资源的MIME类型，将作为 Object 元数据
  是否在上传完成以后，将 COS 返回的文件MD5与本地文件算出来的md5进行校验。默认开启，如果校验出错，
  文件仍然会被上传到 COS, 不过我们会在本地抛出校验失败的error。
  */
-@property (nonatomic, assign) BOOL enableMD5Verification;
+@property (nonatomic, assign) BOOL enableMD5Verification __attribute__((deprecated("该属性已过期，请用enableVerification替换")));
+/**
+ 是否在上传完成以后，将 COS 返回的文件MD5与本地文件算出来的md5进行校验。默认开启，如果校验出错，
+ 文件仍然会被上传到 COS, 不过我们会在本地抛出校验失败的error。
+ */
+@property (nonatomic, assign) BOOL enableVerification;
 
-/*
+/**
  在进行HTTP请求的时候，可以通过设置该参数来设置自定义的一些头部信息。
  通常情况下，携带特定的额外HTTP头部可以使用某项功能，如果是这类需求，可以通过设置该属性来实现。
  */

QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m

@@ -31,7 +31,8 @@
 #import <QCloudCore/QCloudHTTPRetryHanlder.h>
 static NSUInteger kQCloudCOSXMLUploadLengthLimit = 1*1024*1024;
 static NSUInteger kQCloudCOSXMLUploadSliceLength = 1*1024*1024;
-
+static NSUInteger kQCloudCOSXMLMD5Length = 32;
+static NSUInteger kQCloudCOSXMLSha1Length = 40;
 @interface QCloudCOSXMlResumeUploadInfo : NSObject
 @property (nonatomic, strong) NSString* localPath;
 @property (strong, nonatomic) NSString *object;
@@ -497,25 +498,26 @@ - (void) uploadOffsetBodys:(NSArray<QCloudFileOffsetBody*>*)allParts
                     [strongSelf cancel];
                 }
             } else{
-                
-                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:@"DataIntegrityError分片:上传过程中MD5校验与本地不一致，请检查本地文件在上传过程中是否发生了变化,建议调用删除接口将COS上的文件删除并重新上传,本地计算的 MD5 值:%@, 返回的 ETag值:%@",localMD5String,MD5FromeETag];
-                        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 || self.enableVerification) {
+                    if(outputObject.eTag.length == (kQCloudCOSXMLMD5Length+2)) {
+                        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:@"DataIntegrityError分片:上传过程中MD5校验与本地不一致，请检查本地文件在上传过程中是否发生了变化,建议调用删除接口将COS上的文件删除并重新上传,本地计算的 MD5 值:%@, 返回的 ETag值:%@",localMD5String,MD5FromeETag];
+                            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

@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
-s.version              = "5.7.6"
+s.version              = "5.7.7"
 
   s.summary          = "QCloudCore--腾讯云iOS-SDK Foundation"
 

QCloudCore/Classes/Base/QCloudClientBase/Authentation/QCloudAuthentationV5Creator.m

@@ -23,7 +23,7 @@
 @implementation NSDictionary(HeaderFilter)
 - (NSDictionary*)filteHeaders; {
     NSMutableDictionary* signedHeaders = [[NSMutableDictionary alloc] init];
-    __block  const NSArray* shouldSignedHeaderList = @[ @"Content-Length", @"Content-MD5"];
+    __block  const NSArray* shouldSignedHeaderList = @[ @"Content-Length", @"Content-MD5",@"Content-Type",@"Content-Disposition",@"Content-Encoding",@"Transfer-Encoding",@"Range",@"Host"];
     [self enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
         //签名的Headers列表：x开头的(x-cos-之类的),content-length,content-MD5
         BOOL shouldSigned = NO;