Merge pull request #3831 from butonic/fix-null-mtime

ignore 'null' mtime on tus upload
cs3org · Apr 29, 2023 · 4d1c9f4 · 4d1c9f4
2 parents ef158f7 + 01c3d1e
commit 4d1c9f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-null-mtime.md b/changelog/unreleased/fix-null-mtime.md
@@ -0,0 +1,5 @@
+Bugfix: ignore 'null' mtime on tus upload
+
+decomposedfs now ignores 'null' as an mtime
+
+https://github.com/cs3org/reva/pull/3831
diff --git a/pkg/storage/utils/decomposedfs/upload.go b/pkg/storage/utils/decomposedfs/upload.go
@@ -165,10 +165,14 @@ func (fs *Decomposedfs) InitiateUpload(ctx context.Context, ref *provider.Refere
 	if metadata != nil {
 		info.MetaData["providerID"] = metadata["providerID"]
 		if mtime, ok := metadata["mtime"]; ok {
-			info.MetaData["mtime"] = mtime
+			if mtime != "null" {
+				info.MetaData["mtime"] = mtime
+			}
 		}
 		if expiration, ok := metadata["expires"]; ok {
-			info.MetaData["expires"] = expiration
+			if expiration != "null" {
+				info.MetaData["expires"] = expiration
+			}
 		}
 		if _, ok := metadata["sizedeferred"]; ok {
 			info.SizeIsDeferred = true