feat(action v2): add JWT and JWE payload type options (#11196)

# 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. <[email protected]>
Co-authored-by: conblem <[email protected]>
Co-authored-by: Silvan <[email protected]>
This commit is contained in:
Livio Spring
2025-12-29 13:35:53 +00:00
committed by GitHub
co-authored by Marco A. conblem Silvan
parent 72c8f0192c
commit 791d0587aa
124 changed files with 5040 additions and 782 deletions
@@ -72,8 +72,9 @@ func TestServer_ExecutionTarget(t *testing.T) {
// create target for target changes
targetCreatedName := integration.TargetName()
targetCreatedURL := "https://nonexistent"
targetCreatedPayloadType := action.PayloadType_PAYLOAD_TYPE_JSON
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false)
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false, targetCreatedPayloadType)
// request received by target
wantRequest := &middleware.ContextInfoRequest{
@@ -89,7 +90,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
// replace original request with different targetID
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusOK, changedRequest)
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, false)
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, false, targetCreatedPayloadType)
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
@@ -105,9 +106,10 @@ func TestServer_ExecutionTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
PayloadType: targetCreatedPayloadType,
},
}
@@ -122,9 +124,10 @@ func TestServer_ExecutionTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
PayloadType: targetCreatedPayloadType,
},
}
// content for update
@@ -138,9 +141,10 @@ func TestServer_ExecutionTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
PayloadType: targetCreatedPayloadType,
}
// response received by target
@@ -157,7 +161,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
// after request with different targetID, return changed response
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusOK, changedResponse)
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, false)
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, false, targetCreatedPayloadType)
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
return func() {
closeRequest()
@@ -195,7 +199,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusInternalServerError, nil)
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, true)
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
// GetTarget with used target
request.Id = targetRequest.GetId()
@@ -222,8 +226,9 @@ func TestServer_ExecutionTarget(t *testing.T) {
// create target for target changes
targetCreatedName := integration.TargetName()
targetCreatedURL := "https://nonexistent"
targetCreatedPayloadType := action.PayloadType_PAYLOAD_TYPE_JSON
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false)
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false, targetCreatedPayloadType)
// GetTarget with used target
request.Id = targetCreated.GetId()
@@ -240,9 +245,10 @@ func TestServer_ExecutionTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
Timeout: durationpb.New(5 * time.Second),
Endpoint: targetCreatedURL,
SigningKey: targetCreated.GetSigningKey(),
PayloadType: targetCreatedPayloadType,
},
}
@@ -259,7 +265,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
// after request with different targetID, return changed response
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusInternalServerError, nil)
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, true)
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, true, targetCreatedPayloadType)
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
return func() {
closeResponse()
@@ -307,7 +313,7 @@ func TestServer_ExecutionTarget_Event(t *testing.T) {
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 0, http.StatusOK, nil)
defer closeF()
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
tests := []struct {
@@ -365,7 +371,7 @@ func TestServer_ExecutionTarget_Event_LongerThanTargetTimeout(t *testing.T) {
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 5*time.Second, http.StatusOK, nil)
defer closeF()
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
tests := []struct {
@@ -416,7 +422,7 @@ func TestServer_ExecutionTarget_Event_LongerThanTransactionTimeout(t *testing.T)
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 1*time.Second, http.StatusOK, nil)
defer closeF()
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
tests := []struct {
@@ -499,8 +505,8 @@ func waitForExecutionOnCondition(ctx context.Context, t *testing.T, instance *in
}, retryDuration, tick, "timeout waiting for expected execution result")
}
func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Instance, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse {
resp := instance.CreateTarget(ctx, t, "", endpoint, ty, interrupt)
func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Instance, endpoint string, ty target_domain.TargetType, interrupt bool, payloadType action.PayloadType) *action.CreateTargetResponse {
resp := instance.CreateTarget(ctx, t, "", endpoint, ty, interrupt, payloadType)
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute)
require.EventuallyWithT(t, func(ttt *assert.CollectT) {
@@ -779,7 +785,7 @@ func expectPreUserinfoExecution(ctx context.Context, t *testing.T, instance *int
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preuserinfo"), []string{targetResp.GetId()})
return userResp.GetUserId(), closeF
}
@@ -1087,7 +1093,7 @@ func expectPreAccessTokenExecution(ctx context.Context, t *testing.T, instance *
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preaccesstoken"), []string{targetResp.GetId()})
return userResp.GetUserId(), closeF
}
@@ -1252,7 +1258,7 @@ func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true, action.PayloadType_PAYLOAD_TYPE_JSON)
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("presamlresponse"), []string{targetResp.GetId()})
return userResp.GetUserId(), closeF
@@ -18,7 +18,7 @@ import (
func TestServer_SetExecution_Request(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
tests := []struct {
name string
@@ -175,7 +175,7 @@ func assertSetExecutionResponse(t *testing.T, creationDate, setDate time.Time, e
func TestServer_SetExecution_Response(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
tests := []struct {
name string
@@ -319,7 +319,7 @@ func TestServer_SetExecution_Response(t *testing.T) {
func TestServer_SetExecution_Event(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
tests := []struct {
name string
@@ -482,7 +482,7 @@ func TestServer_SetExecution_Event(t *testing.T) {
func TestServer_SetExecution_Function(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
tests := []struct {
name string
@@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"
target_domain "github.com/zitadel/zitadel/internal/execution/target"
"github.com/zitadel/zitadel/internal/integration"
@@ -54,7 +55,7 @@ func TestServer_GetTarget(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Id = resp.GetId()
response.Target.Id = resp.GetId()
response.Target.Name = name
@@ -71,7 +72,8 @@ func TestServer_GetTarget(t *testing.T) {
TargetType: &action.Target_RestWebhook{
RestWebhook: &action.RESTWebhook{},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -81,7 +83,7 @@ func TestServer_GetTarget(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeAsync, false)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeAsync, false, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Id = resp.GetId()
response.Target.Id = resp.GetId()
response.Target.Name = name
@@ -98,7 +100,8 @@ func TestServer_GetTarget(t *testing.T) {
TargetType: &action.Target_RestAsync{
RestAsync: &action.RESTAsync{},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -108,7 +111,7 @@ func TestServer_GetTarget(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, true)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, true, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Id = resp.GetId()
response.Target.Id = resp.GetId()
response.Target.Name = name
@@ -127,7 +130,8 @@ func TestServer_GetTarget(t *testing.T) {
InterruptOnError: true,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -137,7 +141,7 @@ func TestServer_GetTarget(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, false)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, false, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Id = resp.GetId()
response.Target.Id = resp.GetId()
response.Target.Name = name
@@ -156,7 +160,8 @@ func TestServer_GetTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -166,7 +171,7 @@ func TestServer_GetTarget(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, true)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, true, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Id = resp.GetId()
response.Target.Id = resp.GetId()
response.Target.Name = name
@@ -185,7 +190,8 @@ func TestServer_GetTarget(t *testing.T) {
InterruptOnError: true,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -261,7 +267,7 @@ func TestServer_ListTargets(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
InTargetIdsFilter: &action.InTargetIDsFilter{
TargetIds: []string{resp.GetId()},
@@ -291,7 +297,8 @@ func TestServer_ListTargets(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -301,7 +308,7 @@ func TestServer_ListTargets(t *testing.T) {
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
name := integration.TargetName()
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
request.Filters[0].Filter = &action.TargetSearchFilter_TargetNameFilter{
TargetNameFilter: &action.TargetNameFilter{
TargetName: name,
@@ -331,7 +338,8 @@ func TestServer_ListTargets(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -344,9 +352,9 @@ func TestServer_ListTargets(t *testing.T) {
name1 := integration.TargetName()
name2 := integration.TargetName()
name3 := integration.TargetName()
resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", target_domain.TargetTypeWebhook, false)
resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", target_domain.TargetTypeCall, true)
resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", target_domain.TargetTypeAsync, false)
resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", target_domain.TargetTypeCall, true, action.PayloadType_PAYLOAD_TYPE_JWT)
resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", target_domain.TargetTypeAsync, false, action.PayloadType_PAYLOAD_TYPE_JWE)
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
InTargetIdsFilter: &action.InTargetIDsFilter{
TargetIds: []string{resp1.GetId(), resp2.GetId(), resp3.GetId()},
@@ -386,7 +394,8 @@ func TestServer_ListTargets(t *testing.T) {
TargetType: &action.Target_RestAsync{
RestAsync: &action.RESTAsync{},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JWE,
},
{
Endpoint: "https://example.com",
@@ -395,7 +404,8 @@ func TestServer_ListTargets(t *testing.T) {
InterruptOnError: true,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JWT,
},
{
Endpoint: "https://example.com",
@@ -404,7 +414,8 @@ func TestServer_ListTargets(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(5 * time.Second),
Timeout: durationpb.New(5 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
},
},
@@ -445,7 +456,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes
func TestServer_ListExecutions(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false)
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
type args struct {
ctx context.Context
@@ -523,7 +534,7 @@ func TestServer_ListExecutions(t *testing.T) {
args: args{
ctx: isolatedIAMOwnerCTX,
dep: func(ctx context.Context, request *action.ListExecutionsRequest, response *action.ListExecutionsResponse) {
target := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false)
target := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON)
// add target as Filter to the request
request.Filters[0] = &action.ExecutionSearchFilter{
Filter: &action.ExecutionSearchFilter_TargetFilter{
@@ -781,3 +792,334 @@ func TestServer_ListExecutions(t *testing.T) {
})
}
}
func TestServer_ListPublicKeys(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
activeKey, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
})
require.NoError(t, err)
changeDate, err := instance.Client.ActionV2.ActivatePublicKey(isolatedIAMOwnerCTX, &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: activeKey.GetKeyId(),
})
require.NoError(t, err)
expirationDate := timestamppb.New(time.Now().Add(24 * time.Hour))
inactiveKey, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: rsaPublicKeyBytes,
ExpirationDate: expirationDate,
})
require.NoError(t, err)
anotherKey, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: rsaPublicKeyBytes,
})
require.NoError(t, err)
type args struct {
ctx context.Context
req *action.ListPublicKeysRequest
}
tests := []struct {
name string
args args
want *action.ListPublicKeysResponse
wantErr bool
}{
{
name: "missing permission",
args: args{
ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner),
req: &action.ListPublicKeysRequest{},
},
wantErr: true,
},
{
name: "invalid target id",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: "notfound",
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
AppliedLimit: 100,
},
},
},
{
name: "list all",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: targetID,
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
AppliedLimit: 100,
TotalResult: 3,
},
PublicKeys: []*action.PublicKey{
{
KeyId: anotherKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: nil,
CreationDate: anotherKey.GetCreationDate(),
ChangeDate: anotherKey.GetCreationDate(),
},
{
KeyId: inactiveKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: expirationDate,
CreationDate: inactiveKey.GetCreationDate(),
ChangeDate: inactiveKey.GetCreationDate(),
},
{
KeyId: activeKey.GetKeyId(),
Active: true,
PublicKey: publicKeyBytes,
Fingerprint: fingerprint,
ExpirationDate: nil,
CreationDate: activeKey.GetCreationDate(),
ChangeDate: changeDate.GetChangeDate(),
},
},
},
},
{
name: "list only active",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: targetID,
Filters: []*action.PublicKeySearchFilter{
{
Filter: &action.PublicKeySearchFilter_ActiveFilter{
ActiveFilter: true,
},
},
},
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
AppliedLimit: 100,
TotalResult: 1,
},
PublicKeys: []*action.PublicKey{
{
KeyId: activeKey.GetKeyId(),
Active: true,
PublicKey: publicKeyBytes,
Fingerprint: fingerprint,
ExpirationDate: nil,
CreationDate: activeKey.GetCreationDate(),
ChangeDate: changeDate.GetChangeDate(),
},
},
},
},
{
name: "list only inactive",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: targetID,
Filters: []*action.PublicKeySearchFilter{
{
Filter: &action.PublicKeySearchFilter_ActiveFilter{
ActiveFilter: false,
},
},
},
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
AppliedLimit: 100,
TotalResult: 2,
},
PublicKeys: []*action.PublicKey{
{
KeyId: anotherKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: nil,
CreationDate: anotherKey.GetCreationDate(),
ChangeDate: anotherKey.GetCreationDate(),
},
{
KeyId: inactiveKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: expirationDate,
CreationDate: inactiveKey.GetCreationDate(),
ChangeDate: inactiveKey.GetCreationDate(),
},
},
},
},
{
name: "list with expiration date filter (boefore or equals)",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: targetID,
Filters: []*action.PublicKeySearchFilter{
{
Filter: &action.PublicKeySearchFilter_ExpirationDateFilter{
ExpirationDateFilter: &filter.TimestampFilter{
Timestamp: expirationDate,
Method: filter.TimestampFilterMethod_TIMESTAMP_FILTER_METHOD_BEFORE_OR_EQUALS,
},
},
},
},
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
AppliedLimit: 100,
TotalResult: 1,
},
PublicKeys: []*action.PublicKey{
{
KeyId: inactiveKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: expirationDate,
CreationDate: inactiveKey.GetCreationDate(),
ChangeDate: inactiveKey.GetCreationDate(),
},
},
},
},
{
name: "list with expiration date filter (after incl. no expiration)",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: targetID,
Filters: []*action.PublicKeySearchFilter{
{
Filter: &action.PublicKeySearchFilter_ExpirationDateFilter{
ExpirationDateFilter: &filter.TimestampFilter{
Timestamp: expirationDate,
Method: filter.TimestampFilterMethod_TIMESTAMP_FILTER_METHOD_AFTER,
},
},
},
},
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
AppliedLimit: 100,
TotalResult: 2,
},
PublicKeys: []*action.PublicKey{
{
KeyId: anotherKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: nil,
CreationDate: anotherKey.GetCreationDate(),
ChangeDate: anotherKey.GetCreationDate(),
},
{
KeyId: activeKey.GetKeyId(),
Active: true,
PublicKey: publicKeyBytes,
Fingerprint: fingerprint,
ExpirationDate: nil,
CreationDate: activeKey.GetCreationDate(),
ChangeDate: changeDate.GetChangeDate(),
},
},
},
},
{
name: "list by key id",
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.ListPublicKeysRequest{
TargetId: targetID,
Filters: []*action.PublicKeySearchFilter{
{
Filter: &action.PublicKeySearchFilter_KeyIdsFilter{
KeyIdsFilter: &filter.InIDsFilter{
Ids: []string{activeKey.GetKeyId(), anotherKey.GetKeyId()},
},
},
},
},
SortingColumn: action.PublicKeyFieldName_PUBLIC_KEY_FIELD_NAME_CHANGE_DATE,
Pagination: &filter.PaginationRequest{
Limit: 1,
Offset: 1,
Asc: true,
},
},
},
want: &action.ListPublicKeysResponse{
Pagination: &filter.PaginationResponse{
TotalResult: 2,
AppliedLimit: 1,
},
PublicKeys: []*action.PublicKey{
{
KeyId: anotherKey.GetKeyId(),
Active: false,
PublicKey: rsaPublicKeyBytes,
Fingerprint: rsaFingerprint,
ExpirationDate: nil,
CreationDate: anotherKey.GetCreationDate(),
ChangeDate: anotherKey.GetCreationDate(),
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(isolatedIAMOwnerCTX, 10*time.Second)
require.EventuallyWithT(t, func(ttt *assert.CollectT) {
got, err := instance.Client.ActionV2.ListPublicKeys(tt.args.ctx, tt.args.req)
if tt.wantErr {
assert.Error(ttt, err, "Error: "+err.Error())
return
}
assert.NoError(ttt, err)
assertPublicKeys(ttt, tt.want, got)
}, retryDuration, tick, "timeout waiting for expected public keys")
})
}
}
func assertPublicKeys(ttt *assert.CollectT, want *action.ListPublicKeysResponse, got *action.ListPublicKeysResponse) {
assert.EqualExportedValues(ttt, want.Pagination, got.Pagination)
assert.Len(ttt, got.PublicKeys, len(want.PublicKeys))
for i := range want.PublicKeys {
assert.Equal(ttt, want.PublicKeys[i].GetKeyId(), got.PublicKeys[i].GetKeyId())
assert.Equal(ttt, want.PublicKeys[i].GetActive(), got.PublicKeys[i].GetActive())
assert.Equal(ttt, want.PublicKeys[i].GetFingerprint(), got.PublicKeys[i].GetFingerprint())
assert.Equal(ttt, want.PublicKeys[i].GetPublicKey(), got.PublicKeys[i].GetPublicKey())
assertDateWithinRangeClockSkew(ttt, got.PublicKeys[i].GetExpirationDate().AsTime(), want.PublicKeys[i].GetExpirationDate().AsTime(), want.PublicKeys[i].GetExpirationDate().AsTime())
assertDateWithinRangeClockSkew(ttt, got.PublicKeys[i].GetCreationDate().AsTime(), want.PublicKeys[i].GetCreationDate().AsTime(), want.PublicKeys[i].GetCreationDate().AsTime())
assertDateWithinRangeClockSkew(ttt, got.PublicKeys[i].GetChangeDate().AsTime(), want.PublicKeys[i].GetChangeDate().AsTime(), want.PublicKeys[i].GetChangeDate().AsTime())
}
}
@@ -4,13 +4,25 @@ package action_test
import (
"context"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"crypto/rsa"
"crypto/sha256"
"crypto/x509"
"encoding/base64"
"encoding/pem"
"fmt"
"testing"
"time"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/zitadel/zitadel/internal/crypto"
target_domain "github.com/zitadel/zitadel/internal/execution/target"
"github.com/zitadel/zitadel/internal/integration"
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
@@ -25,7 +37,7 @@ func TestServer_CreateTarget(t *testing.T) {
signingKey bool
}
alreadyExistingTargetName := integration.TargetName()
instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", target_domain.TargetTypeAsync, false)
instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", target_domain.TargetTypeAsync, false, action.PayloadType_PAYLOAD_TYPE_JSON)
tests := []struct {
name string
ctx context.Context
@@ -115,7 +127,8 @@ func TestServer_CreateTarget(t *testing.T) {
TargetType: &action.CreateTargetRequest_RestAsync{
RestAsync: &action.RESTAsync{},
},
Timeout: durationpb.New(10 * time.Second),
Timeout: durationpb.New(10 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
want: want{
id: true,
@@ -134,7 +147,8 @@ func TestServer_CreateTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(10 * time.Second),
Timeout: durationpb.New(10 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
want: want{
id: true,
@@ -153,7 +167,8 @@ func TestServer_CreateTarget(t *testing.T) {
InterruptOnError: true,
},
},
Timeout: durationpb.New(10 * time.Second),
Timeout: durationpb.New(10 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
want: want{
id: true,
@@ -172,7 +187,8 @@ func TestServer_CreateTarget(t *testing.T) {
InterruptOnError: false,
},
},
Timeout: durationpb.New(10 * time.Second),
Timeout: durationpb.New(10 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
want: want{
id: true,
@@ -192,7 +208,8 @@ func TestServer_CreateTarget(t *testing.T) {
InterruptOnError: true,
},
},
Timeout: durationpb.New(10 * time.Second),
Timeout: durationpb.New(10 * time.Second),
PayloadType: action.PayloadType_PAYLOAD_TYPE_JSON,
},
want: want{
id: true,
@@ -262,7 +279,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "missing permission",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -289,7 +306,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "no change, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -307,7 +324,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "change name, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -325,7 +342,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "regenerate signingkey, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -343,7 +360,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "change type, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -365,7 +382,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "change url, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -383,7 +400,7 @@ func TestServer_UpdateTarget(t *testing.T) {
{
name: "change timeout, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -398,10 +415,28 @@ func TestServer_UpdateTarget(t *testing.T) {
signingKey: false,
},
},
{
name: "change timeout, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
ctx: isolatedIAMOwnerCTX,
req: &action.UpdateTargetRequest{
PayloadType: action.PayloadType_PAYLOAD_TYPE_JWT,
},
},
want: want{
change: true,
changeDate: true,
signingKey: false,
},
},
{
name: "change type async, ok",
prepare: func(request *action.UpdateTargetRequest) {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeAsync, false).GetId()
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeAsync, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
},
args: args{
@@ -497,7 +532,7 @@ func TestServer_DeleteTarget(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
return creationDate, time.Time{}
},
@@ -509,7 +544,7 @@ func TestServer_DeleteTarget(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
request.Id = targetID
instance.DeleteTarget(iamOwnerCtx, t, targetID)
return creationDate, time.Now().UTC()
@@ -546,3 +581,496 @@ func assertDeleteTargetResponse(t *testing.T, creationDate, deletionDate time.Ti
assert.Nil(t, actualResp.DeletionDate)
}
}
var (
publicKey = func() *ecdsa.PublicKey {
privateKey, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
return &privateKey.PublicKey
}()
publicKeyBytes = func() []byte {
pubBytes, _ := x509.MarshalPKIXPublicKey(publicKey)
return pem.EncodeToMemory(&pem.Block{Type: "PUBLIC KEY", Bytes: pubBytes})
}()
fingerprint = func() string {
block, _ := x509.MarshalPKIXPublicKey(publicKey)
hash := sha256.Sum256(block)
return fmt.Sprintf("SHA256:%s", base64.RawStdEncoding.EncodeToString(hash[:]))
}()
rsaPublicKey = func() *rsa.PublicKey {
privateKey, _ := rsa.GenerateKey(rand.Reader, 2048)
return &privateKey.PublicKey
}()
rsaPublicKeyBytes = func() []byte {
data, _ := crypto.PublicKeyToBytes(rsaPublicKey)
return data
}()
rsaFingerprint = func() string {
block, _ := x509.MarshalPKIXPublicKey(rsaPublicKey)
hash := sha256.Sum256(block)
return fmt.Sprintf("SHA256:%s", base64.RawStdEncoding.EncodeToString(hash[:]))
}()
)
func TestServer_AddPublicKey(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
type want struct {
id bool
creationDate bool
}
tests := []struct {
name string
ctx context.Context
req *action.AddPublicKeyRequest
want want
wantErr bool
}{
{
name: "missing permission",
ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner),
req: &action.AddPublicKeyRequest{
TargetId: "targetID",
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
},
wantErr: true,
},
{
name: "empty target id",
ctx: isolatedIAMOwnerCTX,
req: &action.AddPublicKeyRequest{
TargetId: "",
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
},
wantErr: true,
},
{
name: "empty public key",
ctx: isolatedIAMOwnerCTX,
req: &action.AddPublicKeyRequest{
TargetId: "targetID",
PublicKey: nil,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
},
wantErr: true,
},
{
name: "invalid public key",
ctx: isolatedIAMOwnerCTX,
req: &action.AddPublicKeyRequest{
TargetId: "targetID",
PublicKey: []byte("invalid"),
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
},
wantErr: true,
},
{
name: "expiration date in the past",
ctx: isolatedIAMOwnerCTX,
req: &action.AddPublicKeyRequest{
TargetId: "targetID",
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(-1 * time.Hour)),
},
wantErr: true,
},
{
name: "target not existing",
ctx: isolatedIAMOwnerCTX,
req: &action.AddPublicKeyRequest{
TargetId: "notexisting",
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
},
wantErr: true,
},
{
name: "add public key, ok",
ctx: isolatedIAMOwnerCTX,
req: func() *action.AddPublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
return &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
}
}(),
want: want{
id: true,
creationDate: true,
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
start := time.Now()
got, err := instance.Client.ActionV2.AddPublicKey(tt.ctx, tt.req)
if tt.wantErr {
assert.Error(t, err)
return
}
assert.NoError(t, err)
assert.NotEmpty(t, got.GetKeyId())
assertDateWithinRangeClockSkew(t, got.GetCreationDate().AsTime(), start, time.Now())
})
}
}
func TestServer_ActivatePublicKey(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
tests := []struct {
name string
ctx context.Context
req *action.ActivatePublicKeyRequest
wantErr bool
}{
{
name: "missing permission",
ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner),
req: &action.ActivatePublicKeyRequest{
TargetId: "targetID",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "empty target id",
ctx: isolatedIAMOwnerCTX,
req: &action.ActivatePublicKeyRequest{
TargetId: "",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "empty key id",
ctx: isolatedIAMOwnerCTX,
req: &action.ActivatePublicKeyRequest{
TargetId: "targetID",
KeyId: "",
},
wantErr: true,
},
{
name: "target not existing",
ctx: isolatedIAMOwnerCTX,
req: &action.ActivatePublicKeyRequest{
TargetId: "notexisting",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "key not existing",
ctx: isolatedIAMOwnerCTX,
req: func() *action.ActivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
return &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: "notexisting",
}
}(),
wantErr: true,
},
{
name: "already expired key",
ctx: isolatedIAMOwnerCTX,
req: func() *action.ActivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().Add(1 * time.Second)),
})
require.NoError(t, err)
time.Sleep(2 * time.Second)
return &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: true,
},
{
name: "already activated key",
ctx: isolatedIAMOwnerCTX,
req: func() *action.ActivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
})
require.NoError(t, err)
_, err = instance.Client.ActionV2.ActivatePublicKey(isolatedIAMOwnerCTX, &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
})
require.NoError(t, err)
return &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: false,
},
{
name: "activate key, ok",
ctx: isolatedIAMOwnerCTX,
req: func() *action.ActivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
})
require.NoError(t, err)
return &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
start := time.Now()
got, err := instance.Client.ActionV2.ActivatePublicKey(tt.ctx, tt.req)
if tt.wantErr {
assert.Error(t, err)
return
}
assert.NoError(t, err)
assertDateWithinRangeClockSkew(t, got.GetChangeDate().AsTime(), start, time.Now())
})
}
}
func TestServer_DeactivatePublicKey(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
tests := []struct {
name string
ctx context.Context
req *action.DeactivatePublicKeyRequest
wantErr bool
}{
{
name: "missing permission",
ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner),
req: &action.DeactivatePublicKeyRequest{
TargetId: "targetID",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "empty target id",
ctx: isolatedIAMOwnerCTX,
req: &action.DeactivatePublicKeyRequest{
TargetId: "",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "empty key id",
ctx: isolatedIAMOwnerCTX,
req: &action.DeactivatePublicKeyRequest{
TargetId: "targetID",
KeyId: "",
},
wantErr: true,
},
{
name: "target not existing",
ctx: isolatedIAMOwnerCTX,
req: &action.DeactivatePublicKeyRequest{
TargetId: "notexisting",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "key not existing",
ctx: isolatedIAMOwnerCTX,
req: func() *action.DeactivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
return &action.DeactivatePublicKeyRequest{
TargetId: targetID,
KeyId: "notexisting",
}
}(),
wantErr: true,
},
{
name: "already deactivated key",
ctx: isolatedIAMOwnerCTX,
req: func() *action.DeactivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
})
require.NoError(t, err)
return &action.DeactivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: false,
},
{
name: "deactivate key, ok",
ctx: isolatedIAMOwnerCTX,
req: func() *action.DeactivatePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
ExpirationDate: timestamppb.New(time.Now().UTC().Add(time.Hour)),
})
require.NoError(t, err)
_, err = instance.Client.ActionV2.ActivatePublicKey(isolatedIAMOwnerCTX, &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
})
require.NoError(t, err)
return &action.DeactivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
start := time.Now()
got, err := instance.Client.ActionV2.DeactivatePublicKey(tt.ctx, tt.req)
if tt.wantErr {
assert.Error(t, err)
return
}
assert.NoError(t, err)
assertDateWithinRangeClockSkew(t, got.GetChangeDate().AsTime(), start, time.Now())
})
}
}
func TestServer_RemovePublicKey(t *testing.T) {
instance := integration.NewInstance(CTX)
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
tests := []struct {
name string
ctx context.Context
req *action.RemovePublicKeyRequest
wantErr bool
}{
{
name: "missing permission",
ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner),
req: &action.RemovePublicKeyRequest{
TargetId: "targetID",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "empty target id",
ctx: isolatedIAMOwnerCTX,
req: &action.RemovePublicKeyRequest{
TargetId: "",
KeyId: "keyID",
},
wantErr: true,
},
{
name: "empty key id",
ctx: isolatedIAMOwnerCTX,
req: &action.RemovePublicKeyRequest{
TargetId: "targetID",
KeyId: "",
},
wantErr: true,
},
{
name: "target not existing",
ctx: isolatedIAMOwnerCTX,
req: &action.RemovePublicKeyRequest{
TargetId: "notexisting",
KeyId: "keyID",
},
wantErr: false,
},
{
name: "key not existing",
ctx: isolatedIAMOwnerCTX,
req: func() *action.RemovePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
return &action.RemovePublicKeyRequest{
TargetId: targetID,
KeyId: "notexisting",
}
}(),
wantErr: false,
},
{
name: "remove activated key",
ctx: isolatedIAMOwnerCTX,
req: func() *action.RemovePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
})
require.NoError(t, err)
_, err = instance.Client.ActionV2.ActivatePublicKey(isolatedIAMOwnerCTX, &action.ActivatePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
})
require.NoError(t, err)
return &action.RemovePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: true,
},
{
name: "remove key, ok",
ctx: isolatedIAMOwnerCTX,
req: func() *action.RemovePublicKeyRequest {
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false, action.PayloadType_PAYLOAD_TYPE_JSON).GetId()
resp, err := instance.Client.ActionV2.AddPublicKey(isolatedIAMOwnerCTX, &action.AddPublicKeyRequest{
TargetId: targetID,
PublicKey: publicKeyBytes,
})
require.NoError(t, err)
return &action.RemovePublicKeyRequest{
TargetId: targetID,
KeyId: resp.GetKeyId(),
}
}(),
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
_, err := instance.Client.ActionV2.RemovePublicKey(tt.ctx, tt.req)
if tt.wantErr {
assert.Error(t, err)
return
}
assert.NoError(t, err)
})
}
}
func assertDateWithinRangeClockSkew(t assert.TestingT, actual time.Time, start, end time.Time) {
assert.WithinRange(t, actual, start.Add(-time.Second), end.Add(time.Second))
}