mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-05 19:59:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bump reva to get https://github.com/cs3org/reva/pull/4652

Browse Source 
Fixes: #8819
This commit is contained in:
Ralf Haferkamp
2024-04-22 16:04:58 +02:00
committed by Ralf Haferkamp
parent d0dd6c8d85
commit 1e5db86900
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/unreleased/bump-reva.md
View File

@@ -2,6 +2,7 @@ Enhancement: Bump Reva
bumps reva version
https://github.com/owncloud/ocis/pull/8917
https://github.com/owncloud/ocis/pull/8795
https://github.com/owncloud/ocis/pull/8701
https://github.com/owncloud/ocis/pull/8606

2
go.mod
View File

@@ -14,7 +14,7 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/coreos/go-oidc/v3 v3.10.0
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf
github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67
github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
github.com/disintegration/imaging v1.6.2
github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

4
go.sum
View File

@@ -1022,8 +1022,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf h1:MCXXZKR3fj2ZCaEPQ3l3cpR4q/TmVaaPbgKUB2hhCvo=
github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67 h1:oMZvQnlnsOCbNASud6jpZOmSINgGumoNSOD2LGOafQk=
github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

11
vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/usershareprovider.go generated vendored
View File

@@ -191,7 +191,9 @@ func (s *svc) updateSpaceShare(ctx context.Context, req *collaboration.UpdateSha
return nil, errors.Wrap(err, "gateway: error getting grant to remove from storage")
}
if !isSpaceManagerRemaining(listGrantRes.GetGrants(), grant.GetGrantee()) {
return nil, errors.New("gateway: can't remove the last manager")
return &collaboration.UpdateShareResponse{
Status: status.NewPermissionDenied(ctx, errtypes.PermissionDenied(""), "can't remove the last manager"),
}, nil
}
}
st, err = s.updateGrant(ctx, req.GetShare().GetResourceId(), grant, opaque)
@@ -477,8 +479,7 @@ func (s *svc) removeGrant(ctx context.Context, id *provider.ResourceId, g *provi
return nil, errors.Wrap(err, "gateway: error calling RemoveGrant")
}
if grantRes.Status.Code != rpc.Code_CODE_OK {
return status.NewInternal(ctx,
"error removing storage grant"), nil
return grantRes.GetStatus(), nil
}
return status.NewOK(ctx), nil
@@ -723,7 +724,9 @@ func (s *svc) removeSpaceShare(ctx context.Context, ref *provider.ResourceId, gr
}
if len(listGrantRes.Grants) == 1 || !isSpaceManagerRemaining(listGrantRes.Grants, grantee) {
return nil, errors.New("gateway: can't remove the last manager")
return &collaboration.RemoveShareResponse{
Status: status.NewPermissionDenied(ctx, errtypes.PermissionDenied(""), "can't remove the last manager"),
}, nil
}
// TODO: change CS3 APIs

2
vendor/modules.txt vendored
View File

@@ -366,7 +366,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
github.com/cs3org/go-cs3apis/cs3/types/v1beta1
# github.com/cs3org/reva/v2 v2.19.2-0.20240419134937-8a636c82c1cf
# github.com/cs3org/reva/v2 v2.19.2-0.20240422133703-f92da96ffe67
## explicit; go 1.21
github.com/cs3org/reva/v2/cmd/revad/internal/grace
github.com/cs3org/reva/v2/cmd/revad/runtime