-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Application passwords management (#1719)
- Loading branch information
Showing
22 changed files
with
1,594 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| Enhancement: Application passwords management | ||
|
|
||
| This PR adds the functionality to generate authentication tokens with limited | ||
| scope on behalf of registered users. These can be used in third party apps or in | ||
| case primary user credentials cannot be submitted to other parties. | ||
|
|
||
| https://github.com/cs3org/reva/pull/1719 | ||
| https://github.com/cs3org/reva/issues/1714 | ||
| https://github.com/cs3org/cs3apis/pull/127 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
158 changes: 158 additions & 0 deletions
158
internal/grpc/services/applicationauth/applicationauth.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| // Copyright 2018-2021 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 applicationauth | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| appauthpb "github.com/cs3org/go-cs3apis/cs3/auth/applications/v1beta1" | ||
| "github.com/cs3org/reva/pkg/appauth" | ||
| "github.com/cs3org/reva/pkg/appauth/manager/registry" | ||
| "github.com/cs3org/reva/pkg/errtypes" | ||
| "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("applicationauth", New) | ||
| } | ||
|
|
||
| type config struct { | ||
| Driver string `mapstructure:"driver"` | ||
| Drivers map[string]map[string]interface{} `mapstructure:"drivers"` | ||
| } | ||
|
|
||
| type service struct { | ||
| conf *config | ||
| am appauth.Manager | ||
| } | ||
|
|
||
| func (c *config) init() { | ||
| if c.Driver == "" { | ||
| c.Driver = "json" | ||
| } | ||
| } | ||
|
|
||
| func (s *service) Register(ss *grpc.Server) { | ||
| appauthpb.RegisterApplicationsAPIServer(ss, s) | ||
| } | ||
|
|
||
| func getAppAuthManager(c *config) (appauth.Manager, error) { | ||
| if f, ok := registry.NewFuncs[c.Driver]; ok { | ||
| return f(c.Drivers[c.Driver]) | ||
| } | ||
| return nil, errtypes.NotFound("driver not found: " + c.Driver) | ||
| } | ||
|
|
||
| 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 | ||
| } | ||
| return c, nil | ||
| } | ||
|
|
||
| // New creates a app auth provider svc | ||
| func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) { | ||
|
|
||
| c, err := parseConfig(m) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| c.init() | ||
|
|
||
| am, err := getAppAuthManager(c) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| service := &service{ | ||
| conf: c, | ||
| am: am, | ||
| } | ||
|
|
||
| return service, nil | ||
| } | ||
|
|
||
| func (s *service) Close() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (s *service) UnprotectedEndpoints() []string { | ||
| return []string{"/cs3.auth.applications.v1beta1.ApplicationsAPI/GetAppPassword"} | ||
| } | ||
|
|
||
| func (s *service) GenerateAppPassword(ctx context.Context, req *appauthpb.GenerateAppPasswordRequest) (*appauthpb.GenerateAppPasswordResponse, error) { | ||
| pwd, err := s.am.GenerateAppPassword(ctx, req.TokenScope, req.Label, req.Expiration) | ||
| if err != nil { | ||
| return &appauthpb.GenerateAppPasswordResponse{ | ||
| Status: status.NewInternal(ctx, err, "error generating app password"), | ||
| }, nil | ||
| } | ||
|
|
||
| return &appauthpb.GenerateAppPasswordResponse{ | ||
| Status: status.NewOK(ctx), | ||
| AppPassword: pwd, | ||
| }, nil | ||
| } | ||
|
|
||
| func (s *service) ListAppPasswords(ctx context.Context, req *appauthpb.ListAppPasswordsRequest) (*appauthpb.ListAppPasswordsResponse, error) { | ||
| pwds, err := s.am.ListAppPasswords(ctx) | ||
| if err != nil { | ||
| return &appauthpb.ListAppPasswordsResponse{ | ||
| Status: status.NewInternal(ctx, err, "error listing app passwords"), | ||
| }, nil | ||
| } | ||
|
|
||
| return &appauthpb.ListAppPasswordsResponse{ | ||
| Status: status.NewOK(ctx), | ||
| AppPasswords: pwds, | ||
| }, nil | ||
| } | ||
|
|
||
| func (s *service) InvalidateAppPassword(ctx context.Context, req *appauthpb.InvalidateAppPasswordRequest) (*appauthpb.InvalidateAppPasswordResponse, error) { | ||
| err := s.am.InvalidateAppPassword(ctx, req.Password) | ||
| if err != nil { | ||
| return &appauthpb.InvalidateAppPasswordResponse{ | ||
| Status: status.NewInternal(ctx, err, "error invalidating app password"), | ||
| }, nil | ||
| } | ||
|
|
||
| return &appauthpb.InvalidateAppPasswordResponse{ | ||
| Status: status.NewOK(ctx), | ||
| }, nil | ||
| } | ||
|
|
||
| func (s *service) GetAppPassword(ctx context.Context, req *appauthpb.GetAppPasswordRequest) (*appauthpb.GetAppPasswordResponse, error) { | ||
| pwd, err := s.am.GetAppPassword(ctx, req.User, req.Password) | ||
| if err != nil { | ||
| return &appauthpb.GetAppPasswordResponse{ | ||
| Status: status.NewInternal(ctx, err, "error getting app password via username/password"), | ||
| }, nil | ||
| } | ||
|
|
||
| return &appauthpb.GetAppPasswordResponse{ | ||
| Status: status.NewOK(ctx), | ||
| AppPassword: pwd, | ||
| }, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Copyright 2018-2021 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" | ||
|
|
||
| appauthpb "github.com/cs3org/go-cs3apis/cs3/auth/applications/v1beta1" | ||
| "github.com/cs3org/reva/pkg/rgrpc/status" | ||
| "github.com/cs3org/reva/pkg/rgrpc/todo/pool" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| func (s *svc) GenerateAppPassword(ctx context.Context, req *appauthpb.GenerateAppPasswordRequest) (*appauthpb.GenerateAppPasswordResponse, error) { | ||
| c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint) | ||
| if err != nil { | ||
| err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient") | ||
| return &appauthpb.GenerateAppPasswordResponse{ | ||
| Status: status.NewInternal(ctx, err, "error getting app auth provider client"), | ||
| }, nil | ||
| } | ||
|
|
||
| res, err := c.GenerateAppPassword(ctx, req) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "gateway: error calling GenerateAppPassword") | ||
| } | ||
|
|
||
| return res, nil | ||
| } | ||
|
|
||
| func (s *svc) ListAppPasswords(ctx context.Context, req *appauthpb.ListAppPasswordsRequest) (*appauthpb.ListAppPasswordsResponse, error) { | ||
| c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint) | ||
| if err != nil { | ||
| err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient") | ||
| return &appauthpb.ListAppPasswordsResponse{ | ||
| Status: status.NewInternal(ctx, err, "error getting app auth provider client"), | ||
| }, nil | ||
| } | ||
|
|
||
| res, err := c.ListAppPasswords(ctx, req) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "gateway: error calling ListAppPasswords") | ||
| } | ||
|
|
||
| return res, nil | ||
| } | ||
|
|
||
| func (s *svc) InvalidateAppPassword(ctx context.Context, req *appauthpb.InvalidateAppPasswordRequest) (*appauthpb.InvalidateAppPasswordResponse, error) { | ||
| c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint) | ||
| if err != nil { | ||
| err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient") | ||
| return &appauthpb.InvalidateAppPasswordResponse{ | ||
| Status: status.NewInternal(ctx, err, "error getting app auth provider client"), | ||
| }, nil | ||
| } | ||
|
|
||
| res, err := c.InvalidateAppPassword(ctx, req) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "gateway: error calling InvalidateAppPassword") | ||
| } | ||
|
|
||
| return res, nil | ||
| } | ||
|
|
||
| func (s *svc) GetAppPassword(ctx context.Context, req *appauthpb.GetAppPasswordRequest) (*appauthpb.GetAppPasswordResponse, error) { | ||
| c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint) | ||
| if err != nil { | ||
| err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient") | ||
| return &appauthpb.GetAppPasswordResponse{ | ||
| Status: status.NewInternal(ctx, err, "error getting app auth provider client"), | ||
| }, nil | ||
| } | ||
|
|
||
| res, err := c.GetAppPassword(ctx, req) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "gateway: error calling GetAppPassword") | ||
| } | ||
|
|
||
| return res, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.