From 3e67cef3bf6fee94dd0095905979240dacbea83b Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Tue, 16 May 2023 19:41:34 +0200 Subject: [PATCH] update reva to latest edge --- go.mod | 2 +- go.sum | 2 ++ .../services/sharesstorageprovider/sharesstorageprovider.go | 3 +++ .../owncloud/ocs/handlers/apps/sharing/shares/public.go | 2 +- .../owncloud/ocs/handlers/apps/sharing/shares/shares.go | 3 ++- .../cs3org/reva/v2/pkg/storage/utils/decomposedfs/spaces.go | 1 + vendor/modules.txt | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d5549314db..e76ccb7ab5 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.4.0 github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 - github.com/cs3org/reva/v2 v2.13.3-0.20230515105000-30125f104ba1 + github.com/cs3org/reva/v2 v2.13.3-0.20230516144046-7cf837940387 github.com/disintegration/imaging v1.6.2 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e github.com/egirna/icap-client v0.1.1 diff --git a/go.sum b/go.sum index f4df47fa96..35020e889f 100644 --- a/go.sum +++ b/go.sum @@ -629,6 +629,8 @@ github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc= github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA= github.com/cs3org/reva/v2 v2.13.3-0.20230515105000-30125f104ba1 h1:M3+4wZvZolLs90wCjkJYslakQ3JAp/zs16mOwxvieJQ= github.com/cs3org/reva/v2 v2.13.3-0.20230515105000-30125f104ba1/go.mod h1:MoymB39kU/myG7LFkaCwqtoXQHct+/8uoZAvJEmNi+I= +github.com/cs3org/reva/v2 v2.13.3-0.20230516144046-7cf837940387 h1:yCjVQ6x1VtYljREeNYGoK3F4X8MG50qFf+Dd4nMtCo4= +github.com/cs3org/reva/v2 v2.13.3-0.20230516144046-7cf837940387/go.mod h1:MoymB39kU/myG7LFkaCwqtoXQHct+/8uoZAvJEmNi+I= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= diff --git a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go index abd7e942ce..709631a042 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go +++ b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go @@ -683,6 +683,9 @@ func (s *service) Stat(ctx context.Context, req *provider.StatRequest) (*provide PermissionSet: &provider.ResourcePermissions{ // TODO }, + Space: &provider.StorageSpace{ + SpaceType: "virtual", + }, Etag: etag, Owner: owner.Id, }, diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go index 4a1d8f88ad..ff35aadbba 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go @@ -46,7 +46,7 @@ func (h *Handler) createPublicLinkShare(w http.ResponseWriter, r *http.Request, ctx := r.Context() log := appctx.GetLogger(ctx) - c, err := pool.GetGatewayServiceClient(h.gatewayAddr) + c, err := h.getClient() if err != nil { return nil, &ocsError{ Code: response.MetaServerError.StatusCode, diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index 374e7b485b..fea5f61478 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -210,7 +210,7 @@ func (h *Handler) CreateShare(w http.ResponseWriter, r *http.Request) { } sublog := appctx.GetLogger(ctx).With().Interface("ref", ref).Logger() - statReq := provider.StatRequest{Ref: &ref} + statReq := provider.StatRequest{Ref: &ref, FieldMask: &fieldmaskpb.FieldMask{Paths: []string{"space"}}} statRes, err := client.Stat(ctx, &statReq) if err != nil { sublog.Debug().Err(err).Msg("CreateShare: error on stat call") @@ -233,6 +233,7 @@ func (h *Handler) CreateShare(w http.ResponseWriter, r *http.Request) { // check that this is a valid share if statRes.Info.Id.OpaqueId == statRes.Info.Id.SpaceId && + statRes.GetInfo().GetSpace().GetSpaceType() == "personal" && (shareType != int(conversions.ShareTypeSpaceMembershipUser) && shareType != int(conversions.ShareTypeSpaceMembershipGroup)) { response.WriteOCSError(w, r, http.StatusBadRequest, "Can not share space root", nil) return diff --git a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/spaces.go b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/spaces.go index 12f264aeb0..00926d7d6f 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/spaces.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/spaces.go @@ -604,6 +604,7 @@ func (fs *Decomposedfs) UpdateStorageSpace(ctx context.Context, req *provider.Up }, nil } } + metadata[prefixes.TreeMTimeAttr] = []byte(time.Now().UTC().Format(time.RFC3339Nano)) err = spaceNode.SetXattrs(metadata, true) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 4bba358b58..d7419e031b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -349,7 +349,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.13.3-0.20230515105000-30125f104ba1 +# github.com/cs3org/reva/v2 v2.13.3-0.20230516144046-7cf837940387 ## explicit; go 1.19 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime