mirror of
https://github.com/zitadel/zitadel.git
synced 2026-08-19 01:14:48 -05:00
# Which Problems Are Solved The payload in actions V2 is currently sent as JSON to the target endpoint. It might get exposed to intermediary infrastructure or logging systems. For these scenarios there needs to be an application-layer encryption, where the provider of the endpoint can define an key to be used for the encryption. # How the Problems Are Solved - Added an additional option to the target to specify the payload type: `JSON` (current and default), `JWT`, `JWE` (api and console) - added endpoints to upload and manage public keys (to be used for encryption) for a target - updated all action v2 executions (interceptors, oidc, saml, ...) to provide the `GetActiveSigningWebKey` from queries - implemented jwt and jwe in the exections incl. refactoring of code and tests - changes to the authn_keys table: - added a `fingerprint` column - dropped not null constraint on expiration - moved the `GetSignerOnce` into its own package to prevent circular dependencies # Additional Changes None # Additional Context closes #11061 --------- Co-authored-by: Marco A. <marco@zitadel.com> Co-authored-by: conblem <mail@conblem.me> Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com>
338 lines
7.1 KiB
Go
338 lines
7.1 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
|
"github.com/zitadel/zitadel/internal/repository/target"
|
|
)
|
|
|
|
func targetAddEvent(aggID, resourceOwner string) *target.AddedEvent {
|
|
return target.NewAddedEvent(context.Background(),
|
|
target.NewAggregate(aggID, resourceOwner),
|
|
"name",
|
|
target_domain.TargetTypeWebhook,
|
|
"https://example.com",
|
|
time.Second,
|
|
false,
|
|
&crypto.CryptoValue{
|
|
CryptoType: crypto.TypeEncryption,
|
|
Algorithm: "enc",
|
|
KeyID: "id",
|
|
Crypted: []byte("12345678"),
|
|
},
|
|
target_domain.PayloadTypeJSON,
|
|
)
|
|
}
|
|
|
|
func targetRemoveEvent(aggID, resourceOwner string) *target.RemovedEvent {
|
|
return target.NewRemovedEvent(context.Background(),
|
|
target.NewAggregate(aggID, resourceOwner),
|
|
"name",
|
|
)
|
|
}
|
|
|
|
func TestCommandSide_targetsExistsWriteModel(t *testing.T) {
|
|
type fields struct {
|
|
eventstore func(t *testing.T) *eventstore.Eventstore
|
|
}
|
|
type args struct {
|
|
ctx context.Context
|
|
ids []string
|
|
resourceOwner string
|
|
}
|
|
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
args args
|
|
res bool
|
|
}{
|
|
{
|
|
name: "target, single",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target"},
|
|
},
|
|
res: true,
|
|
},
|
|
{
|
|
name: "target, single reset",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
|
|
targetAddEvent("target", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target"},
|
|
},
|
|
res: true,
|
|
},
|
|
{
|
|
name: "target, single before removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target"},
|
|
},
|
|
res: true,
|
|
},
|
|
{
|
|
name: "target, single removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target"},
|
|
},
|
|
res: false,
|
|
},
|
|
{
|
|
name: "target, multiple",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: true,
|
|
},
|
|
{
|
|
name: "target, multiple, first removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: false,
|
|
},
|
|
{
|
|
name: "target, multiple, second removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: false,
|
|
},
|
|
{
|
|
name: "target, multiple, third removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target3", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: false,
|
|
},
|
|
{
|
|
name: "target, multiple, before removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: true,
|
|
},
|
|
{
|
|
name: "target, multiple, all removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target3", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: false,
|
|
},
|
|
|
|
{
|
|
name: "target, multiple, two removed",
|
|
fields: fields{
|
|
eventstore: expectEventstore(
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
targetAddEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target1", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target2", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetAddEvent("target3", "org1"),
|
|
),
|
|
eventFromEventPusher(
|
|
targetRemoveEvent("target2", "org1"),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
ids: []string{"target1", "target2", "target3"},
|
|
},
|
|
res: false,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
c := &Commands{
|
|
eventstore: tt.fields.eventstore(t),
|
|
}
|
|
assert.Equal(t, tt.res, c.existsTargetsByIDs(tt.args.ctx, tt.args.ids, tt.args.resourceOwner))
|
|
|
|
})
|
|
}
|
|
}
|