mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 03:54:21 +00:00
63d733b3a2
# Which Problems Are Solved When executing many concurrent authentication requests on a single machine user, there were performance issues. As the same aggregate is being searched and written to concurrently, we traced it down to a locking issue on the used index. We already optimized the token endpoint by creating a separate OIDC aggregate. At the time we decided to push a single event to the user aggregate, for the user audit log. See [technical advisory 10010](https://zitadel.com/docs/support/advisory/a10010) for more details. However, a recent security fix introduced an additional search query on the user aggregate, causing the locking issue we found. # How the Problems Are Solved Add a feature flag which disables pushing of the `user.token.v2.added`. The event has no importance and was only added for informational purposes on the user objects. The `oidc_session.access_token.added` is the actual payload event and is pushed on the OIDC session aggregate and can still be used for audit trail. # Additional Changes - Fix an event mapper type for `SystemOIDCSingleV1SessionTerminationEventType` # Additional Context - Reported by support request - https://github.com/zitadel/zitadel/pull/7822 changed the token aggregate - https://github.com/zitadel/zitadel/pull/8631 introduced user state check Load test trace graph with `user.token.v2.added` **enabled**. Query times are steadily increasing: ![image](https://github.com/user-attachments/assets/4aa25055-8721-4e93-b695-625560979909) Load test trace graph with `user.token.v2.added` **disabled**. Query times constant: ![image](https://github.com/user-attachments/assets/a7657f6c-0c55-401b-8291-453da5d5caf9) --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
139 lines
5.2 KiB
Go
139 lines
5.2 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/feature"
|
|
"github.com/zitadel/zitadel/internal/repository/feature/feature_v2"
|
|
)
|
|
|
|
type SystemFeaturesWriteModel struct {
|
|
*eventstore.WriteModel
|
|
SystemFeatures
|
|
}
|
|
|
|
func NewSystemFeaturesWriteModel() *SystemFeaturesWriteModel {
|
|
m := &SystemFeaturesWriteModel{
|
|
WriteModel: &eventstore.WriteModel{
|
|
AggregateID: "SYSTEM",
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
}
|
|
return m
|
|
}
|
|
|
|
func (m *SystemFeaturesWriteModel) Reduce() error {
|
|
for _, event := range m.Events {
|
|
switch e := event.(type) {
|
|
case *feature_v2.ResetEvent:
|
|
m.reduceReset()
|
|
case *feature_v2.SetEvent[bool]:
|
|
_, key, err := e.FeatureInfo()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
reduceSystemFeature(&m.SystemFeatures, key, e.Value)
|
|
case *feature_v2.SetEvent[[]feature.ImprovedPerformanceType]:
|
|
_, key, err := e.FeatureInfo()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
reduceSystemFeature(&m.SystemFeatures, key, e.Value)
|
|
}
|
|
}
|
|
return m.WriteModel.Reduce()
|
|
}
|
|
|
|
func (m *SystemFeaturesWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AwaitOpenTransactions().
|
|
AddQuery().
|
|
AggregateTypes(feature_v2.AggregateType).
|
|
AggregateIDs(m.AggregateID).
|
|
EventTypes(
|
|
feature_v2.SystemResetEventType,
|
|
feature_v2.SystemLoginDefaultOrgEventType,
|
|
feature_v2.SystemTriggerIntrospectionProjectionsEventType,
|
|
feature_v2.SystemLegacyIntrospectionEventType,
|
|
feature_v2.SystemUserSchemaEventType,
|
|
feature_v2.SystemTokenExchangeEventType,
|
|
feature_v2.SystemActionsEventType,
|
|
feature_v2.SystemImprovedPerformanceEventType,
|
|
feature_v2.SystemOIDCSingleV1SessionTerminationEventType,
|
|
feature_v2.SystemDisableUserTokenEvent,
|
|
).
|
|
Builder().ResourceOwner(m.ResourceOwner)
|
|
}
|
|
|
|
func (m *SystemFeaturesWriteModel) reduceReset() {
|
|
m.SystemFeatures = SystemFeatures{}
|
|
}
|
|
|
|
func reduceSystemFeature(features *SystemFeatures, key feature.Key, value any) {
|
|
switch key {
|
|
case feature.KeyUnspecified:
|
|
return
|
|
case feature.KeyLoginDefaultOrg:
|
|
v := value.(bool)
|
|
features.LoginDefaultOrg = &v
|
|
case feature.KeyTriggerIntrospectionProjections:
|
|
v := value.(bool)
|
|
features.TriggerIntrospectionProjections = &v
|
|
case feature.KeyLegacyIntrospection:
|
|
v := value.(bool)
|
|
features.LegacyIntrospection = &v
|
|
case feature.KeyUserSchema:
|
|
v := value.(bool)
|
|
features.UserSchema = &v
|
|
case feature.KeyTokenExchange:
|
|
v := value.(bool)
|
|
features.TokenExchange = &v
|
|
case feature.KeyActions:
|
|
v := value.(bool)
|
|
features.Actions = &v
|
|
case feature.KeyImprovedPerformance:
|
|
features.ImprovedPerformance = value.([]feature.ImprovedPerformanceType)
|
|
case feature.KeyOIDCSingleV1SessionTermination:
|
|
v := value.(bool)
|
|
features.OIDCSingleV1SessionTermination = &v
|
|
case feature.KeyDisableUserTokenEvent:
|
|
v := value.(bool)
|
|
features.DisableUserTokenEvent = &v
|
|
}
|
|
}
|
|
|
|
func (wm *SystemFeaturesWriteModel) setCommands(ctx context.Context, f *SystemFeatures) []eventstore.Command {
|
|
aggregate := feature_v2.NewAggregate(wm.AggregateID, wm.ResourceOwner)
|
|
cmds := make([]eventstore.Command, 0, len(feature.KeyValues())-1)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.LoginDefaultOrg, f.LoginDefaultOrg, feature_v2.SystemLoginDefaultOrgEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.TriggerIntrospectionProjections, f.TriggerIntrospectionProjections, feature_v2.SystemTriggerIntrospectionProjectionsEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.LegacyIntrospection, f.LegacyIntrospection, feature_v2.SystemLegacyIntrospectionEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.UserSchema, f.UserSchema, feature_v2.SystemUserSchemaEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.TokenExchange, f.TokenExchange, feature_v2.SystemTokenExchangeEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.Actions, f.Actions, feature_v2.SystemActionsEventType)
|
|
cmds = appendFeatureSliceUpdate(ctx, cmds, aggregate, wm.ImprovedPerformance, f.ImprovedPerformance, feature_v2.SystemImprovedPerformanceEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.OIDCSingleV1SessionTermination, f.OIDCSingleV1SessionTermination, feature_v2.SystemOIDCSingleV1SessionTerminationEventType)
|
|
cmds = appendFeatureUpdate(ctx, cmds, aggregate, wm.DisableUserTokenEvent, f.DisableUserTokenEvent, feature_v2.SystemDisableUserTokenEvent)
|
|
return cmds
|
|
}
|
|
|
|
func appendFeatureUpdate[T comparable](ctx context.Context, cmds []eventstore.Command, aggregate *feature_v2.Aggregate, oldValue, newValue *T, eventType eventstore.EventType) []eventstore.Command {
|
|
if newValue != nil && (oldValue == nil || *oldValue != *newValue) {
|
|
cmds = append(cmds, feature_v2.NewSetEvent[T](ctx, aggregate, eventType, *newValue))
|
|
}
|
|
return cmds
|
|
}
|
|
|
|
func appendFeatureSliceUpdate[T comparable](ctx context.Context, cmds []eventstore.Command, aggregate *feature_v2.Aggregate, oldValues, newValues []T, eventType eventstore.EventType) []eventstore.Command {
|
|
if len(newValues) != len(oldValues) {
|
|
return append(cmds, feature_v2.NewSetEvent[[]T](ctx, aggregate, eventType, newValues))
|
|
}
|
|
for i, oldValue := range oldValues {
|
|
if oldValue != newValues[i] {
|
|
return append(cmds, feature_v2.NewSetEvent[[]T](ctx, aggregate, eventType, newValues))
|
|
}
|
|
}
|
|
return cmds
|
|
}
|