Uploads: Send OC-Checksum for non-TUS

Author: guruz

opencloudApp/src/main/java/eu/opencloud/android/workers/UploadFileFromContentUriWorker.kt

@@ -377,12 +377,16 @@ class UploadFileFromContentUriWorker(
             tusUploadUrl = ocTransfer.tusUploadUrl,
         )
 
+        if (hasPendingTusSession && !hasStoredSha1Checksum()) {
+            Timber.w("TUS session for %s has no original checksum. Clearing state and recreating.", uploadPath)
+            clearTusState()
+        }
+        // Always have the whole-file checksum: TUS sends it in Upload-Metadata, plain PUTs
+        // in the OC-Checksum header. Usually already persisted by copyFileToLocalStorage;
+        // this only reads the source again for cache-reuse runs of pre-checksum DB rows.
+        ensureOriginalTusChecksum()
+
         if (shouldTryTus) {
-            if (hasPendingTusSession && !hasStoredSha1Checksum()) {
-                Timber.w("TUS session for %s has no original checksum. Clearing state and recreating.", uploadPath)
-                clearTusState()
-            }
-            ensureOriginalTusChecksum()
             Timber.d(
                 "Attempting TUS upload (size=%d, threshold=%d, resume=%s)",
                 fileSize,
@@ -434,13 +438,15 @@ class UploadFileFromContentUriWorker(
     }
 
     private fun uploadPlainFile(client: OpenCloudClient) {
+        val fileChecksum = TusChecksumHelper.parseStoredChecksum(ocTransfer.tusUploadChecksum)
         uploadFileOperation = UploadFileFromFileSystemOperation(
             localPath = cachePath,
             remotePath = uploadPath,
             mimeType = mimeType,
             lastModifiedTimestamp = lastModified,
             requiredEtag = null,
             spaceWebDavUrl = spaceWebDavUrl,
+            ocChecksum = fileChecksum?.ocChecksumHeaderValue,
         ).apply {
             addDataTransferProgressListener(this@UploadFileFromContentUriWorker)
         }

opencloudApp/src/main/java/eu/opencloud/android/workers/UploadFileFromFileSystemWorker.kt

@@ -267,12 +267,15 @@ class UploadFileFromFileSystemWorker(
             tusUploadUrl = ocTransfer.tusUploadUrl,
         )
 
+        if (hasPendingTusSession && !hasStoredSha1Checksum()) {
+            Timber.w("TUS session for %s has no original checksum. Clearing state and recreating.", uploadPath)
+            clearTusState()
+        }
+        // Always compute the whole-file checksum: TUS sends it in Upload-Metadata,
+        // plain PUTs send it in the OC-Checksum header.
+        ensureOriginalTusChecksum()
+
         if (shouldTryTus) {
-            if (hasPendingTusSession && !hasStoredSha1Checksum()) {
-                Timber.w("TUS session for %s has no original checksum. Clearing state and recreating.", uploadPath)
-                clearTusState()
-            }
-            ensureOriginalTusChecksum()
             Timber.d(
                 "Attempting TUS upload (size=%d, threshold=%d, resume=%s)",
                 fileSize,
@@ -326,13 +329,15 @@ class UploadFileFromFileSystemWorker(
     }
 
     private fun uploadPlainFile(client: OpenCloudClient) {
+        val fileChecksum = TusChecksumHelper.parseStoredChecksum(ocTransfer.tusUploadChecksum)
         uploadFileOperation = UploadFileFromFileSystemOperation(
             localPath = fileSystemPath,
             remotePath = uploadPath,
             mimeType = mimetype,
             lastModifiedTimestamp = lastModified,
             requiredEtag = eTagInConflict,
             spaceWebDavUrl = spaceWebDavUrl,
+            ocChecksum = fileChecksum?.ocChecksumHeaderValue,
         ).apply {
             addDataTransferProgressListener(this@UploadFileFromFileSystemWorker)
         }

opencloudComLibrary/src/main/java/eu/opencloud/android/lib/common/http/HttpConstants.java

@@ -44,6 +44,7 @@ public class HttpConstants {
     public static final String CONTENT_LENGTH_HEADER = "Content-Length";
     public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
+    public static final String OC_CHECKSUM_HEADER = "OC-Checksum";
     public static final String OC_X_REQUEST_ID = "X-Request-ID";
     public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
     public static final String LOCATION_HEADER = "Location";

opencloudComLibrary/src/main/java/eu/opencloud/android/lib/resources/files/DownloadRemoteFileOperation.kt

@@ -69,7 +69,8 @@ class DownloadRemoteFileOperation(
         return try {
             tmpFile.parentFile?.mkdirs()
             downloadFile(client, tmpFile).also { result ->
-                Timber.i("Download of $remotePath to $tmpPath: ${result.logMessage}")
+                val outcome = if (result.isSuccess) "success, etag=$etag" else result.logMessage
+                Timber.i("Download of $remotePath to $tmpPath: $outcome")
             }
         } catch (e: Exception) {
             RemoteOperationResult<Unit>(e).also { result ->

opencloudComLibrary/src/main/java/eu/opencloud/android/lib/resources/files/UploadFileFromFileSystemOperation.kt

@@ -57,6 +57,8 @@ open class UploadFileFromFileSystemOperation(
     val lastModifiedTimestamp: String,
     val requiredEtag: String?,
     val spaceWebDavUrl: String? = null,
+    /** Whole-file checksum as "ALGORITHM:hex" (e.g. "SHA1:30338d…"); server rejects with 400 on mismatch. */
+    val ocChecksum: String? = null,
 ) : RemoteOperation<Unit>() {
 
     protected val cancellationRequested = AtomicBoolean(false)
@@ -76,7 +78,8 @@ open class UploadFileFromFileSystemOperation(
             } else {
                 // perform the upload
                 result = uploadFile(client)
-                Timber.i("Upload of $localPath to $remotePath: ${result.logMessage}")
+                val outcome = if (result.isSuccess) "success, etag=$etag" else result.logMessage
+                Timber.i("Upload of $localPath to $remotePath: $outcome")
             }
         } catch (e: Exception) {
             if (putMethod?.isAborted == true) {
@@ -107,6 +110,7 @@ open class UploadFileFromFileSystemOperation(
             }
             addRequestHeader(HttpConstants.OC_TOTAL_LENGTH_HEADER, fileToUpload.length().toString())
             addRequestHeader(HttpConstants.OC_X_OC_MTIME_HEADER, lastModifiedTimestamp)
+            ocChecksum?.let { addRequestHeader(HttpConstants.OC_CHECKSUM_HEADER, it) }
         }
 
         val status = client.executeHttpMethod(putMethod)

opencloudComLibrary/src/main/java/eu/opencloud/android/lib/resources/files/tus/TusChecksumHelper.kt

@@ -48,6 +48,10 @@ object TusChecksumHelper {
         val uploadAlgorithm: String
             get() = algorithm.lowercase(Locale.ROOT)
 
+        /** Value for the OC-Checksum header on plain PUTs: "SHA1:<hex>" (colon-separated). */
+        val ocChecksumHeaderValue: String
+            get() = "${metadataAlgorithm()}:${hex.lowercase(Locale.ROOT)}"
+
         private fun metadataAlgorithm(): String =
             if (algorithm.lowercase(Locale.ROOT) == SHA1_WIRE_ALGORITHM) SHA1_METADATA_ALGORITHM
             else algorithm.uppercase(Locale.ROOT)