2021-02-08 10:30:30 +00:00
|
|
|
package command
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2022-12-09 13:04:33 +00:00
|
|
|
"time"
|
2021-02-18 13:48:27 +00:00
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
"github.com/zitadel/zitadel/internal/command/preparation"
|
2022-04-26 23:01:45 +00:00
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
|
|
"github.com/zitadel/zitadel/internal/errors"
|
2022-12-09 13:04:33 +00:00
|
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
2022-04-26 23:01:45 +00:00
|
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
2021-02-08 10:30:30 +00:00
|
|
|
)
|
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
type AddMachineKey struct {
|
|
|
|
Type domain.AuthNKeyType
|
|
|
|
ExpirationDate time.Time
|
|
|
|
}
|
|
|
|
|
|
|
|
type MachineKey struct {
|
|
|
|
models.ObjectRoot
|
|
|
|
|
|
|
|
KeyID string
|
|
|
|
Type domain.AuthNKeyType
|
|
|
|
ExpirationDate time.Time
|
|
|
|
PrivateKey []byte
|
|
|
|
PublicKey []byte
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewMachineKey(resourceOwner string, userID string, expirationDate time.Time, keyType domain.AuthNKeyType) *MachineKey {
|
|
|
|
return &MachineKey{
|
|
|
|
ObjectRoot: models.ObjectRoot{
|
|
|
|
AggregateID: userID,
|
|
|
|
ResourceOwner: resourceOwner,
|
|
|
|
},
|
|
|
|
ExpirationDate: expirationDate,
|
|
|
|
Type: keyType,
|
2022-10-18 15:07:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func (key *MachineKey) SetPublicKey(publicKey []byte) {
|
|
|
|
key.PublicKey = publicKey
|
|
|
|
}
|
|
|
|
func (key *MachineKey) SetPrivateKey(privateKey []byte) {
|
|
|
|
key.PrivateKey = privateKey
|
|
|
|
}
|
|
|
|
func (key *MachineKey) GetExpirationDate() time.Time {
|
|
|
|
return key.ExpirationDate
|
|
|
|
}
|
|
|
|
func (key *MachineKey) SetExpirationDate(t time.Time) {
|
|
|
|
key.ExpirationDate = t
|
|
|
|
}
|
|
|
|
|
|
|
|
func (key *MachineKey) Detail() ([]byte, error) {
|
|
|
|
if len(key.PrivateKey) == 0 {
|
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "KEY-sp2l2m", "Errors.Internal")
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
if key.Type == domain.AuthNKeyTypeJSON {
|
|
|
|
return domain.MachineKeyMarshalJSON(key.KeyID, key.PrivateKey, key.AggregateID)
|
|
|
|
}
|
|
|
|
return nil, errors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal")
|
2022-10-18 15:07:30 +00:00
|
|
|
}
|
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func (key *MachineKey) content() error {
|
|
|
|
if key.ResourceOwner == "" {
|
|
|
|
return errors.ThrowInvalidArgument(nil, "COMMAND-kqpoix", "Errors.ResourceOwnerMissing")
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
if key.AggregateID == "" {
|
|
|
|
return errors.ThrowInvalidArgument(nil, "COMMAND-xuiwk2", "Errors.User.UserIDMissing")
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
if key.KeyID == "" {
|
|
|
|
return errors.ThrowInvalidArgument(nil, "COMMAND-0p2m1h", "Errors.IDMissing")
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
2021-02-08 10:30:30 +00:00
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func (key *MachineKey) valid() (err error) {
|
|
|
|
if err := key.content(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
key.ExpirationDate, err = domain.ValidateExpirationDate(key.ExpirationDate)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (key *MachineKey) checkAggregate(ctx context.Context, filter preparation.FilterToQueryReducer) error {
|
|
|
|
if exists, err := ExistsUser(ctx, filter, key.AggregateID, key.ResourceOwner); err != nil || !exists {
|
|
|
|
return errors.ThrowPreconditionFailed(err, "COMMAND-bnipwm1", "Errors.User.NotFound")
|
2021-02-18 13:48:27 +00:00
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
return nil
|
|
|
|
}
|
2021-02-08 10:30:30 +00:00
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func (c *Commands) AddUserMachineKey(ctx context.Context, machineKey *MachineKey) (*domain.ObjectDetails, error) {
|
|
|
|
if machineKey.KeyID == "" {
|
|
|
|
keyID, err := c.idGenerator.Next()
|
|
|
|
if err != nil {
|
2022-10-18 15:07:30 +00:00
|
|
|
return nil, err
|
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
machineKey.KeyID = keyID
|
2022-10-18 15:07:30 +00:00
|
|
|
}
|
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
validation := prepareAddUserMachineKey(machineKey, c.machineKeySize)
|
|
|
|
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, validation)
|
2021-02-08 10:30:30 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
events, err := c.eventstore.Push(ctx, cmds...)
|
2021-02-18 13:48:27 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
return &domain.ObjectDetails{
|
|
|
|
Sequence: events[len(events)-1].Sequence(),
|
|
|
|
EventDate: events[len(events)-1].CreationDate(),
|
|
|
|
ResourceOwner: events[len(events)-1].Aggregate().ResourceOwner,
|
|
|
|
}, nil
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func prepareAddUserMachineKey(machineKey *MachineKey, keySize int) preparation.Validation {
|
|
|
|
return func() (_ preparation.CreateCommands, err error) {
|
|
|
|
if err := machineKey.valid(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
|
|
|
|
if err := machineKey.checkAggregate(ctx, filter); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if len(machineKey.PublicKey) == 0 {
|
|
|
|
if err = domain.SetNewAuthNKeyPair(machineKey, keySize); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
writeModel, err := getMachineKeyWriteModelByID(ctx, filter, machineKey.AggregateID, machineKey.KeyID, machineKey.ResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if writeModel.Exists() {
|
|
|
|
return nil, errors.ThrowAlreadyExists(nil, "COMMAND-091mops", "Errors.User.Machine.Key.AlreadyExists")
|
|
|
|
}
|
|
|
|
return []eventstore.Command{
|
|
|
|
user.NewMachineKeyAddedEvent(
|
|
|
|
ctx,
|
|
|
|
UserAggregateFromWriteModel(&writeModel.WriteModel),
|
|
|
|
machineKey.KeyID,
|
|
|
|
machineKey.Type,
|
|
|
|
machineKey.ExpirationDate,
|
|
|
|
machineKey.PublicKey,
|
|
|
|
),
|
|
|
|
}, nil
|
|
|
|
}, nil
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
}
|
2021-02-18 13:48:27 +00:00
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func (c *Commands) RemoveUserMachineKey(ctx context.Context, machineKey *MachineKey) (*domain.ObjectDetails, error) {
|
|
|
|
validation := prepareRemoveUserMachineKey(machineKey)
|
|
|
|
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, validation)
|
feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 09:30:11 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
events, err := c.eventstore.Push(ctx, cmds...)
|
feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 09:30:11 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
return &domain.ObjectDetails{
|
|
|
|
Sequence: events[len(events)-1].Sequence(),
|
|
|
|
EventDate: events[len(events)-1].CreationDate(),
|
|
|
|
ResourceOwner: events[len(events)-1].Aggregate().ResourceOwner,
|
|
|
|
}, nil
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func prepareRemoveUserMachineKey(machineKey *MachineKey) preparation.Validation {
|
|
|
|
return func() (_ preparation.CreateCommands, err error) {
|
|
|
|
if err := machineKey.content(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
|
|
|
|
writeModel, err := getMachineKeyWriteModelByID(ctx, filter, machineKey.AggregateID, machineKey.KeyID, machineKey.ResourceOwner)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if !writeModel.Exists() {
|
|
|
|
return nil, errors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.User.Machine.Key.NotFound")
|
|
|
|
}
|
|
|
|
return []eventstore.Command{
|
|
|
|
user.NewMachineKeyRemovedEvent(
|
|
|
|
ctx,
|
|
|
|
UserAggregateFromWriteModel(&writeModel.WriteModel),
|
|
|
|
machineKey.KeyID,
|
|
|
|
),
|
|
|
|
}, nil
|
|
|
|
}, nil
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
}
|
2021-02-08 10:30:30 +00:00
|
|
|
|
2022-12-09 13:04:33 +00:00
|
|
|
func getMachineKeyWriteModelByID(ctx context.Context, filter preparation.FilterToQueryReducer, userID, keyID, resourceOwner string) (_ *MachineKeyWriteModel, err error) {
|
|
|
|
writeModel := NewMachineKeyWriteModel(userID, keyID, resourceOwner)
|
|
|
|
events, err := filter(ctx, writeModel.Query())
|
2021-02-08 10:30:30 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-12-09 13:04:33 +00:00
|
|
|
if len(events) == 0 {
|
|
|
|
return writeModel, nil
|
|
|
|
}
|
|
|
|
writeModel.AppendEvents(events...)
|
|
|
|
err = writeModel.Reduce()
|
|
|
|
return writeModel, err
|
2021-02-08 10:30:30 +00:00
|
|
|
}
|