fix: restore revision after negative post-processing outcome

pkg/storage/fs/posix/blobstore/blobstore.go

@@ -67,7 +67,7 @@ func (bs *Blobstore) Upload(n *node.Node, source, copyTarget string) error {
 		_ = sourceFile.Close()
 	}()
 
-	tempFile, err := os.OpenFile(tempName, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0700)
+	tempFile, err := os.OpenFile(tempName, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
 	if err != nil {
 		return fmt.Errorf("unable to create temp file '%s': %v", tempName, err)
 	}

pkg/storage/fs/posix/tree/revisions.go

@@ -272,7 +272,7 @@ func (tp *Tree) DownloadRevision(ctx context.Context, ref *provider.Reference, r
 	return ri, reader, nil
 }
 
-func (tp *Tree) RestoreRevision(ctx context.Context, srcNode, targetNode metadata.MetadataNode) error {
+func (tp *Tree) RestoreRevision(ctx context.Context, srcNode, targetNode metadata.MetadataNode, mtime time.Time) error {
 	source := srcNode.InternalPath()
 	target := targetNode.InternalPath()
 	rf, err := os.Open(source)
@@ -305,8 +305,10 @@ func (tp *Tree) RestoreRevision(ctx context.Context, srcNode, targetNode metadat
 		return errtypes.InternalError("failed to copy blob xattrs to old revision to node: " + err.Error())
 	}
 
-	// always set the node mtime to the current time
-	mtime := time.Now()
+	// set the node mtime to the current time if no mtime was provided
+	if mtime.IsZero() {
+		mtime = time.Now()
+	}
 	err = os.Chtimes(target, mtime, mtime)
 	if err != nil {
 		return errtypes.InternalError("failed to update times:" + err.Error())

pkg/storage/pkg/decomposedfs/node/node.go

@@ -129,7 +129,7 @@ type Tree interface {
 	Delete(ctx context.Context, node *Node) (err error)
 
 	InitNewNode(ctx context.Context, n *Node, fsize uint64) (metadata.UnlockFunc, error)
-	RestoreRevision(ctx context.Context, source, target metadata.MetadataNode) (err error)
+	RestoreRevision(ctx context.Context, source, target metadata.MetadataNode, mtime time.Time) (err error)
 
 	WriteBlob(node *Node, source string) error
 	ReadBlob(node *Node) (io.ReadCloser, error)

pkg/storage/pkg/decomposedfs/revisions.go

@@ -131,7 +131,7 @@ func (fs *Decomposedfs) RestoreRevision(ctx context.Context, ref *provider.Refer
 
 	// restore revision
 	restoredRevisionPath := fs.lu.InternalPath(spaceID, revisionKey)
-	if err := fs.tp.RestoreRevision(ctx, revisionNode, n); err != nil {
+	if err := fs.tp.RestoreRevision(ctx, revisionNode, n, time.Now()); err != nil {
 		return err
 	}
 

pkg/storage/pkg/decomposedfs/tree/revisions.go

@@ -330,7 +330,7 @@ func (tp *Tree) getRevisionNode(ctx context.Context, ref *provider.Reference, re
 	return n, nil
 }
 
-func (tp *Tree) RestoreRevision(ctx context.Context, sourceNode, targetNode metadata.MetadataNode) error {
+func (tp *Tree) RestoreRevision(ctx context.Context, sourceNode, targetNode metadata.MetadataNode, mtime time.Time) error {
 	err := tp.lookup.CopyMetadata(ctx, sourceNode, targetNode, func(attributeName string, value []byte) (newValue []byte, copy bool) {
 		return value, strings.HasPrefix(attributeName, prefixes.ChecksumPrefix) ||
 			attributeName == prefixes.TypeAttr ||
@@ -340,10 +340,13 @@ func (tp *Tree) RestoreRevision(ctx context.Context, sourceNode, targetNode meta
 	if err != nil {
 		return errtypes.InternalError("failed to copy blob xattrs to old revision to node: " + err.Error())
 	}
-	// always set the node mtime to the current time
+	// set the node mtime to the current time if no mtime was provided
+	if mtime.IsZero() {
+		mtime = time.Now()
+	}
 	err = tp.lookup.MetadataBackend().SetMultiple(ctx, targetNode,
 		map[string][]byte{
-			prefixes.MTimeAttr: []byte(time.Now().UTC().Format(time.RFC3339Nano)),
+			prefixes.MTimeAttr: []byte(mtime.UTC().Format(time.RFC3339Nano)),
 		},
 		false)
 	if err != nil {

pkg/storage/pkg/decomposedfs/upload/upload.go

@@ -371,35 +371,45 @@ func (session *DecomposedFsSession) removeNode(ctx context.Context) {
 // cleanup cleans up after the upload is finished
 func (session *DecomposedFsSession) Cleanup(revertNodeMetadata, cleanBin, cleanInfo bool) {
 	ctx := session.Context(context.Background())
+	sublog := session.store.log.With().Str("cleanup sessionid", session.ID()).Bool("revertNodeMetadata", revertNodeMetadata).Bool("cleanBin", cleanBin).
+		Bool("cleanInfo", cleanInfo).Logger()
 
 	if revertNodeMetadata {
 		n, err := session.Node(ctx)
 		if err != nil {
-			appctx.GetLogger(ctx).Error().Err(err).Str("sessionid", session.ID()).Msg("reading node for session failed")
+			sublog.Error().Err(err).Msg("reading node for session failed")
 		} else {
 			if session.NodeExists() && session.info.MetaData["versionID"] != "" {
 				versionID := session.info.MetaData["versionID"]
-				revisionNode := node.NewBaseNode(n.SpaceID, versionID, session.store.lu)
-
-				if err := session.store.lu.CopyMetadata(ctx, revisionNode, n, func(attributeName string, value []byte) (newValue []byte, copy bool) {
-					return value, strings.HasPrefix(attributeName, prefixes.ChecksumPrefix) ||
-						attributeName == prefixes.TypeAttr ||
-						attributeName == prefixes.BlobIDAttr ||
-						attributeName == prefixes.BlobsizeAttr ||
-						attributeName == prefixes.MTimeAttr
-				}, true); err != nil {
-					appctx.GetLogger(ctx).Info().Str("version", versionID).Str("nodepath", n.InternalPath()).Err(err).Msg("renaming version node failed")
+				sublog.Debug().Str("nodepath", n.InternalPath()).Str("versionID", versionID).Msg("restoring revision")
+				revisionNode, err := node.ReadNode(ctx, session.store.lu, session.SpaceID(), versionID, false, n.SpaceRoot, false)
+				if err != nil {
+					sublog.Error().Err(err).Str("versionID", versionID).Msg("reading revision node failed")
 				}
 
-				if err := os.RemoveAll(revisionNode.InternalPath()); err != nil {
-					appctx.GetLogger(ctx).Info().Str("version", versionID).Str("nodepath", n.InternalPath()).Err(err).Msg("error removing version")
+				if !revisionNode.Exists {
+					sublog.Error().Str("versionID", versionID).Msg("revision node does not exist")
+				}
+
+				// restore the revision
+				mtime, err := revisionNode.GetMTime(ctx)
+				if err != nil {
+					sublog.Error().Err(err).Str("versionID", versionID).Msg("getting mtime of revision node failed")
+					mtime = time.Now()
 				}
 
+				if err := session.store.tp.RestoreRevision(ctx, revisionNode, n, mtime); err != nil {
+					sublog.Error().Err(err).Str("versionID", versionID).Msg("restoring revision node failed")
+				}
+
+				if err := os.RemoveAll(revisionNode.InternalPath()); err != nil {
+					sublog.Error().Err(err).Str("revisionpath", revisionNode.InternalPath()).Msg("removing restored revision file failed")
+				}
 			} else {
 				// if no other upload session is in progress (processing id != session id) or has finished (processing id == "")
 				latestSession, err := n.ProcessingID(ctx)
 				if err != nil {
-					appctx.GetLogger(ctx).Error().Err(err).Str("spaceid", n.SpaceID).Str("nodeid", n.ID).Str("uploadid", session.ID()).Msg("reading processingid for session failed")
+					sublog.Error().Err(err).Str("spaceid", n.SpaceID).Str("nodeid", n.ID).Str("uploadid", session.ID()).Msg("reading processingid for session failed")
 				}
 				if latestSession == session.ID() {
 					// actually delete the node