From 01c3d1ec0c6a7cfd4bae15fb459eb6e94ae63c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 28 Apr 2023 17:26:58 +0200 Subject: [PATCH] ignore 'null' mtime on tus upload --sign --- changelog/unreleased/fix-null-mtime.md | 5 +++++ pkg/storage/utils/decomposedfs/upload.go | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/fix-null-mtime.md diff --git a/changelog/unreleased/fix-null-mtime.md b/changelog/unreleased/fix-null-mtime.md new file mode 100644 index 0000000000..aa7e1e60fc --- /dev/null +++ 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 index 4e707f3ba5..4d8579c0ef 100644 --- 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