Merge pull request #197 from ParsePlatform/nlutsenko.httpsfiles

nlutsenko · nlutsenko · commit 80f27c25d975 · 2015-09-09T17:07:00.000-07:00
Add https support for PFFiles.
diff --git a/Parse/Internal/File/Controller/PFFileController.m b/Parse/Internal/File/Controller/PFFileController.m
@@ -97,7 +97,7 @@ - (BFTask *)downloadFileAsyncWithState:(PFFileState *)fileState
 
         BFTask *resultTask = [self _fileDownloadResultTaskForFileWithState:fileState];
         if (!resultTask) {
-            NSURL *url = [NSURL URLWithString:fileState.urlString];
+            NSURL *url = [NSURL URLWithString:fileState.secureURLString];
             NSString *temporaryPath = [self _temporaryFileDownloadPathForFileState:fileState];
 
             PFProgressBlock unifyingProgressBlock = [self _fileDownloadUnifyingProgressBlockForFileState:fileState];
@@ -116,13 +116,13 @@ - (BFTask *)downloadFileAsyncWithState:(PFFileState *)fileState
                 }];
             }] continueWithBlock:^id(BFTask *task) {
                 dispatch_barrier_async(_downloadDataAccessQueue, ^{
-                    [_downloadTasks removeObjectForKey:fileState.urlString];
-                    [_downloadProgressBlocks removeObjectForKey:fileState.urlString];
+                    [_downloadTasks removeObjectForKey:fileState.secureURLString];
+                    [_downloadProgressBlocks removeObjectForKey:fileState.secureURLString];
                 });
                 return task;
             }];
             dispatch_barrier_async(_downloadDataAccessQueue, ^{
-                _downloadTasks[fileState.urlString] = resultTask;
+                _downloadTasks[fileState.secureURLString] = resultTask;
             });
         }
         return resultTask;
@@ -152,7 +152,7 @@ - (BFTask *)downloadFileStreamAsyncWithState:(PFFileState *)fileState
 - (BFTask *)_fileDownloadResultTaskForFileWithState:(PFFileState *)state {
     __block BFTask *resultTask = nil;
     dispatch_sync(_downloadDataAccessQueue, ^{
-        resultTask = _downloadTasks[state.urlString];
+        resultTask = _downloadTasks[state.secureURLString];
     });
     return resultTask;
 }
@@ -162,7 +162,7 @@ - (PFProgressBlock)_fileDownloadUnifyingProgressBlockForFileState:(PFFileState *
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             __block NSArray *blocks = nil;
             dispatch_sync(_downloadDataAccessQueue, ^{
-                blocks = [_downloadProgressBlocks[fileState.urlString] copy];
+                blocks = [_downloadProgressBlocks[fileState.secureURLString] copy];
             });
             if (blocks.count != 0) {
                 dispatch_async(dispatch_get_main_queue(), ^{
@@ -181,18 +181,18 @@ - (void)_addFileDownloadProgressBlock:(PFProgressBlock)block forFileWithState:(P
     }
 
     dispatch_barrier_async(_downloadDataAccessQueue, ^{
-        NSMutableArray *progressBlocks = _downloadProgressBlocks[state.urlString];
+        NSMutableArray *progressBlocks = _downloadProgressBlocks[state.secureURLString];
         if (!progressBlocks) {
             progressBlocks = [NSMutableArray arrayWithObject:block];
-            _downloadProgressBlocks[state.urlString] = progressBlocks;
+            _downloadProgressBlocks[state.secureURLString] = progressBlocks;
         } else {
             [progressBlocks addObject:block];
         }
     });
 }
 
 - (NSString *)_temporaryFileDownloadPathForFileState:(PFFileState *)fileState {
-    return [NSTemporaryDirectory() stringByAppendingPathComponent:PFMD5HashFromString(fileState.urlString)];
+    return [NSTemporaryDirectory() stringByAppendingPathComponent:PFMD5HashFromString(fileState.secureURLString)];
 }
 
 ///--------------------------------------
@@ -242,11 +242,11 @@ - (BFTask *)uploadFileAsyncWithState:(PFFileState *)fileState
 ///--------------------------------------
 
 - (NSString *)cachedFilePathForFileState:(PFFileState *)fileState {
-    if (!fileState.urlString) {
+    if (!fileState.secureURLString) {
         return nil;
     }
 
-    NSString *filename = [fileState.urlString lastPathComponent];
+    NSString *filename = [fileState.secureURLString lastPathComponent];
     NSString *path = [self.cacheFilesDirectoryPath stringByAppendingPathComponent:filename];
     return path;
 }
diff --git a/Parse/Internal/File/State/PFFileState.h b/Parse/Internal/File/State/PFFileState.h
@@ -11,10 +11,12 @@
 
 #import "PFBaseState.h"
 
+//TODO: (nlutsenko) Add nullability annotations
 @interface PFFileState : PFBaseState <PFBaseStateSubclass, NSCopying, NSMutableCopying>
 
 @property (nonatomic, copy, readonly) NSString *name;
 @property (nonatomic, copy, readonly) NSString *urlString;
+@property (nonatomic, copy, readonly) NSString *secureURLString;
 
 @property (nonatomic, copy, readonly) NSString *mimeType;
 
diff --git a/Parse/Internal/File/State/PFFileState.m b/Parse/Internal/File/State/PFFileState.m
@@ -13,6 +13,14 @@
 #import "PFMutableFileState.h"
 #import "PFPropertyInfo.h"
 
+static NSString *const _PFFileStateSecureDomain = @"files.parsetfss.com";
+
+@interface PFFileState ()
+
+@property (nonatomic, copy, readwrite) NSString *secureURLString;
+
+@end
+
 @implementation PFFileState
 
 ///--------------------------------------
@@ -46,6 +54,43 @@ - (instancetype)initWithName:(NSString *)name urlString:(NSString *)urlString mi
     return self;
 }
 
+///--------------------------------------
+#pragma mark - Accessors
+///--------------------------------------
+
+- (void)setUrlString:(NSString *)urlString {
+    if (self.urlString != urlString) {
+        _urlString = [urlString copy];
+        _secureURLString = nil; // Invalidate variable cache
+    }
+}
+
+- (NSString *)secureURLString {
+    if (_secureURLString) {
+        return _secureURLString;
+    }
+
+    if (!self.urlString) {
+        return nil;
+    }
+
+    NSURLComponents *components = [NSURLComponents componentsWithString:self.urlString];
+    if (!components) {
+        return self.urlString;
+    }
+
+    NSString *scheme = [components scheme];
+    if (![scheme isEqualToString:@"http"]) {
+        return self.urlString;
+    }
+
+    if ([[components host] isEqualToString:_PFFileStateSecureDomain]) {
+        components.scheme = @"https";
+    }
+    _secureURLString = [[components URL] absoluteString];
+    return _secureURLString;
+}
+
 ///--------------------------------------
 #pragma mark - Mutable Copying
 ///--------------------------------------
diff --git a/Parse/Internal/PFEncoder.m b/Parse/Internal/PFEncoder.m
@@ -14,7 +14,7 @@
 #import "PFBase64Encoder.h"
 #import "PFDateFormatter.h"
 #import "PFFieldOperation.h"
-#import "PFFile.h"
+#import "PFFile_Private.h"
 #import "PFGeoPointPrivate.h"
 #import "PFObjectPrivate.h"
 #import "PFOfflineStore.h"
@@ -62,7 +62,7 @@ - (id)encodeObject:(id)object {
         }
         return @{
                  @"__type" : @"File",
-                 @"url" : ((PFFile *)object).url,
+                 @"url" : ((PFFile *)object).state.urlString,
                  @"name" : ((PFFile *)object).name
                  };
 
diff --git a/Parse/PFFile.m b/Parse/PFFile.m
@@ -435,7 +435,7 @@ - (NSString *)name {
 - (NSString *)url {
     __block NSString *url = nil;
     [self _performDataAccessBlock:^{
-        url = self.state.urlString;
+        url = self.state.secureURLString;
     }];
     return url;
 }
diff --git a/Tests/Unit/FileStateTests.m b/Tests/Unit/FileStateTests.m
@@ -29,6 +29,7 @@ - (void)assertFileState:(PFFileState *)state equalToState:(PFFileState *)differe
 
     XCTAssertEqualObjects(state.name, differentState.name);
     XCTAssertEqualObjects(state.urlString, differentState.urlString);
+    XCTAssertEqualObjects(state.secureURLString, differentState.secureURLString);
     XCTAssertEqualObjects(state.mimeType, differentState.mimeType);
 }
 
@@ -40,11 +41,13 @@ - (void)testInit {
     PFFileState *state = [[PFFileState alloc] init];
     XCTAssertNil(state.name);
     XCTAssertNil(state.urlString);
+    XCTAssertNil(state.secureURLString);
     XCTAssertNil(state.mimeType);
 
     state = [[PFMutableFileState alloc] init];
     XCTAssertNil(state.name);
     XCTAssertNil(state.urlString);
+    XCTAssertNil(state.secureURLString);
     XCTAssertNil(state.mimeType);
 }
 
@@ -78,13 +81,15 @@ - (void)testWithEmptyProperties {
                                                   mimeType:nil];
     XCTAssertEqualObjects(state.name, @"file");
     XCTAssertNil(state.urlString);
+    XCTAssertNil(state.secureURLString);
     XCTAssertNil(state.mimeType);
 
     state = [[PFMutableFileState alloc] initWithName:nil
                                            urlString:nil
                                             mimeType:nil];
     XCTAssertEqualObjects(state.name, @"file");
     XCTAssertNil(state.urlString);
+    XCTAssertNil(state.secureURLString);
     XCTAssertNil(state.mimeType);
 }
 
@@ -108,8 +113,29 @@ - (void)testMutableAccessors {
     XCTAssertEqualObjects(state.name, @"a");
     state.urlString = @"b";
     XCTAssertEqualObjects(state.urlString, @"b");
+    XCTAssertEqualObjects(state.secureURLString, @"b");
     state.mimeType = @"c";
     XCTAssertEqualObjects(state.mimeType, @"c");
 }
 
+- (void)testSecureURLString {
+    PFMutableFileState *state = [[PFMutableFileState alloc] initWithName:@"a"
+                                                               urlString:@"http://files.parsetfss.com/yolo.txt"
+                                                                mimeType:nil];
+    XCTAssertEqualObjects(state.urlString, @"http://files.parsetfss.com/yolo.txt");
+    XCTAssertEqualObjects(state.secureURLString, @"https://files.parsetfss.com/yolo.txt");
+
+    state.urlString = @"https://files.parsetfss.com/yolo.txt";
+    XCTAssertEqualObjects(state.urlString, @"https://files.parsetfss.com/yolo.txt");
+    XCTAssertEqualObjects(state.secureURLString, @"https://files.parsetfss.com/yolo.txt");
+
+    state.urlString = @"http://files.parsetfss.com/yolo2.txt";
+    XCTAssertEqualObjects(state.urlString, @"http://files.parsetfss.com/yolo2.txt");
+    XCTAssertEqualObjects(state.secureURLString, @"https://files.parsetfss.com/yolo2.txt");
+
+    state.urlString = nil;
+    XCTAssertNil(state.urlString);
+    XCTAssertNil(state.secureURLString);
+}
+
 @end

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ - (NSString *)name {`
`435`	`435`	`- (NSString *)url {`
`436`	`436`	`__block NSString *url = nil;`
`437`	`437`	`[self _performDataAccessBlock:^{`
`438`		`- url = self.state.urlString;`
	`438`	`+ url = self.state.secureURLString;`
`439`	`439`	`}];`
`440`	`440`	`return url;`
`441`	`441`	`}`