mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +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 <[email protected]>
287 lines
6.3 KiB
Go
287 lines
6.3 KiB
Go
package eventstore
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"sync"
|
|
|
|
"github.com/DATA-DOG/go-sqlmock"
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgtype"
|
|
"github.com/jackc/pgx/v5/stdlib"
|
|
"github.com/zitadel/logging"
|
|
|
|
new_db "github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
new_sql "github.com/zitadel/zitadel/backend/v3/storage/database/dialect/sql"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/database/dialect"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
)
|
|
|
|
func init() {
|
|
dialect.RegisterAfterConnect(RegisterEventstoreTypes)
|
|
}
|
|
|
|
var (
|
|
// pushPlaceholderFmt defines how data are inserted into the events table
|
|
pushPlaceholderFmt = "($%d, $%d, $%d, $%d, $%d, $%d, $%d, $%d, $%d, statement_timestamp(), EXTRACT(EPOCH FROM clock_timestamp()), $%d)"
|
|
// uniqueConstraintPlaceholderFmt defines the format of the unique constraint error returned from the database
|
|
uniqueConstraintPlaceholderFmt = "(%s, %s, %s)"
|
|
|
|
_ eventstore.Pusher = (*Eventstore)(nil)
|
|
)
|
|
|
|
type Eventstore struct {
|
|
client new_db.Pool
|
|
queue eventstore.ExecutionQueue
|
|
}
|
|
|
|
var (
|
|
textType = &pgtype.Type{
|
|
Name: "text",
|
|
OID: pgtype.TextOID,
|
|
Codec: pgtype.TextCodec{},
|
|
}
|
|
commandType = &pgtype.Type{
|
|
Codec: &pgtype.CompositeCodec{
|
|
Fields: []pgtype.CompositeCodecField{
|
|
{
|
|
Name: "instance_id",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "aggregate_type",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "aggregate_id",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "command_type",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "revision",
|
|
Type: &pgtype.Type{
|
|
Name: "int2",
|
|
OID: pgtype.Int2OID,
|
|
Codec: pgtype.Int2Codec{},
|
|
},
|
|
},
|
|
{
|
|
Name: "payload",
|
|
Type: &pgtype.Type{
|
|
Name: "jsonb",
|
|
OID: pgtype.JSONBOID,
|
|
Codec: &pgtype.JSONBCodec{
|
|
Marshal: json.Marshal,
|
|
Unmarshal: json.Unmarshal,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: "creator",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "owner",
|
|
Type: textType,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
commandArrayCodec = &pgtype.Type{
|
|
Codec: &pgtype.ArrayCodec{
|
|
ElementType: commandType,
|
|
},
|
|
}
|
|
command2Type = &pgtype.Type{
|
|
Codec: &pgtype.CompositeCodec{
|
|
Fields: []pgtype.CompositeCodecField{
|
|
{
|
|
Name: "instance_id",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "aggregate_type",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "aggregate_id",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "command_type",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "revision",
|
|
Type: &pgtype.Type{
|
|
Name: "int2",
|
|
OID: pgtype.Int2OID,
|
|
Codec: pgtype.Int2Codec{},
|
|
},
|
|
},
|
|
{
|
|
Name: "payload",
|
|
Type: &pgtype.Type{
|
|
Name: "jsonb",
|
|
OID: pgtype.JSONBOID,
|
|
Codec: &pgtype.JSONBCodec{
|
|
Marshal: json.Marshal,
|
|
Unmarshal: json.Unmarshal,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Name: "creator",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "owner",
|
|
Type: textType,
|
|
},
|
|
{
|
|
Name: "enforce_owner",
|
|
Type: &pgtype.Type{
|
|
Name: "bool",
|
|
OID: pgtype.BoolOID,
|
|
Codec: pgtype.BoolCodec{},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
command2ArrayCodec = &pgtype.Type{
|
|
Codec: &pgtype.ArrayCodec{
|
|
ElementType: command2Type,
|
|
},
|
|
}
|
|
)
|
|
|
|
var typeMu sync.Mutex
|
|
|
|
func RegisterEventstoreTypes(ctx context.Context, conn *pgx.Conn) error {
|
|
err := registerEventstoreType(ctx, conn, "command2", command2Type, command2ArrayCodec)
|
|
logging.OnError(err).Debug("failed to register command2")
|
|
|
|
err = registerEventstoreType(ctx, conn, "command", commandType, commandArrayCodec)
|
|
logging.OnError(err).Debug("failed to register command")
|
|
|
|
return nil
|
|
}
|
|
|
|
func registerEventstoreType(ctx context.Context, conn *pgx.Conn, typ string, typeCodec, arrayCodec *pgtype.Type) error {
|
|
// conn.TypeMap is not thread safe
|
|
typeMu.Lock()
|
|
defer typeMu.Unlock()
|
|
|
|
m := conn.TypeMap()
|
|
|
|
var cmd *command
|
|
if _, ok := m.TypeForValue(cmd); ok {
|
|
return nil
|
|
}
|
|
|
|
if typeCodec.OID == 0 || arrayCodec.OID == 0 {
|
|
err := conn.QueryRow(ctx, "select oid, typarray from pg_type where typname = $1 and typnamespace = (select oid from pg_namespace where nspname = $2)", typ, "eventstore").
|
|
Scan(&typeCodec.OID, &arrayCodec.OID)
|
|
if err != nil {
|
|
logging.WithError(err).Debug("failed to get oid for command type")
|
|
return nil
|
|
}
|
|
if typeCodec.OID == 0 || arrayCodec.OID == 0 {
|
|
logging.Debug("oid for command type not found")
|
|
return nil
|
|
}
|
|
}
|
|
|
|
m.RegisterTypes([]*pgtype.Type{
|
|
{
|
|
Name: "eventstore." + typ,
|
|
Codec: typeCodec.Codec,
|
|
OID: typeCodec.OID,
|
|
},
|
|
{
|
|
Name: typ,
|
|
Codec: typeCodec.Codec,
|
|
OID: typeCodec.OID,
|
|
},
|
|
{
|
|
Name: "eventstore._" + typ,
|
|
Codec: arrayCodec.Codec,
|
|
OID: arrayCodec.OID,
|
|
},
|
|
{
|
|
Name: "_" + typ,
|
|
Codec: arrayCodec.Codec,
|
|
OID: arrayCodec.OID,
|
|
},
|
|
})
|
|
dialect.RegisterDefaultPgTypeVariants[command](m, "eventstore."+typ, "eventstore._"+typ)
|
|
dialect.RegisterDefaultPgTypeVariants[command](m, typ, "_"+typ)
|
|
|
|
return nil
|
|
}
|
|
|
|
func NewEventstore(client *database.DB, opts ...EventstoreOption) *Eventstore {
|
|
es := &Eventstore{
|
|
client: new_sql.SQLPool(client.DB),
|
|
}
|
|
for _, opt := range opts {
|
|
opt(es)
|
|
}
|
|
return es
|
|
}
|
|
|
|
func (es *Eventstore) Health(ctx context.Context) error {
|
|
return es.client.Ping(ctx)
|
|
}
|
|
|
|
var errTypesNotFound = errors.New("types not found")
|
|
|
|
func CheckExecutionPlan(ctx context.Context, conn *sql.Conn) error {
|
|
return conn.Raw(func(driverConn any) error {
|
|
if _, ok := driverConn.(sqlmock.SqlmockCommon); ok {
|
|
return nil
|
|
}
|
|
conn, ok := driverConn.(*stdlib.Conn)
|
|
if !ok {
|
|
return errTypesNotFound
|
|
}
|
|
|
|
return RegisterEventstoreTypes(ctx, conn.Conn())
|
|
})
|
|
}
|
|
|
|
func (es *Eventstore) pushTx(ctx context.Context, client new_db.QueryExecutor) (tx new_db.Transaction, deferrable func(err error) error, err error) {
|
|
tx, ok := client.(new_db.Transaction)
|
|
if ok {
|
|
return tx, func(err error) error { return err }, nil
|
|
}
|
|
beginner, ok := client.(new_db.Beginner)
|
|
if !ok {
|
|
beginner = es.client
|
|
}
|
|
|
|
tx, err = beginner.Begin(ctx, &new_db.TransactionOptions{
|
|
IsolationLevel: new_db.IsolationLevelReadCommitted,
|
|
AccessMode: new_db.AccessModeReadWrite,
|
|
})
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return tx, func(err error) error { return tx.End(ctx, err) }, nil
|
|
}
|
|
|
|
type EventstoreOption func(*Eventstore)
|
|
|
|
func WithExecutionQueueOption(queue eventstore.ExecutionQueue) EventstoreOption {
|
|
return func(es *Eventstore) {
|
|
es.queue = queue
|
|
}
|
|
}
|