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>
264 lines
6.5 KiB
Go
264 lines
6.5 KiB
Go
package command
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
)
|
|
|
|
type OrgDomainWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
Domain string
|
|
ValidationType domain.OrgDomainValidationType
|
|
ValidationCode *crypto.CryptoValue
|
|
Primary bool
|
|
Verified bool
|
|
|
|
State domain.OrgDomainState
|
|
}
|
|
|
|
func (wm *OrgDomainWriteModel) reset() {
|
|
wm.ValidationType = domain.OrgDomainValidationTypeUnspecified
|
|
wm.ValidationCode = nil
|
|
wm.Primary = false
|
|
wm.Verified = false
|
|
wm.State = domain.OrgDomainStateUnspecified
|
|
}
|
|
|
|
func NewOrgDomainWriteModel(orgID string, domain string) *OrgDomainWriteModel {
|
|
return &OrgDomainWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: orgID,
|
|
ResourceOwner: orgID,
|
|
},
|
|
Domain: domain,
|
|
}
|
|
}
|
|
|
|
func (wm *OrgDomainWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *org.DomainAddedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.DomainVerificationAddedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.DomainVerificationFailedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.DomainVerifiedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.DomainPrimarySetEvent:
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.DomainRemovedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *OrgDomainWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *org.DomainAddedEvent:
|
|
wm.Domain = e.Domain
|
|
wm.State = domain.OrgDomainStateActive
|
|
case *org.DomainVerificationAddedEvent:
|
|
wm.ValidationType = e.ValidationType
|
|
wm.ValidationCode = e.ValidationCode
|
|
case *org.DomainVerifiedEvent:
|
|
wm.Verified = true
|
|
case *org.DomainPrimarySetEvent:
|
|
wm.Primary = e.Domain == wm.Domain
|
|
case *org.DomainRemovedEvent:
|
|
wm.State = domain.OrgDomainStateRemoved
|
|
wm.Verified = false
|
|
wm.Primary = false
|
|
wm.ValidationType = domain.OrgDomainValidationTypeUnspecified
|
|
wm.ValidationCode = nil
|
|
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
|
wm.reset()
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *OrgDomainWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(org.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
org.OrgDomainAddedEventType,
|
|
org.OrgDomainVerifiedEventType,
|
|
org.OrgDomainVerificationAddedEventType,
|
|
org.OrgDomainVerifiedEventType,
|
|
org.OrgDomainPrimarySetEventType,
|
|
org.OrgDomainRemovedEventType,
|
|
org.OrgAddedEventType,
|
|
org.OrgRemovedEventType,
|
|
).
|
|
Builder()
|
|
}
|
|
|
|
type OrgDomainsWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
Domains []*Domain
|
|
PrimaryDomain string
|
|
OrgName string
|
|
}
|
|
|
|
type Domain struct {
|
|
Domain string
|
|
Verified bool
|
|
State domain.OrgDomainState
|
|
}
|
|
|
|
func NewOrgDomainsWriteModel(orgID string) *OrgDomainsWriteModel {
|
|
return &OrgDomainsWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: orgID,
|
|
ResourceOwner: orgID,
|
|
},
|
|
Domains: make([]*Domain, 0),
|
|
}
|
|
}
|
|
|
|
func (wm *OrgDomainsWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *org.OrgAddedEvent:
|
|
wm.OrgName = e.Name
|
|
wm.Domains = nil
|
|
wm.PrimaryDomain = ""
|
|
case *org.OrgRemovedEvent:
|
|
wm.OrgName = ""
|
|
wm.Domains = nil
|
|
wm.PrimaryDomain = ""
|
|
case *org.OrgChangedEvent:
|
|
wm.OrgName = e.Name
|
|
case *org.DomainAddedEvent:
|
|
wm.Domains = append(wm.Domains, &Domain{Domain: e.Domain, State: domain.OrgDomainStateActive})
|
|
case *org.DomainVerifiedEvent:
|
|
for _, d := range wm.Domains {
|
|
if d.Domain == e.Domain {
|
|
d.Verified = true
|
|
continue
|
|
}
|
|
}
|
|
case *org.DomainPrimarySetEvent:
|
|
wm.PrimaryDomain = e.Domain
|
|
case *org.DomainRemovedEvent:
|
|
for _, d := range wm.Domains {
|
|
if d.Domain == e.Domain {
|
|
d.State = domain.OrgDomainStateRemoved
|
|
continue
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *OrgDomainsWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(org.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
org.OrgAddedEventType,
|
|
org.OrgChangedEventType,
|
|
org.OrgDomainAddedEventType,
|
|
org.OrgDomainVerifiedEventType,
|
|
org.OrgDomainVerificationAddedEventType,
|
|
org.OrgDomainVerifiedEventType,
|
|
org.OrgDomainPrimarySetEventType,
|
|
org.OrgDomainRemovedEventType,
|
|
org.OrgRemovedEventType,
|
|
).
|
|
Builder()
|
|
}
|
|
|
|
type OrgDomainVerifiedWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
Domain string
|
|
Verified bool
|
|
}
|
|
|
|
func NewOrgDomainVerifiedWriteModel(domain string) *OrgDomainVerifiedWriteModel {
|
|
return &OrgDomainVerifiedWriteModel{
|
|
WriteModel: eventstore.WriteModel{},
|
|
Domain: domain,
|
|
}
|
|
}
|
|
|
|
func (wm *OrgDomainVerifiedWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *org.DomainVerifiedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.DomainRemovedEvent:
|
|
if e.Domain != wm.Domain {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *OrgDomainVerifiedWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *org.DomainVerifiedEvent:
|
|
wm.Verified = true
|
|
wm.ResourceOwner = e.Aggregate().ResourceOwner
|
|
case *org.DomainRemovedEvent:
|
|
wm.Verified = false
|
|
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
|
if wm.ResourceOwner != e.Aggregate().ID {
|
|
continue
|
|
}
|
|
wm.Verified = false
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *OrgDomainVerifiedWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
AggregateTypes(org.AggregateType).
|
|
EventTypes(
|
|
org.OrgDomainVerifiedEventType,
|
|
org.OrgDomainRemovedEventType,
|
|
org.OrgRemovedEventType,
|
|
org.OrgAddedEventType,
|
|
).
|
|
Builder()
|
|
}
|