mirror of
https://github.com/zitadel/zitadel.git
synced 2026-07-25 18:28:00 +00:00
# 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>
170 lines
5.0 KiB
Go
170 lines
5.0 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/project"
|
|
)
|
|
|
|
type ApplicationSecretWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
ApplicationID string
|
|
ClientID string
|
|
HashedSecret string
|
|
|
|
State domain.AppState
|
|
SecretAllowed bool
|
|
IsAPI bool
|
|
}
|
|
|
|
func NewApplicationSecretWriteModel(projectID, applicationID, resourceOwner string) *ApplicationSecretWriteModel {
|
|
return &ApplicationSecretWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: projectID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
ApplicationID: applicationID,
|
|
}
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *project.ApplicationRemovedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.OIDCConfigAddedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.OIDCConfigChangedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.APIConfigAddedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.APIConfigChangedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.OIDCConfigSecretChangedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.OIDCConfigSecretHashUpdatedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.APIConfigSecretChangedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.APIConfigSecretHashUpdatedEvent:
|
|
if e.AppID != wm.ApplicationID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.ProjectRemovedEvent:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *project.ApplicationRemovedEvent:
|
|
wm.State = domain.AppStateRemoved
|
|
case *project.OIDCConfigAddedEvent:
|
|
wm.appendAddOIDCEvent(e)
|
|
case *project.OIDCConfigChangedEvent:
|
|
wm.appendChangeOIDCEvent(e)
|
|
case *project.APIConfigAddedEvent:
|
|
wm.appendAddAPIEvent(e)
|
|
case *project.APIConfigChangedEvent:
|
|
wm.appendChangeAPIEvent(e)
|
|
case *project.OIDCConfigSecretChangedEvent:
|
|
wm.HashedSecret = crypto.SecretOrEncodedHash(e.ClientSecret, e.HashedSecret)
|
|
case *project.OIDCConfigSecretHashUpdatedEvent:
|
|
wm.HashedSecret = e.HashedSecret
|
|
case *project.APIConfigSecretChangedEvent:
|
|
wm.HashedSecret = crypto.SecretOrEncodedHash(e.ClientSecret, e.HashedSecret)
|
|
case *project.APIConfigSecretHashUpdatedEvent:
|
|
wm.HashedSecret = e.HashedSecret
|
|
case *project.ProjectRemovedEvent:
|
|
wm.ClientID = ""
|
|
wm.HashedSecret = ""
|
|
wm.SecretAllowed = false
|
|
wm.IsAPI = false
|
|
wm.State = domain.AppStateRemoved
|
|
case *project.ProjectAddedEvent:
|
|
wm.ClientID = ""
|
|
wm.HashedSecret = ""
|
|
wm.SecretAllowed = false
|
|
wm.IsAPI = false
|
|
wm.State = domain.AppStateUnspecified
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) appendAddOIDCEvent(e *project.OIDCConfigAddedEvent) {
|
|
wm.State = domain.AppStateActive
|
|
wm.ClientID = e.ClientID
|
|
wm.SecretAllowed = e.AuthMethodType == domain.OIDCAuthMethodTypeBasic || e.AuthMethodType == domain.OIDCAuthMethodTypePost
|
|
wm.IsAPI = false
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) appendChangeOIDCEvent(e *project.OIDCConfigChangedEvent) {
|
|
if e.AuthMethodType != nil {
|
|
wm.SecretAllowed = *e.AuthMethodType == domain.OIDCAuthMethodTypeBasic || *e.AuthMethodType == domain.OIDCAuthMethodTypePost
|
|
}
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) appendAddAPIEvent(e *project.APIConfigAddedEvent) {
|
|
wm.State = domain.AppStateActive
|
|
wm.ClientID = e.ClientID
|
|
wm.SecretAllowed = e.AuthMethodType == domain.APIAuthMethodTypeBasic
|
|
wm.IsAPI = true
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) appendChangeAPIEvent(e *project.APIConfigChangedEvent) {
|
|
if e.AuthMethodType != nil {
|
|
wm.SecretAllowed = *e.AuthMethodType == domain.APIAuthMethodTypeBasic
|
|
}
|
|
}
|
|
|
|
func (wm *ApplicationSecretWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(project.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
project.ProjectAddedType,
|
|
project.ApplicationRemovedType,
|
|
project.OIDCConfigAddedType,
|
|
project.OIDCConfigChangedType,
|
|
project.APIConfigAddedType,
|
|
project.APIConfigChangedType,
|
|
project.OIDCConfigSecretChangedType,
|
|
project.OIDCConfigSecretHashUpdatedType,
|
|
project.APIConfigSecretChangedType,
|
|
project.APIConfigSecretHashUpdatedType,
|
|
project.ProjectRemovedType).
|
|
Builder()
|
|
}
|