Add stubs and drivers for groupprovider service

changelog/unreleased/groupprovider.md

@@ -0,0 +1,8 @@
+Enhancement: Add stubs and manager for groupprovider service
+
+Recently, there was a separation of concerns with regard to users and groups in
+CS3APIs. This PR adds the required stubs and drivers for the group manager.
+
+https://github.com/cs3org/cs3apis/pull/99
+https://github.com/cs3org/cs3apis/pull/102
+https://github.com/cs3org/reva/pull/1358

cmd/revad/runtime/loader.go

@@ -30,6 +30,7 @@ import (
 	_ "github.com/cs3org/reva/pkg/auth/manager/loader"
 	_ "github.com/cs3org/reva/pkg/auth/registry/loader"
 	_ "github.com/cs3org/reva/pkg/cbox/loader"
+	_ "github.com/cs3org/reva/pkg/group/manager/loader"
 	_ "github.com/cs3org/reva/pkg/metrics/driver/loader"
 	_ "github.com/cs3org/reva/pkg/ocm/invite/manager/loader"
 	_ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/loader"

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/cheggaaa/pb v1.0.29
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
-	github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21
+	github.com/cs3org/go-cs3apis v0.0.0-20210104105209-0d3ecb3453dc
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59
 	github.com/go-ldap/ldap/v3 v3.2.4

go.sum

@@ -92,6 +92,10 @@ github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e h1:tqSPWQeueWTKnJVMJff
 github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4=
 github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 h1:mZpylrgnCgSeaZ5EznvHIPIKuaQHMHZDi2wkJtk4M8Y=
 github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
+github.com/cs3org/go-cs3apis v0.0.0-20201130144553-72667e613e44 h1:bvVU3EesXzpOJu+Sh6bffwCOaF7mW3KxRVaEmDpIw38=
+github.com/cs3org/go-cs3apis v0.0.0-20201130144553-72667e613e44/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
+github.com/cs3org/go-cs3apis v0.0.0-20210104105209-0d3ecb3453dc h1:vHFqu+Gb/iOKYFy2KswpwIG3G6zRMudRn+rQ2bg3TPE=
+github.com/cs3org/go-cs3apis v0.0.0-20210104105209-0d3ecb3453dc/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
 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=

internal/grpc/services/gateway/gateway.go

@@ -52,6 +52,7 @@ type config struct {
 	OCMProviderAuthorizerEndpoint string `mapstructure:"ocmproviderauthorizersvc"`
 	OCMCoreEndpoint               string `mapstructure:"ocmcoresvc"`
 	UserProviderEndpoint          string `mapstructure:"userprovidersvc"`
+	GroupProviderEndpoint         string `mapstructure:"groupprovidersvc"`
 	DataTxEndpoint                string `mapstructure:"datatx"`
 	DataGatewayEndpoint           string `mapstructure:"datagateway"`
 	CommitShareToStorageGrant     bool   `mapstructure:"commit_share_to_storage_grant"`
@@ -92,6 +93,7 @@ func (c *config) init() {
 	c.OCMProviderAuthorizerEndpoint = sharedconf.GetGatewaySVC(c.OCMProviderAuthorizerEndpoint)
 	c.OCMCoreEndpoint = sharedconf.GetGatewaySVC(c.OCMCoreEndpoint)
 	c.UserProviderEndpoint = sharedconf.GetGatewaySVC(c.UserProviderEndpoint)
+	c.GroupProviderEndpoint = sharedconf.GetGatewaySVC(c.GroupProviderEndpoint)
 	c.DataTxEndpoint = sharedconf.GetGatewaySVC(c.DataTxEndpoint)
 
 	c.DataGatewayEndpoint = sharedconf.GetDataGateway(c.DataGatewayEndpoint)

internal/grpc/services/gateway/groupprovider.go

@@ -0,0 +1,108 @@
+// Copyright 2018-2020 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package gateway
+
+import (
+	"context"
+
+	group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
+	"github.com/cs3org/reva/pkg/rgrpc/status"
+	"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
+	"github.com/pkg/errors"
+)
+
+func (s *svc) GetGroup(ctx context.Context, req *group.GetGroupRequest) (*group.GetGroupResponse, error) {
+	c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
+	if err != nil {
+		return &group.GetGroupResponse{
+			Status: status.NewInternal(ctx, err, "error getting auth client"),
+		}, nil
+	}
+
+	res, err := c.GetGroup(ctx, req)
+	if err != nil {
+		return nil, errors.Wrap(err, "gateway: error calling GetGroup")
+	}
+
+	return res, nil
+}
+
+func (s *svc) GetGroupByClaim(ctx context.Context, req *group.GetGroupByClaimRequest) (*group.GetGroupByClaimResponse, error) {
+	c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
+	if err != nil {
+		return &group.GetGroupByClaimResponse{
+			Status: status.NewInternal(ctx, err, "error getting auth client"),
+		}, nil
+	}
+
+	res, err := c.GetGroupByClaim(ctx, req)
+	if err != nil {
+		return nil, errors.Wrap(err, "gateway: error calling GetGroupByClaim")
+	}
+
+	return res, nil
+}
+
+func (s *svc) FindGroups(ctx context.Context, req *group.FindGroupsRequest) (*group.FindGroupsResponse, error) {
+	c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
+	if err != nil {
+		return &group.FindGroupsResponse{
+			Status: status.NewInternal(ctx, err, "error getting auth client"),
+		}, nil
+	}
+
+	res, err := c.FindGroups(ctx, req)
+	if err != nil {
+		return nil, errors.Wrap(err, "gateway: error calling FindGroups")
+	}
+
+	return res, nil
+}
+
+func (s *svc) GetMembers(ctx context.Context, req *group.GetMembersRequest) (*group.GetMembersResponse, error) {
+	c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
+	if err != nil {
+		return &group.GetMembersResponse{
+			Status: status.NewInternal(ctx, err, "error getting auth client"),
+		}, nil
+	}
+
+	res, err := c.GetMembers(ctx, req)
+	if err != nil {
+		return nil, errors.Wrap(err, "gateway: error calling GetMembers")
+	}
+
+	return res, nil
+}
+
+func (s *svc) HasMember(ctx context.Context, req *group.HasMemberRequest) (*group.HasMemberResponse, error) {
+	c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
+	if err != nil {
+		return &group.HasMemberResponse{
+			Status: status.NewInternal(ctx, err, "error getting auth client"),
+		}, nil
+	}
+
+	res, err := c.HasMember(ctx, req)
+	if err != nil {
+		return nil, errors.Wrap(err, "gateway: error calling HasMember")
+	}
+
+	return res, nil
+}

internal/grpc/services/gateway/userprovider.go

@@ -75,22 +75,6 @@ func (s *svc) FindUsers(ctx context.Context, req *user.FindUsersRequest) (*user.
 	return res, nil
 }
 
-func (s *svc) FindGroups(ctx context.Context, req *user.FindGroupsRequest) (*user.FindGroupsResponse, error) {
-	c, err := pool.GetUserProviderServiceClient(s.c.UserProviderEndpoint)
-	if err != nil {
-		return &user.FindGroupsResponse{
-			Status: status.NewInternal(ctx, err, "error getting auth client"),
-		}, nil
-	}
-
-	res, err := c.FindGroups(ctx, req)
-	if err != nil {
-		return nil, errors.Wrap(err, "gateway: error calling FindGroups")
-	}
-
-	return res, nil
-}
-
 func (s *svc) GetUserGroups(ctx context.Context, req *user.GetUserGroupsRequest) (*user.GetUserGroupsResponse, error) {
 	c, err := pool.GetUserProviderServiceClient(s.c.UserProviderEndpoint)
 	if err != nil {
@@ -106,19 +90,3 @@ func (s *svc) GetUserGroups(ctx context.Context, req *user.GetUserGroupsRequest)
 
 	return res, nil
 }
-
-func (s *svc) IsInGroup(ctx context.Context, req *user.IsInGroupRequest) (*user.IsInGroupResponse, error) {
-	c, err := pool.GetUserProviderServiceClient(s.c.UserProviderEndpoint)
-	if err != nil {
-		return &user.IsInGroupResponse{
-			Status: status.NewInternal(ctx, err, "error getting auth client"),
-		}, nil
-	}
-
-	res, err := c.IsInGroup(ctx, req)
-	if err != nil {
-		return nil, errors.Wrap(err, "gateway: error calling IsInGroup")
-	}
-
-	return res, nil
-}

internal/grpc/services/groupprovider/groupprovider.go

@@ -0,0 +1,174 @@
+// Copyright 2018-2020 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package groupprovider
+
+import (
+	"context"
+	"fmt"
+
+	grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
+	"github.com/cs3org/reva/pkg/group"
+	"github.com/cs3org/reva/pkg/group/manager/registry"
+	"github.com/cs3org/reva/pkg/rgrpc"
+	"github.com/cs3org/reva/pkg/rgrpc/status"
+	"github.com/mitchellh/mapstructure"
+	"github.com/pkg/errors"
+	"google.golang.org/grpc"
+)
+
+func init() {
+	rgrpc.Register("groupprovider", New)
+}
+
+type config struct {
+	Driver  string                            `mapstructure:"driver"`
+	Drivers map[string]map[string]interface{} `mapstructure:"drivers"`
+}
+
+func (c *config) init() {
+	if c.Driver == "" {
+		c.Driver = "json"
+	}
+}
+
+func parseConfig(m map[string]interface{}) (*config, error) {
+	c := &config{}
+	if err := mapstructure.Decode(m, c); err != nil {
+		err = errors.Wrap(err, "error decoding conf")
+		return nil, err
+	}
+	c.init()
+	return c, nil
+}
+
+func getDriver(c *config) (group.Manager, error) {
+	if f, ok := registry.NewFuncs[c.Driver]; ok {
+		return f(c.Drivers[c.Driver])
+	}
+
+	return nil, fmt.Errorf("driver %s not found for group manager", c.Driver)
+}
+
+// New returns a new GroupProviderServiceServer.
+func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
+	c, err := parseConfig(m)
+	if err != nil {
+		return nil, err
+	}
+
+	groupManager, err := getDriver(c)
+	if err != nil {
+		return nil, err
+	}
+
+	svc := &service{groupmgr: groupManager}
+
+	return svc, nil
+}
+
+type service struct {
+	groupmgr group.Manager
+}
+
+func (s *service) Close() error {
+	return nil
+}
+
+func (s *service) UnprotectedEndpoints() []string {
+	return []string{}
+}
+
+func (s *service) Register(ss *grpc.Server) {
+	grouppb.RegisterGroupAPIServer(ss, s)
+}
+
+func (s *service) GetGroup(ctx context.Context, req *grouppb.GetGroupRequest) (*grouppb.GetGroupResponse, error) {
+	group, err := s.groupmgr.GetGroup(ctx, req.GroupId)
+	if err != nil {
+		err = errors.Wrap(err, "groupprovidersvc: error getting group")
+		return &grouppb.GetGroupResponse{
+			Status: status.NewInternal(ctx, err, "error getting group"),
+		}, nil
+	}
+
+	return &grouppb.GetGroupResponse{
+		Status: status.NewOK(ctx),
+		Group:  group,
+	}, nil
+}
+
+func (s *service) GetGroupByClaim(ctx context.Context, req *grouppb.GetGroupByClaimRequest) (*grouppb.GetGroupByClaimResponse, error) {
+	group, err := s.groupmgr.GetGroupByClaim(ctx, req.Claim, req.Value)
+	if err != nil {
+		err = errors.Wrap(err, "groupprovidersvc: error getting group by claim")
+		return &grouppb.GetGroupByClaimResponse{
+			Status: status.NewInternal(ctx, err, "error getting group by claim"),
+		}, nil
+	}
+
+	return &grouppb.GetGroupByClaimResponse{
+		Status: status.NewOK(ctx),
+		Group:  group,
+	}, nil
+}
+
+func (s *service) FindGroups(ctx context.Context, req *grouppb.FindGroupsRequest) (*grouppb.FindGroupsResponse, error) {
+	groups, err := s.groupmgr.FindGroups(ctx, req.Filter)
+	if err != nil {
+		err = errors.Wrap(err, "groupprovidersvc: error finding groups")
+		return &grouppb.FindGroupsResponse{
+			Status: status.NewInternal(ctx, err, "error finding groups"),
+		}, nil
+	}
+
+	return &grouppb.FindGroupsResponse{
+		Status: status.NewOK(ctx),
+		Groups: groups,
+	}, nil
+}
+
+func (s *service) GetMembers(ctx context.Context, req *grouppb.GetMembersRequest) (*grouppb.GetMembersResponse, error) {
+	members, err := s.groupmgr.GetMembers(ctx, req.GroupId)
+	if err != nil {
+		err = errors.Wrap(err, "groupprovidersvc: error getting group members")
+		return &grouppb.GetMembersResponse{
+			Status: status.NewInternal(ctx, err, "error getting group members"),
+		}, nil
+	}
+
+	return &grouppb.GetMembersResponse{
+		Status:  status.NewOK(ctx),
+		Members: members,
+	}, nil
+}
+
+func (s *service) HasMember(ctx context.Context, req *grouppb.HasMemberRequest) (*grouppb.HasMemberResponse, error) {
+	ok, err := s.groupmgr.HasMember(ctx, req.GroupId, req.UserId)
+	if err != nil {
+		err = errors.Wrap(err, "groupprovidersvc: error checking for group member")
+		return &grouppb.HasMemberResponse{
+			Status: status.NewInternal(ctx, err, "error checking for group member"),
+		}, nil
+	}
+
+	return &grouppb.HasMemberResponse{
+		Status: status.NewOK(ctx),
+		Ok:     ok,
+	}, nil
+}

internal/grpc/services/loader/loader.go

@@ -26,6 +26,7 @@ import (
 	_ "github.com/cs3org/reva/internal/grpc/services/authregistry"
 	_ "github.com/cs3org/reva/internal/grpc/services/datatx"
 	_ "github.com/cs3org/reva/internal/grpc/services/gateway"
+	_ "github.com/cs3org/reva/internal/grpc/services/groupprovider"
 	_ "github.com/cs3org/reva/internal/grpc/services/helloworld"
 	_ "github.com/cs3org/reva/internal/grpc/services/ocmcore"
 	_ "github.com/cs3org/reva/internal/grpc/services/ocminvitemanager"