mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 03:54:21 +00:00
382a97c30f
# Which Problems Are Solved The end_session_endpoint currently always requires the userAgent cookie to be able to terminate session created through the hosted login UI. Only tokens issued through the Login V2 can be used to directly terminate a specific session and without the need of a cookie. This PR adds the possibility to terminate a single V1 session or all V1 sessions belonging to the same user agent without the need of the userAgent cookie by providing an id_token as `id_token_hint` which contains the id of a V1 session as `sid`. # How the Problems Are Solved - #8525 added the `sid` claim for id_tokens issued through the login UI - The `sid` can now be checked for the `V1_` prefix and queries for either the userAgentID and depending on the `OIDCSingleV1SessionTermination` flag all userIDs of active session from the same user agent id - The `OIDCSingleV1SessionTermination` flag is added with default value false to keep the existing behavior of terminating all sessions even in case of providing an id_token_hint # Additional Changes - pass `context.Context` into session view functions for querying the database with that context # Additional Context - relates to #8499 - closes #8501
357 lines
9.5 KiB
Go
357 lines
9.5 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/muhlemmer/gu"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/feature/feature_v2"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func TestCommands_SetSystemFeatures(t *testing.T) {
|
|
aggregate := feature_v2.NewAggregate("SYSTEM", "SYSTEM")
|
|
|
|
type args struct {
|
|
ctx context.Context
|
|
f *SystemFeatures
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
eventstore func(*testing.T) *eventstore.Eventstore
|
|
args args
|
|
want *domain.ObjectDetails
|
|
wantErr error
|
|
}{
|
|
{
|
|
name: "filter error",
|
|
eventstore: expectEventstore(
|
|
expectFilterError(io.ErrClosedPipe),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
LoginDefaultOrg: gu.Ptr(true),
|
|
}},
|
|
wantErr: io.ErrClosedPipe,
|
|
},
|
|
{
|
|
name: "all nil, No Change",
|
|
eventstore: expectEventstore(),
|
|
args: args{context.Background(), &SystemFeatures{}},
|
|
wantErr: zerrors.ThrowInternal(nil, "COMMAND-Oop8a", "Errors.NoChangesFound"),
|
|
},
|
|
{
|
|
name: "set LoginDefaultOrg",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
LoginDefaultOrg: gu.Ptr(true),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "set TriggerIntrospectionProjections",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemTriggerIntrospectionProjectionsEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
TriggerIntrospectionProjections: gu.Ptr(true),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "set LegacyIntrospection",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLegacyIntrospectionEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
LegacyIntrospection: gu.Ptr(true),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "set UserSchema",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemUserSchemaEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
UserSchema: gu.Ptr(true),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "set Actions",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemActionsEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
Actions: gu.Ptr(true),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "push error",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPushFailed(io.ErrClosedPipe,
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLegacyIntrospectionEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
LegacyIntrospection: gu.Ptr(true),
|
|
}},
|
|
wantErr: io.ErrClosedPipe,
|
|
},
|
|
{
|
|
name: "set all",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemTriggerIntrospectionProjectionsEventType, false,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLegacyIntrospectionEventType, true,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemUserSchemaEventType, true,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemActionsEventType, true,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemOIDCSingleV1SessionTerminationEventType, true,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
LoginDefaultOrg: gu.Ptr(true),
|
|
TriggerIntrospectionProjections: gu.Ptr(false),
|
|
LegacyIntrospection: gu.Ptr(true),
|
|
UserSchema: gu.Ptr(true),
|
|
Actions: gu.Ptr(true),
|
|
OIDCSingleV1SessionTermination: gu.Ptr(true),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "set only updated",
|
|
eventstore: expectEventstore(
|
|
// throw in some set events, reset and set again.
|
|
expectFilter(
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
)),
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemTriggerIntrospectionProjectionsEventType, false,
|
|
)),
|
|
eventFromEventPusher(feature_v2.NewResetEvent(
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemResetEventType,
|
|
)),
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, false,
|
|
)),
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLegacyIntrospectionEventType, true,
|
|
)),
|
|
),
|
|
expectPush(
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemTriggerIntrospectionProjectionsEventType, false,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemUserSchemaEventType, true,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemActionsEventType, false,
|
|
),
|
|
feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemOIDCSingleV1SessionTerminationEventType, false,
|
|
),
|
|
),
|
|
),
|
|
args: args{context.Background(), &SystemFeatures{
|
|
LoginDefaultOrg: gu.Ptr(true),
|
|
TriggerIntrospectionProjections: gu.Ptr(false),
|
|
LegacyIntrospection: gu.Ptr(true),
|
|
UserSchema: gu.Ptr(true),
|
|
Actions: gu.Ptr(false),
|
|
OIDCSingleV1SessionTermination: gu.Ptr(false),
|
|
}},
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
c := &Commands{
|
|
eventstore: tt.eventstore(t),
|
|
}
|
|
got, err := c.SetSystemFeatures(tt.args.ctx, tt.args.f)
|
|
require.ErrorIs(t, err, tt.wantErr)
|
|
assert.Equal(t, tt.want, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCommands_ResetSystemFeatures(t *testing.T) {
|
|
aggregate := feature_v2.NewAggregate("SYSTEM", "SYSTEM")
|
|
tests := []struct {
|
|
name string
|
|
eventstore func(*testing.T) *eventstore.Eventstore
|
|
want *domain.ObjectDetails
|
|
wantErr error
|
|
}{
|
|
{
|
|
name: "filter error",
|
|
eventstore: expectEventstore(
|
|
expectFilterError(io.ErrClosedPipe),
|
|
),
|
|
wantErr: io.ErrClosedPipe,
|
|
},
|
|
{
|
|
name: "push error",
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
)),
|
|
),
|
|
expectPushFailed(io.ErrClosedPipe,
|
|
feature_v2.NewResetEvent(context.Background(), aggregate, feature_v2.SystemResetEventType),
|
|
),
|
|
),
|
|
wantErr: io.ErrClosedPipe,
|
|
},
|
|
{
|
|
name: "success",
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
)),
|
|
),
|
|
expectPush(
|
|
feature_v2.NewResetEvent(context.Background(), aggregate, feature_v2.SystemResetEventType),
|
|
),
|
|
),
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "no change after previous reset",
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(feature_v2.NewSetEvent[bool](
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemLoginDefaultOrgEventType, true,
|
|
)),
|
|
eventFromEventPusher(feature_v2.NewResetEvent(
|
|
context.Background(), aggregate,
|
|
feature_v2.SystemResetEventType,
|
|
)),
|
|
),
|
|
),
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
{
|
|
name: "no change without previous events",
|
|
eventstore: expectEventstore(
|
|
expectFilter(),
|
|
),
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "SYSTEM",
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
c := &Commands{
|
|
eventstore: tt.eventstore(t),
|
|
}
|
|
got, err := c.ResetSystemFeatures(context.Background())
|
|
require.ErrorIs(t, err, tt.wantErr)
|
|
assertObjectDetails(t, tt.want, got)
|
|
})
|
|
}
|
|
}
|