[feature/tus-support] Add Tus upload support (WIP)

ownCloudSDK.xcodeproj/project.pbxproj

@@ -83,6 +83,8 @@
 		DC19BFEE21CBACBC007C20D1 /* OCProcessManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DC19BFEC21CBACBC007C20D1 /* OCProcessManager.m */; };
 		DC19BFF121CBE28B007C20D1 /* OCWaitCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = DC19BFEF21CBE28B007C20D1 /* OCWaitCondition.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC19BFF221CBE28B007C20D1 /* OCWaitCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DC19BFF021CBE28B007C20D1 /* OCWaitCondition.m */; };
+		DC1D3DF22459B86200328EBC /* NSString+TUSMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1D3DF02459B86200328EBC /* NSString+TUSMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DC1D3DF32459B86200328EBC /* NSString+TUSMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1D3DF12459B86200328EBC /* NSString+TUSMetadata.m */; };
 		DC1D4D3720DBD58E005A3DFC /* OCFile.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1D4D3520DBD58E005A3DFC /* OCFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC1D4D3820DBD58E005A3DFC /* OCFile.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1D4D3620DBD58E005A3DFC /* OCFile.m */; };
 		DC20DE4B21BFCBC20096000B /* OCLogComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = DC20DE4921BFCBC20096000B /* OCLogComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -492,6 +494,8 @@
 		DCE26621211348B00001FB2C /* OCCore+CommandLocalImport.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE2661F211348B00001FB2C /* OCCore+CommandLocalImport.m */; };
 		DCE370942099D18100114981 /* OCDatabaseConsistentOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE370922099D18100114981 /* OCDatabaseConsistentOperation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DCE370952099D18100114981 /* OCDatabaseConsistentOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE370932099D18100114981 /* OCDatabaseConsistentOperation.m */; };
+		DCE451A52459AD3F0074363F /* OCTUSJob.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE451A32459AD3F0074363F /* OCTUSJob.h */; };
+		DCE451A62459AD3F0074363F /* OCTUSJob.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE451A42459AD3F0074363F /* OCTUSJob.m */; };
 		DCE48DD8220E1C7B00839E97 /* OCHTTPPipelineTaskCache.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE48DD6220E1C7A00839E97 /* OCHTTPPipelineTaskCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DCE48DD9220E1C7B00839E97 /* OCHTTPPipelineTaskCache.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE48DD7220E1C7B00839E97 /* OCHTTPPipelineTaskCache.m */; };
 		DCE784F922325D4F00733F01 /* OCConnection+Recipients.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE784F722325D4F00733F01 /* OCConnection+Recipients.m */; };
@@ -517,6 +521,8 @@
 		DCEEB2F22047094500189B9A /* NSData+OCHash.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEEB2F02047094500189B9A /* NSData+OCHash.m */; };
 		DCEEB2F5204802CF00189B9A /* OCIssue.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEEB2F3204802CF00189B9A /* OCIssue.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DCEEB2F6204802CF00189B9A /* OCIssue.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEEB2F4204802CF00189B9A /* OCIssue.m */; };
+		DCF39B552458268E00DEA137 /* OCTUSHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF39B532458268E00DEA137 /* OCTUSHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DCF39B562458268E00DEA137 /* OCTUSHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF39B542458268E00DEA137 /* OCTUSHeader.m */; };
 		DCFBACF121BAA77F00943F76 /* largePropFindResponse1000.xml in Resources */ = {isa = PBXBuildFile; fileRef = DCFBACF021BAA77F00943F76 /* largePropFindResponse1000.xml */; };
 		DCFBACF721BAB35A00943F76 /* PerformanceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFBACF621BAB35A00943F76 /* PerformanceTests.m */; };
 		DCFBACF921BAB5F500943F76 /* OCDetailedPerformanceTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFBACF821BAB5F500943F76 /* OCDetailedPerformanceTestCase.m */; };
@@ -751,6 +757,8 @@
 		DC19BFEC21CBACBC007C20D1 /* OCProcessManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCProcessManager.m; sourceTree = "<group>"; };
 		DC19BFEF21CBE28B007C20D1 /* OCWaitCondition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCWaitCondition.h; sourceTree = "<group>"; };
 		DC19BFF021CBE28B007C20D1 /* OCWaitCondition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCWaitCondition.m; sourceTree = "<group>"; };
+		DC1D3DF02459B86200328EBC /* NSString+TUSMetadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+TUSMetadata.h"; sourceTree = "<group>"; };
+		DC1D3DF12459B86200328EBC /* NSString+TUSMetadata.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+TUSMetadata.m"; sourceTree = "<group>"; };
 		DC1D4D3520DBD58E005A3DFC /* OCFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCFile.h; sourceTree = "<group>"; };
 		DC1D4D3620DBD58E005A3DFC /* OCFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCFile.m; sourceTree = "<group>"; };
 		DC1D4D3D20DC2281005A3DFC /* OCClaim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCClaim.h; sourceTree = "<group>"; };
@@ -1172,6 +1180,8 @@
 		DCE2661F211348B00001FB2C /* OCCore+CommandLocalImport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OCCore+CommandLocalImport.m"; sourceTree = "<group>"; };
 		DCE370922099D18100114981 /* OCDatabaseConsistentOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCDatabaseConsistentOperation.h; sourceTree = "<group>"; };
 		DCE370932099D18100114981 /* OCDatabaseConsistentOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCDatabaseConsistentOperation.m; sourceTree = "<group>"; };
+		DCE451A32459AD3F0074363F /* OCTUSJob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCTUSJob.h; sourceTree = "<group>"; };
+		DCE451A42459AD3F0074363F /* OCTUSJob.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCTUSJob.m; sourceTree = "<group>"; };
 		DCE48DD6220E1C7A00839E97 /* OCHTTPPipelineTaskCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCHTTPPipelineTaskCache.h; sourceTree = "<group>"; };
 		DCE48DD7220E1C7B00839E97 /* OCHTTPPipelineTaskCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCHTTPPipelineTaskCache.m; sourceTree = "<group>"; };
 		DCE784F722325D4F00733F01 /* OCConnection+Recipients.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OCConnection+Recipients.m"; sourceTree = "<group>"; };
@@ -1195,6 +1205,8 @@
 		DCEEB2F02047094500189B9A /* NSData+OCHash.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+OCHash.m"; sourceTree = "<group>"; };
 		DCEEB2F3204802CF00189B9A /* OCIssue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCIssue.h; sourceTree = "<group>"; };
 		DCEEB2F4204802CF00189B9A /* OCIssue.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCIssue.m; sourceTree = "<group>"; };
+		DCF39B532458268E00DEA137 /* OCTUSHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCTUSHeader.h; sourceTree = "<group>"; };
+		DCF39B542458268E00DEA137 /* OCTUSHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCTUSHeader.m; sourceTree = "<group>"; };
 		DCFBACF021BAA77F00943F76 /* largePropFindResponse1000.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = largePropFindResponse1000.xml; sourceTree = "<group>"; };
 		DCFBACF621BAB35A00943F76 /* PerformanceTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PerformanceTests.m; sourceTree = "<group>"; };
 		DCFBACF821BAB5F500943F76 /* OCDetailedPerformanceTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCDetailedPerformanceTestCase.m; sourceTree = "<group>"; };
@@ -2545,6 +2557,7 @@
 				DC855707204FEA1500189B9A /* Authentication */,
 				DC4B12002209C24F0062BCDD /* HTTP */,
 				DC855708204FEA3400189B9A /* Connection */,
+				DCF39B572458290200DEA137 /* TUS */,
 				DC4B11FB220996330062BCDD /* Progress */,
 				DC19BFC621CA67B1007C20D1 /* Issues */,
 				DC1D4D3420DBD557005A3DFC /* File Handling */,
@@ -2699,6 +2712,19 @@
 			path = Toolkit;
 			sourceTree = "<group>";
 		};
+		DCF39B572458290200DEA137 /* TUS */ = {
+			isa = PBXGroup;
+			children = (
+				DCF39B542458268E00DEA137 /* OCTUSHeader.m */,
+				DCF39B532458268E00DEA137 /* OCTUSHeader.h */,
+				DCE451A42459AD3F0074363F /* OCTUSJob.m */,
+				DCE451A32459AD3F0074363F /* OCTUSJob.h */,
+				DC1D3DF12459B86200328EBC /* NSString+TUSMetadata.m */,
+				DC1D3DF02459B86200328EBC /* NSString+TUSMetadata.h */,
+			);
+			path = TUS;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -2772,6 +2798,7 @@
 				DC0AE4F22311C75300428681 /* OCKeyValueStack.h in Headers */,
 				DC1D4D3720DBD58E005A3DFC /* OCFile.h in Headers */,
 				DC34227A217CAA0B00705508 /* OCIPNotificationCenter.h in Headers */,
+				DCF39B552458268E00DEA137 /* OCTUSHeader.h in Headers */,
 				DC8EB2FE23951AAB009148F9 /* OCAuthenticationBrowserSession.h in Headers */,
 				DCEEB2F5204802CF00189B9A /* OCIssue.h in Headers */,
 				DC35969A2240EC0A00C4D6E6 /* OCQueryCondition+Item.h in Headers */,
@@ -2812,6 +2839,7 @@
 				DC179CD520948DF30018DF7F /* NSProgress+OCExtensions.h in Headers */,
 				DCADC0442072CCC900DB8E83 /* OCCoreItemListTask.h in Headers */,
 				DCD3439C2059319C00189B9A /* OCSQLiteDB.h in Headers */,
+				DC1D3DF22459B86200328EBC /* NSString+TUSMetadata.h in Headers */,
 				DCDD9B18222989E50052A001 /* OCRecipient.h in Headers */,
 				DCADC03F2072774200DB8E83 /* OCQuery+Internal.h in Headers */,
 				DC4A2C5E20D4608100A47260 /* OCIssueChoice.h in Headers */,
@@ -2905,6 +2933,7 @@
 				DC708CE4214135E200FE43CA /* OCSyncActionDownload.h in Headers */,
 				DC188997218B09CC00CFB3F9 /* OCLogFileSource.h in Headers */,
 				DCDD9B14222986D50052A001 /* OCShare+OCXMLObjectCreation.h in Headers */,
+				DCE451A52459AD3F0074363F /* OCTUSJob.h in Headers */,
 				DC42254720766D63002E01E4 /* OCReachabilityMonitor.h in Headers */,
 				DCDD9B2B22312ED80052A001 /* OCRateLimiter.h in Headers */,
 				DC3CE0482429FCDF00AB8B88 /* OCMessageQueue.h in Headers */,
@@ -3316,6 +3345,7 @@
 				DC359693223FA7CC00C4D6E6 /* OCQueryCondition.m in Sources */,
 				DCFFF57F20D3A51C0096D2D3 /* OCSyncContext.m in Sources */,
 				DCA36D4E22A6B14200265534 /* OCPKCE.m in Sources */,
+				DCF39B562458268E00DEA137 /* OCTUSHeader.m in Sources */,
 				DCAEB06A21FA617D0067E147 /* OCActivity.m in Sources */,
 				DC2FED61228D5589004FDEC6 /* OCCore+Favorites.m in Sources */,
 				DC29F4C324323C4900347658 /* OCSyncIssueTemplate.m in Sources */,
@@ -3341,6 +3371,7 @@
 				DC114A9522A7A87C00CBD597 /* NSData+OCRandom.m in Sources */,
 				DC8556EE204DEA2900189B9A /* OCHTTPDAVRequest.m in Sources */,
 				DC4AFAA7206A6E7100189B9A /* OCSQLiteResultSet.m in Sources */,
+				DCE451A62459AD3F0074363F /* OCTUSJob.m in Sources */,
 				DC19BFEE21CBACBC007C20D1 /* OCProcessManager.m in Sources */,
 				DCC8FA0020285C1500EB6701 /* OCAuthenticationMethodOAuth2.m in Sources */,
 				DCDD9B15222986D50052A001 /* OCShare+OCXMLObjectCreation.m in Sources */,
@@ -3377,6 +3408,7 @@
 				DC2F6376223A61990063C2DA /* OCCoreQuery.m in Sources */,
 				DCC8F9F7202855A200EB6701 /* OCShare.m in Sources */,
 				DC39DC472041A03300189B9A /* OCAuthenticationMethodBasicAuth.m in Sources */,
+				DC1D3DF32459B86200328EBC /* NSString+TUSMetadata.m in Sources */,
 				DC34227B217CAA0B00705508 /* OCIPNotificationCenter.m in Sources */,
 				DCC8FA0C2029C0BE00EB6701 /* OCQueryFilter.m in Sources */,
 				DCDBEE2C2048A6A800189B9A /* OCConnection+Setup.m in Sources */,

ownCloudSDK/Connection/Capabilities/OCCapabilities.h

@@ -19,6 +19,7 @@
 #import <Foundation/Foundation.h>
 #import "OCChecksumAlgorithm.h"
 #import "OCShare.h"
+#import "OCTUSHeader.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -55,6 +56,17 @@ typedef NSNumber* OCCapabilityBool;
 @property(readonly,nullable,nonatomic) NSString *davChunkingVersion;
 @property(readonly,nullable,nonatomic) NSArray<NSString *> *davReports;
 
+#pragma mark - TUS
+@property(readonly,nonatomic) BOOL tusSupported;
+@property(readonly,nullable,nonatomic) OCTUSCapabilities tusCapabilities;
+@property(readonly,nullable,nonatomic) NSArray<OCTUSVersion> *tusVersions;
+@property(readonly,nullable,nonatomic) OCTUSVersion tusResumable;
+@property(readonly,nullable,nonatomic) NSArray<OCTUSExtension> *tusExtensions;
+@property(readonly,nullable,nonatomic) NSNumber *tusMaxChunkSize;
+@property(readonly,nullable,nonatomic) OCHTTPMethod tusHTTPMethodOverride;
+
+@property(readonly,nullable,nonatomic) OCTUSHeader *tusCapabilitiesHeader; //!< .tusCapabilities translated into an OCTUSHeader
+
 #pragma mark - Files
 @property(readonly,nullable,nonatomic) OCCapabilityBool supportsPrivateLinks;
 @property(readonly,nullable,nonatomic) OCCapabilityBool supportsBigFileChunking;

ownCloudSDK/Connection/Capabilities/OCCapabilities.m

@@ -25,6 +25,10 @@
 @interface OCCapabilities()
 {
 	NSDictionary<NSString *, id> *_capabilities;
+
+	OCTUSHeader *_tusCapabilitiesHeader;
+	NSArray<OCTUSVersion> *_tusVersions;
+	NSArray<OCTUSExtension> *_tusExtensions;
 }
 
 @end
@@ -57,6 +61,17 @@ @implementation OCCapabilities
 @dynamic davChunkingVersion;
 @dynamic davReports;
 
+#pragma mark - TUS
+@dynamic tusSupported;
+@dynamic tusCapabilities;
+@dynamic tusVersions;
+@dynamic tusResumable;
+@dynamic tusExtensions;
+@dynamic tusMaxChunkSize;
+@dynamic tusHTTPMethodOverride;
+
+@dynamic tusCapabilitiesHeader;
+
 #pragma mark - Files
 @dynamic supportsPrivateLinks;
 @dynamic supportsBigFileChunking;
@@ -229,6 +244,79 @@ - (NSString *)davChunkingVersion
 	return (OCTypedCast(_capabilities[@"dav"][@"reports"], NSArray));
 }
 
+#pragma mark - TUS
+- (BOOL)tusSupported
+{
+	return (self.tusResumable.length > 0);
+}
+
+- (OCTUSCapabilities)tusCapabilities
+{
+	return (OCTypedCast(_capabilities[@"files"][@"tus_support"], NSDictionary));
+}
+
+- (NSArray<OCTUSVersion> *)tusVersions
+{
+	if (_tusVersions)
+	{
+		_tusVersions = [OCTypedCast(self.tusCapabilities[@"version"], NSString) componentsSeparatedByString:@","];
+	}
+
+	return (_tusVersions);
+}
+
+- (OCTUSVersion)tusResumable
+{
+	return(OCTypedCast(self.tusCapabilities[@"resumable"], NSString));
+}
+
+- (NSArray<OCTUSExtension> *)tusExtensions
+{
+	if (_tusExtensions == nil)
+	{
+		NSString *tusExtensionsString = OCTypedCast(self.tusCapabilities[@"extension"], NSString);
+
+		_tusExtensions = [tusExtensionsString componentsSeparatedByString:@","];
+	}
+
+	return (_tusExtensions);
+}
+
+- (NSNumber *)tusMaxChunkSize
+{
+	return(OCTypedCast(self.tusCapabilities[@"max_chunk_size"], NSNumber));
+}
+
+- (OCHTTPMethod)tusHTTPMethodOverride
+{
+	NSString *httpMethodOverride = OCTypedCast(self.tusCapabilities[@"http_method_override"], NSString);
+
+	if (httpMethodOverride.length == 0)
+	{
+		return (nil);
+	}
+
+	return(httpMethodOverride);
+}
+
+- (OCTUSHeader *)tusCapabilitiesHeader
+{
+	if ((_tusCapabilitiesHeader == nil) && self.tusSupported)
+	{
+		OCTUSHeader *header = [[OCTUSHeader alloc] init];
+
+		header.extensions = self.tusExtensions;
+		header.version = self.tusResumable;
+		header.versions = self.tusVersions;
+
+		header.maximumChunkSize = self.tusMaxChunkSize;
+
+		_tusCapabilitiesHeader = header;
+	}
+
+	return (_tusCapabilitiesHeader);
+}
+
 #pragma mark - Files
 - (OCCapabilityBool)supportsPrivateLinks
 {

ownCloudSDK/Connection/OCConnection.h

@@ -73,6 +73,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (OCHTTPRequestInstruction)connection:(OCConnection *)connection instructionForFinishedRequest:(OCHTTPRequest *)request withResponse:(OCHTTPResponse *)response error:(NSError *)error defaultsTo:(OCHTTPRequestInstruction)defaultInstruction;
 
+- (nullable OCTUSHeader *)connection:(OCConnection *)connection tusHeader:(nullable OCTUSHeader *)tusHeader forChildrenOf:(OCItem *)parentItem;
+
 @end
 
 NS_ASSUME_NONNULL_END
@@ -383,6 +385,7 @@ extern OCConnectionOptionKey OCConnectionOptionChecksumKey; //!< OCChecksum inst
 extern OCConnectionOptionKey OCConnectionOptionChecksumAlgorithmKey; //!< OCChecksumAlgorithmIdentifier identifying the checksum algorithm to use to compute checksums for the "OC-Checksum" header in uploads
 extern OCConnectionOptionKey OCConnectionOptionGroupIDKey; //!< OCHTTPRequestGroupID to use for requests
 extern OCConnectionOptionKey OCConnectionOptionRequiredSignalsKey; //!< NSSet<OCConnectionSignalID> with the signal ids to require for the requests
+extern OCConnectionOptionKey OCConnectionOptionTemporarySegmentFolderURLKey; //!< NSURL of the temporary folder to store file segments in when performing uploads via TUS
 
 extern OCIPCNotificationName OCIPCNotificationNameConnectionSettingsChanged; //!< Posted when connection settings changed