diff --git a/changelog/unreleased/bump-go-cs3apis.md b/changelog/unreleased/bump-go-cs3apis.md new file mode 100644 index 0000000000..ddaa3bef40 --- /dev/null +++ b/changelog/unreleased/bump-go-cs3apis.md @@ -0,0 +1,6 @@ +Change: Updated to the latest version of the go-cs3apis + +The go-cs3apis dependency was updated to the latest version + +https://github.com/cs3org/reva/pull/4759 +https://github.com/owncloud/ocis/issues/9554 diff --git a/cmd/reva/ls.go b/cmd/reva/ls.go index b90f984b95..a493f0ed02 100644 --- a/cmd/reva/ls.go +++ b/cmd/reva/ls.go @@ -72,7 +72,7 @@ func lsCommand() *command { } if len(w) == 0 { if *longFlag { - fmt.Printf("%s %d %d %v %s\n", info.Type, info.Mtime, info.Size, info.Id, p) + fmt.Printf("%s %d %d %v %s\n", info.Type, info.Mtime.GetSeconds(), info.Size, info.Id, p) } else { fmt.Println(p) } diff --git a/go.mod b/go.mod index 14c79f8170..16361ad003 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/cheggaaa/pb v1.0.29 github.com/coreos/go-oidc/v3 v3.4.0 github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e - github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 + github.com/cs3org/go-cs3apis v0.0.0-20240425114016-d2cb31692b4e github.com/dgraph-io/ristretto v0.1.1 github.com/emvi/iso-639-1 v1.1.0 github.com/eventials/go-tus v0.0.0-20220610120217-05d0564bb571 diff --git a/go.sum b/go.sum index ecf3792e80..28f7afbdce 100644 --- a/go.sum +++ b/go.sum @@ -916,8 +916,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e h1:tqSPWQeueWTKnJVMJffz4pz0o1WuQxJ28+5x5JgaHD8= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= -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/go-cs3apis v0.0.0-20240425114016-d2cb31692b4e h1:Cm2l8m2riLa79eh7V2wHd1Ra7wR3TbngmeLZBJ9MxTU= +github.com/cs3org/go-cs3apis v0.0.0-20240425114016-d2cb31692b4e/go.mod h1:yyP8PRo0EZou3nSH7H4qjlzQwaydPeIRNgX50npQHpE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -1941,7 +1941,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190415081028-16da32be82c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2266,7 +2265,6 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= diff --git a/internal/grpc/interceptors/auth/scope.go b/internal/grpc/interceptors/auth/scope.go index 3fa9e7943f..fc7fdbf0ff 100644 --- a/internal/grpc/interceptors/auth/scope.go +++ b/internal/grpc/interceptors/auth/scope.go @@ -142,7 +142,7 @@ func resolveLightweightScope(ctx context.Context, ref *provider.Reference, scope } for _, share := range shares.Shares { - shareKey := "lw:" + user.Id.OpaqueId + scopeDelimiter + storagespace.FormatResourceID(*share.Share.ResourceId) + shareKey := "lw:" + user.Id.OpaqueId + scopeDelimiter + storagespace.FormatResourceID(share.Share.ResourceId) _ = scopeExpansionCache.SetWithExpire(shareKey, nil, scopeCacheExpiration*time.Second) if ref.ResourceId != nil && utils.ResourceIDEqual(share.Share.ResourceId, ref.ResourceId) { @@ -229,7 +229,7 @@ func checkRelativeReference(ctx context.Context, requested *provider.Reference, } } - key := storagespace.FormatResourceID(*sharedResourceID) + scopeDelimiter + getRefKey(requested) + key := storagespace.FormatResourceID(sharedResourceID) + scopeDelimiter + getRefKey(requested) _ = scopeExpansionCache.SetWithExpire(key, nil, scopeCacheExpiration*time.Second) return nil } @@ -246,7 +246,7 @@ func resolveUserShare(ctx context.Context, ref *provider.Reference, scope *authp func checkCacheForNestedResource(ctx context.Context, ref *provider.Reference, resource *provider.ResourceId, client gateway.GatewayAPIClient, mgr token.Manager) error { // Check if this ref is cached - key := storagespace.FormatResourceID(*resource) + scopeDelimiter + getRefKey(ref) + key := storagespace.FormatResourceID(resource) + scopeDelimiter + getRefKey(ref) if _, err := scopeExpansionCache.Get(key); err == nil { return nil } @@ -520,7 +520,7 @@ func getRefKey(ref *provider.Reference) string { } if ref.GetResourceId() != nil { - return storagespace.FormatResourceID(*ref.ResourceId) + return storagespace.FormatResourceID(ref.ResourceId) } // on malicious request both path and rid could be empty diff --git a/internal/grpc/services/gateway/authprovider.go b/internal/grpc/services/gateway/authprovider.go index 59214afffe..5f9ced4017 100644 --- a/internal/grpc/services/gateway/authprovider.go +++ b/internal/grpc/services/gateway/authprovider.go @@ -36,6 +36,7 @@ import ( "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/pkg/errors" "google.golang.org/grpc/metadata" + "google.golang.org/protobuf/proto" ) func (s *svc) Authenticate(ctx context.Context, req *gateway.AuthenticateRequest) (*gateway.AuthenticateResponse, error) { @@ -92,12 +93,12 @@ func (s *svc) Authenticate(ctx context.Context, req *gateway.AuthenticateRequest }, nil } - u := *res.User + u := proto.Clone(res.User).(*userpb.User) if sharedconf.SkipUserGroupsInToken() { u.Groups = []string{} } - token, err := s.tokenmgr.MintToken(ctx, &u, res.TokenScope) + token, err := s.tokenmgr.MintToken(ctx, u, res.TokenScope) if err != nil { err = errors.Wrap(err, "authsvc: error in MintToken") res := &gateway.AuthenticateResponse{ diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go index 1541fff874..8f508645ba 100644 --- a/internal/grpc/services/gateway/storageprovider.go +++ b/internal/grpc/services/gateway/storageprovider.go @@ -213,7 +213,7 @@ func (s *svc) CreateStorageSpace(ctx context.Context, req *provider.CreateStorag } // just pick the first provider, we expect only one - c, err := s.getStorageProviderClient(ctx, res.Providers[0]) + c, err := s.getSpacesProviderClient(ctx, res.Providers[0]) if err != nil { return &provider.CreateStorageSpaceResponse{ Status: status.NewStatusFromErrType(ctx, "gateway could not get storage provider client", err), @@ -310,7 +310,7 @@ func (s *svc) ListStorageSpaces(ctx context.Context, req *provider.ListStorageSp func (s *svc) UpdateStorageSpace(ctx context.Context, req *provider.UpdateStorageSpaceRequest) (*provider.UpdateStorageSpaceResponse, error) { // TODO: needs to be fixed ref := &provider.Reference{ResourceId: req.StorageSpace.Root} - c, _, err := s.find(ctx, ref) + c, _, err := s.findSpacesProvider(ctx, ref) if err != nil { return &provider.UpdateStorageSpaceResponse{ Status: status.NewStatusFromErrType(ctx, fmt.Sprintf("gateway could not find reference %+v", ref), err), @@ -347,7 +347,7 @@ func (s *svc) DeleteStorageSpace(ctx context.Context, req *provider.DeleteStorag } ref := &provider.Reference{ResourceId: &rid} - c, _, err := s.find(ctx, ref) + c, _, err := s.findSpacesProvider(ctx, ref) if err != nil { return &provider.DeleteStorageSpaceResponse{ Status: status.NewStatusFromErrType(ctx, fmt.Sprintf("gateway could not find reference %+v", ref), err), @@ -1028,6 +1028,20 @@ func (s *svc) find(ctx context.Context, ref *provider.Reference) (provider.Provi return client, p[0], err } +// findSpacesProvider looks up the provider that is responsible for the given request +// It will return a client that the caller can use to make the call, as well as the ProviderInfo. It: +// - contains the provider path, which is the mount point of the provider +// - may contain a list of storage spaces with their id and space path +func (s *svc) findSpacesProvider(ctx context.Context, ref *provider.Reference) (provider.SpacesAPIClient, *registry.ProviderInfo, error) { + p, err := s.findSpaces(ctx, ref) + if err != nil { + return nil, nil, err + } + + client, err := s.getSpacesProviderClient(ctx, p[0]) + return client, p[0], err +} + func (s *svc) findUnique(ctx context.Context, ref *provider.Reference) (provider.ProviderAPIClient, *registry.ProviderInfo, error) { p, err := s.findSingleSpace(ctx, ref) if err != nil { @@ -1082,6 +1096,18 @@ func (s *svc) findAndUnwrapUnique(ctx context.Context, ref *provider.Reference) return c, p, relativeReference, nil } +func (s *svc) getSpacesProviderClient(_ context.Context, p *registry.ProviderInfo) (provider.SpacesAPIClient, error) { + c, err := pool.GetSpacesProviderServiceClient(p.Address) + if err != nil { + return nil, err + } + + return &cachedSpacesAPIClient{ + c: c, + createPersonalSpaceCache: s.createPersonalSpaceCache, + }, nil +} + func (s *svc) getStorageProviderClient(_ context.Context, p *registry.ProviderInfo) (provider.ProviderAPIClient, error) { c, err := pool.GetStorageProviderServiceClient(p.Address) if err != nil { diff --git a/internal/grpc/services/gateway/storageprovidercache.go b/internal/grpc/services/gateway/storageprovidercache.go index f3db156ec2..122620bcb3 100644 --- a/internal/grpc/services/gateway/storageprovidercache.go +++ b/internal/grpc/services/gateway/storageprovidercache.go @@ -77,6 +77,50 @@ func (c *cachedRegistryClient) GetHome(ctx context.Context, in *registry.GetHome return c.c.GetHome(ctx, in, opts...) } +/* + Cached Spaces Provider +*/ + +type cachedSpacesAPIClient struct { + c provider.SpacesAPIClient + createPersonalSpaceCache cache.CreatePersonalSpaceCache +} + +// CreateStorageSpace creates a storage space +func (c *cachedSpacesAPIClient) CreateStorageSpace(ctx context.Context, in *provider.CreateStorageSpaceRequest, opts ...grpc.CallOption) (*provider.CreateStorageSpaceResponse, error) { + if in.Type == "personal" { + key := c.createPersonalSpaceCache.GetKey(ctxpkg.ContextMustGetUser(ctx).GetId()) + if key != "" { + s := &provider.CreateStorageSpaceResponse{} + if err := c.createPersonalSpaceCache.PullFromCache(key, s); err == nil { + return s, nil + } + } + resp, err := c.c.CreateStorageSpace(ctx, in, opts...) + switch { + case err != nil: + return nil, err + case resp.Status.Code != rpc.Code_CODE_OK && resp.Status.Code != rpc.Code_CODE_ALREADY_EXISTS: + return resp, nil + case key == "": + return resp, nil + default: + return resp, c.createPersonalSpaceCache.PushToCache(key, resp) + } + } + return c.c.CreateStorageSpace(ctx, in, opts...) +} + +func (c *cachedSpacesAPIClient) ListStorageSpaces(ctx context.Context, in *provider.ListStorageSpacesRequest, opts ...grpc.CallOption) (*provider.ListStorageSpacesResponse, error) { + return c.c.ListStorageSpaces(ctx, in, opts...) +} +func (c *cachedSpacesAPIClient) UpdateStorageSpace(ctx context.Context, in *provider.UpdateStorageSpaceRequest, opts ...grpc.CallOption) (*provider.UpdateStorageSpaceResponse, error) { + return c.c.UpdateStorageSpace(ctx, in, opts...) +} +func (c *cachedSpacesAPIClient) DeleteStorageSpace(ctx context.Context, in *provider.DeleteStorageSpaceRequest, opts ...grpc.CallOption) (*provider.DeleteStorageSpaceResponse, error) { + return c.c.DeleteStorageSpace(ctx, in, opts...) +} + /* Cached Storage Provider */ @@ -108,31 +152,6 @@ func (c *cachedAPIClient) CreateHome(ctx context.Context, in *provider.CreateHom } } -// CreateStorageSpace creates a storage space -func (c *cachedAPIClient) CreateStorageSpace(ctx context.Context, in *provider.CreateStorageSpaceRequest, opts ...grpc.CallOption) (*provider.CreateStorageSpaceResponse, error) { - if in.Type == "personal" { - key := c.createPersonalSpaceCache.GetKey(ctxpkg.ContextMustGetUser(ctx).GetId()) - if key != "" { - s := &provider.CreateStorageSpaceResponse{} - if err := c.createPersonalSpaceCache.PullFromCache(key, s); err == nil { - return s, nil - } - } - resp, err := c.c.CreateStorageSpace(ctx, in, opts...) - switch { - case err != nil: - return nil, err - case resp.Status.Code != rpc.Code_CODE_OK && resp.Status.Code != rpc.Code_CODE_ALREADY_EXISTS: - return resp, nil - case key == "": - return resp, nil - default: - return resp, c.createPersonalSpaceCache.PushToCache(key, resp) - } - } - return c.c.CreateStorageSpace(ctx, in, opts...) -} - // methods below here are not cached, they just call the client directly // Stat returns the Resoure info for a given resource @@ -226,15 +245,6 @@ func (c *cachedAPIClient) Unlock(ctx context.Context, in *provider.UnlockRequest func (c *cachedAPIClient) GetHome(ctx context.Context, in *provider.GetHomeRequest, opts ...grpc.CallOption) (*provider.GetHomeResponse, error) { return c.c.GetHome(ctx, in, opts...) } -func (c *cachedAPIClient) ListStorageSpaces(ctx context.Context, in *provider.ListStorageSpacesRequest, opts ...grpc.CallOption) (*provider.ListStorageSpacesResponse, error) { - return c.c.ListStorageSpaces(ctx, in, opts...) -} -func (c *cachedAPIClient) UpdateStorageSpace(ctx context.Context, in *provider.UpdateStorageSpaceRequest, opts ...grpc.CallOption) (*provider.UpdateStorageSpaceResponse, error) { - return c.c.UpdateStorageSpace(ctx, in, opts...) -} -func (c *cachedAPIClient) DeleteStorageSpace(ctx context.Context, in *provider.DeleteStorageSpaceRequest, opts ...grpc.CallOption) (*provider.DeleteStorageSpaceResponse, error) { - return c.c.DeleteStorageSpace(ctx, in, opts...) -} func (c *cachedAPIClient) TouchFile(ctx context.Context, in *provider.TouchFileRequest, opts ...grpc.CallOption) (*provider.TouchFileResponse, error) { return c.c.TouchFile(ctx, in, opts...) } diff --git a/internal/grpc/services/gateway/usershareprovider.go b/internal/grpc/services/gateway/usershareprovider.go index 919845efb6..5f3aa839c3 100644 --- a/internal/grpc/services/gateway/usershareprovider.go +++ b/internal/grpc/services/gateway/usershareprovider.go @@ -22,6 +22,7 @@ import ( "context" "slices" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" @@ -365,6 +366,10 @@ func (s *svc) UpdateReceivedShare(ctx context.Context, req *collaboration.Update */ } +func (s *svc) ListExistingReceivedShares(_ context.Context, _ *collaboration.ListReceivedSharesRequest) (*gateway.ListExistingReceivedSharesResponse, error) { + return nil, errtypes.NotSupported("Unimplemented") +} + func (s *svc) denyGrant(ctx context.Context, id *provider.ResourceId, g *provider.Grantee, opaque *typesv1beta1.Opaque) (*rpc.Status, error) { ref := &provider.Reference{ ResourceId: id, diff --git a/internal/grpc/services/publicshareprovider/publicshareprovider.go b/internal/grpc/services/publicshareprovider/publicshareprovider.go index 0c740f3668..3202b8c755 100644 --- a/internal/grpc/services/publicshareprovider/publicshareprovider.go +++ b/internal/grpc/services/publicshareprovider/publicshareprovider.go @@ -350,7 +350,7 @@ func (s *service) RemovePublicShare(ctx context.Context, req *link.RemovePublicS Status: status.NewInternal(ctx, "error loading public share"), }, err } - if !publicshare.IsCreatedByUser(*ps, user) { + if !publicshare.IsCreatedByUser(ps, user) { sRes, err := gatewayClient.Stat(ctx, &provider.StatRequest{Ref: &provider.Reference{ResourceId: ps.ResourceId}}) if err != nil { log.Err(err).Interface("resource_id", ps.ResourceId).Msg("failed to stat shared resource") @@ -480,7 +480,7 @@ func (s *service) UpdatePublicShare(ctx context.Context, req *link.UpdatePublicS // users should always be able to downgrade links to internal links // when they are the creator of the link // all other users should have the WritePublicLink permission - if !isInternalLink && !publicshare.IsCreatedByUser(*ps, user) { + if !isInternalLink && !publicshare.IsCreatedByUser(ps, user) { canWriteLink, err := utils.CheckPermission(ctx, permission.WritePublicLink, gatewayClient) if err != nil { return &link.UpdatePublicShareResponse{ @@ -502,7 +502,7 @@ func (s *service) UpdatePublicShare(ctx context.Context, req *link.UpdatePublicS }, err } - if !publicshare.IsCreatedByUser(*ps, user) { + if !publicshare.IsCreatedByUser(ps, user) { if !sRes.GetInfo().GetPermissionSet().UpdateGrant { return &link.UpdatePublicShareResponse{ Status: status.NewPermissionDenied(ctx, nil, "no permission to update public share"), diff --git a/internal/grpc/services/publicstorageprovider/publicstorageprovider.go b/internal/grpc/services/publicstorageprovider/publicstorageprovider.go index 9fb92cd26c..dd685e183a 100644 --- a/internal/grpc/services/publicstorageprovider/publicstorageprovider.go +++ b/internal/grpc/services/publicstorageprovider/publicstorageprovider.go @@ -75,6 +75,7 @@ func (s *service) UnprotectedEndpoints() []string { func (s *service) Register(ss *grpc.Server) { provider.RegisterProviderAPIServer(ss, s) + provider.RegisterSpacesAPIServer(ss, s) } func parseConfig(m map[string]interface{}) (*config, error) { @@ -453,7 +454,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora // we know a grant for this resource space := &provider.StorageSpace{ Id: &provider.StorageSpaceId{ - OpaqueId: storagespace.FormatResourceID(*root), + OpaqueId: storagespace.FormatResourceID(root), }, SpaceType: "grant", Owner: &userv1beta1.User{Id: grantee}, @@ -485,7 +486,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora } space := &provider.StorageSpace{ Id: &provider.StorageSpaceId{ - OpaqueId: storagespace.FormatResourceID(*root), + OpaqueId: storagespace.FormatResourceID(root), }, SpaceType: "mountpoint", Owner: &userv1beta1.User{Id: grantee}, // FIXME actually, the mount point belongs to no one? diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go index 5fd8db144c..97de593b6d 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go @@ -77,6 +77,7 @@ func (s *service) UnprotectedEndpoints() []string { func (s *service) Register(ss *grpc.Server) { provider.RegisterProviderAPIServer(ss, s) + provider.RegisterSpacesAPIServer(ss, s) } // NewDefault returns a new instance of the SharesStorageProvider service with default dependencies @@ -432,7 +433,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora space := &provider.StorageSpace{ Opaque: opaque, Id: &provider.StorageSpaceId{ - OpaqueId: storagespace.FormatResourceID(*virtualRootID), + OpaqueId: storagespace.FormatResourceID(virtualRootID), }, SpaceType: "virtual", //Owner: &userv1beta1.User{Id: receivedShare.Share.Owner}, // FIXME actually, the mount point belongs to the recipient @@ -454,7 +455,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora // we know a grant for this resource space := &provider.StorageSpace{ Id: &provider.StorageSpaceId{ - OpaqueId: storagespace.FormatResourceID(*root), + OpaqueId: storagespace.FormatResourceID(root), }, SpaceType: "grant", Owner: &userv1beta1.User{Id: receivedShare.Share.Owner}, @@ -508,7 +509,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora space := &provider.StorageSpace{ Opaque: opaque, Id: &provider.StorageSpaceId{ - OpaqueId: storagespace.FormatResourceID(*root), + OpaqueId: storagespace.FormatResourceID(root), }, SpaceType: "mountpoint", Owner: &userv1beta1.User{Id: receivedShare.Share.Owner}, // FIXME actually, the mount point belongs to the recipient @@ -818,7 +819,7 @@ func (s *service) ListContainer(ctx context.Context, req *provider.ListContainer if receivedShare.GetState() != collaboration.ShareState_SHARE_STATE_ACCEPTED { continue } - rIDStr := storagespace.FormatResourceID(*receivedShare.GetShare().GetResourceId()) + rIDStr := storagespace.FormatResourceID(receivedShare.GetShare().GetResourceId()) if oldest, ok := oldestReceivedSharesByResourceID[rIDStr]; ok { // replace if older than current oldest if utils.TSToTime(receivedShare.GetShare().GetCtime()).Before(utils.TSToTime(oldest.GetShare().GetCtime())) { diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go index d2921a53e6..6c303bf155 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go @@ -168,7 +168,7 @@ var _ = Describe("Sharesstorageprovider", func() { gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient]( "GatewaySelector", "any", - func(cc *grpc.ClientConn) gateway.GatewayAPIClient { + func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient { return gatewayClient }, ) @@ -178,7 +178,7 @@ var _ = Describe("Sharesstorageprovider", func() { sharingCollaborationSelector = pool.GetSelector[collaboration.CollaborationAPIClient]( "SharingCollaborationSelector", "any", - func(cc *grpc.ClientConn) collaboration.CollaborationAPIClient { + func(cc grpc.ClientConnInterface) collaboration.CollaborationAPIClient { return sharingCollaborationClient }, ) diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go index 9144888ba9..7c548db53c 100644 --- a/internal/grpc/services/storageprovider/storageprovider.go +++ b/internal/grpc/services/storageprovider/storageprovider.go @@ -116,6 +116,7 @@ func (s *Service) UnprotectedEndpoints() []string { return []string{} } func (s *Service) Register(ss *grpc.Server) { provider.RegisterProviderAPIServer(ss, s) + provider.RegisterSpacesAPIServer(ss, s) } func parseXSTypes(xsTypes map[string]uint32) ([]*provider.ResourceChecksumPriority, error) { @@ -298,7 +299,7 @@ func (s *Service) InitiateFileDownload(ctx context.Context, req *provider.Initia if utils.IsRelativeReference(req.Ref) { s.addMissingStorageProviderID(req.GetRef().GetResourceId(), nil) protocol.Protocol = "spaces" - u.Path = path.Join(u.Path, "spaces", storagespace.FormatResourceID(*req.Ref.ResourceId), req.Ref.Path) + u.Path = path.Join(u.Path, "spaces", storagespace.FormatResourceID(req.Ref.ResourceId), req.Ref.Path) } else { // Currently, we only support the simple protocol for GET requests // Once we have multiple protocols, this would be moved to the fs layer @@ -612,7 +613,7 @@ func (s *Service) DeleteStorageSpace(ctx context.Context, req *provider.DeleteSt // FIXME: why is this string parsing necessary? idraw, _ := storagespace.ParseID(req.Id.GetOpaqueId()) idraw.OpaqueId = idraw.GetSpaceId() - id := &provider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(idraw)} + id := &provider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&idraw)} spaces, err := s.Storage.ListStorageSpaces(ctx, []*provider.ListStorageSpacesRequest_Filter{{Type: provider.ListStorageSpacesRequest_Filter_TYPE_ID, Term: &provider.ListStorageSpacesRequest_Filter_Id{Id: id}}}, true) if err != nil { diff --git a/internal/grpc/services/usershareprovider/usershareprovider_test.go b/internal/grpc/services/usershareprovider/usershareprovider_test.go index afaf689559..d577a80521 100644 --- a/internal/grpc/services/usershareprovider/usershareprovider_test.go +++ b/internal/grpc/services/usershareprovider/usershareprovider_test.go @@ -77,7 +77,7 @@ var _ = Describe("user share provider service", func() { gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient]( "GatewaySelector", "any", - func(cc *grpc.ClientConn) gateway.GatewayAPIClient { + func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient { return gatewayClient }, ) diff --git a/internal/http/services/appprovider/appprovider.go b/internal/http/services/appprovider/appprovider.go index 5ab334cac6..bf7154e586 100644 --- a/internal/http/services/appprovider/appprovider.go +++ b/internal/http/services/appprovider/appprovider.go @@ -48,6 +48,7 @@ import ( "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog" + "google.golang.org/protobuf/proto" ) func init() { @@ -304,7 +305,7 @@ func (s *svc) handleNew(w http.ResponseWriter, r *http.Request) { writeError(w, r, appErrorInvalidParameter, "the given file id does not point to a file", nil) return } - fileid = storagespace.FormatResourceID(*statRes.Info.Id) + fileid = storagespace.FormatResourceID(statRes.Info.Id) } js, err := json.Marshal( @@ -574,7 +575,8 @@ func buildApps(mimeTypes []*appregistry.MimeTypeInfo, userAgent, secureViewAppAd for _, m := range mimeTypes { apps := []*ProviderInfo{} for _, p := range m.AppProviders { - ep := &ProviderInfo{ProviderInfo: *p} + ep := &ProviderInfo{} + proto.Merge(&ep.ProviderInfo, p) if p.Address == secureViewAppAddr { ep.SecureView = true } @@ -586,7 +588,8 @@ func buildApps(mimeTypes []*appregistry.MimeTypeInfo, userAgent, secureViewAppAd } } if len(apps) > 0 { - mt := &MimeTypeInfo{MimeTypeInfo: *m} + mt := &MimeTypeInfo{} + proto.Merge(&mt.MimeTypeInfo, m) mt.AppProviders = apps res = append(res, mt) } diff --git a/internal/http/services/owncloud/ocdav/copy.go b/internal/http/services/owncloud/ocdav/copy.go index 2ebd66ef9b..97b4686420 100644 --- a/internal/http/services/owncloud/ocdav/copy.go +++ b/internal/http/services/owncloud/ocdav/copy.go @@ -214,7 +214,7 @@ func (s *svc) executePathCopy(ctx context.Context, selector pool.Selectable[gate return fmt.Errorf("status code %d", r.GetStatus().GetCode()) } - fileid = storagespace.FormatResourceID(*r.GetInfo().GetId()) + fileid = storagespace.FormatResourceID(r.GetInfo().GetId()) } else { // copy file @@ -438,7 +438,7 @@ func (s *svc) executeSpacesCopy(ctx context.Context, w http.ResponseWriter, sele return fmt.Errorf("stat: status code %d", r.GetStatus().GetCode()) } - fileid = storagespace.FormatResourceID(*r.GetInfo().GetId()) + fileid = storagespace.FormatResourceID(r.GetInfo().GetId()) } else { // copy file // 1. get download url diff --git a/internal/http/services/owncloud/ocdav/dav.go b/internal/http/services/owncloud/ocdav/dav.go index 50fe001667..ba82e15439 100644 --- a/internal/http/services/owncloud/ocdav/dav.go +++ b/internal/http/services/owncloud/ocdav/dav.go @@ -287,7 +287,7 @@ func (h *DavHandler) Handler(s *svc) http.Handler { // If the link is internal then 307 redirect if psRes.Status.Code == rpc.Code_CODE_OK && grants.PermissionsEqual(psRes.Share.Permissions.GetPermissions(), &provider.ResourcePermissions{}) { if psRes.GetShare().GetResourceId() != nil { - rUrl := path.Join("/dav/spaces", storagespace.FormatResourceID(*psRes.GetShare().GetResourceId())) + rUrl := path.Join("/dav/spaces", storagespace.FormatResourceID(psRes.GetShare().GetResourceId())) http.Redirect(w, r, rUrl, http.StatusTemporaryRedirect) return } diff --git a/internal/http/services/owncloud/ocdav/head.go b/internal/http/services/owncloud/ocdav/head.go index f055d18f49..10e2af57f9 100644 --- a/internal/http/services/owncloud/ocdav/head.go +++ b/internal/http/services/owncloud/ocdav/head.go @@ -85,7 +85,7 @@ func (s *svc) handleHead(ctx context.Context, w http.ResponseWriter, r *http.Req info := res.Info w.Header().Set(net.HeaderContentType, info.MimeType) w.Header().Set(net.HeaderETag, info.Etag) - w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*info.Id)) + w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(info.Id)) w.Header().Set(net.HeaderOCETag, info.Etag) if info.Checksum != nil { w.Header().Set(net.HeaderOCChecksum, fmt.Sprintf("%s:%s", strings.ToUpper(string(storageprovider.GRPC2PKGXS(info.Checksum.Type))), info.Checksum.Sum)) diff --git a/internal/http/services/owncloud/ocdav/meta.go b/internal/http/services/owncloud/ocdav/meta.go index 9bdf2a99e9..1ac28f5b80 100644 --- a/internal/http/services/owncloud/ocdav/meta.go +++ b/internal/http/services/owncloud/ocdav/meta.go @@ -104,7 +104,7 @@ func (h *MetaHandler) handlePathForUser(w http.ResponseWriter, r *http.Request, ctx, span := appctx.GetTracerProvider(r.Context()).Tracer(tracerName).Start(r.Context(), "meta_propfind") defer span.End() - id := storagespace.FormatResourceID(*rid) + id := storagespace.FormatResourceID(rid) sublog := appctx.GetLogger(ctx).With().Str("path", r.URL.Path).Str("resourceid", id).Logger() sublog.Info().Msg("calling get path for user") diff --git a/internal/http/services/owncloud/ocdav/move.go b/internal/http/services/owncloud/ocdav/move.go index 9b1e3c705b..79a6bbd563 100644 --- a/internal/http/services/owncloud/ocdav/move.go +++ b/internal/http/services/owncloud/ocdav/move.go @@ -345,7 +345,7 @@ func (s *svc) handleMove(ctx context.Context, w http.ResponseWriter, r *http.Req info := dstStatRes.Info w.Header().Set(net.HeaderContentType, info.MimeType) w.Header().Set(net.HeaderETag, info.Etag) - w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*info.Id)) + w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(info.Id)) w.Header().Set(net.HeaderOCETag, info.Etag) w.WriteHeader(successCode) } diff --git a/internal/http/services/owncloud/ocdav/ocdav_blackbox_test.go b/internal/http/services/owncloud/ocdav/ocdav_blackbox_test.go index bbfce7cded..8a97069734 100644 --- a/internal/http/services/owncloud/ocdav/ocdav_blackbox_test.go +++ b/internal/http/services/owncloud/ocdav/ocdav_blackbox_test.go @@ -172,7 +172,7 @@ var _ = Describe("ocdav", func() { }, }, }, - Id: &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, + Id: &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, Root: &cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "root"}, Name: "username", RootInfo: &cs3storageprovider.ResourceInfo{ @@ -864,7 +864,7 @@ var _ = Describe("ocdav", func() { // setup the request // set the webdav endpoint to test basePath = "/webdav" - userspace.Id = &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "userspace"})} + userspace.Id = &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "userspace"})} userspace.Root = &cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "userspace"} // path based requests at the /webdav endpoint first look up the storage space @@ -938,7 +938,7 @@ var _ = Describe("ocdav", func() { BeforeEach(func() { basePath = "/dav/spaces" - userspace.Id = &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "userspace"})} + userspace.Id = &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "userspace"})} userspace.Root = &cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "userspace", OpaqueId: "userspace"} // path based requests at the /webdav endpoint first look up the storage space client.On("ListStorageSpaces", mock.Anything, mock.MatchedBy(func(req *cs3storageprovider.ListStorageSpacesRequest) bool { diff --git a/internal/http/services/owncloud/ocdav/ocdav_whitebox_test.go b/internal/http/services/owncloud/ocdav/ocdav_whitebox_test.go index 97acf61de7..1529d8fa2e 100644 --- a/internal/http/services/owncloud/ocdav/ocdav_whitebox_test.go +++ b/internal/http/services/owncloud/ocdav/ocdav_whitebox_test.go @@ -28,7 +28,7 @@ import ( func TestWrapResourceID(t *testing.T) { expected := "storageid" + "$" + "spaceid" + "!" + "opaqueid" - wrapped := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "storageid", SpaceId: "spaceid", OpaqueId: "opaqueid"}) + wrapped := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "storageid", SpaceId: "spaceid", OpaqueId: "opaqueid"}) if wrapped != expected { t.Errorf("wrapped id doesn't have the expected format: got %s expected %s", wrapped, expected) diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind.go b/internal/http/services/owncloud/ocdav/propfind/propfind.go index 31f11b6ebc..42269f8063 100644 --- a/internal/http/services/owncloud/ocdav/propfind/propfind.go +++ b/internal/http/services/owncloud/ocdav/propfind/propfind.go @@ -1177,7 +1177,7 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p // return all known properties if id != nil { - sid := storagespace.FormatResourceID(*id) + sid := storagespace.FormatResourceID(id) appendToOK( prop.Escaped("oc:id", sid), prop.Escaped("oc:fileid", sid), @@ -1186,7 +1186,7 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p } if md.ParentId != nil { - appendToOK(prop.Escaped("oc:file-parent", storagespace.FormatResourceID(*md.ParentId))) + appendToOK(prop.Escaped("oc:file-parent", storagespace.FormatResourceID(md.ParentId))) } else { appendToNotFound(prop.NotFound("oc:file-parent")) } @@ -1305,19 +1305,19 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p // I tested the desktop client and phoenix to annotate which properties are requestted, see below cases case "fileid": // phoenix only if id != nil { - appendToOK(prop.Escaped("oc:fileid", storagespace.FormatResourceID(*id))) + appendToOK(prop.Escaped("oc:fileid", storagespace.FormatResourceID(id))) } else { appendToNotFound(prop.NotFound("oc:fileid")) } case "id": // desktop client only if id != nil { - appendToOK(prop.Escaped("oc:id", storagespace.FormatResourceID(*id))) + appendToOK(prop.Escaped("oc:id", storagespace.FormatResourceID(id))) } else { appendToNotFound(prop.NotFound("oc:id")) } case "file-parent": if md.ParentId != nil { - appendToOK(prop.Escaped("oc:file-parent", storagespace.FormatResourceID(*md.ParentId))) + appendToOK(prop.Escaped("oc:file-parent", storagespace.FormatResourceID(md.ParentId))) } else { appendToNotFound(prop.NotFound("oc:file-parent")) } @@ -1521,7 +1521,7 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p case "privatelink": privateURL, err := url.Parse(publicURL) if err == nil && id != nil { - privateURL.Path = path.Join(privateURL.Path, "f", storagespace.FormatResourceID(*id)) + privateURL.Path = path.Join(privateURL.Path, "f", storagespace.FormatResourceID(id)) propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:privatelink", privateURL.String())) } else { propstatNotFound.Prop = append(propstatNotFound.Prop, prop.NotFound("oc:privatelink")) diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind_test.go b/internal/http/services/owncloud/ocdav/propfind/propfind_test.go index 07692245f0..7d4dcebbfa 100644 --- a/internal/http/services/owncloud/ocdav/propfind/propfind_test.go +++ b/internal/http/services/owncloud/ocdav/propfind/propfind_test.go @@ -128,7 +128,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}, Name: "foospace", } @@ -141,7 +141,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooquxspace", OpaqueId: "root"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooquxspace", OpaqueId: "root"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooquxspace", OpaqueId: "root"}, Name: "fooquxspace", } @@ -154,7 +154,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace", OpaqueId: "sharedfile"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace", OpaqueId: "sharedfile"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace", OpaqueId: "sharedfile"}, Name: "fooFileShareSpace", } @@ -167,7 +167,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace2", OpaqueId: "sharedfile2"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace2", OpaqueId: "sharedfile2"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace2", OpaqueId: "sharedfile2"}, Name: "fooFileShareSpace2", } @@ -180,7 +180,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooDirShareSpace", OpaqueId: "shareddir"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooDirShareSpace", OpaqueId: "shareddir"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooDirShareSpace", OpaqueId: "shareddir"}, Name: "fooDirShareSpace", } @@ -787,7 +787,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) spaceIDUrl := net.EncodePath(spaceID) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -822,7 +822,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -838,7 +838,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -855,7 +855,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -873,7 +873,7 @@ var _ = Describe("PropfindWithDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -959,7 +959,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}, Name: "foospace", } @@ -972,7 +972,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooquxspace", OpaqueId: "root"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooquxspace", OpaqueId: "root"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooquxspace", OpaqueId: "root"}, Name: "fooquxspace", } @@ -985,7 +985,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace", OpaqueId: "sharedfile"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace", OpaqueId: "sharedfile"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace", OpaqueId: "sharedfile"}, Name: "fooFileShareSpace", } @@ -998,7 +998,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace2", OpaqueId: "sharedfile2"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace2", OpaqueId: "sharedfile2"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooFileShareSpace2", OpaqueId: "sharedfile2"}, Name: "fooFileShareSpace2", } @@ -1011,7 +1011,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { }, }, }, - Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooDirShareSpace", OpaqueId: "shareddir"})}, + Id: &sprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooDirShareSpace", OpaqueId: "shareddir"})}, Root: &sprovider.ResourceId{StorageId: "provider-1", SpaceId: "fooDirShareSpace", OpaqueId: "shareddir"}, Name: "fooDirShareSpace", } @@ -1598,7 +1598,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) spaceIDUrl := net.EncodePath(spaceID) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -1633,7 +1633,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -1649,7 +1649,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -1666,7 +1666,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusMultiStatus)) @@ -1684,7 +1684,7 @@ var _ = Describe("PropfindWithoutDepthInfinity", func() { Expect(err).ToNot(HaveOccurred()) req = req.WithContext(ctx) - spaceID := storagespace.FormatResourceID(sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) + spaceID := storagespace.FormatResourceID(&sprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}) handler.HandleSpacesPropfind(rr, req, spaceID) Expect(rr.Code).To(Equal(http.StatusBadRequest)) diff --git a/internal/http/services/owncloud/ocdav/put.go b/internal/http/services/owncloud/ocdav/put.go index 5f931a16f8..9811efd385 100644 --- a/internal/http/services/owncloud/ocdav/put.go +++ b/internal/http/services/owncloud/ocdav/put.go @@ -230,7 +230,7 @@ func (s *svc) handlePut(ctx context.Context, w http.ResponseWriter, r *http.Requ w.Header().Set(net.HeaderETag, sRes.Info.Etag) w.Header().Set(net.HeaderOCETag, sRes.Info.Etag) - w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*sRes.Info.Id)) + w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(sRes.Info.Id)) w.Header().Set(net.HeaderLastModified, net.RFC1123Z(sRes.Info.Mtime)) w.WriteHeader(http.StatusCreated) diff --git a/internal/http/services/owncloud/ocdav/spaces.go b/internal/http/services/owncloud/ocdav/spaces.go index 158fc569b6..37797d60ad 100644 --- a/internal/http/services/owncloud/ocdav/spaces.go +++ b/internal/http/services/owncloud/ocdav/spaces.go @@ -22,6 +22,7 @@ import ( "net/http" "path" + provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/config" "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" @@ -30,6 +31,7 @@ import ( "github.com/cs3org/reva/v2/pkg/rhttp/router" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" + "google.golang.org/protobuf/proto" ) // SpacesHandler handles trashbin requests @@ -167,10 +169,10 @@ func (h *SpacesHandler) handleSpacesTrashbin(w http.ResponseWriter, r *http.Requ } log.Debug().Str("key", key).Str("path", r.URL.Path).Str("dst", dst).Msg("spaces restore") - dstRef := ref + dstRef := proto.Clone(&ref).(*provider.Reference) dstRef.Path = utils.MakeRelativePath(dst) - trashbinHandler.restore(w, r, s, &ref, &dstRef, key, r.URL.Path) + trashbinHandler.restore(w, r, s, &ref, dstRef, key, r.URL.Path) case http.MethodDelete: trashbinHandler.delete(w, r, s, &ref, key, r.URL.Path) default: diff --git a/internal/http/services/owncloud/ocdav/trashbin.go b/internal/http/services/owncloud/ocdav/trashbin.go index 0888151f95..ef742c54df 100644 --- a/internal/http/services/owncloud/ocdav/trashbin.go +++ b/internal/http/services/owncloud/ocdav/trashbin.go @@ -601,7 +601,7 @@ func (h *TrashbinHandler) restore(w http.ResponseWriter, r *http.Request, s *svc info := dstStatRes.Info w.Header().Set(net.HeaderContentType, info.MimeType) w.Header().Set(net.HeaderETag, info.Etag) - w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*info.Id)) + w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(info.Id)) w.Header().Set(net.HeaderOCETag, info.Etag) w.WriteHeader(successCode) diff --git a/internal/http/services/owncloud/ocdav/tus.go b/internal/http/services/owncloud/ocdav/tus.go index 04696eb05a..2b85a1d231 100644 --- a/internal/http/services/owncloud/ocdav/tus.go +++ b/internal/http/services/owncloud/ocdav/tus.go @@ -377,7 +377,7 @@ func (s *svc) handleTusPost(ctx context.Context, w http.ResponseWriter, r *http. ) w.Header().Set(net.HeaderContentType, info.MimeType) - w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(*info.Id)) + w.Header().Set(net.HeaderOCFileID, storagespace.FormatResourceID(info.Id)) w.Header().Set(net.HeaderOCETag, info.Etag) w.Header().Set(net.HeaderETag, info.Etag) w.Header().Set(net.HeaderOCPermissions, permissions) diff --git a/internal/http/services/owncloud/ocdav/versions.go b/internal/http/services/owncloud/ocdav/versions.go index 0c9de36c35..e9b25ac999 100644 --- a/internal/http/services/owncloud/ocdav/versions.go +++ b/internal/http/services/owncloud/ocdav/versions.go @@ -58,7 +58,7 @@ func (h *VersionsHandler) Handler(s *svc, rid *provider.ResourceId) http.Handler } // baseURI is encoded as part of the response payload in href field - baseURI := path.Join(ctx.Value(net.CtxKeyBaseURI).(string), storagespace.FormatResourceID(*rid)) + baseURI := path.Join(ctx.Value(net.CtxKeyBaseURI).(string), storagespace.FormatResourceID(rid)) ctx = context.WithValue(ctx, net.CtxKeyBaseURI, baseURI) r = r.WithContext(ctx) diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/token.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/token.go index be0c12e1ca..90774e6187 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/token.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/token.go @@ -81,7 +81,7 @@ func handleGetToken(ctx context.Context, tkn string, pw string, c gateway.Gatewa } if protected && !t.PasswordProtected { - space, status, err := spacelookup.LookUpStorageSpaceByID(ctx, c, storagespace.FormatResourceID(provider.ResourceId{StorageId: t.StorageID, SpaceId: t.SpaceID, OpaqueId: t.OpaqueID})) + space, status, err := spacelookup.LookUpStorageSpaceByID(ctx, c, storagespace.FormatResourceID(&provider.ResourceId{StorageId: t.StorageID, SpaceId: t.SpaceID, OpaqueId: t.OpaqueID})) // add info only if user is able to stat if err == nil && status.Code == rpc.Code_CODE_OK { t.SpacePath = utils.ReadPlainFromOpaque(space.Opaque, "path") @@ -111,7 +111,7 @@ func buildTokenInfo(owner *user.User, tkn string, token string, passProtected bo return t, fmt.Errorf("can't stat resource. %+v %s", sRes, err) } - t.ID = storagespace.FormatResourceID(*sRes.Share.GetResourceId()) + t.ID = storagespace.FormatResourceID(sRes.Share.GetResourceId()) t.StorageID = sRes.Share.ResourceId.GetStorageId() t.SpaceID = sRes.Share.ResourceId.GetSpaceId() t.OpaqueID = sRes.Share.ResourceId.GetOpaqueId() diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go index dd636f4b54..25da16b6dc 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go @@ -323,7 +323,7 @@ func (h *Handler) updatePublicShare(w http.ResponseWriter, r *http.Request, shar return } - createdByUser := publicshare.IsCreatedByUser(*share, user) + createdByUser := publicshare.IsCreatedByUser(share, user) // NOTE: you are allowed to update a link TO a public link without the `PublicLink.Write` permission if you created it yourself if (permKey != nil && *permKey != 0) || !createdByUser { @@ -540,7 +540,7 @@ func (h *Handler) removePublicShare(w http.ResponseWriter, r *http.Request, shar } u := ctxpkg.ContextMustGetUser(ctx) - if !publicshare.IsCreatedByUser(*share, u) { + if !publicshare.IsCreatedByUser(share, u) { sRes, err := c.Stat(r.Context(), &provider.StatRequest{Ref: &provider.Reference{ResourceId: share.ResourceId}}) if err != nil { log.Err(err).Interface("resource_id", share.ResourceId).Msg("failed to stat shared resource") diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index b006d5d528..02d92344f1 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -179,13 +179,14 @@ func (h *Handler) startCacheWarmup(c sharecache.Warmup) { } } -func (h *Handler) extractReference(r *http.Request) (provider.Reference, error) { - var ref provider.Reference +func (h *Handler) extractReference(r *http.Request) (*provider.Reference, error) { + ref := &provider.Reference{} // NOTE: space_ref is deprecated and will be removed in ~2 weeks (1.6.22) sr := r.FormValue("space_ref") if sr != "" { - return storagespace.ParseReference(sr) + ref, err := storagespace.ParseReference(sr) + return &ref, err } p, id := r.FormValue("path"), r.FormValue("space") @@ -243,7 +244,7 @@ func (h *Handler) CreateShare(w http.ResponseWriter, r *http.Request) { return } - statReq := provider.StatRequest{Ref: &ref, FieldMask: &fieldmaskpb.FieldMask{Paths: []string{"space"}}} + 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") @@ -976,7 +977,7 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) { } var status *rpc.Status - pinfo, status, err = h.getResourceInfoByReference(ctx, client, &ref) + pinfo, status, err = h.getResourceInfoByReference(ctx, client, ref) if err != nil { response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "error sending a grpc stat request", err) return @@ -1157,7 +1158,7 @@ func (h *Handler) listSharesWithOthers(w http.ResponseWriter, r *http.Request) { response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, errParsingSpaceReference.Error(), errParsingSpaceReference) return } - filters, linkFilters, e = h.addFilters(w, r, &ref) + filters, linkFilters, e = h.addFilters(w, r, ref) if e != nil { // result has been written as part of addFilters return @@ -1275,7 +1276,7 @@ func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, inf s.MimeType = parsedMt // TODO STime: &types.Timestamp{Seconds: info.Mtime.Seconds, Nanos: info.Mtime.Nanos}, // TODO Storage: int - s.ItemSource = storagespace.FormatResourceID(*info.Id) + s.ItemSource = storagespace.FormatResourceID(info.Id) s.FileSource = s.ItemSource s.Path = path.Join("/", info.Path) switch { @@ -1317,7 +1318,7 @@ func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, inf s.StorageID = storageIDPrefix + s.FileTarget if info.ParentId != nil { - s.FileParent = storagespace.FormatResourceID(*info.ParentId) + s.FileParent = storagespace.FormatResourceID(info.ParentId) } // item type s.ItemType = conversions.ResourceType(info.GetType()).String() @@ -1333,7 +1334,7 @@ func (h *Handler) addFileInfo(ctx context.Context, s *conversions.ShareData, inf } if info.GetSpace().GetRoot() != nil { - s.SpaceID = storagespace.FormatResourceID(*info.GetSpace().GetRoot()) + s.SpaceID = storagespace.FormatResourceID(info.GetSpace().GetRoot()) } s.SpaceAlias = utils.ReadPlainFromOpaque(info.GetSpace().GetOpaque(), "spaceAlias") } diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go index 35ccf7a65b..aa85d0ae1a 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go @@ -150,14 +150,14 @@ func (h *Handler) addSpaceMember(w http.ResponseWriter, r *http.Request, info *p return } - if !isSpaceManagerRemaining(lgRes.Grants, grantee) { + if !isSpaceManagerRemaining(lgRes.Grants, &grantee) { response.WriteOCSError(w, r, http.StatusForbidden, "the space must have at least one manager", nil) return } // we have to send the update request to the gateway to give it a chance to invalidate its cache // TODO the gateway no longer should cache stuff because invalidation is to expensive. The decomposedfs already has a better cache. - if granteeExists(lgRes.Grants, grantee) { + if granteeExists(lgRes.Grants, &grantee) { if permissions != nil { fieldmask = append(fieldmask, "permissions") } @@ -257,7 +257,7 @@ func (h *Handler) removeSpaceMember(w http.ResponseWriter, r *http.Request, spac return } - if len(lgRes.Grants) == 1 || !isSpaceManagerRemaining(lgRes.Grants, grantee) { + if len(lgRes.Grants) == 1 || !isSpaceManagerRemaining(lgRes.Grants, &grantee) { response.WriteOCSError(w, r, http.StatusForbidden, "can't remove the last manager", nil) return } @@ -349,28 +349,28 @@ func (h *Handler) findProvider(ctx context.Context, ref *provider.Reference) (*r return res.Providers[0], nil } -func isSpaceManagerRemaining(grants []*provider.Grant, grantee provider.Grantee) bool { +func isSpaceManagerRemaining(grants []*provider.Grant, grantee *provider.Grantee) bool { for _, g := range grants { // RemoveGrant is currently the way to check for the manager role // If it is not set than the current grant is not for a manager and // we can just continue with the next one. - if g.Permissions.RemoveGrant && !isEqualGrantee(*g.Grantee, grantee) { + if g.Permissions.RemoveGrant && !isEqualGrantee(g.Grantee, grantee) { return true } } return false } -func granteeExists(grants []*provider.Grant, grantee provider.Grantee) bool { +func granteeExists(grants []*provider.Grant, grantee *provider.Grantee) bool { for _, g := range grants { - if isEqualGrantee(*g.Grantee, grantee) { + if isEqualGrantee(g.Grantee, grantee) { return true } } return false } -func isEqualGrantee(a, b provider.Grantee) bool { +func isEqualGrantee(a, b *provider.Grantee) bool { // Ideally we would want to use utils.GranteeEqual() // but the grants stored in the decomposedfs aren't complete (missing usertype and idp) // because of that the check would fail so we can only check the ... for now. diff --git a/pkg/app/provider/demo/demo.go b/pkg/app/provider/demo/demo.go index 9964eb0948..e5a83cf750 100644 --- a/pkg/app/provider/demo/demo.go +++ b/pkg/app/provider/demo/demo.go @@ -40,7 +40,7 @@ type demoProvider struct { } func (p *demoProvider) GetAppURL(ctx context.Context, resource *provider.ResourceInfo, viewMode appprovider.ViewMode, token, language string) (*appprovider.OpenInAppURL, error) { - url := fmt.Sprintf("