mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-17 19:05:13 +00:00
fix(eventstore): allow overwriting resource owner of events (#12261)
# 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 <[email protected]>
This commit is contained in:
co-authored by
abhishek kumar gupta
parent
4459a1380c
commit
6082e59d47
@@ -108,7 +108,7 @@ func (wm *OIDCApplicationWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *project.ProjectRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -118,6 +118,29 @@ func (wm *OIDCApplicationWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *project.ApplicationAddedEvent:
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.ClientSecretString = ""
|
||||
wm.RedirectUris = nil
|
||||
wm.ResponseTypes = nil
|
||||
wm.GrantTypes = nil
|
||||
wm.ApplicationType = domain.OIDCApplicationTypeWeb
|
||||
wm.AuthMethodType = domain.OIDCAuthMethodTypeBasic
|
||||
wm.PostLogoutRedirectUris = nil
|
||||
wm.OIDCVersion = domain.OIDCVersionV1
|
||||
wm.Compliance = nil
|
||||
wm.DevMode = false
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.AccessTokenRoleAssertion = false
|
||||
wm.IDTokenRoleAssertion = false
|
||||
wm.IDTokenUserinfoAssertion = false
|
||||
wm.ClockSkew = 0
|
||||
wm.AdditionalOrigins = nil
|
||||
wm.SkipNativeAppSuccessPage = false
|
||||
wm.BackChannelLogoutURI = ""
|
||||
wm.LoginVersion = domain.LoginVersionUnspecified
|
||||
wm.LoginBaseURI = ""
|
||||
wm.oidc = false
|
||||
wm.AppName = e.Name
|
||||
wm.State = domain.AppStateActive
|
||||
case *project.ApplicationChangedEvent:
|
||||
@@ -143,6 +166,30 @@ func (wm *OIDCApplicationWriteModel) Reduce() error {
|
||||
case *project.OIDCConfigSecretHashUpdatedEvent:
|
||||
wm.HashedSecret = e.HashedSecret
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.AppName = ""
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.ClientSecretString = ""
|
||||
wm.RedirectUris = nil
|
||||
wm.ResponseTypes = nil
|
||||
wm.GrantTypes = nil
|
||||
wm.ApplicationType = domain.OIDCApplicationTypeWeb
|
||||
wm.AuthMethodType = domain.OIDCAuthMethodTypeBasic
|
||||
wm.PostLogoutRedirectUris = nil
|
||||
wm.OIDCVersion = domain.OIDCVersionV1
|
||||
wm.Compliance = nil
|
||||
wm.DevMode = false
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.AccessTokenRoleAssertion = false
|
||||
wm.IDTokenRoleAssertion = false
|
||||
wm.IDTokenUserinfoAssertion = false
|
||||
wm.ClockSkew = 0
|
||||
wm.AdditionalOrigins = nil
|
||||
wm.SkipNativeAppSuccessPage = false
|
||||
wm.BackChannelLogoutURI = ""
|
||||
wm.LoginVersion = domain.LoginVersionUnspecified
|
||||
wm.LoginBaseURI = ""
|
||||
wm.oidc = false
|
||||
wm.State = domain.AppStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -237,6 +284,7 @@ func (wm *OIDCApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationAddedType,
|
||||
project.ApplicationChangedType,
|
||||
project.ApplicationDeactivatedType,
|
||||
|
||||
Reference in New Issue
Block a user