mirror of
https://github.com/zitadel/zitadel.git
synced 2026-07-25 18:28:00 +00:00
6082e59d47
# Which Problems Are Solved - The eventstore did not support intentionally overwriting the resource owner when creating events for aggregates that may be reused across owners. - Resource owner handling was implicit and could not be controlled per command/event type. - We needed a safe way to distinguish between: - keeping the existing aggregate owner, and - explicitly setting a new owner for specific create-like events. # How the Problems Are Solved - Introduced a new eventstore command type with an explicit enforce_owner flag. - Updated eventstore.commands_to_events and eventstore.push so owner assignment is now explicit: - if enforce_owner is true, the command owner is written - if enforce_owner is false, the existing aggregate owner is retained when present - Added EnforceResourceOwnerCommand and wiring so command types can opt in to enforced owner behavior. - Wired the new behavior through the v3 eventstore push path, including compatibility fallback for older command type mapping. - Added migration/setup changes to register and use the new command type and SQL functions. - Added and updated tests for owner overwrite and aggregate ID reuse scenarios. # Additional Changes - Added small migration/setup robustness improvements related to eventstore setup ordering and helper reuse. - Added focused test coverage for enforced owner behavior and sequencing. - Events that currently allow owner changes (implement EnforceResourceOwner) are: - AddedEvent (action) - GroupAddedEvent - StartedEvent (idp intent) - ProjectAddedEvent - HumanAddedEvent - HumanRegisteredEvent - MachineAddedEvent - CreatedEvent (schema user) # Additional Context - Follow-up for eventstore owner-handling correctness in create flows and aggregate ID reuse cases. - No additional issue link was attached for this change. --------- Co-authored-by: abhishek kumar gupta <abhishek818t@gmail.com>
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
package command
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
)
|
|
|
|
type MachineKeyWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
KeyID string
|
|
KeyType domain.AuthNKeyType
|
|
ExpirationDate time.Time
|
|
|
|
State domain.MachineKeyState
|
|
}
|
|
|
|
func NewMachineKeyWriteModel(userID, keyID, resourceOwner string) *MachineKeyWriteModel {
|
|
return &MachineKeyWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: userID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
KeyID: keyID,
|
|
}
|
|
}
|
|
|
|
func (wm *MachineKeyWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *user.MachineKeyAddedEvent:
|
|
if wm.KeyID != e.KeyID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.MachineKeyRemovedEvent:
|
|
if wm.KeyID != e.KeyID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
default:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *MachineKeyWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *user.HumanAddedEvent, *user.HumanRegisteredEvent:
|
|
wm.KeyType = domain.AuthNKeyTypeNONE
|
|
wm.ExpirationDate = time.Time{}
|
|
wm.State = domain.MachineKeyStateUnspecified
|
|
case *user.MachineAddedEvent:
|
|
wm.KeyType = domain.AuthNKeyTypeNONE
|
|
wm.ExpirationDate = time.Time{}
|
|
wm.State = domain.MachineKeyStateUnspecified
|
|
case *user.MachineKeyAddedEvent:
|
|
wm.KeyID = e.KeyID
|
|
wm.KeyType = e.KeyType
|
|
wm.ExpirationDate = e.ExpirationDate
|
|
wm.State = domain.MachineKeyStateActive
|
|
case *user.MachineKeyRemovedEvent:
|
|
wm.State = domain.MachineKeyStateRemoved
|
|
case *user.UserRemovedEvent:
|
|
wm.KeyType = domain.AuthNKeyTypeNONE
|
|
wm.ExpirationDate = time.Time{}
|
|
wm.State = domain.MachineKeyStateRemoved
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *MachineKeyWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(user.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
user.HumanAddedType,
|
|
user.HumanRegisteredType,
|
|
user.MachineAddedEventType,
|
|
user.MachineKeyAddedEventType,
|
|
user.MachineKeyRemovedEventType,
|
|
user.UserRemovedType).
|
|
Builder()
|
|
}
|
|
|
|
func (wm *MachineKeyWriteModel) Exists() bool {
|
|
return wm.State != domain.MachineKeyStateUnspecified && wm.State != domain.MachineKeyStateRemoved
|
|
}
|