mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 11:34:26 +00:00
8d94d1b468
# 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>
(cherry picked from commit 63d733b3a2
)
147 lines
5.5 KiB
Go
147 lines
5.5 KiB
Go
package feature_v2
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"strings"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/feature"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var (
|
|
SystemResetEventType = resetEventTypeFromFeature(feature.LevelSystem)
|
|
SystemLoginDefaultOrgEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyLoginDefaultOrg)
|
|
SystemTriggerIntrospectionProjectionsEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyTriggerIntrospectionProjections)
|
|
SystemLegacyIntrospectionEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyLegacyIntrospection)
|
|
SystemUserSchemaEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyUserSchema)
|
|
SystemTokenExchangeEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyTokenExchange)
|
|
SystemActionsEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyActions)
|
|
SystemImprovedPerformanceEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyImprovedPerformance)
|
|
SystemOIDCSingleV1SessionTerminationEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyOIDCSingleV1SessionTermination)
|
|
SystemDisableUserTokenEvent = setEventTypeFromFeature(feature.LevelSystem, feature.KeyDisableUserTokenEvent)
|
|
|
|
InstanceResetEventType = resetEventTypeFromFeature(feature.LevelInstance)
|
|
InstanceLoginDefaultOrgEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyLoginDefaultOrg)
|
|
InstanceTriggerIntrospectionProjectionsEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyTriggerIntrospectionProjections)
|
|
InstanceLegacyIntrospectionEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyLegacyIntrospection)
|
|
InstanceUserSchemaEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyUserSchema)
|
|
InstanceTokenExchangeEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyTokenExchange)
|
|
InstanceActionsEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyActions)
|
|
InstanceImprovedPerformanceEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyImprovedPerformance)
|
|
InstanceWebKeyEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyWebKey)
|
|
InstanceDebugOIDCParentErrorEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyDebugOIDCParentError)
|
|
InstanceOIDCSingleV1SessionTerminationEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyOIDCSingleV1SessionTermination)
|
|
InstanceDisableUserTokenEvent = setEventTypeFromFeature(feature.LevelInstance, feature.KeyDisableUserTokenEvent)
|
|
)
|
|
|
|
const (
|
|
resetSuffix = "reset"
|
|
setSuffix = "set"
|
|
)
|
|
|
|
func resetEventTypeFromFeature(level feature.Level) eventstore.EventType {
|
|
return eventstore.EventType(strings.Join([]string{AggregateType, level.String(), resetSuffix}, "."))
|
|
}
|
|
|
|
func setEventTypeFromFeature(level feature.Level, key feature.Key) eventstore.EventType {
|
|
return eventstore.EventType(strings.Join([]string{AggregateType, level.String(), key.String(), setSuffix}, "."))
|
|
}
|
|
|
|
type ResetEvent struct {
|
|
*eventstore.BaseEvent `json:"-"`
|
|
}
|
|
|
|
func (e *ResetEvent) SetBaseEvent(b *eventstore.BaseEvent) {
|
|
e.BaseEvent = b
|
|
}
|
|
|
|
func (e *ResetEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *ResetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func NewResetEvent(
|
|
ctx context.Context,
|
|
aggregate *Aggregate,
|
|
eventType eventstore.EventType,
|
|
) *ResetEvent {
|
|
return &ResetEvent{
|
|
eventstore.NewBaseEventForPush(
|
|
ctx, &aggregate.Aggregate, eventType),
|
|
}
|
|
}
|
|
|
|
type SetEvent[T any] struct {
|
|
*eventstore.BaseEvent `json:"-"`
|
|
|
|
Value T
|
|
}
|
|
|
|
func (e *SetEvent[T]) SetBaseEvent(b *eventstore.BaseEvent) {
|
|
e.BaseEvent = b
|
|
}
|
|
|
|
func (e *SetEvent[T]) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *SetEvent[T]) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
type FeatureJSON struct {
|
|
Key feature.Key
|
|
Value []byte
|
|
}
|
|
|
|
// FeatureJSON prepares converts the event to a key-value pair with a JSON value payload.
|
|
func (e *SetEvent[T]) FeatureJSON() (*FeatureJSON, error) {
|
|
_, key, err := e.FeatureInfo()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
jsonValue, err := json.Marshal(e.Value)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternalf(err, "FEAT-go9Ji", "reduce.wrong.event.type %s", e.EventType)
|
|
}
|
|
return &FeatureJSON{
|
|
Key: key,
|
|
Value: jsonValue,
|
|
}, nil
|
|
}
|
|
|
|
// FeatureInfo extracts a feature's level and key from the event.
|
|
func (e *SetEvent[T]) FeatureInfo() (feature.Level, feature.Key, error) {
|
|
ss := strings.Split(string(e.EventType), ".")
|
|
if len(ss) != 4 {
|
|
return 0, 0, zerrors.ThrowInternalf(nil, "FEAT-Ahs4m", "reduce.wrong.event.type %s", e.EventType)
|
|
}
|
|
level, err := feature.LevelString(ss[1])
|
|
if err != nil {
|
|
return 0, 0, zerrors.ThrowInternalf(err, "FEAT-Boo2i", "reduce.wrong.event.type %s", e.EventType)
|
|
}
|
|
key, err := feature.KeyString(ss[2])
|
|
if err != nil {
|
|
return 0, 0, zerrors.ThrowInternalf(err, "FEAT-eir0M", "reduce.wrong.event.type %s", e.EventType)
|
|
}
|
|
return level, key, nil
|
|
}
|
|
|
|
func NewSetEvent[T any](
|
|
ctx context.Context,
|
|
aggregate *Aggregate,
|
|
eventType eventstore.EventType,
|
|
value T,
|
|
) *SetEvent[T] {
|
|
return &SetEvent[T]{
|
|
eventstore.NewBaseEventForPush(
|
|
ctx, &aggregate.Aggregate, eventType),
|
|
value,
|
|
}
|
|
}
|