mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-16 04:48:04 +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>
135 lines
4.3 KiB
Go
135 lines
4.3 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/feature"
|
|
feature_v1 "github.com/zitadel/zitadel/internal/repository/feature"
|
|
"github.com/zitadel/zitadel/internal/repository/feature/feature_v2"
|
|
)
|
|
|
|
type InstanceFeaturesReadModel struct {
|
|
*eventstore.ReadModel
|
|
system *SystemFeatures
|
|
instance *InstanceFeatures
|
|
}
|
|
|
|
func NewInstanceFeaturesReadModel(ctx context.Context, system *SystemFeatures) *InstanceFeaturesReadModel {
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
m := &InstanceFeaturesReadModel{
|
|
ReadModel: &eventstore.ReadModel{
|
|
AggregateID: instanceID,
|
|
ResourceOwner: instanceID,
|
|
},
|
|
instance: new(InstanceFeatures),
|
|
system: system,
|
|
}
|
|
m.populateFromSystem()
|
|
return m
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) Reduce() (err error) {
|
|
for _, event := range m.Events {
|
|
switch e := event.(type) {
|
|
case *feature_v2.ResetEvent:
|
|
m.reduceReset()
|
|
case *feature_v1.SetEvent[feature_v1.Boolean]:
|
|
err = reduceInstanceFeatureSet(
|
|
m.instance,
|
|
feature_v1.DefaultLoginInstanceEventToV2(e),
|
|
)
|
|
case *feature_v2.SetEvent[bool]:
|
|
err = reduceInstanceFeatureSet(m.instance, e)
|
|
case *feature_v2.SetEvent[[]feature.ImprovedPerformanceType]:
|
|
err = reduceInstanceFeatureSet(m.instance, e)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return m.ReadModel.Reduce()
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AwaitOpenTransactions().
|
|
AddQuery().
|
|
AggregateTypes(feature_v2.AggregateType).
|
|
EventTypes(
|
|
feature_v1.DefaultLoginInstanceEventType,
|
|
feature_v2.InstanceResetEventType,
|
|
feature_v2.InstanceLoginDefaultOrgEventType,
|
|
feature_v2.InstanceTriggerIntrospectionProjectionsEventType,
|
|
feature_v2.InstanceLegacyIntrospectionEventType,
|
|
feature_v2.InstanceUserSchemaEventType,
|
|
feature_v2.InstanceTokenExchangeEventType,
|
|
feature_v2.InstanceActionsEventType,
|
|
feature_v2.InstanceImprovedPerformanceEventType,
|
|
feature_v2.InstanceWebKeyEventType,
|
|
feature_v2.InstanceDebugOIDCParentErrorEventType,
|
|
feature_v2.InstanceOIDCSingleV1SessionTerminationEventType,
|
|
feature_v2.InstanceDisableUserTokenEvent,
|
|
).
|
|
Builder().ResourceOwner(m.ResourceOwner)
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) reduceReset() {
|
|
if m.populateFromSystem() {
|
|
return
|
|
}
|
|
m.instance = nil
|
|
m.instance = new(InstanceFeatures)
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) populateFromSystem() bool {
|
|
if m.system == nil {
|
|
return false
|
|
}
|
|
m.instance.LoginDefaultOrg = m.system.LoginDefaultOrg
|
|
m.instance.TriggerIntrospectionProjections = m.system.TriggerIntrospectionProjections
|
|
m.instance.LegacyIntrospection = m.system.LegacyIntrospection
|
|
m.instance.UserSchema = m.system.UserSchema
|
|
m.instance.TokenExchange = m.system.TokenExchange
|
|
m.instance.Actions = m.system.Actions
|
|
m.instance.ImprovedPerformance = m.system.ImprovedPerformance
|
|
m.instance.OIDCSingleV1SessionTermination = m.system.OIDCSingleV1SessionTermination
|
|
m.instance.DisableUserTokenEvent = m.system.DisableUserTokenEvent
|
|
return true
|
|
}
|
|
|
|
func reduceInstanceFeatureSet[T any](features *InstanceFeatures, event *feature_v2.SetEvent[T]) error {
|
|
level, key, err := event.FeatureInfo()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
switch key {
|
|
case feature.KeyUnspecified:
|
|
return nil
|
|
case feature.KeyLoginDefaultOrg:
|
|
features.LoginDefaultOrg.set(level, event.Value)
|
|
case feature.KeyTriggerIntrospectionProjections:
|
|
features.TriggerIntrospectionProjections.set(level, event.Value)
|
|
case feature.KeyLegacyIntrospection:
|
|
features.LegacyIntrospection.set(level, event.Value)
|
|
case feature.KeyUserSchema:
|
|
features.UserSchema.set(level, event.Value)
|
|
case feature.KeyTokenExchange:
|
|
features.TokenExchange.set(level, event.Value)
|
|
case feature.KeyActions:
|
|
features.Actions.set(level, event.Value)
|
|
case feature.KeyImprovedPerformance:
|
|
features.ImprovedPerformance.set(level, event.Value)
|
|
case feature.KeyWebKey:
|
|
features.WebKey.set(level, event.Value)
|
|
case feature.KeyDebugOIDCParentError:
|
|
features.DebugOIDCParentError.set(level, event.Value)
|
|
case feature.KeyOIDCSingleV1SessionTermination:
|
|
features.OIDCSingleV1SessionTermination.set(level, event.Value)
|
|
case feature.KeyDisableUserTokenEvent:
|
|
features.DisableUserTokenEvent.set(level, event.Value)
|
|
}
|
|
return nil
|
|
}
|