From 1b0b14512cbe70a357f152e14e919445d38d6e2c Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 11:40:21 +0200 Subject: [PATCH 1/8] Read UID and GID from the opaque object for CS3 proxy backend --- ocs/pkg/service/v0/users.go | 60 +++++++++++++++++++++++++++++++---- proxy/pkg/user/backend/cs3.go | 12 ++++--- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index d01c83f090..3e08596567 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -17,6 +17,7 @@ import ( "google.golang.org/protobuf/types/known/fieldmaskpb" merrors "github.com/asim/go-micro/v3/errors" + cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/ocs/pkg/service/v0/response" @@ -42,13 +43,14 @@ func (o Ocs) GetSelf(w http.ResponseWriter, r *http.Request) { // TODO(someone) this fix is in place because if the user backend (PROXY_ACCOUNT_BACKEND_TYPE) is set to, for instance, // cs3, we cannot count with the accounts service. if u != nil { + uid, gid := o.extractUIDAndGID(u) d := &data.User{ UserID: u.Username, DisplayName: u.DisplayName, LegacyDisplayName: u.DisplayName, Email: u.Mail, - UIDNumber: u.UidNumber, - GIDNumber: u.GidNumber, + UIDNumber: uid, + GIDNumber: gid, } mustNotFail(render.Render(w, r, response.DataRender(d))) return @@ -88,10 +90,32 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) { } if err != nil { merr := merrors.FromError(err) - if merr.Code == http.StatusNotFound { - mustNotFail(render.Render(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found"))) - } else { - mustNotFail(render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))) + u, ok := user.ContextGetUser(r.Context()) + if !ok || u.Id == nil || u.Id.OpaqueId == "" { + mustNotFail(render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "user is missing an id"))) + return + } + if u != nil { + uid, gid := o.extractUIDAndGID(u) + d := &data.User{ + UserID: u.Username, + DisplayName: u.DisplayName, + LegacyDisplayName: u.DisplayName, + Email: u.Mail, + UIDNumber: uid, + GIDNumber: gid, + Enabled: "true", // Assume true for CS3 backend? + // TODO query storage registry for free space? of home storage, maybe... + Quota: &data.Quota{ + Free: 2840756224000, + Used: 5059416668, + Total: 2845815640668, + Relative: 0.18, + Definition: "default", + }, + } + mustNotFail(render.Render(w, r, response.DataRender(d))) + return } o.logger.Error().Err(merr).Str("userid", userid).Msg("could not get account for user") return @@ -533,3 +557,27 @@ func (o Ocs) fetchAccountByUsername(ctx context.Context, name string) (*accounts } return nil, merrors.NotFound("", "The requested user could not be found") } + +func (o Ocs) extractUIDAndGID(u *cs3.User) (int64, int64) { + var uid, gid int64 + var err error + if u.Opaque != nil && u.Opaque.Map != nil { + if uidObj, ok := u.Opaque.Map["uid"]; ok { + if uidObj.Decoder == "plain" { + uid, err = strconv.ParseInt(string(uidObj.Value), 10, 64) + if err != nil { + o.logger.Error().Err(err).Interface("user", u).Msg("could not extract uid for user") + } + } + } + if gidObj, ok := u.Opaque.Map["gid"]; ok { + if gidObj.Decoder == "plain" { + gid, err = strconv.ParseInt(string(gidObj.Value), 10, 64) + if err != nil { + o.logger.Error().Err(err).Interface("user", u).Msg("could not extract gid for user") + } + } + } + } + return uid, gid +} diff --git a/proxy/pkg/user/backend/cs3.go b/proxy/pkg/user/backend/cs3.go index 3c97d36427..3dff9c88c9 100644 --- a/proxy/pkg/user/backend/cs3.go +++ b/proxy/pkg/user/backend/cs3.go @@ -70,10 +70,14 @@ func (c *cs3backend) GetUserByClaims(ctx context.Context, claim, value string, w c.logger.Error().Err(err).Msg("Could not encode loaded roles") } - user.Opaque = &types.Opaque{ - Map: map[string]*types.OpaqueEntry{ - "roles": enc, - }, + if user.Opaque == nil { + user.Opaque = &types.Opaque{ + Map: map[string]*types.OpaqueEntry{ + "roles": enc, + }, + } + } else { + user.Opaque.Map["roles"] = enc } return res.User, nil From 9a2a3bf22931ea003b6fdf8efa9667b1d0aa5065 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 13:28:19 +0200 Subject: [PATCH 2/8] Make accounts backend configurable in ocs --- ocs/pkg/config/config.go | 16 +-- ocs/pkg/flagset/flagset.go | 15 +++ ocs/pkg/service/v0/service.go | 7 ++ ocs/pkg/service/v0/users.go | 186 ++++++++++++++++++++++++---------- 4 files changed, 161 insertions(+), 63 deletions(-) diff --git a/ocs/pkg/config/config.go b/ocs/pkg/config/config.go index 6a01ad55d6..451701210a 100644 --- a/ocs/pkg/config/config.go +++ b/ocs/pkg/config/config.go @@ -47,13 +47,15 @@ type TokenManager struct { // Config combines all available configuration parts. type Config struct { - File string - Log Log - Debug Debug - HTTP HTTP - Tracing Tracing - TokenManager TokenManager - Service Service + File string + Log Log + Debug Debug + HTTP HTTP + Tracing Tracing + TokenManager TokenManager + Service Service + AccountBackend string + RevaAddress string Context context.Context Supervised bool diff --git a/ocs/pkg/flagset/flagset.go b/ocs/pkg/flagset/flagset.go index 7e428536db..d1924af673 100644 --- a/ocs/pkg/flagset/flagset.go +++ b/ocs/pkg/flagset/flagset.go @@ -150,6 +150,21 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"OCS_JWT_SECRET", "OCIS_JWT_SECRET"}, Destination: &cfg.TokenManager.JWTSecret, }, + + &cli.StringFlag{ + Name: "account-backend-type", + Value: flags.OverrideDefaultString(cfg.AccountBackend, "accounts"), + Usage: "account-backend-type", + EnvVars: []string{"OCS_ACCOUNT_BACKEND_TYPE"}, + Destination: &cfg.AccountBackend, + }, + &cli.StringFlag{ + Name: "reva-gateway-addr", + Value: flags.OverrideDefaultString(cfg.RevaAddress, "127.0.0.1:9142"), + Usage: "REVA Gateway Endpoint", + EnvVars: []string{"OCS_REVA_GATEWAY_ADDR"}, + Destination: &cfg.RevaAddress, + }, } } diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index 09d559c9f5..fb6a726879 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -10,6 +10,7 @@ import ( "github.com/go-chi/chi/middleware" "github.com/go-chi/render" + cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocis-pkg/account" "github.com/owncloud/ocis/ocis-pkg/log" @@ -19,6 +20,7 @@ import ( ocsm "github.com/owncloud/ocis/ocs/pkg/middleware" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/proxy/pkg/user/backend" settings "github.com/owncloud/ocis/settings/pkg/proto/v0" ) @@ -154,6 +156,11 @@ func (o Ocs) getAccountService() accounts.AccountsService { return accounts.NewAccountsService("com.owncloud.api.accounts", grpc.DefaultClient) } +func (o Ocs) getCS3Backend() backend.UserBackend { + revaClient, err := cs3.GetGatewayServiceClient(o.config.RevaAddress) + return backend.NewCS3UserBackend(revaClient, nil, revaClient, o.logger) +} + func (o Ocs) getGroupsService() accounts.GroupsService { return accounts.NewGroupsService("com.owncloud.api.accounts", grpc.DefaultClient) } diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 3e08596567..7b39cd8c12 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -34,27 +34,19 @@ func (o Ocs) GetSelf(w http.ResponseWriter, r *http.Request) { return } - account, err = o.getAccountService().GetAccount(r.Context(), &accounts.GetAccountRequest{ - Id: u.Id.OpaqueId, - }) + switch o.config.AccountBackend { + case "accounts": + account, err = o.getAccountService().GetAccount(r.Context(), &accounts.GetAccountRequest{ + Id: u.Id.OpaqueId, + }) + case "cs3": + account, err = o.fetchAccountFromCS3BackendByID(r.Context(), u.Id) + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } if err != nil { merr := merrors.FromError(err) - // TODO(someone) this fix is in place because if the user backend (PROXY_ACCOUNT_BACKEND_TYPE) is set to, for instance, - // cs3, we cannot count with the accounts service. - if u != nil { - uid, gid := o.extractUIDAndGID(u) - d := &data.User{ - UserID: u.Username, - DisplayName: u.DisplayName, - LegacyDisplayName: u.DisplayName, - Email: u.Mail, - UIDNumber: uid, - GIDNumber: gid, - } - mustNotFail(render.Render(w, r, response.DataRender(d))) - return - } o.logger.Error().Err(merr).Interface("user", u).Msg("could not get account for user") return } @@ -83,39 +75,23 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) { var account *accounts.Account var err error - if userid == "" { + switch { + case userid == "": mustNotFail(render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "missing user in context"))) - } else { + case o.config.AccountBackend == "accounts": account, err = o.fetchAccountByUsername(r.Context(), userid) + case o.config.AccountBackend == "cs3": + account, err = o.fetchAccountFromCS3BackendByUsername(r.Context(), userid) + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) } + if err != nil { merr := merrors.FromError(err) - u, ok := user.ContextGetUser(r.Context()) - if !ok || u.Id == nil || u.Id.OpaqueId == "" { - mustNotFail(render.Render(w, r, response.ErrRender(data.MetaBadRequest.StatusCode, "user is missing an id"))) - return - } - if u != nil { - uid, gid := o.extractUIDAndGID(u) - d := &data.User{ - UserID: u.Username, - DisplayName: u.DisplayName, - LegacyDisplayName: u.DisplayName, - Email: u.Mail, - UIDNumber: uid, - GIDNumber: gid, - Enabled: "true", // Assume true for CS3 backend? - // TODO query storage registry for free space? of home storage, maybe... - Quota: &data.Quota{ - Free: 2840756224000, - Used: 5059416668, - Total: 2845815640668, - Relative: 0.18, - Definition: "default", - }, - } - mustNotFail(render.Render(w, r, response.DataRender(d))) - return + if merr.Code == http.StatusNotFound { + mustNotFail(render.Render(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found"))) + } else { + mustNotFail(render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))) } o.logger.Error().Err(merr).Str("userid", userid).Msg("could not get account for user") return @@ -212,9 +188,20 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) { newAccount.GidNumber = gidNumber } - account, err := o.getAccountService().CreateAccount(r.Context(), &accounts.CreateAccountRequest{ - Account: newAccount, - }) + var account *accounts.Account + var err error + + switch o.config.AccountBackend { + case "accounts": + account, err = o.getAccountService().CreateAccount(r.Context(), &accounts.CreateAccountRequest{ + Account: newAccount, + }) + case "cs3": + o.logger.Fatal().Msg("cs3 backend doesn't support adding users") + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } + if err != nil { merr := merrors.FromError(err) switch merr.Code { @@ -263,7 +250,18 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) { // EditUser creates a new user account func (o Ocs) EditUser(w http.ResponseWriter, r *http.Request) { userid := chi.URLParam(r, "userid") - account, err := o.fetchAccountByUsername(r.Context(), userid) + + var account *accounts.Account + var err error + switch o.config.AccountBackend { + case "accounts": + account, err := o.fetchAccountByUsername(r.Context(), userid) + case "cs3": + o.logger.Fatal().Msg("cs3 backend doesn't support editing users") + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } + if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { @@ -330,7 +328,18 @@ func (o Ocs) EditUser(w http.ResponseWriter, r *http.Request) { // DeleteUser deletes a user func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) { userid := chi.URLParam(r, "userid") - account, err := o.fetchAccountByUsername(r.Context(), userid) + + var account *accounts.Account + var err error + switch o.config.AccountBackend { + case "accounts": + account, err := o.fetchAccountByUsername(r.Context(), userid) + case "cs3": + o.logger.Fatal().Msg("cs3 backend doesn't support deleting users") + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } + if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { @@ -365,7 +374,18 @@ func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) { // EnableUser enables a user func (o Ocs) EnableUser(w http.ResponseWriter, r *http.Request) { userid := chi.URLParam(r, "userid") - account, err := o.fetchAccountByUsername(r.Context(), userid) + + var account *accounts.Account + var err error + switch o.config.AccountBackend { + case "accounts": + account, err := o.fetchAccountByUsername(r.Context(), userid) + case "cs3": + o.logger.Fatal().Msg("cs3 backend doesn't support enabling users") + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } + if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { @@ -405,7 +425,18 @@ func (o Ocs) EnableUser(w http.ResponseWriter, r *http.Request) { // DisableUser disables a user func (o Ocs) DisableUser(w http.ResponseWriter, r *http.Request) { userid := chi.URLParam(r, "userid") - account, err := o.fetchAccountByUsername(r.Context(), userid) + + var account *accounts.Account + var err error + switch o.config.AccountBackend { + case "accounts": + account, err := o.fetchAccountByUsername(r.Context(), userid) + case "cs3": + o.logger.Fatal().Msg("cs3 backend doesn't support disabling users") + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } + if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { @@ -522,9 +553,20 @@ func (o Ocs) ListUsers(w http.ResponseWriter, r *http.Request) { query = fmt.Sprintf("on_premises_sam_account_name eq '%s'", escapeValue(search)) } - res, err := o.getAccountService().ListAccounts(r.Context(), &accounts.ListAccountsRequest{ - Query: query, - }) + var res *accounts.ListAccountsResponse + var err error + switch o.config.AccountBackend { + case "accounts": + res, err = o.getAccountService().ListAccounts(r.Context(), &accounts.ListAccountsRequest{ + Query: query, + }) + case "cs3": + // TODO + o.logger.Fatal().Msg("cs3 backend doesn't support listing users") + default: + o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) + } + if err != nil { o.logger.Err(err).Msg("could not list users") mustNotFail(render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, "could not list users"))) @@ -558,6 +600,38 @@ func (o Ocs) fetchAccountByUsername(ctx context.Context, name string) (*accounts return nil, merrors.NotFound("", "The requested user could not be found") } +func (o Ocs) fetchAccountFromCS3BackendByUsername(ctx context.Context, name string) (*accounts.Account, error) { + backend := o.getCS3Backend() + u, err := backend.GetUserByClaims(ctx, "username", name, false) + if err != nil { + return nil, err + } + uid, gid := o.extractUIDAndGID(u) + return &accounts.Account{ + OnPremisesSamAccountName: u.Username, + DisplayName: u.DisplayName, + Mail: u.Mail, + UIDNumber: uid, + GIDNumber: gid, + } +} + +func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId) (*accounts.Account, error) { + backend := o.getCS3Backend() + u, err := backend.GetUser(ctx, id, false) + if err != nil { + return nil, err + } + uid, gid := o.extractUIDAndGID(u) + return &accounts.Account{ + OnPremisesSamAccountName: u.Username, + DisplayName: u.DisplayName, + Mail: u.Mail, + UIDNumber: uid, + GIDNumber: gid, + } +} + func (o Ocs) extractUIDAndGID(u *cs3.User) (int64, int64) { var uid, gid int64 var err error From fff0c7499a1bf7f7dbeb593e4fcda55a662f8149 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 13:35:11 +0200 Subject: [PATCH 3/8] Fixes --- ocs/pkg/service/v0/service.go | 2 +- ocs/pkg/service/v0/users.go | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index fb6a726879..9aa53aecaa 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -10,7 +10,7 @@ import ( "github.com/go-chi/chi/middleware" "github.com/go-chi/render" - cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" + "github.com/owncloud/ocis/proxy/pkg/cs3" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocis-pkg/account" "github.com/owncloud/ocis/ocis-pkg/log" diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 7b39cd8c12..7823ab1134 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -189,7 +189,6 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) { } var account *accounts.Account - var err error switch o.config.AccountBackend { case "accounts": @@ -611,9 +610,9 @@ func (o Ocs) fetchAccountFromCS3BackendByUsername(ctx context.Context, name stri OnPremisesSamAccountName: u.Username, DisplayName: u.DisplayName, Mail: u.Mail, - UIDNumber: uid, - GIDNumber: gid, - } + UidNumber: uid, + GidNumber: gid, + }, nil } func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId) (*accounts.Account, error) { @@ -627,9 +626,9 @@ func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId) OnPremisesSamAccountName: u.Username, DisplayName: u.DisplayName, Mail: u.Mail, - UIDNumber: uid, - GIDNumber: gid, - } + UidNumber: uid, + GidNumber: gid, + }, nil } func (o Ocs) extractUIDAndGID(u *cs3.User) (int64, int64) { From 9a590b37dcaa8780c06f696c554458d33d266631 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 13:38:20 +0200 Subject: [PATCH 4/8] Revert to using user in context --- ocs/pkg/service/v0/users.go | 48 ++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 7823ab1134..52066ef7a4 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -34,19 +34,27 @@ func (o Ocs) GetSelf(w http.ResponseWriter, r *http.Request) { return } - switch o.config.AccountBackend { - case "accounts": - account, err = o.getAccountService().GetAccount(r.Context(), &accounts.GetAccountRequest{ - Id: u.Id.OpaqueId, - }) - case "cs3": - account, err = o.fetchAccountFromCS3BackendByID(r.Context(), u.Id) - default: - o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) - } + account, err = o.getAccountService().GetAccount(r.Context(), &accounts.GetAccountRequest{ + Id: u.Id.OpaqueId, + }) if err != nil { merr := merrors.FromError(err) + // TODO(someone) this fix is in place because if the user backend (PROXY_ACCOUNT_BACKEND_TYPE) is set to, for instance, + // cs3, we cannot count with the accounts service. + if u != nil { + uid, gid := o.extractUIDAndGID(u) + d := &data.User{ + UserID: u.Username, + DisplayName: u.DisplayName, + LegacyDisplayName: u.DisplayName, + Email: u.Mail, + UIDNumber: uid, + GIDNumber: gid, + } + mustNotFail(render.Render(w, r, response.DataRender(d))) + return + } o.logger.Error().Err(merr).Interface("user", u).Msg("could not get account for user") return } @@ -81,7 +89,7 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) { case o.config.AccountBackend == "accounts": account, err = o.fetchAccountByUsername(r.Context(), userid) case o.config.AccountBackend == "cs3": - account, err = o.fetchAccountFromCS3BackendByUsername(r.Context(), userid) + account, err = o.fetchAccountFromCS3Backend(r.Context(), userid) default: o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend) } @@ -599,7 +607,7 @@ func (o Ocs) fetchAccountByUsername(ctx context.Context, name string) (*accounts return nil, merrors.NotFound("", "The requested user could not be found") } -func (o Ocs) fetchAccountFromCS3BackendByUsername(ctx context.Context, name string) (*accounts.Account, error) { +func (o Ocs) fetchAccountFromCS3Backend(ctx context.Context, name string) (*accounts.Account, error) { backend := o.getCS3Backend() u, err := backend.GetUserByClaims(ctx, "username", name, false) if err != nil { @@ -615,22 +623,6 @@ func (o Ocs) fetchAccountFromCS3BackendByUsername(ctx context.Context, name stri }, nil } -func (o Ocs) fetchAccountFromCS3BackendByID(ctx context.Context, id *cs3.UserId) (*accounts.Account, error) { - backend := o.getCS3Backend() - u, err := backend.GetUser(ctx, id, false) - if err != nil { - return nil, err - } - uid, gid := o.extractUIDAndGID(u) - return &accounts.Account{ - OnPremisesSamAccountName: u.Username, - DisplayName: u.DisplayName, - Mail: u.Mail, - UidNumber: uid, - GidNumber: gid, - }, nil -} - func (o Ocs) extractUIDAndGID(u *cs3.User) (int64, int64) { var uid, gid int64 var err error From 52f9d15b2bb9d46321db6c0c3b0a2fd31dd571b8 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 13:46:25 +0200 Subject: [PATCH 5/8] Minor fixes --- ocs/pkg/service/v0/service.go | 2 +- ocs/pkg/service/v0/users.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index 9aa53aecaa..8a435611fb 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -157,7 +157,7 @@ func (o Ocs) getAccountService() accounts.AccountsService { } func (o Ocs) getCS3Backend() backend.UserBackend { - revaClient, err := cs3.GetGatewayServiceClient(o.config.RevaAddress) + revaClient, _ := cs3.GetGatewayServiceClient(o.config.RevaAddress) return backend.NewCS3UserBackend(revaClient, nil, revaClient, o.logger) } diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 52066ef7a4..ac25d0541d 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -262,7 +262,7 @@ func (o Ocs) EditUser(w http.ResponseWriter, r *http.Request) { var err error switch o.config.AccountBackend { case "accounts": - account, err := o.fetchAccountByUsername(r.Context(), userid) + account, err = o.fetchAccountByUsername(r.Context(), userid) case "cs3": o.logger.Fatal().Msg("cs3 backend doesn't support editing users") default: @@ -340,7 +340,7 @@ func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) { var err error switch o.config.AccountBackend { case "accounts": - account, err := o.fetchAccountByUsername(r.Context(), userid) + account, err = o.fetchAccountByUsername(r.Context(), userid) case "cs3": o.logger.Fatal().Msg("cs3 backend doesn't support deleting users") default: @@ -386,7 +386,7 @@ func (o Ocs) EnableUser(w http.ResponseWriter, r *http.Request) { var err error switch o.config.AccountBackend { case "accounts": - account, err := o.fetchAccountByUsername(r.Context(), userid) + account, err = o.fetchAccountByUsername(r.Context(), userid) case "cs3": o.logger.Fatal().Msg("cs3 backend doesn't support enabling users") default: @@ -437,7 +437,7 @@ func (o Ocs) DisableUser(w http.ResponseWriter, r *http.Request) { var err error switch o.config.AccountBackend { case "accounts": - account, err := o.fetchAccountByUsername(r.Context(), userid) + account, err = o.fetchAccountByUsername(r.Context(), userid) case "cs3": o.logger.Fatal().Msg("cs3 backend doesn't support disabling users") default: From 8b3a18ac8caee4f106af843d246daa3ce57da45f Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 14:14:51 +0200 Subject: [PATCH 6/8] Log if reva client cannot be generated --- ocs/pkg/service/v0/service.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index 8a435611fb..899aae9ff5 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -10,7 +10,6 @@ import ( "github.com/go-chi/chi/middleware" "github.com/go-chi/render" - "github.com/owncloud/ocis/proxy/pkg/cs3" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocis-pkg/account" "github.com/owncloud/ocis/ocis-pkg/log" @@ -20,6 +19,7 @@ import ( ocsm "github.com/owncloud/ocis/ocs/pkg/middleware" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/proxy/pkg/cs3" "github.com/owncloud/ocis/proxy/pkg/user/backend" settings "github.com/owncloud/ocis/settings/pkg/proto/v0" ) @@ -157,7 +157,10 @@ func (o Ocs) getAccountService() accounts.AccountsService { } func (o Ocs) getCS3Backend() backend.UserBackend { - revaClient, _ := cs3.GetGatewayServiceClient(o.config.RevaAddress) + revaClient, err := cs3.GetGatewayServiceClient(o.config.RevaAddress) + if err != nil { + o.logger.Fatal().Msgf("could not get reva client at address %s", o.config.RevaAddress) + } return backend.NewCS3UserBackend(revaClient, nil, revaClient, o.logger) } From ffe3a17b732a43b104660c38a800f85cd3133375 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 14:19:40 +0200 Subject: [PATCH 7/8] Add proxy to go.mod --- ocs/go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ocs/go.mod b/ocs/go.mod index 0f60b427ad..cfa6dd54bc 100644 --- a/ocs/go.mod +++ b/ocs/go.mod @@ -18,6 +18,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/openzipkin/zipkin-go v0.2.5 github.com/owncloud/ocis/accounts v0.5.3-0.20210216094451-dc73176dc62d + github.com/owncloud/ocis/proxy v0.0.0-20210216094451-dc73176dc62d github.com/owncloud/ocis/ocis-pkg v0.0.0-20210216094451-dc73176dc62d github.com/owncloud/ocis/settings v0.0.0-20210216094451-dc73176dc62d github.com/owncloud/ocis/store v0.0.0-20210216094451-dc73176dc62d @@ -32,6 +33,7 @@ require ( replace ( github.com/owncloud/ocis/accounts => ../accounts + github.com/owncloud/ocis/proxy => ../proxy github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg github.com/owncloud/ocis/settings => ../settings github.com/owncloud/ocis/store => ../store From ded4abbd55c7021899e827bef6df7ec524687d99 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Tue, 13 Apr 2021 15:02:07 +0200 Subject: [PATCH 8/8] Set default user backend to accounts --- ocs/pkg/service/v0/service.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index 899aae9ff5..e5a882455f 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -59,6 +59,10 @@ func NewService(opts ...Option) Service { logger: options.Logger, } + if svc.config.AccountBackend == "" { + svc.config.AccountBackend = "accounts" + } + requireUser := ocsm.RequireUser() requireAdmin := ocsm.RequireAdmin(