The AWS Mobile SDK for iOS 2.0.17.

Author: Yosuke Matsuda

AWSCore/MobileAnalytics/core/io/AWSMobileAnalyticsBufferedReader.m

@@ -53,7 +53,7 @@ -(id)initWithInputStream:(NSInputStream*)stream
         self.inputStream = stream;
         self.bufferLength = bufferLength;
         self.readFromStream = [[NSMutableString alloc] initWithCapacity:bufferLength];
-        self.streamBuffer = [NSMutableData dataWithLength:bufferLength];
+        self.streamBuffer = [NSMutableData new];
         self.lockObject = [[NSObject alloc] init];
     }
     return self;
@@ -82,14 +82,45 @@ -(BOOL)readLine:(NSString**)line withError:(NSError**)readError
             NSRange newlineOccurence = [self.readFromStream rangeOfCharacterFromSet:[NSCharacterSet newlineCharacterSet]];
             while (newlineOccurence.location == NSNotFound && [self.inputStream hasBytesAvailable])
             {
-                uint8_t* dataBuffer = (uint8_t*)[self.streamBuffer mutableBytes];
+                uint8_t dataBuffer[self.bufferLength];
                 NSInteger readAmount = [self.inputStream read:dataBuffer maxLength:self.bufferLength];
 
                 if(readAmount > 0)
                 {
-                    NSString* readString = [[NSString alloc] initWithBytes:dataBuffer
-                                                                    length:readAmount
-                                                                  encoding:NSUTF8StringEncoding];
+                    [self.streamBuffer setLength:0];
+                    [self.streamBuffer appendBytes:(const void *)dataBuffer length:readAmount];
+                    
+                    /* if readString is nil, we probably are reading a multibytes characters
+                     (e.g. Euro Sign "U+20AC" is 3 bytes char, "U+10348" is a 4 bytes char) and encounter a partial character. We need to continue
+                     read byte by byte to a max of 4 bytes until the whole character has been read from inputStream
+                     */
+                    NSString* readString = nil;
+                    NSInteger count = 1;
+                    while ((readString = [[NSString alloc] initWithData:self.streamBuffer encoding:NSUTF8StringEncoding]) == nil) {
+                        uint8_t aByteBuff[1];
+                        NSInteger len = [self.inputStream read:aByteBuff maxLength:1];
+                        if (len > 0) {
+                            [self.streamBuffer appendBytes:(const void *)aByteBuff length:len];
+                        } else {
+                            //break if it is end of stream or any error occured.
+                            break;
+                        }
+                        
+                        //according to RFC3629, no UTF8 encoded character has a length larger than 4 bytes.
+                        if (count < 4) {
+                            count++;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (readString == nil) {
+                        error = [AWSMobileAnalyticsErrorUtils errorWithDomain:AWSBufferedReaderErrorDomain
+                                                              withDescription:@"unable to parse string, make sure it is a valid UTF8 string"
+                                                                withErrorCode:AWSBufferedReaderErrorCode_UnableToParseString];
+                        break;
+                    }
+
 
                     // append the new chunck of data to what we've read and re-evaluate the loop
                     [self.readFromStream appendString:readString];

AWSCore/MobileAnalytics/include/core/io/AWSMobileAnalyticsBufferedReader.h

@@ -18,7 +18,8 @@
 FOUNDATION_EXPORT NSString * const AWSBufferedReaderErrorDomain;
 
 typedef NS_ENUM(NSInteger, AWSBufferedReaderErrorCodes) {
-    AWSBufferedReaderErrorCode_IOStreamClosed = 0
+    AWSBufferedReaderErrorCode_IOStreamClosed = 0,
+    AWSBufferedReaderErrorCode_UnableToParseString = 1,
 };
 
 @interface AWSMobileAnalyticsBufferedReader : NSObject

AWSCore/Networking/AWSNetworking.m

@@ -21,7 +21,7 @@
 #import "AWSURLSessionManager.h"
 
 NSString *const AWSNetworkingErrorDomain = @"com.amazonaws.AWSNetworkingErrorDomain";
-NSString *const AWSiOSSDKVersion = @"2.0.16";
+NSString *const AWSiOSSDKVersion = @"2.0.17";
 
 #pragma mark - AWSHTTPMethod
 

AWSCore/Utility/AWSCategory.h

@@ -53,6 +53,12 @@ FOUNDATION_EXPORT NSString *const AWSDateShortDateFormat1;
 
 @end
 
+@interface NSNumber (AWS)
+
++ (NSNumber *)aws_numberFromString:(NSString *)string;
+
+@end
+
 @interface NSObject (AWS)
 
 - (NSDictionary *)aws_properties;

AWSCore/Utility/AWSCategory.m

@@ -142,6 +142,17 @@ -(id) aws_objectForCaseInsensitiveKey:(id)aKey {
 
 @end
 
+@implementation NSNumber (AWS)
+
++ (NSNumber *)aws_numberFromString:(NSString *)string {
+    NSNumberFormatter *numberFormatter = [NSNumberFormatter new];
+    numberFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+
+    return [numberFormatter numberFromString:string];
+}
+
+@end
+
 @implementation NSObject (AWS)
 
 - (NSDictionary *)aws_properties {

AWSiOSSDKAnalyticsTests/AIBufferedReaderTests.m

@@ -137,6 +137,42 @@ -(void)test_readingFromInputStream_multipleReadsRequired
     [self readFromReader:reader andVerifySuccessWith:NO andVerifyLineWith:nil andVerifyErrorCode:[NSNumber numberWithInt:AWSBufferedReaderErrorCode_IOStreamClosed]];
 }
 
+-(void)testReadingFromInputStream_largeMultibytesCharacters {
+    
+    //create a string with multi bytes characters in it (e.g. Chinese Characters)
+    NSString *chineseString = @"𐍈今天是个好天气€";
+    
+    NSMutableString* longChineseString = [NSMutableString stringWithCapacity:100000];
+    for(int i = 0; i < 100000; i++)
+    {
+        [longChineseString appendString:chineseString];
+        [longChineseString appendString:@"\n"];
+        
+    }
+    
+    NSData* mockInput = [longChineseString dataUsingEncoding:NSUTF8StringEncoding];
+    NSInputStream* inputStream = [NSInputStream inputStreamWithData:mockInput];
+    [inputStream open];
+    
+    
+    AWSMobileAnalyticsBufferedReader* reader = [AWSMobileAnalyticsBufferedReader readerWithInputStream:inputStream];
+    
+    for(int i = 0; i < 100000; i++)
+    {
+        [self readFromReader:reader andVerifySuccessWith:YES andVerifyLineWith:chineseString andVerifyErrorCode:nil];
+    }
+    
+    // no more data, so we should get a successful call with a nil string to signal end of stream
+    [self readFromReader:reader andVerifySuccessWith:YES andVerifyLineWith:nil andVerifyErrorCode:nil];
+    
+    // now that the buffer is at end, we need to close the object
+    [reader close];
+    
+    // any calls after this are errors
+    [self readFromReader:reader andVerifySuccessWith:NO andVerifyLineWith:nil andVerifyErrorCode:[NSNumber numberWithInt:AWSBufferedReaderErrorCode_IOStreamClosed]];
+    
+}
+
 -(void)testReadingFromInputStream_largeStream
 {
     // create a string with all the ascii codes in it

AWSiOSSDKTests/AWSCognitoCredentialsProviderTests.m

@@ -115,7 +115,6 @@ @implementation AWSCognitoCredentialsProviderTests
 #pragma mark - Set up/Tear down
 
 + (void)setUp {
-    [AWSLogger defaultLogger].logLevel = AWSLogLevelVerbose;
     [super setUp];
     [AWSTestUtility setupCognitoCredentialsProvider];
 

AWSiOSSDKTests/AWSCoreTests.m

@@ -77,6 +77,11 @@ - (void)testStringToDate {
     XCTAssertEqualWithAccuracy(testTimeAmz, expectedTime, 10, "Failed to create a proper date from string usingAWSDateAmzDateFormat");
 }
 
+- (void)testNumberFormatt {
+    XCTAssertEqualObjects([NSNumber aws_numberFromString:@"12345.67"], @12345.67);
+    XCTAssertNil([NSNumber aws_numberFromString:@"12345,67"]);
+}
+
 - (void)testUrlEncode {
     NSString *inputOne = @"test %";
     NSString *inputTwo = [NSString stringWithFormat:@"test %%"];

AWSiOSSDKTests/AWSEC2Tests.m

@@ -73,7 +73,7 @@ - (void)testDescribeImages {
     AWSEC2 *ec2 = [AWSEC2 defaultEC2];
 
     AWSEC2DescribeImagesRequest *describeImagesRequest = [AWSEC2DescribeImagesRequest new];
-    describeImagesRequest.imageIds = @[@"ami-c4fe9aac"]; // Microsoft Windows Server 2012 R2 Base Image ID
+    describeImagesRequest.imageIds = @[@"ami-b27830da"]; // Microsoft Windows Server 2012 R2 Base Image ID
     [[[ec2 describeImages:describeImagesRequest] continueWithBlock:^id(BFTask *task) {
         if (task.error) {
             XCTFail(@"Error: [%@]", task.error);
@@ -87,7 +87,7 @@ - (void)testDescribeImages {
             BOOL imageExist = NO;
 
             for (AWSEC2Image *image in describeImagesResult.images) {
-                if ([image.imageId isEqualToString:@"ami-c4fe9aac"]) {
+                if ([image.imageId isEqualToString:@"ami-b27830da"]) {
                     imageExist = YES;
                     XCTAssertEqual(AWSEC2PlatformValuesWindows, image.platform);
                 }

AWSiOSSDKTests/AWSS3PreSignedURLBuilderTests.m

@@ -41,7 +41,6 @@ @implementation AWSS3PreSignedURLBuilderTests
 
 - (void)setUp {
     [super setUp];
-    [AWSLogger defaultLogger].logLevel = AWSLogLevelError;
     // Put setup code here. This method is called before the invocation of each test method in the class.
     [AWSTestUtility setupCognitoCredentialsProvider];
 }
@@ -340,7 +339,7 @@ - (void)testPutObjectWithSpecialCharacters {
 
                 XCTAssertNotNil(presignedURL);
 
-                NSLog(@"(PUT)presigned URL (Put)is: %@",presignedURL.absoluteString);
+                //NSLog(@"(PUT)presigned URL (Put)is: %@",presignedURL.absoluteString);
 
                 NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:presignedURL];
                 request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;