Merge pull request #4 from longbai/add_crc

crc32  check

Author: longbai

Qiniu.podspec

@@ -5,8 +5,7 @@ Pod::Spec.new do |s|
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'
   s.author       = 'Qiniu => sdk@qiniu.com'
-  s.documentation_url = 'http://developer.qiniu.com/docs/v6/sdk/ios-sdk.html'
-  s.source       = {:git => 'https://github.com/qiniu/objc-sdk.git', :tag => 'v7.0.2'}
+  s.source       = {:git => 'https://github.com/qiniu/objc-sdk.git', :tag => s.version}
 
   s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.8'

QiniuSDK/Common/QNCrc32.m

@@ -9,6 +9,7 @@
 #import <zlib.h>
 
 #import "QNCrc32.h"
+#import "QNConfig.h"
 
 @implementation QNCrc32
 
@@ -26,7 +27,18 @@ + (UInt32)file:(NSString *)filePath
 		if (*error != nil) {
 			return 0;
 		}
-		return [QNCrc32 data:data];
+
+		int len = (int)[data length];
+		int count = (len + kQNBlockSize - 1) / kQNBlockSize;
+
+		uLong crc = crc32(0L, Z_NULL, 0);
+		for (int i = 0; i < count; i++) {
+			int offset = i * kQNBlockSize;
+			int size = (len - offset) > kQNBlockSize ? kQNBlockSize : (len - offset);
+			NSData *d = [data subdataWithRange:NSMakeRange(offset, (unsigned int)size)];
+			crc = crc32(crc, [d bytes], (uInt)[d length]);
+		}
+		return (UInt32)crc;
 	}
 }
 

QiniuSDK/Common/QNUrlSafeBase64.m

@@ -18,11 +18,6 @@ + (NSString *)encodeString:(NSString *)sourceString {
 	return [self encodeData:data];
 }
 
-+ (NSError *)decodeError:(int)pos {
-//    NSString *s = [[NSString alloc] initWithFormat:@"illegal url safe base64 data at input byte %d", pos];
-	return nil;
-}
-
 + (NSString *)encodeData:(NSData *)data {
 	NSUInteger length = [data length];
 	NSMutableData *mutableData = [NSMutableData dataWithLength:((length + 2) / 3) * 4];

QiniuSDK/Common/QNVersion.h

@@ -8,4 +8,4 @@
 
 #import <Foundation/Foundation.h>
 
-static const NSString *kQiniuVersion = @"7.0.0";
+static const NSString *kQiniuVersion = @"7.0.3";

QiniuSDK/Http/QNResponseInfo.h

@@ -20,15 +20,14 @@ extern const int kQNNetworkError;
 @property (nonatomic, readonly, getter = isCancelled) BOOL canceled;
 @property (nonatomic, readonly, getter = isOK) BOOL ok;
 @property (nonatomic, readonly, getter = isConnectionBroken) BOOL broken;
+@property (nonatomic, readonly) BOOL couldRetry;
 
 + (instancetype)cancel;
 
 - (instancetype)initWithError:(NSError *)error;
 
 - (instancetype)initWithCancelled;
 
-@property (nonatomic, readonly) BOOL couldRetry;
-
 - (instancetype)init:(int)status
            withReqId:(NSString *)reqId
             withXLog:(NSString *)xlog

QiniuSDK/Http/QNResponseInfo.m

@@ -49,7 +49,7 @@ - (BOOL)isConnectionBroken {
 }
 
 - (BOOL)couldRetry {
-	return (_statusCode >= 500 && _statusCode < 600 && _statusCode != 579) || _statusCode == kQNNetworkError || _statusCode == 996;
+	return (_statusCode >= 500 && _statusCode < 600 && _statusCode != 579) || _statusCode == kQNNetworkError || _statusCode == 996 || _statusCode == 406;
 }
 
 - (instancetype)init:(int)status

QiniuSDK/Storage/QNResumeUpload.m

@@ -14,6 +14,7 @@
 #import "QNHttpManager.h"
 #import "QNUploadOption+Private.h"
 #import "QNRecorderDelegate.h"
+#import "QNCrc32.h"
 
 typedef void (^task)(void);
 
@@ -34,6 +35,7 @@ @interface QNResumeUpload ()
 @property UInt64 modifyTime;
 @property (nonatomic, weak) id <QNRecorderDelegate> recorder;
 
+@property UInt32 chunkCrc;
 
 - (void)makeBlock:(NSString *)uphost
            offset:(UInt32)offset
@@ -216,8 +218,15 @@ - (void)nextTask:(UInt32)offset retriedTimes:(int)retried host:(NSString *)host
 			[self nextTask:offset retriedTimes:retried + 1 host:nextHost];
 			return;
 		}
+
+		if (resp == nil) {
+			[self nextTask:offset retriedTimes:retried host:host];
+			return;
+		}
+
 		NSString *ctx = resp[@"ctx"];
-		if (ctx == nil) {
+		NSNumber *crc = resp[@"crc32"];
+		if (ctx == nil || crc == nil || [crc unsignedLongValue] != _chunkCrc) {
 			[self nextTask:offset retriedTimes:retried host:host];
 			return;
 		}
@@ -252,6 +261,7 @@ - (void)makeBlock:(NSString *)uphost
          complete:(QNCompleteBlock)complete {
 	NSData *data = [self.data subdataWithRange:NSMakeRange(offset, (unsigned int)chunkSize)];
 	NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkblk/%u", uphost, (unsigned int)blockSize];
+	_chunkCrc = [QNCrc32 data:data];
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }
 
@@ -264,8 +274,7 @@ - (void)putChunk:(NSString *)uphost
 	NSData *data = [self.data subdataWithRange:NSMakeRange(offset, (unsigned int)size)];
 	UInt32 chunkOffset = offset % kQNBlockSize;
 	NSString *url = [[NSString alloc] initWithFormat:@"http://%@/bput/%@/%u", uphost, context, (unsigned int)chunkOffset];
-
-	// Todo: check crc
+	_chunkCrc = [QNCrc32 data:data];
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }
 

QiniuSDK/Storage/QNUploadManager.m

@@ -11,7 +11,7 @@
 #import "QNConfig.h"
 #import "QNHttpManager.h"
 #import "QNResponseInfo.h"
-
+#import "QNCrc32.h"
 #import "QNUploadManager.h"
 #import "QNResumeUpload.h"
 #import "QNUploadOption+Private.h"
@@ -71,7 +71,7 @@ - (void)putData:(NSData *)data
 
 	parameters[@"token"] = token;
 
-	if (option.params) {
+	if (option && option.params) {
 		[parameters addEntriesFromDictionary:[option p_convertToPostParams]];
 	}
 
@@ -81,6 +81,10 @@ - (void)putData:(NSData *)data
 		mimeType = @"application/octet-stream";
 	}
 
+	if (option && option.checkCrc) {
+		parameters[@"crc32"] = [NSNumber numberWithUnsignedLong:[QNCrc32 data:data]];
+	}
+
 	QNInternalProgressBlock p = nil;
 
 	if (option && option.progressHandler) {

QiniuSDKTests/QNCrc32Test.m

@@ -8,6 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "QNCrc32.h"
+#import "QNTempFile.h"
 
 @interface QNCrc32Test : XCTestCase
 
@@ -22,4 +23,13 @@ - (void)testData {
 	XCTAssert(crc == 3964322768, @"Pass");
 }
 
+- (void)testFile {
+	NSError *error;
+	NSURL *file = [QNTempFile createTempfileWithSize:5 * 1024 * 1024];
+	UInt32 u = [QNCrc32 file:[file relativePath] error:&error];
+
+	XCTAssert(u == 3376132981, @"Pass");
+	[QNTempFile removeTempfile:file];
+}
+
 @end

QiniuSDKTests/QNFormUploadTest.m

@@ -35,7 +35,7 @@ - (void)testUp {
 	__block QNResponseInfo *testInfo = nil;
 	__block NSDictionary *testResp = nil;
 
-	QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:@"text/plain" progressHandler:nil params:@{ @"foo":@"bar" } checkCrc:NO cancellationSignal:nil];
+	QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:@"text/plain" progressHandler:nil params:@{ @"x:foo":@"bar" } checkCrc:YES cancellationSignal:nil];
 	NSData *data = [@"Hello, World!" dataUsingEncoding : NSUTF8StringEncoding];
 	[self.upManager putData:data key:@"你好" token:g_token complete: ^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
 	    testInfo = info;