mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-25 09:07:48 +00:00
f3e6f3b23b
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
255 lines
8.9 KiB
Go
255 lines
8.9 KiB
Go
package projection
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler/crdb"
|
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
)
|
|
|
|
const (
|
|
UserAuthMethodTable = "projections.user_auth_methods4"
|
|
|
|
UserAuthMethodUserIDCol = "user_id"
|
|
UserAuthMethodTypeCol = "method_type"
|
|
UserAuthMethodTokenIDCol = "token_id"
|
|
UserAuthMethodCreationDateCol = "creation_date"
|
|
UserAuthMethodChangeDateCol = "change_date"
|
|
UserAuthMethodSequenceCol = "sequence"
|
|
UserAuthMethodResourceOwnerCol = "resource_owner"
|
|
UserAuthMethodInstanceIDCol = "instance_id"
|
|
UserAuthMethodStateCol = "state"
|
|
UserAuthMethodNameCol = "name"
|
|
UserAuthMethodOwnerRemovedCol = "owner_removed"
|
|
)
|
|
|
|
type userAuthMethodProjection struct {
|
|
crdb.StatementHandler
|
|
}
|
|
|
|
func newUserAuthMethodProjection(ctx context.Context, config crdb.StatementHandlerConfig) *userAuthMethodProjection {
|
|
p := new(userAuthMethodProjection)
|
|
config.ProjectionName = UserAuthMethodTable
|
|
config.Reducers = p.reducers()
|
|
config.InitCheck = crdb.NewTableCheck(
|
|
crdb.NewTable([]*crdb.Column{
|
|
crdb.NewColumn(UserAuthMethodUserIDCol, crdb.ColumnTypeText),
|
|
crdb.NewColumn(UserAuthMethodTypeCol, crdb.ColumnTypeEnum),
|
|
crdb.NewColumn(UserAuthMethodTokenIDCol, crdb.ColumnTypeText),
|
|
crdb.NewColumn(UserAuthMethodCreationDateCol, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(UserAuthMethodChangeDateCol, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(UserAuthMethodSequenceCol, crdb.ColumnTypeInt64),
|
|
crdb.NewColumn(UserAuthMethodStateCol, crdb.ColumnTypeEnum),
|
|
crdb.NewColumn(UserAuthMethodResourceOwnerCol, crdb.ColumnTypeText),
|
|
crdb.NewColumn(UserAuthMethodInstanceIDCol, crdb.ColumnTypeText),
|
|
crdb.NewColumn(UserAuthMethodNameCol, crdb.ColumnTypeText),
|
|
crdb.NewColumn(UserAuthMethodOwnerRemovedCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
|
},
|
|
crdb.NewPrimaryKey(UserAuthMethodInstanceIDCol, UserAuthMethodUserIDCol, UserAuthMethodTypeCol, UserAuthMethodTokenIDCol),
|
|
crdb.WithIndex(crdb.NewIndex("resource_owner", []string{UserAuthMethodResourceOwnerCol})),
|
|
crdb.WithIndex(crdb.NewIndex("owner_removed", []string{UserAuthMethodOwnerRemovedCol})),
|
|
),
|
|
)
|
|
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
|
return p
|
|
}
|
|
|
|
func (p *userAuthMethodProjection) reducers() []handler.AggregateReducer {
|
|
return []handler.AggregateReducer{
|
|
{
|
|
Aggregate: user.AggregateType,
|
|
EventRedusers: []handler.EventReducer{
|
|
{
|
|
Event: user.HumanPasswordlessTokenAddedType,
|
|
Reduce: p.reduceInitAuthMethod,
|
|
},
|
|
{
|
|
Event: user.HumanU2FTokenAddedType,
|
|
Reduce: p.reduceInitAuthMethod,
|
|
},
|
|
{
|
|
Event: user.HumanMFAOTPAddedType,
|
|
Reduce: p.reduceInitAuthMethod,
|
|
},
|
|
{
|
|
Event: user.HumanPasswordlessTokenVerifiedType,
|
|
Reduce: p.reduceActivateEvent,
|
|
},
|
|
{
|
|
Event: user.HumanU2FTokenVerifiedType,
|
|
Reduce: p.reduceActivateEvent,
|
|
},
|
|
{
|
|
Event: user.HumanMFAOTPVerifiedType,
|
|
Reduce: p.reduceActivateEvent,
|
|
},
|
|
{
|
|
Event: user.HumanPasswordlessTokenRemovedType,
|
|
Reduce: p.reduceRemoveAuthMethod,
|
|
},
|
|
{
|
|
Event: user.HumanU2FTokenRemovedType,
|
|
Reduce: p.reduceRemoveAuthMethod,
|
|
},
|
|
{
|
|
Event: user.HumanMFAOTPRemovedType,
|
|
Reduce: p.reduceRemoveAuthMethod,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Aggregate: org.AggregateType,
|
|
EventRedusers: []handler.EventReducer{
|
|
{
|
|
Event: org.OrgRemovedEventType,
|
|
Reduce: p.reduceOwnerRemoved,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Aggregate: instance.AggregateType,
|
|
EventRedusers: []handler.EventReducer{
|
|
{
|
|
Event: instance.InstanceRemovedEventType,
|
|
Reduce: reduceInstanceRemovedHelper(UserAuthMethodInstanceIDCol),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func (p *userAuthMethodProjection) reduceInitAuthMethod(event eventstore.Event) (*handler.Statement, error) {
|
|
tokenID := ""
|
|
var methodType domain.UserAuthMethodType
|
|
switch e := event.(type) {
|
|
case *user.HumanPasswordlessAddedEvent:
|
|
methodType = domain.UserAuthMethodTypePasswordless
|
|
tokenID = e.WebAuthNTokenID
|
|
case *user.HumanU2FAddedEvent:
|
|
methodType = domain.UserAuthMethodTypeU2F
|
|
tokenID = e.WebAuthNTokenID
|
|
case *user.HumanOTPAddedEvent:
|
|
methodType = domain.UserAuthMethodTypeOTP
|
|
default:
|
|
return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType})
|
|
}
|
|
|
|
return crdb.NewUpsertStatement(
|
|
event,
|
|
[]handler.Column{
|
|
handler.NewCol(UserAuthMethodInstanceIDCol, nil),
|
|
handler.NewCol(UserAuthMethodUserIDCol, nil),
|
|
handler.NewCol(UserAuthMethodTypeCol, nil),
|
|
handler.NewCol(UserAuthMethodTokenIDCol, nil),
|
|
},
|
|
[]handler.Column{
|
|
handler.NewCol(UserAuthMethodTokenIDCol, tokenID),
|
|
handler.NewCol(UserAuthMethodCreationDateCol, event.CreationDate()),
|
|
handler.NewCol(UserAuthMethodChangeDateCol, event.CreationDate()),
|
|
handler.NewCol(UserAuthMethodResourceOwnerCol, event.Aggregate().ResourceOwner),
|
|
handler.NewCol(UserAuthMethodInstanceIDCol, event.Aggregate().InstanceID),
|
|
handler.NewCol(UserAuthMethodUserIDCol, event.Aggregate().ID),
|
|
handler.NewCol(UserAuthMethodSequenceCol, event.Sequence()),
|
|
handler.NewCol(UserAuthMethodStateCol, domain.MFAStateNotReady),
|
|
handler.NewCol(UserAuthMethodTypeCol, methodType),
|
|
handler.NewCol(UserAuthMethodNameCol, ""),
|
|
},
|
|
), nil
|
|
}
|
|
|
|
func (p *userAuthMethodProjection) reduceActivateEvent(event eventstore.Event) (*handler.Statement, error) {
|
|
tokenID := ""
|
|
name := ""
|
|
var methodType domain.UserAuthMethodType
|
|
|
|
switch e := event.(type) {
|
|
case *user.HumanPasswordlessVerifiedEvent:
|
|
methodType = domain.UserAuthMethodTypePasswordless
|
|
tokenID = e.WebAuthNTokenID
|
|
name = e.WebAuthNTokenName
|
|
case *user.HumanU2FVerifiedEvent:
|
|
methodType = domain.UserAuthMethodTypeU2F
|
|
tokenID = e.WebAuthNTokenID
|
|
name = e.WebAuthNTokenName
|
|
case *user.HumanOTPVerifiedEvent:
|
|
methodType = domain.UserAuthMethodTypeOTP
|
|
|
|
default:
|
|
return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType})
|
|
}
|
|
|
|
return crdb.NewUpdateStatement(
|
|
event,
|
|
[]handler.Column{
|
|
handler.NewCol(UserAuthMethodChangeDateCol, event.CreationDate()),
|
|
handler.NewCol(UserAuthMethodSequenceCol, event.Sequence()),
|
|
handler.NewCol(UserAuthMethodNameCol, name),
|
|
handler.NewCol(UserAuthMethodStateCol, domain.MFAStateReady),
|
|
},
|
|
[]handler.Condition{
|
|
handler.NewCond(UserAuthMethodUserIDCol, event.Aggregate().ID),
|
|
handler.NewCond(UserAuthMethodTypeCol, methodType),
|
|
handler.NewCond(UserAuthMethodResourceOwnerCol, event.Aggregate().ResourceOwner),
|
|
handler.NewCond(UserAuthMethodTokenIDCol, tokenID),
|
|
handler.NewCond(UserAuthMethodInstanceIDCol, event.Aggregate().InstanceID),
|
|
},
|
|
), nil
|
|
}
|
|
|
|
func (p *userAuthMethodProjection) reduceRemoveAuthMethod(event eventstore.Event) (*handler.Statement, error) {
|
|
var tokenID string
|
|
var methodType domain.UserAuthMethodType
|
|
switch e := event.(type) {
|
|
case *user.HumanPasswordlessRemovedEvent:
|
|
methodType = domain.UserAuthMethodTypePasswordless
|
|
tokenID = e.WebAuthNTokenID
|
|
case *user.HumanU2FRemovedEvent:
|
|
methodType = domain.UserAuthMethodTypeU2F
|
|
tokenID = e.WebAuthNTokenID
|
|
case *user.HumanOTPRemovedEvent:
|
|
methodType = domain.UserAuthMethodTypeOTP
|
|
|
|
default:
|
|
return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType})
|
|
}
|
|
conditions := []handler.Condition{
|
|
handler.NewCond(UserAuthMethodUserIDCol, event.Aggregate().ID),
|
|
handler.NewCond(UserAuthMethodTypeCol, methodType),
|
|
handler.NewCond(UserAuthMethodResourceOwnerCol, event.Aggregate().ResourceOwner),
|
|
handler.NewCond(UserAuthMethodInstanceIDCol, event.Aggregate().InstanceID),
|
|
}
|
|
if tokenID != "" {
|
|
conditions = append(conditions, handler.NewCond(UserAuthMethodTokenIDCol, tokenID))
|
|
}
|
|
return crdb.NewDeleteStatement(
|
|
event,
|
|
conditions,
|
|
), nil
|
|
}
|
|
|
|
func (p *userAuthMethodProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) {
|
|
e, ok := event.(*org.OrgRemovedEvent)
|
|
if !ok {
|
|
return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-FwDZ8", "reduce.wrong.event.type %s", org.OrgRemovedEventType)
|
|
}
|
|
|
|
return crdb.NewUpdateStatement(
|
|
e,
|
|
[]handler.Column{
|
|
handler.NewCol(UserAuthMethodChangeDateCol, e.CreationDate()),
|
|
handler.NewCol(UserAuthMethodSequenceCol, e.Sequence()),
|
|
handler.NewCol(UserAuthMethodOwnerRemovedCol, true),
|
|
},
|
|
[]handler.Condition{
|
|
handler.NewCond(UserAuthMethodInstanceIDCol, e.Aggregate().InstanceID),
|
|
handler.NewCond(UserAuthMethodResourceOwnerCol, e.Aggregate().ID),
|
|
},
|
|
), nil
|
|
}
|