Avoid overwriting object tags when changing lock (#9794)

cmd/object-handlers.go

@@ -2699,8 +2699,11 @@ func (api objectAPIHandlers) PutObjectLegalHoldHandler(w http.ResponseWriter, r
 		return
 	}
 	objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockLegalHold)] = strings.ToUpper(string(legalHold.Status))
+	if objInfo.UserTags != "" {
+		objInfo.UserDefined[xhttp.AmzTagDirective] = replaceDirective
+		objInfo.UserDefined[xhttp.AmzObjectTagging] = objInfo.UserTags
+	}
 	objInfo.metadataOnly = true
-
 	if _, err = objectAPI.CopyObject(ctx, bucket, object, bucket, object, objInfo, ObjectOptions{}, ObjectOptions{}); err != nil {
 		writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r))
 		return
@@ -2857,6 +2860,10 @@ func (api objectAPIHandlers) PutObjectRetentionHandler(w http.ResponseWriter, r
 
 	objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockMode)] = string(objRetention.Mode)
 	objInfo.UserDefined[strings.ToLower(xhttp.AmzObjectLockRetainUntilDate)] = objRetention.RetainUntilDate.UTC().Format(time.RFC3339)
+	if objInfo.UserTags != "" {
+		objInfo.UserDefined[xhttp.AmzTagDirective] = replaceDirective
+		objInfo.UserDefined[xhttp.AmzObjectTagging] = objInfo.UserTags
+	}
 	objInfo.metadataOnly = true // Perform only metadata updates.
 	if _, err = objectAPI.CopyObject(ctx, bucket, object, bucket, object, objInfo, ObjectOptions{}, ObjectOptions{}); err != nil {
 		writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r))

cmd/storage-datatypes.go

@@ -85,7 +85,7 @@ func (entry FileInfo) ToObjectInfo() ObjectInfo {
 			ContentEncoding: entry.Metadata["content-encoding"],
 		}
 
-		// Extrat object tagging information
+		// Extract object tagging information
 		objInfo.UserTags = entry.Metadata[xhttp.AmzObjectTagging]
 
 		// Extract etag from metadata.