Merge pull request #4928 from roman-vanicek/edge

Propagate lock in PROPPATCH in WebDAV
cs3org · Nov 21, 2024 · 2041e81 · 2041e81
2 parents 43de17f + 4002675
commit 2041e81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelog/unreleased/propagate-lock-proppatch.md b/changelog/unreleased/propagate-lock-proppatch.md
@@ -0,0 +1,4 @@
+Bugfix: Propagate lock in PROPPATCH
+Clients using locking (ie. Windows) could not create/copy files over webdav as file seemed to be locked.
+
+https://github.com/cs3org/reva/pull/4928
diff --git a/internal/http/services/owncloud/ocdav/proppatch.go b/internal/http/services/owncloud/ocdav/proppatch.go
@@ -133,12 +133,14 @@ func (s *svc) handleProppatch(ctx context.Context, w http.ResponseWriter, r *htt
 	rreq := &provider.UnsetArbitraryMetadataRequest{
 		Ref:                   ref,
 		ArbitraryMetadataKeys: []string{""},
+		LockId:                requestLockToken(r),
 	}
 	sreq := &provider.SetArbitraryMetadataRequest{
 		Ref: ref,
 		ArbitraryMetadata: &provider.ArbitraryMetadata{
 			Metadata: map[string]string{},
 		},
+		LockId: requestLockToken(r),
 	}
 
 	acceptedProps := []xml.Name{}