Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: correct status code when move is denied #4439

Merged
merged 3 commits into from
Dec 28, 2023
Merged

fix: correct status code when move is denied #4439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c64091c
fix: correct status code when move is denied
micbar Dec 27, 2023
396839a
test: fix unit tests
micbar Dec 27, 2023
6cb36cf
Update changelog/unreleased/fix-statuscode-move-denied.md
micbar Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/fix-statuscode-move-denied.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: Fixed wrong status code when moving a file to a denied path

We fixed a bug when the status code 502 was returned when moving a file to a denied path. Status code 403 (forbidden) is now returned to be compatible with oc10.

https://github.com/cs3org/reva/pull/4439
2 changes: 1 addition & 1 deletion internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ func (s *service) Move(ctx context.Context, req *provider.MoveRequest) (*provide

if dstReceivedShare.Share.Id.OpaqueId != srcReceivedShare.Share.Id.OpaqueId {
return &provider.MoveResponse{
Status: status.NewUnimplemented(ctx, nil, "sharesstorageprovider: can not move between shares"),
Status: status.NewPermissionDenied(ctx, nil, "sharesstorageprovider: can not move between shares"),
}, nil
}

Expand Down
4 changes: 2 additions & 2 deletions internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ var _ = Describe("Sharesstorageprovider", func() {
gatewayClient.AssertNotCalled(GinkgoT(), "Move", mock.Anything, mock.Anything)
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(res.Status.Code).To(Equal(rpc.Code_CODE_UNIMPLEMENTED))
Expect(res.Status.Code).To(Equal(rpc.Code_CODE_PERMISSION_DENIED))
})

It("refuses to move a file between shares resolving to the same space", func() {
Expand All @@ -826,7 +826,7 @@ var _ = Describe("Sharesstorageprovider", func() {
gatewayClient.AssertNotCalled(GinkgoT(), "Move", mock.Anything, mock.Anything)
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(res.Status.Code).To(Equal(rpc.Code_CODE_UNIMPLEMENTED))
Expect(res.Status.Code).To(Equal(rpc.Code_CODE_PERMISSION_DENIED))
})

It("moves a file", func() {
Expand Down
4 changes: 4 additions & 0 deletions internal/http/services/owncloud/ocdav/move.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@ func (s *svc) handleMove(ctx context.Context, w http.ResponseWriter, r *http.Req
switch mRes.Status.Code {
case rpc.Code_CODE_ABORTED:
status = http.StatusPreconditionFailed
case rpc.Code_CODE_PERMISSION_DENIED:
status = http.StatusForbidden
// create oc10 compatible error message
m = "Destination directory is not writable"
case rpc.Code_CODE_UNIMPLEMENTED:
// We translate this into a Bad Gateway error as per https://www.rfc-editor.org/rfc/rfc4918#section-9.9.4
// > 502 (Bad Gateway) - This may occur when the destination is on another
Expand Down
Loading